socialcast-git-extensions 0.10.3 → 0.11.0

data/Rakefile

@@ -12,8 +12,7 @@ begin
     gem.authors = ["Ryan Sonnek"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     gem.add_runtime_dependency "grit", ">= 0"
-    gem.add_runtime_dependency "jira4r", ">= 0"
-    gem.add_runtime_dependency "soap4r", ">= 0"
+    gem.add_runtime_dependency "wireframe-jira4r", ">= 0"
     gem.add_runtime_dependency "activesupport", ">= 0"
     gem.add_runtime_dependency "git_remote_branch", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.10.3
+0.11.0

data/bin/git-prune-merged

@@ -11,25 +11,12 @@ remote = ARGV.delete("--remote") || ARGV.delete("-r")
 run_cmd "git checkout master"
 run_cmd "git pull"
 
-def each_branch(options = {}, &block)
-  reserved_branches = %w{ HEAD master last_known_good_master staging last_known_good_staging next_release last_known_good_next_release }
-  args = []
-  args << '-r' if options[:remote]
-  args << '--merged'
-  branches = `git branch #{args.join(' ')}`.split("\n")
-  branches.each do |branch|
-    branch = branch.gsub(/\*/, '').strip.split(' ').first
-    branch = branch.split('/').last if options[:remote]
-    yield(branch) unless reserved_branches.include?(branch)
-  end
-end
-
-each_branch do |branch|
+branches(:merged => true).each do |branch|
   run_cmd "git branch -d #{branch}"
 end
 
 if remote
-  each_branch :remote => true do |branch|
+  branches(:merged => true, :remote => true).each do |branch|
     run_cmd "grb rm #{branch}"
   end
 end

data/bin/git-release-pending

@@ -7,16 +7,39 @@ include Socialcast
 run_cmd 'git checkout master'
 run_cmd 'git pull'
 run_cmd 'git pull origin last_known_good_next_release'
-run_cmd 'put push origin HEAD'
+run_cmd 'git push origin HEAD'
 
 filter_id = '10102'
 issues = jira_server.getIssuesFromFilterWithLimit filter_id, 0, 1000
-issues.each do |issue|
-  #TODO: only resolve if the git branch has been merged into master?
-  puts "Should this ticket be closed? #{issue.key}"
-  # puts 'Transitioning ticket from "Resolved" to "Closed"'
-  # release_action = '101'
-  # jira_server.progressWorkflowAction issue.key, release_action, []
+branches = issues.collect do |issue|
+  field = issue.customFieldValues.detect {|k| k.customfieldId == GIT_BRANCH_FIELD }
+  field ? field.values.first : nil
+end.uniq.compact
+
+issues_with_no_branch = issues.reject do |issue| 
+  issue.customFieldValues.detect {|k| k.customfieldId == GIT_BRANCH_FIELD }
+end
+if issues_with_no_branch.any?
+  puts "The following tickets do not have a git branch configured"
+  puts issues_with_no_branch.collect(&:key).join(' ')
+end
+
+branches.each do |branch|
+  if branches(:merged => true, :remote => true).include?(branch)
+    puts "All changes in #{branch} have been merged into master"
+    issues_in_branch = associated_tickets(branch)
+    puts "Related tickets on branch #{branch}: #{issues_in_branch.collect(&:key).join(' ')}"
+
+    issues_in_branch.each do |issue|
+      puts "#{issue.key} - #{issue.summary}"
+      next unless Readline.readline("Mark this issue as released? (y/n)? ") == 'y'
+
+      release_action = '101'
+      jira_server.progressWorkflowAction issue.key, release_action, []
+    end
+  else
+    puts "#{branch} has NOT yet been merged into master"
+  end
 end
 
 run_cmd 'git prune-merged -r'

data/lib/socialcast-git-extensions.rb

@@ -1,5 +1,5 @@
 require 'jira4r'
-require 'activesupport'
+require 'active_support'
 require 'grit'
 
 module Socialcast
@@ -65,12 +65,29 @@ module Socialcast
       jira_server.progressWorkflowAction ticket, action.to_s, []
     end
   end
+  def associated_tickets(branch)
+    jira_server.getIssuesFromJqlSearch "project = 'SCWEBAPP' and 'Git Branch' ~ '#{branch}'", 1000
+  end
 
   def run_cmd(cmd)
     puts "\nRunning: #{cmd}"
     raise "#{cmd} failed" unless system cmd
   end
 
+  def branches(options = {})
+    branches = []
+    reserved_branches = %w{ HEAD master last_known_good_master staging last_known_good_staging next_release last_known_good_next_release }
+    args = []
+    args << '-r' if options[:remote]
+    args << '--merged' if options[:merged]
+    output = `git branch #{args.join(' ')}`.split("\n")
+    output.each do |branch|
+      branch = branch.gsub(/\*/, '').strip.split(' ').first
+      branch = branch.split('/').last if options[:remote]
+      branches << branch unless reserved_branches.include?(branch)
+    end
+    branches
+  end
   def reset_branch(branch)
     run_cmd "git checkout master"
     run_cmd "git pull"

data/socialcast-git-extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{socialcast-git-extensions}
-  s.version = "0.10.3"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]
-  s.date = %q{2010-07-09}
+  s.date = %q{2010-07-16}
   s.description = %q{git extension scripts for socialcast workflow}
   s.email = %q{ryan@socialcast.com}
   s.executables = ["git-integrate", "git-promote", "git-prune-merged", "git-release", "git-release-pending", "git-reset-staging", "git-track", "git-update", "git-wtf"]
@@ -55,23 +55,20 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<grit>, [">= 0"])
-      s.add_runtime_dependency(%q<jira4r>, [">= 0"])
-      s.add_runtime_dependency(%q<soap4r>, [">= 0"])
+      s.add_runtime_dependency(%q<wireframe-jira4r>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<git_remote_branch>, [">= 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<grit>, [">= 0"])
-      s.add_dependency(%q<jira4r>, [">= 0"])
-      s.add_dependency(%q<soap4r>, [">= 0"])
+      s.add_dependency(%q<wireframe-jira4r>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<git_remote_branch>, [">= 0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<grit>, [">= 0"])
-    s.add_dependency(%q<jira4r>, [">= 0"])
-    s.add_dependency(%q<soap4r>, [">= 0"])
+    s.add_dependency(%q<wireframe-jira4r>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<git_remote_branch>, [">= 0"])
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 51
   prerelease: false
   segments: 
   - 0
-  - 10
-  - 3
-  version: 0.10.3
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 -05:00
+date: 2010-07-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jira4r
+  name: wireframe-jira4r
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,7 +61,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: soap4r
+  name: activesupport
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,7 +75,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: git_remote_branch
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,20 +88,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: git_remote_branch
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id006
 description: git extension scripts for socialcast workflow
 email: ryan@socialcast.com
 executables: