socialcast-git-extensions 0.12.2 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.12.2
+1.0.0

data/bin/git-integrate

@@ -1,14 +1,17 @@
 #!/usr/bin/env ruby
 
+# if the branch has already been integrated, the tickets can be inferred and looked up from jira
+# usage:
+# git integrate <ticket_id> <ticket_id2>...
+
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
 include Socialcast
 
-assert_tickets_provided
+branch = current_branch
+tickets = assert_tickets_provided(ARGV, branch)
 
 run_cmd 'git update'
-
-branch = current_branch
 integrate(branch, 'staging')
 
-update_tickets :branch => branch, :in_staging => true
-start_tickets
+update_tickets tickets, :branch => branch, :in_staging => true
+start_tickets tickets

data/bin/git-promote

@@ -3,14 +3,13 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
 include Socialcast
 
-assert_tickets_provided
+branch = current_branch
+tickets = assert_tickets_provided(ARGV, branch)
 
 run_cmd 'git update'
-
-branch = current_branch
 integrate(branch, 'next_release')
 
-update_tickets :branch => branch, :in_staging => true
-resolve_tickets
+update_tickets tickets, :branch => branch, :in_staging => true
+resolve_tickets tickets
 
 integrate(branch, 'staging')

data/bin/git-release

@@ -7,17 +7,16 @@ include Socialcast
 branch = current_branch
 raise "Cannot release reserved branch" if %w{master staging}.include?(branch)
 
-assert_tickets_provided
+tickets = assert_tickets_provided(ARGV, branch)
 
 exit unless Readline.readline("This will release #{branch} to production.  Are you sure (y/n)? ") == 'y'
 
 run_cmd 'git update'
-
 integrate branch, 'master'
 
-update_tickets :branch => branch
-release_tickets
+update_tickets tickets, :branch => branch
+release_tickets tickets
 
-run_cmd "git promote #{ARGV.join(' ')}"
-run_cmd "git integrate #{ARGV.join(' ')}"
+integrate branch, 'next_release'
+integrate branch, 'staging'
 run_cmd "grb rm #{branch}"

data/bin/git-release-pending

@@ -30,16 +30,11 @@ branches.each do |branch|
   puts "\n\nChecking state of branch #{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|
+    releasable_tickets = tickets_from_branch(branch).select 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, []
+      Readline.readline("Mark this issue as released? (y/n)? ") == 'y'
     end
+    release_tickets releasable_tickets
   else
     puts "#{branch} has NOT yet been merged into master"
   end

data/lib/socialcast-git-extensions.rb

@@ -45,52 +45,59 @@ module Socialcast
     end
   end
 
-  def assert_tickets_provided
-    raise "JIRA ticket is required to run this process" unless tickets.any?
+  def assert_tickets_provided(ticket_ids, branch)
+    tickets = tickets_from_branch_and_arguments(ticket_ids, branch)
+    raise "JIRA ticket id or existing JIRA Git Branch is required to run this process" unless tickets.any?
+    tickets
   end
-  def tickets
-    ARGV
+  def tickets_from_branch_and_arguments(ticket_ids, branch)
+    tickets_from_arguments(ticket_ids) + tickets_from_branch(branch)
   end
-  def update_tickets(options = {})
+  def tickets_from_arguments(ticket_ids)
+    ticket_ids.collect do |key|
+      jira_server.getIssue key
+    end
+  end
+  def tickets_from_branch(branch)
+    jira_server.getIssuesFromJqlSearch "project = 'SCWEBAPP' and 'Git Branch' ~ '#{branch}'", 1000
+  end
+  def update_tickets(tickets, options = {})
     tickets.each do |ticket|
+      puts "Updating ticket: #{ticket.key} - #{ticket.summary}"
       fields = []
       fields << Jira4R::V2::RemoteFieldValue.new(GIT_BRANCH_FIELD, [options[:branch]]) if options[:branch]
       fields << Jira4R::V2::RemoteFieldValue.new(IN_STAGING_FIELD, ['true']) if options[:in_staging]
       begin
-        jira_server.updateIssue ticket, fields
+        jira_server.updateIssue ticket.key, fields
       rescue => e
         puts "Error updating ticket: #{e.message}"
       end
     end
   end
-  def start_tickets
+  def start_tickets(tickets)
     tickets.each do |ticket|
       transition_ticket_if_has_status ticket, 1, 11
     end
   end
-  def resolve_tickets
+  def resolve_tickets(tickets)
     tickets.each do |ticket|
       transition_ticket_if_has_status ticket, 3, 21
     end
   end
-  def release_tickets
+  def release_tickets(tickets)
     tickets.each do |ticket|
       transition_ticket_if_has_status ticket, 5, 101
     end
   end
-  def transition_ticket_if_has_status(ticket, status, action)
-    issue = jira_server.getIssue ticket
+  def transition_ticket_if_has_status(issue, status, action)
     if issue.status == status.to_s
       begin
-        jira_server.progressWorkflowAction ticket, action.to_s, []
+        jira_server.progressWorkflowAction issue.key, action.to_s, []
       rescue => e
         puts "Error updating ticket: #{e.message}"
       end
     end
   end
-  def associated_tickets(branch)
-    jira_server.getIssuesFromJqlSearch "project = 'SCWEBAPP' and 'Git Branch' ~ '#{branch}'", 1000
-  end
 
   def run_cmd(cmd)
     puts "\nRunning: #{cmd}"

data/socialcast-git-extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{socialcast-git-extensions}
-  s.version = "0.12.2"
+  s.version = "1.0.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-27}
+  s.date = %q{2010-07-30}
   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"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 12
-  - 2
-  version: 0.12.2
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 -05:00
+date: 2010-07-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency