socialcast-git-extensions 0.4.0 → 0.5.0

data/Rakefile

@@ -14,7 +14,8 @@ begin
     gem.add_runtime_dependency "grit", ">= 0"
     gem.add_runtime_dependency "jira4r", ">= 0"
     gem.add_runtime_dependency "soap4r", ">= 0"
-    gem.add_runtime_dependency "activesupport", ">= 2.3.5"
+    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
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/bin/git-integrate

@@ -1,17 +1,14 @@
 #!/usr/bin/env ruby
 
-require 'grit'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
 include Socialcast
 
-repo = Grit::Repo.new(Dir.pwd)
-branch = Grit::Head.current(repo).name
+ticket = ARGV.shift
+raise 'JIRA ticket is required in order to move into staging' unless ticket
 
+branch = current_branch
 update(branch)
 integrate(branch, 'staging')
 
-ticket = ARGV.shift
-if ticket
-  update_ticket ticket, {:branch => branch, :in_staging => true}
-  start_ticket ticket
-end
+update_ticket ticket, {:branch => branch, :in_staging => true}
+start_ticket ticket

data/bin/git-promote

@@ -1,15 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'grit'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
 include Socialcast
 
-repo = Grit::Repo.new(Dir.pwd)
-branch = Grit::Head.current(repo).name
-
 ticket = ARGV.shift
-raise 'JIRA ticket is required in order to move into next_release'
+raise 'JIRA ticket is required in order to move into next_release' unless ticket
 
+branch = current_branch
 update(branch)
 integrate(branch, 'next_release')
 

data/bin/git-release

@@ -1,20 +1,22 @@
 #!/usr/bin/env ruby
 
-require 'grit'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
 require 'readline'
 include Socialcast
 
-repo = Grit::Repo.new(Dir.pwd)
-branch = Grit::Head.current(repo).name
-
+branch = current_branch
 raise "Cannot release reserved branch" if %w{master staging}.include?(branch)
 
+ticket = ARGV.shift
+raise 'JIRA ticket is required in order to release this branch' unless ticket
+
 exit unless Readline.readline("This will release #{branch} to production.  Are you sure (y/n)? ") == 'y'
-run_cmd 'git checkout master'
-run_cmd 'git pull origin master'
-run_cmd "git pull . #{branch}"
-run_cmd 'git push origin HEAD'
-run_cmd "grb rm #{branch}"
 
-run_cmd "git integrate"
+update branch
+integrate branch, 'master'
+
+update_ticket ticket, {:branch => branch}
+release_ticket ticket
+
+run_cmd "git integrate #{ticket}"
+run_cmd "grb rm #{branch}"

data/lib/socialcast-git-extensions.rb

@@ -1,11 +1,16 @@
 require 'jira4r'
 require 'activesupport'
+require 'grit'
 
 module Socialcast
   GIT_BRANCH_FIELD = 'customfield_10010'
   IN_STAGING_FIELD = 'customfield_10020'
   JIRA_CREDENTIALS_FILE = File.expand_path('~/.jira_key')
-  
+
+  def current_branch
+    repo = Grit::Repo.new(Dir.pwd)
+    Grit::Head.current(repo).name
+  end
   def jira_credentials
     @credentials ||= YAML.load_file(JIRA_CREDENTIALS_FILE).symbolize_keys!
     @credentials
@@ -46,19 +51,18 @@ module Socialcast
     jira_server.updateIssue ticket, fields
   end
   def start_ticket(ticket)
-    issue = jira_server.getIssue ticket
-    if issue.status == '1'
-      puts "Transitioning ticket from 'Open' to 'In Progress'"
-      start_work_action = '11'
-      jira_server.progressWorkflowAction ticket, start_work_action, []
-    end
+    transition_ticket_if_has_status ticket, '1', '11'
   end
   def resolve_ticket(ticket)
+    transition_ticket_if_has_status ticket, '3', '21'
+  end
+  def release_ticket(ticket)
+    transition_ticket_if_has_status ticket, '4', '101'
+  end
+  def transition_ticket_if_has_status(ticket, status, action)
     issue = jira_server.getIssue ticket
-    if issue.status == '3'
-      puts 'Transitioning ticket from "In Progress" to "Resolved"'
-      finish_work_action = '21'
-      jira_server.progressWorkflowAction ticket, finish_work_action, []
+    if issue.status == status
+      jira_server.progressWorkflowAction ticket, action, []
     end
   end
 
@@ -76,8 +80,10 @@ module Socialcast
   def integrate(branch, destination_branch = 'staging')
     puts "integrating #{branch} into #{destination_branch}"
     run_cmd "git remote prune origin"
-    run_cmd "git branch -D #{destination_branch}" rescue nil
-    run_cmd "grb track #{destination_branch}"
+    unless destination_branch == 'master'
+      run_cmd "git branch -D #{destination_branch}" rescue nil
+      run_cmd "grb track #{destination_branch}"
+    end
     run_cmd "git checkout #{destination_branch}"
     run_cmd "git pull . #{branch}"
     run_cmd "git push origin HEAD"

data/socialcast-git-extensions.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{socialcast-git-extensions}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]
@@ -52,20 +52,23 @@ Gem::Specification.new do |s|
       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<activesupport>, [">= 2.3.5"])
+      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<activesupport>, [">= 2.3.5"])
+      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<activesupport>, [">= 2.3.5"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<git_remote_branch>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -82,14 +82,26 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
+        - 0
+        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: