socialcast-git-extensions 0.6.2 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.0

data/bin/git-integrate

@@ -6,8 +6,9 @@ include Socialcast
 ticket = ARGV.shift
 raise 'JIRA ticket is required in order to move into staging' unless ticket
 
+run_cmd 'git update'
+
 branch = current_branch
-update(branch)
 integrate(branch, 'staging')
 
 update_ticket ticket, {:branch => branch, :in_staging => true}

data/bin/git-promote

@@ -6,8 +6,9 @@ include Socialcast
 ticket = ARGV.shift
 raise 'JIRA ticket is required in order to move into next_release' unless ticket
 
+run_cmd 'git update'
+
 branch = current_branch
-update(branch)
 integrate(branch, 'next_release')
 
 update_ticket ticket, {:branch => branch, :in_staging => true}

data/bin/git-release

@@ -12,11 +12,13 @@ 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'
 
-update branch
+run_cmd 'git update'
+
 integrate branch, 'master'
 
 update_ticket ticket, {:branch => branch}
 release_ticket ticket
 
+run_cmd "git promote #{ticket}"
 run_cmd "git integrate #{ticket}"
 run_cmd "grb rm #{branch}"

data/bin/git-update

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
+include Socialcast
+
+branch = current_branch
+
+puts "updating #{branch} to have most recent changes from master"
+run_cmd "git pull origin #{branch}" rescue nil
+run_cmd 'git pull origin master'
+run_cmd 'git push origin HEAD'
+run_cmd 'git remote prune origin'

data/lib/socialcast-git-extensions.rb

@@ -71,12 +71,6 @@ module Socialcast
     raise "#{cmd} failed" unless system cmd
   end
 
-  def update(branch)
-    puts "updating #{branch} to have most recent changes from master"
-    run_cmd "git pull origin #{branch}" rescue nil
-    run_cmd 'git pull origin master'
-    run_cmd 'git push origin HEAD'
-  end
   def integrate(branch, destination_branch = 'staging')
     puts "integrating #{branch} into #{destination_branch}"
     run_cmd "git remote prune origin"

data/socialcast-git-extensions.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{socialcast-git-extensions}
-  s.version = "0.6.2"
+  s.version = "0.7.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-07}
   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-wtf"]
+  s.executables = ["git-integrate", "git-promote", "git-prune-merged", "git-release", "git-update", "git-wtf"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "bin/git-promote",
      "bin/git-prune-merged",
      "bin/git-release",
+     "bin/git-update",
      "bin/git-wtf",
      "lib/socialcast-git-extensions.rb",
      "socialcast-git-extensions.gemspec",

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 2
-  version: 0.6.2
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -109,6 +109,7 @@ executables:
 - git-promote
 - git-prune-merged
 - git-release
+- git-update
 - git-wtf
 extensions: []
 
@@ -126,6 +127,7 @@ files:
 - bin/git-promote
 - bin/git-prune-merged
 - bin/git-release
+- bin/git-update
 - bin/git-wtf
 - lib/socialcast-git-extensions.rb
 - socialcast-git-extensions.gemspec