redmine_stagecoach 0.6.12 → 0.6.13

data/VERSION

@@ -1 +1 @@
-0.6.12
+0.6.13

data/bin/stagecoach

@@ -56,13 +56,6 @@ module Stagecoach
     end
   end
 
-
-  # Set up redmine client config.
-  RedmineApi::Client.instance_eval do
-    self.site = config["redmine_site"]
-    self.user = config["redmine_api_key"]
-  end
-
   # Checks for uncommitted/unstashed changes and aborts if present.
   if Git.changes != ''
     puts "You have uncommitted changes:".red
@@ -72,10 +65,39 @@ module Stagecoach
     exit
   end 
 
+  
+  # ------------------------------------------------------------------
+  # Git branch operations: list, cleanup
+  # ------------------------------------------------------------------
+
+  if opts[:list]
+    CommandLine.line_break
+    puts "Local Git Branches created with Stagecoach:"
+    puts "%s = already merged into master" % "Green".green
+    puts "%s = not merged into master" % "Red".red
+    CommandLine.line_break
+    local_stagecoach_branches = {}
+    config.each { |k,v| local_stagecoach_branches[k] = v unless k =~ /redmine_site|redmine_api_key|redmine_user_id/}
+    local_stagecoach_branches.keys.sort.each do |branch_name|
+      branch_attributes = local_stagecoach_branches[branch_name]
+
+      if Git.branches.select { |a| a.match(/\W+#{branch_name}/) } 
+        puts Git.branch_merged_to_master?(branch_name) ? branch_name.green : branch_name.red
+      end 
+    end
+    exit
+  end
+
   # ------------------------------------------------------------------
   # Initial stage - set up branch and git issue.
   # ------------------------------------------------------------------
 
+  # Set up redmine client config.
+  RedmineApi::Client.instance_eval do
+    self.site = config["redmine_site"]
+    self.user = config["redmine_api_key"]
+  end
+
   unless opts[:deploy] or opts[:push]
 
     # If no issue argument has been given.
@@ -183,10 +205,10 @@ module Stagecoach
 
     # Issue handling.
     if opts[:github]
-      config[Git.current_branch] = {:github_issue => opts[:github]}
+      config[Git.current_branch] = {'github_issue' => opts[:github]}
       #TODO check that github issue is not assigned to somebody already
     elsif opts[:redmine]
-      config[Git.current_branch] = {:redmine_issue => redmine_issue_number}
+      config[Git.current_branch] = {'redmine_issue' => redmine_issue_number}
     end
 
     # Set up the related issue for this branch.
@@ -203,7 +225,7 @@ module Stagecoach
       Git.assign_issue_to_me(github_issue_id)
 
       # Save it so we can reference it in commits using the magic of git hooks!
-      config[Git.current_branch] = {:github_issue => github_issue_id, :redmine_issue => redmine_issue_number}
+      config[Git.current_branch] = {'github_issue' => github_issue_id, 'redmine_issue' => redmine_issue_number}
 
     end
 

data/lib/stagecoach/command_line.rb

@@ -30,6 +30,7 @@ For more info see the readme at https://github.com/omnikron/stagecoach#readme
         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 :list, "Use this to list local branches which you have created with Stagecoach"
         opt :push, "Use this option to push your changes to your remote branch (will be created if necessary)"
         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"

data/lib/stagecoach/git.rb

@@ -2,7 +2,7 @@ module Stagecoach
   class Git
     class << self
       def branches
-        `git branch`.split("\n")
+        `git branch`.split("\n").each {|a| a.lstrip! }
       end
       
       def global_config(header, config)
@@ -29,6 +29,13 @@ module Stagecoach
         end
       end
 
+      def branch_merged_to_master?(branch)
+         list = `git branch --merged`.split("\n").collect(&:strip)
+         list << Git.current_branch
+         list.include?(branch.strip)
+      end
+
+
       def correct_branch?
         CommandLine.line_break
         print "You are currently in local branch: #{Git.current_branch.red} \nAre these details correct? ([Y]es or [Q]uit):  "
@@ -74,7 +81,12 @@ module Stagecoach
         Git.change_to_branch(to_branch)
         puts `git pull origin #{to_branch}`
         puts `git merge #{from_branch}`
-        raise 'merge failed' if $?.exitstatus != 0
+        begin
+          raise 'Merge failed' if $?.exitstatus != 0
+        rescue 
+          puts $!.class.name + ": " + $!.message      # $! refers to the last error object
+          puts "Please resolve the merge conflict and deploy again. Exiting..."
+        end
       end
 
       def push(branch)

data/lib/stagecoach/redmine.rb

@@ -25,7 +25,7 @@ module Stagecoach
         # RedmineApi::Client.site + "/issues/" + issue.id
         #
         # but this caused URI merge errors on some setups.
-        "#{RedmineApi::Client.site}/issues/#{issue.id}"
+        "#{RedmineApi::Client.site}issues/#{issue.id}"
       end
 
       # Open the issue in a browser.

data/redmine_stagecoach.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "redmine_stagecoach"
-  s.version = "0.6.12"
+  s.version = "0.6.13"
 
   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.12
+  version: 0.6.13
   prerelease: 
 platform: ruby
 authors:
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1007617363068209098
+      hash: 2934984471721959034
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: