socialcast-git-extensions 2.3.11 → 3.0.0.pre

data/bin/cleanup

@@ -0,0 +1,5 @@
+#!/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)

data/bin/git-integrate

@@ -1,16 +1,5 @@
 #!/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::Git
-
-branch = current_branch
-protect_reserved_branches!(branch, 'integrate')
-
-run_cmd 'git update'
-integrate(branch, 'prototype')
-
-share "#worklog integrating #{branch} into prototype #scgitx"
+require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions', 'cli.rb')
+script = Socialcast::Gitx::CLI.new
+script.invoke(:integrate, ARGV)

data/bin/git-nuke

@@ -0,0 +1,5 @@
+#!/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)

data/bin/git-release

@@ -1,19 +1,5 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast::Git
-
-branch = current_branch
-protect_reserved_branches!(branch, 'release')
-
-exit unless HighLine.agree("<%= color('Release #{branch} to production? (y/n)', :green) %>")
-
-run_cmd 'git update'
-integrate branch, 'master'
-
-integrate branch, 'staging'
-integrate 'staging', 'prototype'
-run_cmd "git checkout master"
-run_cmd "grb rm #{branch}"
-
-share "#worklog releasing #{branch} to production #scgitx"
+require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions', 'cli.rb')
+script = Socialcast::Gitx::CLI.new
+script.invoke(:release)

data/bin/git-reviewrequest

@@ -1,78 +1,5 @@
 #!/usr/bin/env ruby
 
-# create a github review request for the current branch
-# usage:
-# git reviewrequest
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions', 'string_ext.rb')
-include Socialcast::Git
-include Socialcast::Github
-
-branch = current_branch
-username = `git config -z --global --get github.user`.strip
-password = HighLine.ask("Github password: ") { |q| q.echo = false }
-
-run_cmd 'git update'
-
-description = ""
-if index = (ARGV.index('-d') || ARGV.index('--description'))
-  description = ARGV[index + 1]
-  if description.nil?
-    puts "Usage: #git-reviewrequest -d <description>"
-    exit 1
-  end
-else
-  require 'tempfile'
-  Tempfile.open('reviewrequest.md') do |f|
-    helper_tip = <<-EOS.dedent
-      # Describe your pull request
-      # Use GitHub flavored Markdown http://github.github.com/github-flavored-markdown/
-      # Why not include a screenshot? Format is ![title](url)
-    EOS
-    f << "\n\n#{helper_tip}"
-    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 = description.gsub(/^\#.*/, '').chomp.strip
-  end
-end
-
-short_description = description.split("\n").first(5).join("\n")
-changes = `git diff --stat origin/master...#{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
-change_summary = (changes + [stats]).join("\n")
-
-repo = `git config -z --get remote.origin.url`.strip
-# ex: git@github.com:socialcast/socialcast-git-extensions.git
-repo = repo.scan(/:(.+\/.+)\./).first.first
-url = create_pull_request username, password, branch, repo, description
-
-if url
-  review_message = ["@SocialcastDevelopers #reviewrequest for #{branch} #scgitx", short_description, change_summary].join("\n\n")
-  share review_message, {:url => url, :message_type => 'review_request'}
-else
-  HighLine.say "Skipping socialcast announcement"
-  exit 1
-end
+require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions', 'cli.rb')
+script = Socialcast::Gitx::CLI.new
+script.invoke(:reviewrequest, ARGV)

data/bin/git-share

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
 
-# publish the current branch for others to review
-# usage:
-# git share
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast::Git
-
-run_cmd "grb publish #{current_branch}"
+require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions', 'cli.rb')
+script = Socialcast::Gitx::CLI.new
+script.invoke(:share, ARGV)

data/bin/git-start

@@ -1,24 +1,5 @@
 #!/usr/bin/env ruby
 
-#start a new git branch with latest changes from master
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast::Git
-
-unless branch_name = ARGV.first
-  example_branch = %w{ api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link }.sort_by { rand }.first
-  repo = Grit::Repo.new(Dir.pwd)
-  remote_branches = repo.remotes.collect {|b| b.name.split('/').last }
-  until branch_name = HighLine.ask("What would you like to name your branch? (ex: #{example_branch})") {|q| 
-      q.validate = Proc.new { |branch|
-        branch =~ /^[A-Za-z0-9\-_]+$/ && !remote_branches.include?(branch)
-      }
-    }
-  end
-end
-
-run_cmd 'git checkout master'
-run_cmd 'git pull'
-run_cmd "git checkout -b #{branch_name}"
-
-share "#worklog starting work on #{branch_name} #scgitx"
+require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions', 'cli.rb')
+script = Socialcast::Gitx::CLI.new
+script.invoke(:start, ARGV)

data/bin/git-track

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast::Git
-
-branch = current_branch
-
-run_cmd "git branch --set-upstream #{branch} origin/#{branch}"
+require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions', 'cli.rb')
+script = Socialcast::Gitx::CLI.new
+script.invoke(:track, ARGV)

data/bin/git-update

@@ -1,12 +1,5 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast::Git
-
-branch = current_branch
-
-HighLine.say "updating <%= color('#{branch}', :green) %> 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'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions', 'cli.rb')
+script = Socialcast::Gitx::CLI.new
+script.invoke(:update, ARGV)

data/lib/socialcast-git-extensions.rb

@@ -1,25 +1,16 @@
 require 'rubygems'
-require 'highline/import'
+require 'socialcast-git-extensions/version'
+require 'socialcast-git-extensions/string_ext'
+require 'socialcast-git-extensions/git'
+require 'socialcast-git-extensions/github'
 
 module Socialcast
   module Gitx
-    def protect_reserved_branches!(branch, mode)
-      abort("Cannot #{mode} reserved branch") if Socialcast::Git::RESERVED_BRANCHES.include?(branch)
-    end
+    # execute a shell command and raise an error if non-zero exit code is returned
     def run_cmd(cmd)
-      HighLine.say "\n> <%= color('#{cmd.gsub("'", '')}', :red) %>"
+      say "\n> "
+      say cmd.gsub("'", ''), :red
       raise "#{cmd} failed" unless system cmd
     end
-    def share(message, options = {})
-      return if ARGV.delete("--quiet") || ARGV.delete("-q")
-      require 'socialcast'
-      require 'socialcast/message'
-      Socialcast::Message.configure_from_credentials
-      Socialcast::Message.create options.merge(:body => message)
-      say "Message has been shared"
-    end
   end
 end
-
-require 'socialcast-git-extensions/git'
-require 'socialcast-git-extensions/github'

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

@@ -0,0 +1,198 @@
+require "thor"
+require 'rest_client'
+require 'socialcast-git-extensions'
+
+module Socialcast
+  module Gitx
+    class CLI < Thor
+      include Socialcast::Gitx
+      include Socialcast::Gitx::Git
+      include Socialcast::Gitx::Github
+
+      BASE_BRANCH = 'master'
+      PULL_REQUEST_DESCRIPTION = "\n\n" + <<-EOS.dedent
+        # Describe your pull request
+        # Use GitHub flavored Markdown http://github.github.com/github-flavored-markdown/
+        # Why not include a screenshot? Format is ![title](url)
+      EOS
+
+      method_option :quiet, :type => :boolean, :aliases => '-q'
+      method_option :trace, :type => :boolean, :aliases => '-v'
+      def initialize(*args)
+        super(*args)
+        RestClient.proxy = ENV['HTTPS_PROXY'] if ENV.has_key?('HTTPS_PROXY')
+        RestClient.log = Logger.new(STDOUT) if options[:trace]
+      end
+
+      desc "reviewrequest", "Create a pull request on github"
+      method_option :description, :type => :string, :aliases => '-d', :desc => 'pull request description'
+      # @see http://developer.github.com/v3/pulls/
+      def reviewrequest
+        token = authorization_token
+
+        update
+
+        description = options[:description] || editor_input(PULL_REQUEST_DESCRIPTION)
+        branch = current_branch
+        repo = current_repo
+        create_pull_request token, branch, repo, description
+
+        short_description = description.split("\n").first(5).join("\n")
+        review_message = ["@SocialcastDevelopers #reviewrequest for #{branch} #scgitx", short_description, changelog_summary(branch)].join("\n\n")
+        post review_message, {:url => url, :message_type => 'review_request'}
+      end
+
+      desc 'update', 'Update the current branch with latest upstream changes'
+      def update
+        branch = current_branch
+
+        say 'updating '
+        say "#{branch} ", :green
+        say "to have most recent changes from "
+        say BASE_BRANCH, :green
+
+        run_cmd "git pull origin #{branch}" rescue nil
+        run_cmd "git pull origin #{BASE_BRANCH}"
+        run_cmd 'git push origin HEAD'
+        run_cmd 'git remote prune origin'
+      end
+
+      desc 'cleanup', 'Cleanup branches that have been merged into master from the repo'
+      def cleanup
+        run_cmd "git checkout #{BASE_BRANCH}"
+        run_cmd "git pull"
+
+        say "Deleting branches that have been merged into "
+        say BASE_BRANCH, :green
+        branches(:merged => true).each do |branch|
+          run_cmd "git branch -d #{branch}"
+        end
+        branches(:merged => true, :remote => true).each do |branch|
+          run_cmd "grb rm #{branch}"
+        end
+      end
+
+      desc 'track', 'set the current branch to track the remote branch with the same name'
+      def track
+        branch = current_branch
+        run_cmd "git branch --set-upstream #{branch} origin/#{branch}"
+      end
+
+      desc 'start', 'start a new git branch with latest changes from master'
+      def start(branch_name = nil)
+        unless branch_name
+          example_branch = %w{ api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link }.sort_by { rand }.first
+          repo = Grit::Repo.new(Dir.pwd)
+          remote_branches = repo.remotes.collect {|b| b.name.split('/').last }
+          until branch_name = ask("What would you like to name your branch? (ex: #{example_branch})") {|q|
+              q.validate = Proc.new { |branch|
+                branch =~ /^[A-Za-z0-9\-_]+$/ && !remote_branches.include?(branch)
+              }
+            }
+          end
+        end
+
+        run_cmd "git checkout #{BASE_BRANCH}"
+        run_cmd 'git pull'
+        run_cmd "git checkout -b #{branch_name}"
+
+        post "#worklog starting work on #{branch_name} #scgitx"
+      end
+
+      desc 'share', 'publish the current branch for peer review'
+      def share
+        run_cmd "grb publish #{current_branch}"
+      end
+
+      desc 'integrate', 'integrate the current branch into one of the aggregate development branches'
+      def integrate(target_branch)
+        branch = current_branch
+
+        update
+        integrate_branch(branch, target_branch)
+        integrate_branch(branch, 'prototype') if target_branch == 'staging'
+
+        post "#worklog integrating #{branch} into #{target_branch} #scgitx"
+      end
+
+      desc 'nuke', 'nuke the specified aggregate branch and reset it to a known good state'
+      def nuke(bad_branch, good_branch='last_known_good_master')
+        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)
+
+        post "#worklog resetting #{branch} branch to #{good_branch} #scgitx\n\nthe following branches were affected:\n#{removed_branches.map{|b| '* ' + b}.join("\n") }"
+      end
+
+      desc 'release', 'release the current branch to production'
+      def release
+        branch = current_branch
+        assert_not_protected_branch!(branch, 'release')
+
+        return unless yes?("Release #{branch} to production? (y/n)", :green)
+
+        update
+        integrate branch, 'master'
+        integrate branch, 'staging'
+        run_cmd "git checkout #{BASE_BRANCH}"
+        run_cmd "grb rm #{branch}"
+
+        share "#worklog releasing #{branch} to production #scgitx"
+      end
+
+
+      private
+
+      # build a summary of changes
+      def changelog_summary(branch)
+        changes = `git diff --stat origin/#{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 = {})
+        return if options[:quiet]
+        require 'socialcast'
+        require 'socialcast/message'
+        Socialcast::Message.configure_from_credentials
+        Socialcast::Message.create params.merge(:body => message)
+        say "Message has been posted"
+      end
+    end
+  end
+end

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

@@ -1,56 +1,85 @@
 require 'grit'
 
 module Socialcast
-  module Git
-    include Socialcast::Gitx
-    RESERVED_BRANCHES = %w{ HEAD master last_known_good_master staging last_known_good_staging next_release last_known_good_next_release }
+  module Gitx
+    module Git
+      RESERVED_BRANCHES = %w{ HEAD master staging prototype next_release }
 
-    def current_branch
-      repo = Grit::Repo.new(Dir.pwd)
-      Grit::Head.current(repo).name
-    end
-    def branches(options = {})
-      branches = []
-      args = []
-      args << '-r' if options[:remote]
-      args << '--merged' if options[:merged]
-      output = `git branch #{args.join(' ')}`.split("\n")
-      output.each do |branch|
-        branch = branch.gsub(/\*/, '').strip.split(' ').first
-        branch = branch.split('/').last if options[:remote]
-        branches << branch unless RESERVED_BRANCHES.include?(branch)
+      def assert_not_protected_branch!(branch, action)
+        raise "Cannot #{action} reserved branch" if RESERVED_BRANCHES.include?(branch) || aggregate_branch?(branch)
       end
-      branches.uniq
-    end
-    def reset_branch(branch, head_branch = 'master', options = {})
-      return if branch == head_branch
 
-      HighLine.say "resetting <%= color('#{branch}', :green) %> branch to <%= color('#{head_branch}', :green) %>"
+      # lookup the current branch of the PWD
+      def current_branch
+        repo = Grit::Repo.new(Dir.pwd)
+        Grit::Head.current(repo).name
+      end
 
-      run_cmd "git checkout #{head_branch}"
-      run_cmd "git pull"
-      removed_branches = branches :remote => true, :merged => "origin/#{branch}"
-      run_cmd "git branch -D #{branch}" rescue nil
-      run_cmd "git push origin :#{branch}" rescue nil
-      run_cmd "git checkout -b #{branch}"
-      run_cmd "grb publish #{branch}"
-      run_cmd "git checkout #{head_branch}"
+      # lookup the current repository of the PWD
+      # ex: git@github.com:socialcast/socialcast-git-extensions.git
+      def current_repo
+        repo = `git config -z --get remote.origin.url`.strip
+        repo.scan(/:(.+\/.+)\./).first.first
+      end
 
-      share "#worklog resetting #{branch} branch to #{head_branch} #scgitx\n\nthe following branches were affected:\n#{removed_branches.map{|b| '* ' + b}.join("\n") }" if options[:share]
-    end
+      # retrieve a list of branches
+      def branches(options = {})
+        branches = []
+        args = []
+        args << '-r' if options[:remote]
+        args << "--merged #{options[:merged].is_a?(String) ? options[:merged] : ''}" if options[:merged]
+        output = `git branch #{args.join(' ')}`.split("\n")
+        output.each do |branch|
+          branch = branch.gsub(/\*/, '').strip.split(' ').first
+          branch = branch.split('/').last if options[:remote]
+          branches << branch unless RESERVED_BRANCHES.include?(branch)
+        end
+        branches.uniq
+      end
 
-    def integrate(branch, destination_branch = 'staging')
-      HighLine.say "integrating <%= color('#{branch}', :green) %> into <%= color('#{destination_branch}', :green) %>"
-      run_cmd "git remote prune origin"
-      unless destination_branch == 'master'
-        run_cmd "git branch -D #{destination_branch}" rescue nil
-        run_cmd "grb track #{destination_branch}"
+      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)
+        raise "Can not reset #{branch} to #{head_branch}" if branch == head_branch
+        raise "Only aggregate branches are allowed to be reset: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(branch)
+        say "Resetting "
+        say "#{branch} ", :green
+        say "branch to "
+        say head_branch, :green
+
+        run_cmd "git checkout #{head_branch}"
+        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 checkout -b #{branch}"
+        run_cmd "grb publish #{branch}"
+        run_cmd "git checkout #{head_branch}"
+
+        removed_branches
+      end
+
+      # integrate a branch into a destination aggregate branch
+      def integrate_branch(branch, destination_branch = 'staging')
+        assert_not_protected_branch!(branch, 'integrate')
+        raise "Only aggregate branches are allowed for integration: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(destination_branch)
+        say "Integrating "
+        say "#{branch} ", :green
+        say "into "
+        say destination_branch, :green
+
+        run_cmd "git remote prune origin"
+        run_cmd "git checkout #{destination_branch}"
+        run_cmd "git pull . #{branch}"
+        run_cmd "git push origin HEAD"
+        run_cmd "git checkout #{branch}"
       end
-      run_cmd "git checkout #{destination_branch}"
-      run_cmd "git pull . #{branch}"
-      run_cmd "git push origin HEAD"
 
-      run_cmd "git checkout #{branch}"
+      private
+      def aggregate_branch?(branch)
+        AGGREGATE_BRANCHES.include?(branch) || branch.starts_with?('last_known_good')
+      end
     end
   end
 end

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

@@ -1,22 +1,50 @@
 require 'rest_client'
 require 'json'
+require 'socialcast'
 
 module Socialcast
-  module Github
-    def create_pull_request(username, password, branch, repo, body)
-      payload = {:title => branch, :base => 'master', :head => branch, :body => body}.to_json
-      begin
-        HighLine.say "Creating pull request for #{branch} against master in #{repo}"
-        RestClient.proxy = ENV['HTTPS_PROXY'] if ENV.has_key?('HTTPS_PROXY')
-        response = RestClient::Request.new(:url => "https://api.github.com/repos/#{repo}/pulls", :method => "POST", :user => username, :password => password, :payload => payload, :headers => {:accept => :json, :content_type => :json}).execute
+  module Gitx
+    module Github
+      # request github authorization token
+      # store the token in ~/.socialcast/credentials.yml for future reuse
+      # @see http://developer.github.com/v3/oauth/#scopes
+      def authorization_token
+        credentials = Socialcast.credentials
+        return credentials[:scgitx_token] if credentials[:scgitx_token]
+
+        username = `git config -z --global --get github.user`.strip
+        raise "Github user not configured.  Run: `git config --global github.user 'me@email.com'`" if username.empty?
+        password = ask("Github password for #{username}: ") { |q| q.echo = false }
+
+        payload = {:scopes => ['repo'], :note => 'Socialcast Git eXtension', :note_url => 'https://github.com/socialcast/socialcast-git-extensions'}.to_json
+        response = RestClient::Request.new(:url => "https://api.github.com/authorizations", :method => "POST", :user => username, :password => password, :payload => payload, :headers => {:accept => :json, :content_type => :json}).execute
+        data = JSON.parse response.body
+        token = data['token']
+        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']}"
+        throw e
+      end
+
+      # @see http://developer.github.com/v3/pulls/
+      def create_pull_request(token, branch, repo, body)
+        payload = {:title => branch, :base => 'master', :head => branch, :body => body}.to_json
+        say "Creating pull request for "
+        say "#{branch} ", :green
+        say "against "
+        say "master ", :green
+        say "in "
+        say repo, :green
+        response = RestClient::Request.new(:url => "https://api.github.com/repos/#{repo}/pulls", :method => "POST", :payload => payload, :headers => {:accept => :json, :content_type => :json, 'Authorization' => "token #{token}"}).execute
         data = JSON.parse response.body
         url = data['html_url']
       rescue RestClient::Exception => e
         data = JSON.parse e.http_body
-        HighLine.say "Failed to create pull request: #{data['message']}"
-        false
+        say "Failed to create pull request: #{data['message']}"
+        throw e
       end
     end
   end
 end
-

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

@@ -4,4 +4,8 @@ class String
     gsub(/^#{a}/,'')
   end
   alias :dedent :undent
+
+  def starts_with?(characters)
+    self.match(/^#{characters}/) ? true : false
+  end
 end

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

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

data/socialcast-git-extensions.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency(%q<grit>, [">= 0"])
   s.add_runtime_dependency(%q<git_remote_branch>, [">= 0"])
-  s.add_runtime_dependency(%q<highline>, [">= 0"])
   s.add_runtime_dependency(%q<socialcast>, [">= 1.1.4"])
   s.add_runtime_dependency(%q<rest-client>, [">= 1.4.0"])
   s.add_runtime_dependency(%q<json_pure>, [">= 0"])
+  s.add_runtime_dependency(%q<thor>, [">= 0"])
   s.add_development_dependency(%q<rake>, ["0.9.2.2"])
   s.add_development_dependency(%q<shoulda>, ["2.11.3"])
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 2.3.11
-  prerelease: 
+  version: 3.0.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &2156547240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156547240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git_remote_branch
-  requirement: &2156546180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156546180
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: &2156542060 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2156542060
 - !ruby/object:Gem::Dependency
   name: socialcast
-  requirement: &2156538080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +53,15 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156538080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156537160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +69,31 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156537160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2156535480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,39 +101,52 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156535480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156534700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2156534700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2156533020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *2156533020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.11.3
 description: GIT it done!
 email:
 - ryan@socialcast.com
 executables:
+- cleanup
 - git-integrate
-- git-promote
-- git-prune-merged
+- git-nuke
 - git-release
-- git-reset-prototype
-- git-reset-staging
 - git-reviewrequest
 - git-share
 - git-start
@@ -125,12 +163,10 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- bin/cleanup
 - bin/git-integrate
-- bin/git-promote
-- bin/git-prune-merged
+- bin/git-nuke
 - bin/git-release
-- bin/git-reset-prototype
-- bin/git-reset-staging
 - bin/git-reviewrequest
 - bin/git-share
 - bin/git-start
@@ -138,6 +174,7 @@ files:
 - bin/git-update
 - bin/git-wtf
 - lib/socialcast-git-extensions.rb
+- lib/socialcast-git-extensions/cli.rb
 - lib/socialcast-git-extensions/git.rb
 - lib/socialcast-git-extensions/github.rb
 - lib/socialcast-git-extensions/string_ext.rb
@@ -157,15 +194,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2945626375834761242
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: socialcast-git-extensions
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: git extension scripts for socialcast workflow

data/bin/git-promote

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast::Git
-
-branch = current_branch
-protect_reserved_branches!(branch, 'promote')
-
-run_cmd 'git update'
-integrate(branch, 'staging')
-
-
-integrate('staging', 'prototype')
-run_cmd "git checkout #{branch}"
-
-share "#worklog promoting #{branch} into staging #scgitx"

data/bin/git-prune-merged

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-
-#prune branches that have been merged into master from the repo
-#usage -r --remote to prune remote branches
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast::Git
-
-remote = ARGV.delete("--remote") || ARGV.delete("-r")
-
-run_cmd "git checkout master"
-run_cmd "git pull"
-
-HighLine.say "Deleting <%= color('#{remote ? 'remote' : 'local'}', :green) %> branches that have been merged into master"
-branches(:merged => true).each do |branch|
-  run_cmd "git branch -d #{branch}"
-end
-
-if remote
-  branches(:merged => true, :remote => true).each do |branch|
-    run_cmd "grb rm #{branch}"
-  end
-end

data/bin/git-reset-prototype

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast::Git
-
-head_branch = ARGV.first || 'master'
-reset_branch('prototype', head_branch, :share => true)
-reset_branch('last_known_good_prototype', head_branch)

data/bin/git-reset-staging

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast::Git
-
-head_branch = ARGV.first || 'last_known_good_staging'
-reset_branch('staging', head_branch, :share => (head_branch != 'last_known_good_staging'))
-reset_branch('last_known_good_staging', head_branch)