redmine_stagecoach 0.5.3 → 0.6.1

data/Gemfile

@@ -11,5 +11,4 @@ group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -1,22 +1,31 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.0)
     capistrano (2.9.0)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    ghi (0.3.0)
+    ghi (0.3.1)
     git (1.2.5)
-    highline (1.6.9)
+    highline (1.6.11)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    multi_json (1.0.4)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -25,7 +34,6 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     rake (0.9.2.2)
-    rcov (0.9.11)
     shoulda (2.11.3)
     trollop (1.16.2)
 
@@ -38,6 +46,5 @@ DEPENDENCIES
   capistrano
   ghi
   jeweler (~> 1.6.4)
-  rcov
   shoulda
   trollop

data/Rakefile

@@ -33,13 +33,13 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
+#require 'rcov/rcovtask'
+#Rcov::RcovTask.new do |test|
+#  test.libs << 'test'
+#  test.pattern = 'test/**/test_*.rb'
+#  test.verbose = true
+#  test.rcov_opts << '--exclude "gems/*"'
+#end
 
 task :default => :test
 

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.6.1

data/bin/stagecoach

@@ -31,13 +31,13 @@ module Stagecoach
     Config.setup if config["redmine_api"]  == "none"
 
     # Checks that command-line args are present and correct.
-    Trollop::die :planio, "issue number can only contain digits" if opts[:planio] && opts[:planio][/\D/]
+    Trollop::die :redmine, "issue number can only contain digits" if opts[:redmine] && opts[:redmine][/\D/]
     Trollop::die :github, "issue number can only contain digits" if opts[:github] && opts[:github][/\D/]
     Trollop::die :branch, "name must be longer than 1 character" if opts[:branch] && opts[:branch].length <= 1
 
-    # You can't give a planio and a github issue number (for the moment)
-    if opts[:github] && opts[:planio]
-      puts "You can't enter a github issue at the same time as a planio issue at the moment.  Make up your mind!\nExiting..."
+    # You can't give a redmine and a github issue number (for the moment)
+    if opts[:github] && opts[:redmine]
+      puts "You can't enter a github issue at the same time as a redmine issue at the moment.  Make up your mind!\nExiting..."
       exit
     end
   end
@@ -57,34 +57,36 @@ module Stagecoach
     exit
   end 
 
+  # ------------------------------------------------------------------
   # Initial stage - set up branch and git issue.
+  # ------------------------------------------------------------------
 
-  unless opts[:deploy]
+  unless opts[:deploy] or opts[:push]
 
     # If no issue argument has been given.
-    if opts[:github].nil? && opts[:planio].nil?
-      print "Are you working on a [P]lanio or a [G]ithub issue:  "
+    if opts[:github].nil? && opts[:redmine].nil?
+      print "Are you working on a [R]edmine or a [G]ithub issue:  "
       case STDIN.gets.chomp
-      when 'P'
-        print "Please enter your Planio issue number:  "
-        opts[:planio] = gets.chomp
+      when 'R'
+        print "Please enter your Redmine issue number:  "
+        opts[:redmine] = gets.chomp
       when 'G'
         print "Please enter your Github issue number:  "
         opts[:github] = gets.chomp
       end
     end
 
-    # Check that the planio issue is not already assigned.
-    if opts[:planio]
-      planio_issue_number = opts[:planio]
-      planio_issue = Redmine.issue(planio_issue_number)
-      if planio_issue.status.id != '1'
+    # Check that the redmine issue is not already assigned.
+    if opts[:redmine]
+      redmine_issue_number = opts[:redmine]
+      redmine_issue = Redmine.issue(redmine_issue_number)
+      if redmine_issue.status.id != '1'
         puts "Warning!".red
-        puts "This issue is in status '#{planio_issue.status.name}'"
+        puts "This issue is in status '#{redmine_issue.status.name}'"
         begin 
-        puts "It is assigned to #{planio_issue.assigned_to.name}"
+          puts "It is assigned to #{redmine_issue.assigned_to.name}"
         rescue
-        puts "But it is not assigned to anybody yet." 
+          puts "But it is not assigned to anybody yet." 
         end
         print "Continue? [Y]es or [Q]uit:  "
         case STDIN.gets.chomp
@@ -94,9 +96,9 @@ module Stagecoach
         end
       end
 
-      # Set the planio issue status to 'In Bearbeitung'
-      planio_issue.status_id = 2
-      planio_issue.save
+      # Set the redmine issue status to 'In Bearbeitung'
+      redmine_issue.status_id = 2
+      redmine_issue.save
     end
 
     # TODO: Check that the github issue is not already assigned.
@@ -152,7 +154,7 @@ module Stagecoach
     else
       Git.new_branch(new_branch)
     end
-    
+
     # Ugly code, pretty output...
     CommandLine.line_break
 
@@ -160,36 +162,36 @@ module Stagecoach
     if opts[:github]
       config[Git.current_branch] = {:github_issue => opts[:github]}
       #TODO check that github issue is not assigned to somebody already
-    elsif opts[:planio]
-      config[Git.current_branch] = {:planio_issue => planio_issue_number}
+    elsif opts[:redmine]
+      config[Git.current_branch] = {:redmine_issue => redmine_issue_number}
     end
 
     issue = config[Git.current_branch]
 
     # Set up the related issue for this branch.
-    if planio_issue = issue[:planio_issue]
+    if redmine_issue = issue[:redmine_issue]
       begin
-        puts "Searching for issue number #{planio_issue}..."
-        redmine_issue = Redmine.issue(planio_issue)
+        puts "Searching for issue number #{redmine_issue}..."
+        redmine_issue = Redmine.issue(redmine_issue)
       rescue ActiveResource::ResourceNotFound => e
         puts e.message
         exit
       end
-        puts "Issue found: #{redmine_issue.subject}\n" 
+      puts "Issue found: #{redmine_issue.subject}\n" 
 
-      # Create a Github issue referencing the planio issue.
+      # Create a Github issue referencing the redmine issue.
       puts "Creating Git issue with subject: " + redmine_issue.subject
-      body = "Planio issue: #{Redmine.issue_url(redmine_issue)} \n\n #{redmine_issue.description}"
+      body = "Redmine issue: #{Redmine.issue_url(redmine_issue)} \n\n #{redmine_issue.description}"
 
       # Create a Git issue.
       github_issue =  Git.new_issue(redmine_issue.subject, body)
       github_issue_id = github_issue[/\d+/]
 
       # Save it so we can reference it in commits using the magic of git hooks!
-      config[Git.current_branch] = {:github_issue => github_issue_id, :planio_issue => planio_issue}
+      config[Git.current_branch] = {:github_issue => github_issue_id, :redmine_issue => redmine_issue}
 
       print "Would you like to edit the issue on Github? [Y]es or anything else to continue:  "
-      
+
       if STDIN.gets.chomp == 'Y'
         Git.view_issue(github_issue_id) 
       else
@@ -210,15 +212,21 @@ module Stagecoach
   end
 
   # ------------------------------------------------------------------
-  # Deploy stage.
-  if opts[:deploy]
+  # Push stage
+  # ------------------------------------------------------------------
 
+  if opts[:push]
     # Get the current git branch
     branch = Git.current_branch
 
-    # There's no point in deploying without any commits
+    # There's no point in pushing without any commits
     unless Git.branch_has_commits?(branch)
-      puts "You don't have any uncommitted changes on branch #{branch}.  Please make some commits before running stagecoach!\nExiting..."
+      puts "You don't have any uncommitted changes on branch #{branch}."
+      puts "If you have already pushed your changes, run:"
+      puts "stagecoach -d [deploy_branch]  - default is 'staging'"
+      puts "Otherwise, go make some commits!"
+      puts "#%s for help" % "stagecoach -h".green
+      puts "Exiting..."
       exit
     end
 
@@ -228,7 +236,7 @@ module Stagecoach
       puts "You have a dirty git branch:\n".red
       puts Git.status
       CommandLine.line_break
-      print "[D]eploy anyway".red
+      print "[P]ush anyway".red
       print " or "
       print "[anything else] to cancel:  ".green
       case STDIN.gets.chomp
@@ -242,26 +250,45 @@ module Stagecoach
       end
     end
 
-
+    # TODO this needs removing if we implement the 'deploy to staging' stuff
     # Stop anybody deploying master to staging...
     case branch
-    when 'master', 'Master' 
-      puts "You can't use stagecoach to deploy your master branch.\nExiting..."
+    when 'master', 'Master', 'staging', 'Staging' 
+      puts "You can't use stagecoach to deploy your #{branch} branch.\nExiting..."
       exit
     end
 
-    # Finally, push, merge and deploy!
+    # Push the branch and give option to continue or quit
     Git.push(branch)
-    Git.merge(staging, branch)
-    Git.push(staging)
-    Capistrano.deploy(staging)
+
+    puts "Push successful."  
+    unless opts[:deploy_given]
+      "stagecoach -d [branch_name] to deploy (default is staging)."
+      "exiting..."
+      exit
+    end
+  end
+
+  # ------------------------------------------------------------------
+  # Deploy stage.
+  # ------------------------------------------------------------------
+
+  if opts[:deploy_given]
+
+    # Get the current git branch
+    from_branch = Git.current_branch
+    to_branch = opts[:deploy]
+
+    Git.merge(to_branch, from_branch)
+    Git.push(to_branch)
+    Capistrano.deploy(to_branch)
     Git.change_to_branch(master)
 
-    # Planio issue to feedback status
-    if planio_issue_number =  config[branch][:planio_issue]
+    # Redmine issue to feedback status
+    if redmine_issue_number =  config[branch][:redmine_issue]
       CommandLine.line_break
-      puts "Attempting to change Planio ticket status to 'Feedback' for you:"
-      issue = Redmine.issue(planio_issue_number)
+      puts "Attempting to change Redmine ticket status to 'Feedback' for you:"
+      issue = Redmine.issue(redmine_issue_number)
       issue.status_id = 4
       issue.save
       Redmine.view_issue(issue)

data/lib/githooks/commit-msg

@@ -91,7 +91,7 @@ message =
   case flag
   when *NO_REFERENCE_FLAGS
     message
-  when *CLOSING_FLAGS
+  when *CLOSE
     [ message, finish ].join(" ")
   else
     [ message, reference ].join(" ")

data/lib/stagecoach/capistrano.rb

@@ -3,7 +3,7 @@ module Stagecoach
     class << self
       def deploy(branch)
         CommandLine.line_break
-        puts "Deploying staging"
+        puts "Deploying to #{branch}"
         puts `bundle exec cap #{branch} deploy`
       end
     end

data/lib/stagecoach/command_line.rb

@@ -73,11 +73,15 @@ This automates the entire deploy workflow for you as follows:
 #{"Flags".red}
         EOS
         opt :branch, "Enter your new branch name here, eg. stagecoach -b new_branch (optional)", :type => :string
-        opt :planio, "Enter your planio issue number here, eg. stagecoach -p 1234 (optional)", :type  => :string
+        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 :deploy, "Use this option to skip straight to push & deploy if you have already pulled from master and created your new branch"
+        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 :setup, "Use this the first time you run stagecoach to save your redmine repository and api key"
-        opt :testing, "Dev testing tool"
+        
+        # Some arguments don't belong together
+        conflicts(:redmine, :github)
+        conflicts(:push, :deploy)
       end
     end
   end

data/lib/stagecoach/git.rb

@@ -122,8 +122,7 @@ module Stagecoach
       end
 
       def view_issue(github_issue)
-        issue_url = `ghi -u#{github_issue}`
-        `open #{issue_url}`
+        `ghi -u#{github_issue}`
       end
 
       def issue(id)

data/lib/stagecoach/redmine.rb

@@ -24,7 +24,7 @@ module Stagecoach
     # Open the issue in a browser.
     def self.view_issue(issue)
       issue_url = Redmine.issue_url(issue)
-        print "Open planio issue in browser? [Y]es or anything else to exit:  "
+        print "Open issue in browser? [Y]es or anything else to exit:  "
         `open #{issue_url.to_s}` if gets.chomp == "Y"
         puts "Staging completed!  Exiting..."
     end

data/redmine_stagecoach.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "redmine_stagecoach"
-  s.version = "0.5.3"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oli Barnett"]
-  s.date = "2012-01-26"
+  s.date = "2012-02-06"
   s.description = "Git/capistrano workflow automation script with Redmine & Github issue integration"
   s.email = "o.barnett@digitaleseiten.de"
   s.executables = ["stagecoach"]
@@ -56,7 +56,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<activeresource>, [">= 0"])
       s.add_dependency(%q<ghi>, [">= 0"])
@@ -65,7 +64,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<activeresource>, [">= 0"])
@@ -75,7 +73,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmine_stagecoach
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70101551536900 !ruby/object:Gem::Requirement
+  requirement: &70339518370680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70101551536900
+  version_requirements: *70339518370680
 - !ruby/object:Gem::Dependency
   name: ghi
-  requirement: &70101551536420 !ruby/object:Gem::Requirement
+  requirement: &70339518366500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70101551536420
+  version_requirements: *70339518366500
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70101551535940 !ruby/object:Gem::Requirement
+  requirement: &70339518361640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70101551535940
+  version_requirements: *70339518361640
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70101551535460 !ruby/object:Gem::Requirement
+  requirement: &70339518356740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70101551535460
+  version_requirements: *70339518356740
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70101551534980 !ruby/object:Gem::Requirement
+  requirement: &70339518354140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101551534980
+  version_requirements: *70339518354140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70101551534500 !ruby/object:Gem::Requirement
+  requirement: &70339518348360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70101551534500
+  version_requirements: *70339518348360
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70101551534020 !ruby/object:Gem::Requirement
+  requirement: &70339518345820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,18 +87,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70101551534020
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70101551533540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70101551533540
+  version_requirements: *70339518345820
 description: Git/capistrano workflow automation script with Redmine & Github issue
   integration
 email: o.barnett@digitaleseiten.de
@@ -144,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 65861914571469357
+      hash: 4109014189137184230
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: