WordPress.org
Get WordPress

Plugin Directory

Changeset 1089532


Ignore:
Timestamp:
02/14/2015 12:18:41 AM (11 years ago)
Author:
mpvanwinkle77
Message:

Preparing for 1.1.2-beta release

Location:
twigify/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • twigify/trunk/bin/update-svn.sh

    r1058659 r1089532  
    11#! /bin/bash
    2 # based on https://github.com/GaryJones/wordpress-plugin-git-flow-svn-deploy
     2# Based on https://github.com/GaryJones/wordpress-plugin-git-flow-svn-deploy
    33
    4 PLUGINSLUG='twigify'
     4 #SVNPATH="${input:-$default_svnpath}" # Populate with default if empty
     5 #SVNURL="${input:-$default_svnurl}" # Populate with default if empty
     6 #SVNUSER="${input:-$default_svnuser}" # Populate with default if empty
     7 #PLUGINDIR="${input:-$default_plugindir}" # Populate with default if empty
     8 #MAINFILE="${input:-$default_mainfile}" # Populate with default if empty
    59
    6 # Set up some default values. Feel free to change these in your own script
    7 CURRENTDIR=`pwd`
    8 echo "CURRENT is $CURRENTDIR"
    9 SVNPATH="/tmp/$PLUGINSLUG"
    10 SVNURL="http://plugins.svn.wordpress.org/$PLUGINSLUG"
    11 SVNUSER="mpvanwinkle77"
    12 PLUGINDIR="$CURRENTDIR"
    13 MAINFILE="$PLUGINSLUG.php"
     10echo "That's all of the data collected."
     11echo
     12echo "Slug: $PLUGINSLUG"
     13echo "Temp checkout path: $SVNPATH"
     14echo "Remote SVN repo: $SVNURL"
     15echo "SVN username: $SVNUSER"
     16echo "Plugin directory: $PLUGINDIR"
     17echo "Main file: $MAINFILE"
     18echo
     19
     20# Allow user cancellation
     21if [ "$PROCEED" != "y" ]; then echo "Aborting..."; exit 1; fi
    1422
    1523# git config
    … …  
    1826# Let's begin...
    1927echo ".........................................."
    20 echo 
     28echo
    2129echo "Preparing to deploy WordPress plugin"
    22 echo 
     30echo
    2331echo ".........................................."
    24 echo 
     32echo
    2533
    2634# Check version in readme.txt is the same as plugin file after translating both to unix line breaks to work around grep's failure to identify mac line breaks
    … …  
    3442echo "Versions match in readme.txt and $MAINFILE. Let's proceed..."
    3543
     44# GaryJ: Ignore check for git tag, as git flow release finish creates this.
     45#if git show-ref --tags --quiet --verify -- "refs/tags/$NEWVERSION1"
     46#   then
     47#       echo "Version $NEWVERSION1 already exists as git tag. Exiting....";
     48#       exit 1;
     49#   else
     50#       echo "Git version does not exist. Let's proceed..."
     51#fi
     52
    3653echo "Changing to $GITPATH"
    3754cd $GITPATH
     55# GaryJ: Commit message variable not needed . Hard coded for SVN trunk commit for consistency.
     56#echo -e "Enter a commit message for this new version: \c"
     57#read COMMITMSG
     58# GaryJ: git flow release finish already covers this commit.
     59#git commit -am "$COMMITMSG"
     60
     61# GaryJ: git flow release finish already covers this tag creation.
     62#echo "Tagging new version in git"
     63#git tag -a "$NEWVERSION1" -m "Tagging version $NEWVERSION1"
     64
    3865echo "Pushing git master to origin, with tags"
    3966git push origin master
    4067git push origin master --tags
    4168
     69echo
    4270echo "Creating local copy of SVN repo trunk ..."
    43 svn checkout $SVNURL --username=$SVNUSER --password=$SVNPASS $SVNPATH 
    44 svn update --username=$SVNUSER --password=$SVNPASS --quiet $SVNPATH/trunk --set-depth infinity
     71svn checkout $SVNURL $SVNPATH --depth immediates
     72svn update --quiet $SVNPATH/trunk --set-depth infinity
    4573
    4674echo "Ignoring GitHub specific files"
    … …  
    5280echo "Exporting the HEAD of master from git to the trunk of SVN"
    5381git checkout-index -a -f --prefix=$SVNPATH/trunk/
     82
     83# If submodule exist, recursively check out their indexes
     84if [ -f ".gitmodules" ]
     85    then
     86        echo "Exporting the HEAD of each submodule from git to the trunk of SVN"
     87        git submodule init
     88        git submodule update
     89        git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
     90            while read path_key path
     91            do
     92                #url_key=$(echo $path_key | sed 's/\.path/.url/')
     93                #url=$(git config -f .gitmodules --get "$url_key")
     94                #git submodule add $url $path
     95                echo "This is the submodule path: $path"
     96                echo "The following line is the command to checkout the submodule."
     97                echo "git submodule foreach --recursive 'git checkout-index -a -f --prefix=$SVNPATH/trunk/$path/'"
     98                git submodule foreach --recursive 'git checkout-index -a -f --prefix=$SVNPATH/trunk/$path/'
     99            done
     100fi
    54101
    55102# Support for the /assets folder on the .org repo.
    … …  
    67114# Add all new files that are not set to be ignored
    68115svn status | grep -v "^.[ \t]*\..*" | grep "^?" | awk '{print $2}' | xargs svn add
    69 svn commit --username=$SVNUSER --password=$SVNPASS -m "Preparing for $NEWVERSION1 release"
     116svn commit --username=$SVNUSER -m "Preparing for $NEWVERSION1 release"
    70117
    71118echo "Updating WordPress plugin repo assets and committing"
    … …  
    76123svn status | grep -v "^.[ \t]*\..*" | grep "^?" | awk '{print $2}' | xargs svn add
    77124svn update --accept mine-full $SVNPATH/assets/*
    78 svn commit --username=$SVNUSER --password=$SVNPASS -m "Updating assets"
     125svn commit --username=$SVNUSER -m "Updating assets"
    79126
    80127echo "Creating new SVN tag and committing it"
    … …  
    86133svn delete --force --quiet $SVNPATH/tags/$NEWVERSION1/trunk
    87134cd $SVNPATH/tags/$NEWVERSION1
    88 svn commit --username=$SVNUSER --password=$SVNPASS -m "Tagging version $NEWVERSION1"
     135svn commit --username=$SVNUSER -m "Tagging version $NEWVERSION1"
    89136
    90137echo "Removing temporary directory $SVNPATH"

  • twigify/trunk/lib/ContentTemplates/Alert.php

    r1043611 r1089532  
    1010  public static function instance() {
    1111    if(!self::$instance) {
    12       self::$instance = new Self();
     12      self::$instance = new self();
    1313    }
    1414    return self::$instance;

  • twigify/trunk/readme.txt

    r1076306 r1089532  
    55Requires at least: 4.0.1
    66Tested up to: 4.1
    7 Stable tag: 1.1.1-beta
     7Stable tag: 1.1.2-beta
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    5959= 1.1.1-beta =
    6060* removes debuging code accidentally left behind.
     61
     62= 1.1.2-beta =
     63* lowercase self for compatibility with php 5.4

  • twigify/trunk/twigify.php

    r1076306 r1089532  
    55    Description: Allows you to create content templates that will conditionally override the content of a post or page or customer post type
    66    Author: Mike Van Winkle
    7     Version: 1.1.1-beta
     7    Version: 1.1.2-beta
    88    Author URI: http://mikevanwinkle.com
    99    Text Domain: twigify
    1010    Domain Path: /lang
    1111*/
    12 define('CT_VERSION', '0.1-alpha');
     12define('CT_VERSION', '1.1.2-beta');
    1313
    1414// register autoloader
Note: See TracChangeset for help on using the changeset viewer.