redmine_stagecoach 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/bin/stagecoach

@@ -117,7 +117,7 @@ module Stagecoach
     Git.checkout(master)
     puts "Pulling changes:"
     Git.pull
-    if opts[:branch]
+    if opts[:branch_given]
       new_branch = opts[:branch]
     else  
       print "Please enter a new git branch name for your changes (branch will be created):  "

data/lib/stagecoach/command_line.rb

@@ -76,12 +76,8 @@ This automates the entire deploy workflow for you as follows:
         opt :redmine, "Enter your redmine/planio issue number here, eg. stagecoach -r 1234 (optional)", :type  => :string
         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 (default is staging)", :type => :string, :default => 'staging'
+        opt :deploy, "Use this option to  deploy from your current branch to any branch you choose, eg. stagecoach -d staging", :type => :string 
         opt :setup, "Use this the first time you run stagecoach to save your redmine repository and api key"
-        
-        # Some arguments don't belong together
-        conflicts(:redmine, :github)
-        conflicts(:push, :deploy)
       end
     end
   end

data/redmine_stagecoach.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "redmine_stagecoach"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oli Barnett"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmine_stagecoach
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70339518370680 !ruby/object:Gem::Requirement
+  requirement: &70329089329460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339518370680
+  version_requirements: *70329089329460
 - !ruby/object:Gem::Dependency
   name: ghi
-  requirement: &70339518366500 !ruby/object:Gem::Requirement
+  requirement: &70329089328980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339518366500
+  version_requirements: *70329089328980
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70339518361640 !ruby/object:Gem::Requirement
+  requirement: &70329089328500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339518361640
+  version_requirements: *70329089328500
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70339518356740 !ruby/object:Gem::Requirement
+  requirement: &70329089328020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339518356740
+  version_requirements: *70329089328020
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70339518354140 !ruby/object:Gem::Requirement
+  requirement: &70329089327540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339518354140
+  version_requirements: *70329089327540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70339518348360 !ruby/object:Gem::Requirement
+  requirement: &70329089327060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70339518348360
+  version_requirements: *70329089327060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70339518345820 !ruby/object:Gem::Requirement
+  requirement: &70329089326580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70339518345820
+  version_requirements: *70329089326580
 description: Git/capistrano workflow automation script with Redmine & Github issue
   integration
 email: o.barnett@digitaleseiten.de
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4109014189137184230
+      hash: 4546930486911805785
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: