socialcast-git-extensions 2.2.1 → 2.2.2

data/bin/git-integrate

@@ -5,13 +5,12 @@
 # git integrate <ticket_id> <ticket_id2>...
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast
-
-is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
+include Socialcast::Gitx
+include Socialcast::Git
 
 branch = current_branch
 
 run_cmd 'git update'
 integrate(branch, 'prototype')
 
-run_cmd "socialcast share '#worklog integrating #{branch} into prototype #scgitx'" unless is_quiet
+share "#worklog integrating #{branch} into prototype #scgitx"

data/bin/git-promote

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast
-
-is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
+include Socialcast::Gitx
+include Socialcast::Git
 
 branch = current_branch
 
@@ -14,4 +13,4 @@ integrate(branch, 'staging')
 integrate('staging', 'prototype')
 run_cmd "git checkout #{branch}"
 
-run_cmd "socialcast share '#worklog promoting #{branch} into staging #scgitx'" unless is_quiet
+share "#worklog promoting #{branch} into staging #scgitx"

data/bin/git-prune-merged

@@ -4,7 +4,8 @@
 #usage -r --remote to prune remote branches
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast
+include Socialcast::Gitx
+include Socialcast::Git
 
 remote = ARGV.delete("--remote") || ARGV.delete("-r")
 

data/bin/git-release

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast
+include Socialcast::Gitx
+include Socialcast::Git
 
 branch = current_branch
 abort("Cannot release reserved branch") if %w{master staging prototype}.include?(branch)
 
-is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
-
 exit unless HighLine.agree("<%= color('Release #{branch} to production? (y/n)', :green) %>")
 
 run_cmd 'git update'
@@ -18,4 +17,4 @@ integrate 'staging', 'prototype'
 run_cmd "git checkout master"
 run_cmd "grb rm #{branch}"
 
-run_cmd "socialcast share '#worklog releasing #{branch} to production #scgitx'" unless is_quiet
+share "#worklog releasing #{branch} to production #scgitx"

data/bin/git-reset-prototype

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast
+include Socialcast::Gitx
+include Socialcast::Git
 
 head_branch = ARGV.first || 'master'
 reset_branch('prototype', head_branch)
@@ -9,5 +10,4 @@ reset_branch('last_known_good_prototype', head_branch)
 
 HighLine.say "\n<%= color('Updating the following tickets to no longer be in prototype:', :red) %>"
 
-is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
-run_cmd "socialcast share '#worklog resetting prototype branch #scgitx'" unless is_quiet
+share "#worklog resetting prototype branch #scgitx"

data/bin/git-reset-staging

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast
+include Socialcast::Gitx
+include Socialcast::Git
 
 head_branch = ARGV.first || 'last_known_good_staging'
 reset_branch('staging', head_branch)
 reset_branch('last_known_good_staging', head_branch)
 
-is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
-run_cmd "socialcast share '#worklog resetting staging branch #scgitx'" unless is_quiet
+share "#worklog resetting staging branch #scgitx"

data/bin/git-reviewrequest

@@ -5,9 +5,9 @@
 # git reviewrequest
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast
-
-is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
+include Socialcast::Gitx
+include Socialcast::Git
+include Socialcast::Github
 
 branch = current_branch
 username = `git config -z --global --get github.user`.strip
@@ -16,4 +16,4 @@ password = HighLine.ask("Github password: ") { |q| q.echo = false }
 run_cmd 'git update'
 
 url = create_pull_request username, password, branch
-run_cmd "socialcast share '@SocialcastDevelopers #reviewrequest for #{branch} #scgitx' --url #{url}" unless is_quiet
+share "@SocialcastDevelopers #reviewrequest for #{branch} #scgitx", url

data/bin/git-share

@@ -5,6 +5,7 @@
 # git share
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast
+include Socialcast::Gitx
+include Socialcast::Git
 
 run_cmd "grb publish #{current_branch}"

data/bin/git-start

@@ -3,9 +3,8 @@
 #start a new git branch with latest changes from master
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast
-
-is_quiet = ARGV.delete("--quiet") || ARGV.delete("-q")
+include Socialcast::Gitx
+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
@@ -23,4 +22,4 @@ run_cmd 'git checkout master'
 run_cmd 'git pull'
 run_cmd "git checkout -b #{branch_name}"
 
-run_cmd "socialcast share '#worklog starting work on #{branch_name} #scgitx'" unless is_quiet
+share "#worklog starting work on #{branch_name} #scgitx"

data/bin/git-track

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast
+include Socialcast::Gitx
+include Socialcast::Git
 
 branch = current_branch
 

data/bin/git-update

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extensions.rb')
-include Socialcast
+include Socialcast::Gitx
+include Socialcast::Git
 
 branch = current_branch
 

data/lib/socialcast-git-extensions.rb

@@ -1,64 +1,20 @@
-require 'grit'
 require 'highline/import'
-require 'rest_client'
-require 'json'
+require 'socialcast-git-extensions/git'
+require 'socialcast-git-extensions/github'
 
 module Socialcast
   module Gitx
-
-  end
-
-  def current_branch
-    repo = Grit::Repo.new(Dir.pwd)
-    Grit::Head.current(repo).name
-  end
- 
-  def run_cmd(cmd)
-    HighLine.say "\n> <%= color('#{cmd.gsub("'", '')}', :red) %>"
-    raise "#{cmd} failed" unless system cmd
-  end
-
-  def branches(options = {})
-    branches = []
-    reserved_branches = %w{ HEAD master last_known_good_master staging last_known_good_staging next_release last_known_good_next_release }
-    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)
+    class << self
+      def run_cmd(cmd)
+        HighLine.say "\n> <%= color('#{cmd.gsub("'", '')}', :red) %>"
+        raise "#{cmd} failed" unless system cmd
+      end
+      def share(message, url = nil)
+        return if ARGV.delete("--quiet") || ARGV.delete("-q")
+        cmd = "socialcast share '#{message}'"
+        cmd += " --url #{url}" if url
+        run_cmd cmd
+      end
     end
-    branches
-  end
-  def reset_branch(branch, head_branch = 'master')
-    return if branch == head_branch
-    run_cmd "git checkout #{head_branch}"
-    run_cmd "git pull"
-    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}"
-  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}"
-    end
-    run_cmd "git checkout #{destination_branch}"
-    run_cmd "git pull . #{branch}"
-    run_cmd "git push origin HEAD"
-
-    run_cmd "git checkout #{branch}"
-  end
-  def create_pull_request(username, password, branch)
-    response = RestClient.post "https://#{username}:#{password}@api.github.com/repos/socialcast/socialcast/pulls", {:title => branch, :base => 'master', :head => branch}.to_json, :accept => :json, :content_type => :json
-    data = JSON.parse response.body
-    url = data['html_url']
   end
 end

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

@@ -0,0 +1,52 @@
+require 'grit'
+
+module Socialcast
+  module Git
+    include Socialcast::Gitx
+
+    class << self
+      def current_branch
+        repo = Grit::Repo.new(Dir.pwd)
+        Grit::Head.current(repo).name
+      end
+      def branches(options = {})
+        branches = []
+        reserved_branches = %w{ HEAD master last_known_good_master staging last_known_good_staging next_release last_known_good_next_release }
+        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)
+        end
+        branches
+      end
+      def reset_branch(branch, head_branch = 'master')
+        return if branch == head_branch
+        run_cmd "git checkout #{head_branch}"
+        run_cmd "git pull"
+        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}"
+      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}"
+        end
+        run_cmd "git checkout #{destination_branch}"
+        run_cmd "git pull . #{branch}"
+        run_cmd "git push origin HEAD"
+
+        run_cmd "git checkout #{branch}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require 'rest_client'
+require 'json'
+
+module Socialcast
+  module Github
+    class << self
+      def create_pull_request(username, password, branch)
+        response = RestClient.post "https://#{username}:#{password}@api.github.com/repos/socialcast/socialcast/pulls", {:title => branch, :base => 'master', :head => branch}.to_json, :accept => :json, :content_type => :json
+        data = JSON.parse response.body
+        url = data['html_url']
+      end
+    end
+  end
+end

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

@@ -1,7 +1,5 @@
 module Socialcast
-  module Git
-    module Extensions
-      VERSION = "2.2.1"
-    end
+  module Gitx
+    VERSION = "2.2.2"
   end
 end

data/socialcast-git-extensions.gemspec

@@ -4,7 +4,7 @@ require "socialcast-git-extensions/version"
 
 Gem::Specification.new do |s|
   s.name        = "socialcast-git-extensions"
-  s.version     = Socialcast::Git::Extensions::VERSION
+  s.version     = Socialcast::Gitx::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ryan Sonnek"]
   s.email       = ["ryan@socialcast.com"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -161,6 +161,8 @@ files:
 - bin/git-update
 - bin/git-wtf
 - lib/socialcast-git-extensions.rb
+- lib/socialcast-git-extensions/git.rb
+- lib/socialcast-git-extensions/github.rb
 - lib/socialcast-git-extensions/version.rb
 - socialcast-git-extensions.gemspec
 - test/helper.rb