socialcast-git-extensions 3.0.0.pre2 → 3.0.0.pre4

data/README.rdoc

@@ -1,9 +1,43 @@
 = socialcast-git-extensions
 
-Description goes here.
+= Core Git Extensions
+
+=== Options
+* --quiet => supress posting message in Socialcast
+
+== git start <new_branch_name (optional)>
+
+update local repository with latest upstream changes and create a new feature branch
+
+== git update
+
+update the local feature branch with latest remote changes plus upstream released changes.
+
+== git integrate <aggregate_branch_name (optional, default: prototype)>
+
+integrate the current feature branch into an aggregate branch (ex: prototype, staging)
+
+== git reviewrequest
+
+create a pull request on github for peer review of the current branch.
+
+== git release
+
+release the current feature branch to master
+
+= Extra Git Extensions
+
+== git cleanup
+
+delete released branches after they have been merged into master.
+
+== git nuke <aggregate_branch_name>
+
+reset an aggregate branch (ex: prototype, staging) back to a known good state.
+
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -14,4 +48,4 @@ Description goes here.
 
 == Copyright
 
-Copyright (c) 2010 Ryan Sonnek. See LICENSE for details.
+Copyright (c) 2010 Socialcast, Inc. See LICENSE for details.

data/bin/{cleanup → git-cleanup}

@@ -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(:cleanup, ARGV)
+Socialcast::Gitx::CLI.start (['cleanup'] + ARGV)

data/bin/git-integrate

@@ -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(:integrate, ARGV)
+Socialcast::Gitx::CLI.start (['integrate'] + ARGV)

data/bin/git-nuke

@@ -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(:nuke, ARGV)
+Socialcast::Gitx::CLI.start (['nuke'] + ARGV)

data/bin/git-release

@@ -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(:release)
+Socialcast::Gitx::CLI.start (['release'] + ARGV)

data/bin/git-reviewrequest

@@ -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(:reviewrequest, ARGV)
+Socialcast::Gitx::CLI.start (['reviewrequest'] + ARGV)

data/bin/git-share

@@ -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(:share, ARGV)
+Socialcast::Gitx::CLI.start (['share'] + ARGV)

data/bin/git-start

@@ -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(:start, ARGV)
+Socialcast::Gitx::CLI.start (['start'] + ARGV)

data/bin/git-track

@@ -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(:track, ARGV)
+Socialcast::Gitx::CLI.start (['track'] + ARGV)

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

@@ -41,7 +41,7 @@ module Socialcast
         post review_message, {:url => url, :message_type => 'review_request'}
       end
 
-      desc 'update', 'Update the current branch with latest upstream changes'
+      desc 'update', 'Update the current branch with latest changes from the remote feature branch and master'
       def update
         branch = current_branch
 
@@ -98,7 +98,7 @@ module Socialcast
         post "#worklog starting work on #{branch_name} #scgitx"
       end
 
-      desc 'share', 'publish the current branch for peer review'
+      desc 'share', 'Share the current branch in the remote repository'
       def share
         run_cmd "grb publish #{current_branch}"
       end
@@ -118,8 +118,9 @@ module Socialcast
       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)
-        good_branch = options[:destination] || ask("What branch do you want to reset #{bad_branch} to? (default: #{Socialcast::Gitx::BASE_BRANCH})")
-        good_branch = Socialcast::Gitx::BASE_BRANCH if good_branch.length == 0
+        default_good_branch = "last_known_good_#{bad_branch}"
+        good_branch = options[:destination] || ask("What branch do you want to reset #{bad_branch} to? (default: #{default_good_branch})")
+        good_branch = default_good_branch if good_branch.length == 0
         good_branch = "last_known_good_#{good_branch}" unless good_branch.starts_with?('last_known_good_')
         removed_branches = reset_branch(bad_branch, good_branch)
         reset_branch("last_known_good_#{bad_branch}", good_branch) unless "last_known_good_#{bad_branch}" == good_branch

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

@@ -53,7 +53,7 @@ module Socialcast
         run_cmd "git pull"
         removed_branches = branches(:remote => true, :merged => "origin/#{branch}") - branches(:remote => true, :merged => "origin/#{head_branch}")
         run_cmd "git branch -D #{branch}" rescue nil
-        run_cmd "git push origin :#{branch}" rescue nil
+        run_cmd "git push origin --delete #{branch}" rescue nil
         run_cmd "git checkout -b #{branch}"
         run_cmd "grb publish #{branch}"
         run_cmd "git checkout #{head_branch}"

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

@@ -24,8 +24,7 @@ module Socialcast
         Socialcast.credentials = credentials.merge(:scgitx_token => token)
         token
       rescue RestClient::Exception => e
-        data = JSON.parse e.http_body
-        say "Failed to obtain OAuth authorization token: #{data['message']}"
+        process_error e
         throw e
       end
 
@@ -42,10 +41,14 @@ module Socialcast
         data = JSON.parse response.body
         url = data['html_url']
       rescue RestClient::Exception => e
-        data = JSON.parse e.http_body
-        say "Failed to create pull request: #{data['message']}"
+        process_error e
         throw e
       end
+
+      def process_error(e)
+        data = JSON.parse e.http_body
+        say "Failed to create pull request: #{data['message']}", :red
+      end
     end
   end
 end

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

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

data/lib/socialcast-git-extensions.rb

@@ -11,7 +11,7 @@ module Socialcast
     private
     # execute a shell command and raise an error if non-zero exit code is returned
     def run_cmd(cmd)
-      say "\n> "
+      say "\n$ "
       say cmd.gsub("'", ''), :red
       raise "#{cmd} failed" unless system cmd
     end

data/spec/cli_spec.rb

@@ -21,8 +21,7 @@ describe Socialcast::Gitx::CLI do
 
   describe '#update' do
     before do
-      @script = Socialcast::Gitx::CLI.new
-      @script.invoke :update
+      Socialcast::Gitx::CLI.start ['update']
     end
     it 'should run expected commands' do
       Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
@@ -37,8 +36,7 @@ describe Socialcast::Gitx::CLI do
   describe '#integrate' do
     context 'when target branch is ommitted' do
       before do
-        @script = Socialcast::Gitx::CLI.new
-        @script.invoke :integrate
+        Socialcast::Gitx::CLI.start ['integrate']
       end
       it 'should default to prototype' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
@@ -57,8 +55,7 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when target branch == prototype' do
       before do
-        @script = Socialcast::Gitx::CLI.new
-        @script.invoke :integrate, ['prototype']
+        Socialcast::Gitx::CLI.start ['integrate', 'prototype']
       end
       it 'should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
@@ -77,8 +74,7 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when target branch == staging' do
       before do
-        @script = Socialcast::Gitx::CLI.new
-        @script.invoke :integrate, ['staging']
+        Socialcast::Gitx::CLI.start ['integrate', 'staging']
       end
       it 'should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
@@ -102,8 +98,9 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when target branch != staging || prototype' do
       it 'should raise an error' do
-        @script = Socialcast::Gitx::CLI.new
-        lambda { @script.invoke :integrate, ['asdfasdf'] }.should raise_error(/Only aggregate branches are allowed for integration/)
+        lambda {
+          Socialcast::Gitx::CLI.start ['integrate', 'asdfasdfasdf']
+        }.should raise_error(/Only aggregate branches are allowed for integration/)
       end
     end
   end
@@ -112,8 +109,7 @@ describe Socialcast::Gitx::CLI do
     context 'when user rejects release' do
       before do
         Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(false)
-        @script = Socialcast::Gitx::CLI.new
-        @script.invoke :release
+        Socialcast::Gitx::CLI.start ['release']
       end
       it 'should run no commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == []
@@ -122,8 +118,7 @@ describe Socialcast::Gitx::CLI do
     context 'when user confirms release' do
       before do
         Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
-        @script = Socialcast::Gitx::CLI.new
-        @script.invoke :release
+        Socialcast::Gitx::CLI.start ['release']
       end
       it 'should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
@@ -161,8 +156,7 @@ describe Socialcast::Gitx::CLI do
   describe '#nuke' do
     context 'when target branch == prototype and --destination == master' do
       before do
-        @script = Socialcast::Gitx::CLI.new
-        @script.invoke :nuke, ['prototype'], {:destination => 'master'}
+        Socialcast::Gitx::CLI.start ['nuke', 'prototype', '--destination', 'master']
       end
       it 'should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
@@ -185,8 +179,7 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when target branch == staging and --destination == last_known_good_staging' do
       before do
-        @script = Socialcast::Gitx::CLI.new
-        @script.invoke :nuke, ['staging'], {:destination => 'last_known_good_staging'}
+        Socialcast::Gitx::CLI.start ['nuke', 'staging', '--destination', 'last_known_good_staging']
       end
       it 'should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
@@ -196,40 +189,31 @@ describe Socialcast::Gitx::CLI do
           "git push origin :staging",
           "git checkout -b staging",
           "grb publish staging",
-          "git checkout last_known_good_staging",
+          "git checkout last_known_good_staging"
         ]
       end
     end
     context 'when target branch == prototype and destination prompt == nil' do
       before do
         Socialcast::Gitx::CLI.any_instance.should_receive(:ask).and_return('')
-        @script = Socialcast::Gitx::CLI.new
-        @script.invoke :nuke, ['prototype']
+        Socialcast::Gitx::CLI.start ['nuke', 'prototype']
       end
-      it 'defaults to master and should run expected commands' do
+      it 'defaults to last_known_good_prototype and should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
-          "git checkout last_known_good_master",
+          "git checkout last_known_good_prototype",
           "git pull",
           "git branch -D prototype",
           "git push origin :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 checkout -b last_known_good_prototype",
-          "grb publish last_known_good_prototype",
-          "git checkout last_known_good_master"
+          "git checkout last_known_good_prototype"
         ]
       end
     end
     context 'when target branch == prototype and destination prompt = master' do
       before do
         Socialcast::Gitx::CLI.any_instance.should_receive(:ask).and_return('master')
-        @script = Socialcast::Gitx::CLI.new
-        @script.invoke :nuke, ['prototype']
+        Socialcast::Gitx::CLI.start ['nuke', 'prototype']
       end
       it 'should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
@@ -254,8 +238,7 @@ describe Socialcast::Gitx::CLI do
       it 'should raise error' do
         lambda {
           Socialcast::Gitx::CLI.any_instance.should_receive(:ask).and_return('master')
-          @script = Socialcast::Gitx::CLI.new
-          @script.invoke :nuke, ['asdfasdf']
+          Socialcast::Gitx::CLI.start ['nuke', 'asdfasdf']
         }.should raise_error /Only aggregate branches are allowed to be reset/
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre2
+  version: 3.0.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -175,7 +175,7 @@ description: GIT it done!
 email:
 - ryan@socialcast.com
 executables:
-- cleanup
+- git-cleanup
 - git-integrate
 - git-nuke
 - git-release
@@ -195,7 +195,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- bin/cleanup
+- bin/git-cleanup
 - bin/git-integrate
 - bin/git-nuke
 - bin/git-release
@@ -228,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4402162274573639000
+      hash: 3452558432038293622
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: