socialcast-git-extensions 3.0.0.pre4 → 3.0.0

data/bin/git-promote

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions', 'cli.rb')
+Socialcast::Gitx::CLI.start (['promote'] + ARGV)

data/bin/git-update

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions', 'cli.rb')
-script = Socialcast::Gitx::CLI.new
-script.invoke(:update, ARGV)
+Socialcast::Gitx::CLI.start (['update'] + ARGV)

data/lib/socialcast-git-extensions/cli.rb

@@ -115,6 +115,12 @@ module Socialcast
         post "#worklog integrating #{branch} into #{target_branch} #scgitx"
       end
 
+      desc 'promote', '(DEPRECATED) promote the current branch into staging'
+      def promote
+        say 'DEPRECATED: Use `git integrate staging` instead', :red
+        integrate 'staging'
+      end
+
       desc 'nuke', 'nuke the specified aggregate branch and reset it to a known good state'
       method_option :destination, :type => :string, :aliases => '-d', :desc => 'destination branch to reset to'
       def nuke(bad_branch)
@@ -146,46 +152,6 @@ module Socialcast
 
       private
 
-      # build a summary of changes
-      def changelog_summary(branch)
-        changes = `git diff --stat origin/#{Socialcast::Gitx::BASE_BRANCH}...#{branch}`.split("\n")
-        stats = changes.pop
-        if changes.length > 5
-          dirs = changes.map do |file_change|
-            filename = "#{file_change.split.first}"
-            dir = filename.gsub(/\/[^\/]+$/, '')
-            dir
-          end
-          dir_counts = Hash.new(0)
-          dirs.each {|dir| dir_counts[dir] += 1 }
-          changes = dir_counts.to_a.sort_by {|k,v| v}.reverse.first(5).map {|k,v| "#{k} (#{v} file#{'s' if v > 1})"}
-        end
-        (changes + [stats]).join("\n")
-      end
-
-      # launch configured editor to retreive message/string
-      def editor_input(initial_text = '')
-        require 'tempfile'
-        Tempfile.open('reviewrequest.md') do |f|
-          f << initial_text
-          f.flush
-
-          editor = ENV['EDITOR'] || 'vi'
-          flags = case editor
-          when 'mate', 'emacs'
-            '-w'
-          when 'mvim'
-            '-f'
-          else
-            ''
-          end
-          pid = fork { exec "#{editor} #{flags} #{f.path}" }
-          Process.waitpid(pid)
-          description = File.read(f.path)
-          description.gsub(/^\#.*/, '').chomp.strip
-        end
-      end
-
       # post a message in socialcast
       # skip sharing message if CLI quiet option is present
       def post(message, params = {})

data/lib/socialcast-git-extensions/git.rb

@@ -3,7 +3,8 @@ require 'grit'
 module Socialcast
   module Gitx
     module Git
-      RESERVED_BRANCHES = %w{ HEAD master staging prototype next_release }
+      AGGREGATE_BRANCHES = %w{ staging prototype }
+      RESERVED_BRANCHES = %w{ HEAD master next_release } + AGGREGATE_BRANCHES
 
       private
       def assert_not_protected_branch!(branch, action)
@@ -38,7 +39,6 @@ module Socialcast
         branches.uniq
       end
 
-      AGGREGATE_BRANCHES = %w{ staging prototype }
       # reset the specified branch to the same set of commits as the destination branch
       # used to revert commits on aggregate branches back to a known good state
       def reset_branch(branch, head_branch)
@@ -77,10 +77,49 @@ module Socialcast
         run_cmd "git checkout #{branch}"
       end
 
-      private
       def aggregate_branch?(branch)
         AGGREGATE_BRANCHES.include?(branch) || branch.starts_with?('last_known_good')
       end
+
+      # build a summary of changes
+      def changelog_summary(branch)
+        changes = `git diff --stat origin/#{Socialcast::Gitx::BASE_BRANCH}...#{branch}`.split("\n")
+        stats = changes.pop
+        if changes.length > 5
+          dirs = changes.map do |file_change|
+            filename = "#{file_change.split.first}"
+            dir = filename.gsub(/\/[^\/]+$/, '')
+            dir
+          end
+          dir_counts = Hash.new(0)
+          dirs.each {|dir| dir_counts[dir] += 1 }
+          changes = dir_counts.to_a.sort_by {|k,v| v}.reverse.first(5).map {|k,v| "#{k} (#{v} file#{'s' if v > 1})"}
+        end
+        (changes + [stats]).join("\n")
+      end
+
+      # launch configured editor to retreive message/string
+      def editor_input(initial_text = '')
+        require 'tempfile'
+        Tempfile.open('reviewrequest.md') do |f|
+          f << initial_text
+          f.flush
+
+          editor = ENV['EDITOR'] || 'vi'
+          flags = case editor
+          when 'mate', 'emacs'
+            '-w'
+          when 'mvim'
+            '-f'
+          else
+            ''
+          end
+          pid = fork { exec "#{editor} #{flags} #{f.path}" }
+          Process.waitpid(pid)
+          description = File.read(f.path)
+          description.gsub(/^\#.*/, '').chomp.strip
+        end
+      end
     end
   end
 end

data/lib/socialcast-git-extensions/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.0.0.pre4"
+    VERSION = "3.0.0"
   end
 end

data/spec/cli_spec.rb

@@ -76,7 +76,7 @@ describe Socialcast::Gitx::CLI do
       before do
         Socialcast::Gitx::CLI.start ['integrate', 'staging']
       end
-      it 'should run expected commands' do
+      it 'should also integrate into prototype and run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
           "git pull origin FOO",
           "git pull origin master",
@@ -163,14 +163,14 @@ describe Socialcast::Gitx::CLI do
           "git checkout last_known_good_master",
           "git pull",
           "git branch -D prototype",
-          "git push origin :prototype",
+          "git push origin --delete prototype",
           "git checkout -b prototype",
           "grb publish prototype",
           "git checkout last_known_good_master",
           "git checkout last_known_good_master",
           "git pull",
           "git branch -D last_known_good_prototype",
-          "git push origin :last_known_good_prototype",
+          "git push origin --delete last_known_good_prototype",
           "git checkout -b last_known_good_prototype",
           "grb publish last_known_good_prototype",
           "git checkout last_known_good_master"
@@ -186,7 +186,7 @@ describe Socialcast::Gitx::CLI do
           "git checkout last_known_good_staging",
           "git pull",
           "git branch -D staging",
-          "git push origin :staging",
+          "git push origin --delete staging",
           "git checkout -b staging",
           "grb publish staging",
           "git checkout last_known_good_staging"
@@ -203,7 +203,7 @@ describe Socialcast::Gitx::CLI do
           "git checkout last_known_good_prototype",
           "git pull",
           "git branch -D prototype",
-          "git push origin :prototype",
+          "git push origin --delete prototype",
           "git checkout -b prototype",
           "grb publish prototype",
           "git checkout last_known_good_prototype"
@@ -220,14 +220,14 @@ describe Socialcast::Gitx::CLI do
           "git checkout last_known_good_master",
           "git pull",
           "git branch -D prototype",
-          "git push origin :prototype",
+          "git push origin --delete prototype",
           "git checkout -b prototype",
           "grb publish prototype",
           "git checkout last_known_good_master",
           "git checkout last_known_good_master",
           "git pull",
           "git branch -D last_known_good_prototype",
-          "git push origin :last_known_good_prototype",
+          "git push origin --delete last_known_good_prototype",
           "git checkout -b last_known_good_prototype",
           "grb publish last_known_good_prototype",
           "git checkout last_known_good_master"
@@ -243,4 +243,29 @@ describe Socialcast::Gitx::CLI do
       end
     end
   end
+
+  describe '#promote' do
+    before do
+      Socialcast::Gitx::CLI.start ['promote']
+    end
+    it 'should integrate into staging' do
+      Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+        "git pull origin FOO",
+        "git pull origin master",
+        "git push origin HEAD",
+        "git remote prune origin",
+        "git remote prune origin",
+        "git checkout staging",
+        "git pull . FOO",
+        "git push origin HEAD",
+        "git checkout FOO",
+        "git remote prune origin",
+        "git checkout prototype",
+        "git pull . staging",
+        "git push origin HEAD",
+        "git checkout staging",
+        "git checkout FOO"
+      ]
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre4
-  prerelease: 6
+  version: 3.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -178,6 +178,7 @@ executables:
 - git-cleanup
 - git-integrate
 - git-nuke
+- git-promote
 - git-release
 - git-reviewrequest
 - git-share
@@ -198,6 +199,7 @@ files:
 - bin/git-cleanup
 - bin/git-integrate
 - bin/git-nuke
+- bin/git-promote
 - bin/git-release
 - bin/git-reviewrequest
 - bin/git-share
@@ -228,13 +230,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3452558432038293622
+      hash: -1464484862352811039
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -1464484862352811039
 requirements: []
 rubyforge_project: socialcast-git-extensions
 rubygems_version: 1.8.24