redmine_stagecoach 0.6.4 → 0.6.5

data/Gemfile.lock

@@ -1,17 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     builder (3.0.0)
-    capistrano (2.9.0)
+    capistrano (2.11.2)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -25,7 +25,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    multi_json (1.0.4)
+    multi_json (1.2.0)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -34,7 +34,11 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     rake (0.9.2.2)
-    shoulda (2.11.3)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
     trollop (1.16.2)
 
 PLATFORMS

data/README.rdoc

@@ -1,5 +1,7 @@
 = Stagecoach
-stagecoach works in two stages, init and deploy. The init stage creates a branch based on a redmine/planio issue, and the deploy stage pushes, merges and (yes!) deploys it. 
+stagecoach works in two stages, init and deploy. The init stage creates a branch based on a redmine/planio issue, and the deploy stage merges and (yes!) deploys it. 
+
+In between you can use stagecoach -p to push changes from your current branch to your remote repo.  This creates a remote branch for you if one does not exist already.
 
 <b>You should always run stagecoach from the root directory of your repo</b>
 Otherwise it may (will) break.
@@ -12,11 +14,15 @@ so if you need to remove a branch or edit the issue number that a branch points
 
 == Init Stage
   stagecoach -p[lanio] 4115 (OR) -g[ithub] 525 -b[ranch] my_new_branch
+  (optional: -f[rom] original_branch, default => master)
 
 You can also just run stagecoach without any flags and it will allow you to enter this stuff manually.
 
+The -f flag allows you to choose which branch you would like to branch out from.
+The default is master. 
+
 To get started, all stagecoach needs from you is the issue number you are working on (redmine/planio or github) and a new branch name.  You /can/ use an existing branch if it 
-is up to date with your master branch. If it is not, stagecoach will squawk and die and you will have to bring the branch up to date, or use a new one.
+is up to date with your chosen original branch. If it is not, stagecoach will squawk and die and you will have to bring the branch up to date, or use a new one.
   
 If you are working from a redmine/planio issue, stagecoach sets the issue to 'In Progress'.  Currently it does not assign the issue to you, but you have the option to view the issue
 in your browser and do this manually.  It also sets up a git issue for you to reference in your commits (see commit-msg githook).
@@ -44,8 +50,7 @@ For more information, see
 
 This automates the entire deploy workflow for you as follows:
 
-  git push origin new_branch_name
-  git checkout staging
+  git checkout [chosen deploy branch]
   git pull
   git merge task_name
   git push origin staging
@@ -53,13 +58,17 @@ This automates the entire deploy workflow for you as follows:
   set redmine/planio ticket to 'feedback' status (if applicable)
  
 <b> Sample usage: </b>
-  stagecoach -p 4115 -b new_branch_name
+  stagecoach -p 4115 -b new_branch_name -f branch_to_branch_out_from
   [code, commit until feature or fix is complete]
-  stagecoach -d
+  stagecoach -d staging
 
 <b> Flags </b>
   --branch, -b: Enter your new branch name here, eg. stagecoach -b new_branch (optional)
-  --planio, -p: Enter your planio issue number here, eg. stagecoach -p 1234 (optional)
-  --github, -g: Enter your github issue number here, eg. stagecoach -g 1234 (optional)
   --deploy, -d: Use this option to skip straight to push & deploy if you have already pulled from master and created your new branch
+  --from,   -f: Set the original branch from which you would like to make your new branch.  Default is 'master'
+  --github, -g: Enter your github issue number here, eg. stagecoach -g 1234 (optional)
+  --help,   -h: Shows your help
+  --push,   -p: Push the current branch to remote.  Creates a remote branch if none exists.
+  --redmine,-r: Enter your planio issue number here, eg. stagecoach -p 1234 (optional)
   --setup,  -s: Use this the first time you run stagecoach to save your redmine repository/api key and install the commit-msg githook if desired
+  --version, v: Prints the current version

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/bin/stagecoach

@@ -1,21 +1,33 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 require File.dirname(__FILE__) + '/../lib/stagecoach.rb'
+VERSION = File.open(File.dirname(__FILE__) + '/../VERSION').read
 
 CONFIG_FILE = `pwd`.chomp + '/.stagecoach'
 
 module Stagecoach
-  staging = 'staging'
-  master  = 'master'
-
   # Command line options courtesy of the Trollop gem.
   opts = CommandLine.trollop
 
+  staging = 'staging'
+  original_branch  = opts[:from]
+
+  # Check that original_branch actually exists.
+  unless Git.branch_exist?(original_branch)
+    puts "|#{original_branch}| does not exist.".red
+    puts "The -f option is for choosing which branch you want to branch out from."
+    puts "Run stagecoach -h for help"
+    puts "Exiting..."
+    exit
+  end
+
+  
   # Initial setup with -s flag.
   if opts[:setup]
     Config.setup
   end
 
+  
   # Initial setup without -s flag.
   unless File.exist?(CONFIG_FILE)
     puts "No .stagecoach file present, running initial setup."
@@ -43,6 +55,7 @@ module Stagecoach
     end
   end
 
+
   # Set up redmine client config.
   RedmineApi::Client.instance_eval do
     self.site = config["redmine_site"]
@@ -114,17 +127,17 @@ module Stagecoach
     CommandLine.line_break
     puts "Stagecoach: initial stage"
 
-    # Change to master, pull changes, and create a new branch.
+    # Change to from branch, pull changes, and create a new branch.
     CommandLine.line_break  
-    puts "Switching to master branch"
+    puts "Switching to #{original_branch} branch"
     #
     # TODO if there is a file that has been git added but not git committed, it
     # will pop up at this point looking confusing (eg. "A     test_file").
     # Handle this better?
     #
-    Git.checkout(master)
+    Git.checkout(original_branch)
     puts "Pulling changes:"
-    Git.pull
+    Git.pull(original_branch)
     if opts[:branch_given]
       new_branch = opts[:branch]
     else  
@@ -141,15 +154,15 @@ module Stagecoach
 
     # Make sure new local branch does not already exist.
     if Git.branch_exist?(new_branch)
-      puts "There is already a local branch called #{new_branch}."
-      if Git.diff(master, new_branch) == ""
-        print "#{new_branch} is up to date with master.  [U]se or [Q]uit:  "
+      print "There is already a local branch called #{new_branch}.[U]se or [Q]uit:"
+      if Git.diff(original_branch, new_branch) == ""
+        print "#{new_branch} is up to date with #{original_branch}.  [U]se or [Q]uit:  "
       else 
-        puts "#{new_branch} is not up to date with master. Please use a different branch or update this one.".red
+        puts "#{new_branch} is not up to date with #{original_branch}. Please use a different branch or update this one.".red
         puts "Exiting..."
         CommandLine.line_break
-        puts "The following files in branch '#{new_branch}' differ from their master branch versions:"
-        puts Git.diff(master, new_branch)
+        puts "The following files in branch '#{new_branch}' differ from their #{original_branch} branch versions:"
+        puts Git.diff(original_branch, new_branch)
         CommandLine.line_break
         exit
       end
@@ -163,7 +176,7 @@ module Stagecoach
       Git.new_branch(new_branch)
     end
 
-    # Ugly code, pretty output...
+    # Pretty output...
     CommandLine.line_break
 
     # Issue handling.
@@ -282,7 +295,6 @@ module Stagecoach
     Git.merge(to_branch, from_branch)
     Git.push(to_branch)
     Capistrano.deploy(to_branch)
-    Git.change_to_branch(master)
 
     # Redmine issue to feedback status
     if redmine_issue_number =  config[from_branch][:redmine_issue]

data/lib/stagecoach/command_line.rb

@@ -8,76 +8,32 @@ module Stagecoach
       require 'trollop'
       # Command line options using Trollop.
       Trollop::options do
+        version "Stagecoach %s" % VERSION
         banner <<-EOS
-stagecoach works in two stages, init and deploy. The init stage creates a branch based on a redmine/planio issue, and the deploy stage pushes, merges and (yes!) deploys it. 
+Usage
+-----
+Init stage:
+  stagecoach -r[edmine] 4115 (or -g[ithub] 525) -b[ranch] my_new_branch -f[rom] branch_to_branch_out_from
 
-#{"You should always run stagecoach from the root directory of your repo".red}
-Otherwise it may (will) break.
+Push:
+  stagecoach -p
 
-The first time you run stagecoach it will ask you for some information, namely your redmine/planio repo URL and your API key for this repo.
-It will also install a custom commit-msg git hook (if you ask it to) - for more information, see below.  
+Deploy:
+  stagecoach -d staging
 
-All stagecoach config is saved in /path/to/your/repo/.stagecoach which is created at initial setup and added to your global .gitignore.  This is a yaml file with fairly obvious syntax
-so if you need to remove a branch or edit the issue number that a branch points to, it is possible (although not necessarily recommended) to edit it.
+For more info see the readme at https://github.com/omnikron/stagecoach#readme
 
-Init Stage
-----------
-stagecoach -p[lanio] 4115 (OR) -g[ithub] 525 -b[ranch] my_new_branch
-
-You can also just run stagecoach without any flags and it will allow you to enter this stuff manually.
-
-To get started, all stagecoach needs from you is the issue number you are working on (redmine/planio or github) and a new branch name.  You /can/ use an existing branch if it 
-is up to date with your master branch. If it is not, stagecoach will squawk and die and you will have to bring the branch up to date, or use a new one.
-  
-If you are working from a redmine/planio issue, stagecoach sets the issue to 'In Progress'.  Currently it does not assign the issue to you, but you have the option to view the issue
-in your browser and do this manually.  It also sets up a git issue for you to reference in your commits (see commit-msg githook).
-
-If you are working from a github issue, we can all get on with our lives.
-
-Coding Stage
-------------
-Future versions of stagecoach may do the coding for you, but at the moment you have to do this part manually.
-Just code and commit, code and commit until your feature or fix is ready.
-
-#{"commit-msg githook".green}
-If you opt to install the commit-msg githook during initial setup (stagecoach -s) then your commit messages will be automatically referenced to the github issue of the branch you are in 
-(this only applies to branches created or registered in Stagecoach).
-
-  - to reference a different issue from a commit, simply refer to it as normal with #xxx in the commit message. The git-hook will leave your message alone.
-  - to make no reference at all, you can use the #noref tag in the commit message. The git-hook
-  - to close an issue with a commit, use the #closes tag.
-
-For more information, see 
-  - the githook itself at /path/to/your/repo/.git/hooks/commit-msg
-  - http://book.git-scm.com/5_git_hooks.html
-
-Deploy Stage
-------------
-stagecoach -d[eploy]
-
-This automates the entire deploy workflow for you as follows:
-
-  git push origin new_branch_name
-  git checkout staging
-  git pull
-  git merge task_name
-  git push origin staging
-  cap staging deploy
-  set redmine/planio ticket to 'feedback' status (if applicable)
- 
-#{"Sample usage:".green}
-  stagecoach -p 4115 -b new_branch_name
-  [code, commit until feature or fix is complete]
-  stagecoach -d
 
 #{"Flags".red}
         EOS
         opt :branch, "Enter your new branch name here, eg. stagecoach -b new_branch (optional)", :type => :string
-        opt :redmine, "Enter your redmine/planio issue number here, eg. stagecoach -r 1234 (optional)", :type  => :string
+        opt :deploy, "Use this option to  deploy from your current branch to any branch you choose, eg. stagecoach -d staging", :type => :string 
+        opt :from, "Use this option to set the branch you want to branch off from.  Default is master", :type => :string, :default => "master"
         opt :github, "Enter your github issue number here, eg. stagecoach -g 1234 (optional)", :type => :string
         opt :push, "Use this option to push your changes to your remote branch (will be created if necessary)"
-        opt :deploy, "Use this option to  deploy from your current branch to any branch you choose, eg. stagecoach -d staging", :type => :string 
+        opt :redmine, "Enter your redmine/planio issue number here, eg. stagecoach -r 1234 (optional)", :type  => :string
         opt :setup, "Use this the first time you run stagecoach to save your redmine repository and api key"
+        opt :version, "Prints the current version"
       end
     end
   end

data/lib/stagecoach/git.rb

@@ -100,8 +100,8 @@ module Stagecoach
         puts `git checkout #{branch}`
       end
 
-      def pull
-        puts `git pull`
+      def pull(branch)
+        puts `git pull origin #{branch}`
       end
 
       def branch_exist?(branch)

data/redmine_stagecoach.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "redmine_stagecoach"
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oli Barnett"]
-  s.date = "2012-02-14"
+  s.date = "2012-03-27"
   s.description = "Git/capistrano workflow automation script with Redmine & Github issue integration"
   s.email = "o.barnett@digitaleseiten.de"
   s.executables = ["stagecoach"]
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/omnikron/stagecoach"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.18"
   s.summary = "Stagecoach is in ur Redmine, automating ur Git workflow."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmine_stagecoach
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000Z
+date: 2012-03-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70099412421780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70099412421780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ghi
-  requirement: &70099412421300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70099412421300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70099412420820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70099412420820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70099412420340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70099412420340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70099412419860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099412419860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70099412419380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70099412419380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70099412418900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +117,12 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70099412418900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 description: Git/capistrano workflow automation script with Redmine & Github issue
   integration
 email: o.barnett@digitaleseiten.de
@@ -133,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 699970911633980360
+      hash: -2310285675229824545
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Stagecoach is in ur Redmine, automating ur Git workflow.