redmine_stagecoach 0.6.13 → 0.6.14

data/VERSION

@@ -1 +1 @@
-0.6.13
+0.6.14

data/bin/stagecoach

@@ -55,43 +55,44 @@ module Stagecoach
       exit
     end
   end
-
-  # Checks for uncommitted/unstashed changes and aborts if present.
-  if Git.changes != ''
-    puts "You have uncommitted changes:".red
-    puts Git.changes
-    puts "Please commit or stash these changes before running Stagecoach. -h for help."
-    puts "Exiting..."
-    exit
-  end 
-
   
   # ------------------------------------------------------------------
-  # Git branch operations: list, cleanup
+  # Git branch operations: list, tidy
   # ------------------------------------------------------------------
 
-  if opts[:list]
+  if opts[:list] || opts[:tidy]
     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 
+    puts "-------------------------------------------"
+    puts "Local Git Branches created with Stagecoach "
+    puts "-------------------------------------------"
+
+    local_stagecoach_branches = Git.local_stagecoach_branches(config)
+
+    all_branches_list = Git.branches
+    all_branches_list << Git.current_branch
+
+    deletable_branches = Git.list(local_stagecoach_branches, all_branches_list)
+
+    if opts[:tidy]
+      Git.tidy(deletable_branches)
     end
+    puts "Complete!  Exiting..."
     exit
   end
 
-  # ------------------------------------------------------------------
+ # ------------------------------------------------------------------
   # Initial stage - set up branch and git issue.
   # ------------------------------------------------------------------
 
+  # Checks for uncommitted/unstashed changes and aborts if present.
+  if Git.changes != ''
+    puts "You have uncommitted changes:".red
+    puts Git.changes
+    puts "Please commit or stash these changes before running Stagecoach. -h for help."
+    puts "Exiting..."
+    exit
+  end 
+
   # Set up redmine client config.
   RedmineApi::Client.instance_eval do
     self.site = config["redmine_site"]
@@ -331,7 +332,7 @@ module Stagecoach
         puts "Status set to 'Erledigt'"
       else
       end
-        puts 'Completed deploy.'
+      puts 'Completed deploy.'
     end
   end
 end

data/lib/stagecoach/command_line.rb

@@ -27,13 +27,14 @@ For more info see the readme at https://github.com/omnikron/stagecoach#readme
 #{"Flags".red}
         EOS
         opt :branch, "Enter your new branch name here, eg. stagecoach -b new_branch (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 :deploy, "Use this option to  deploy from your current branch to any branch you choose, eg. stagecoach -d staging", :type => :string, :default => "staging" 
         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"
+        opt :tidy, "This will remove all branches that are already merged to master, both remotely and locally."
         opt :version, "Prints the current version"
       end
     end

data/lib/stagecoach/git.rb

@@ -2,9 +2,67 @@ module Stagecoach
   class Git
     class << self
       def branches
-        `git branch`.split("\n").each {|a| a.lstrip! }
+        `git branch`.split("\n").collect(&:strip)
       end
       
+      def list(local_stagecoach_branches, all_branches_list)
+        deletable_branches = []
+        local_stagecoach_branches.keys.sort.each do |branch_name|
+          # branch_attributes = local_stagecoach_branches[branch_name]
+          if all_branches_list.include?(branch_name.strip)
+            if Git.branch_merged_to_master?(branch_name) 
+              puts branch_name 
+              deletable_branches << branch_name
+            else
+             puts branch_name + " *".green
+            end
+          end 
+        end
+        CommandLine.line_break
+        puts "*".green + " = not merged to master, will not be deleted by stagecoach -t"
+        CommandLine.line_break
+        deletable_branches
+      end
+
+      def local_stagecoach_branches(config)
+        local_stagecoach_branches = {}
+        config.each { |k,v| local_stagecoach_branches[k] = v unless k =~ /redmine_site|redmine_api_key|redmine_user_id|master|staging/i}
+      end
+
+      def tidy(deletable_branches)
+        CommandLine.line_break
+        if deletable_branches.length > 0
+          puts "All branches that have been merged into master will be deleted locally and remotely.".red
+          print "Continue? [Y]es or anything else to cancel: "
+          case STDIN.gets.chomp
+          when 'Y' 
+            erase(deletable_branches) 
+          else
+            puts 'No branches deleted.  Exiting...'
+            exit
+          end
+        else
+          puts 'No branches to delete.  Exiting...'
+        end
+      end
+
+      def remote_branches
+        (`git ls-remote`.split(" ").each.select { |e| e =~ /refs\/heads/}).collect {|a| a.gsub("refs/heads/", "")}
+      end
+
+      def erase(list)
+        change_to_branch('master')
+        branches_on_remote = Git.remote_branches
+        list.each {|b| delete_branch(b, branches_on_remote ) }
+      end
+
+      def delete_branch(branch, list)
+        puts "Local: " + `git branch -D #{branch}`
+        if list.include?(branch)
+          puts "Remote: " + `git push origin :#{branch}`
+        end
+      end
+
       def global_config(header, config)
         `git config --global #{header}.#{config}`
       end

data/redmine_stagecoach.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "redmine_stagecoach"
-  s.version = "0.6.13"
+  s.version = "0.6.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oli Barnett"]
-  s.date = "2012-05-18"
+  s.date = "2012-05-21"
   s.description = "Git/capistrano workflow automation script with Redmine & Github issue integration"
   s.email = "o.barnett@digitaleseiten.de"
   s.executables = ["stagecoach"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmine_stagecoach
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2934984471721959034
+      hash: -3389804808014498820
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: