socialcast-git-extensions 2.2.2 → 2.2.3

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

@@ -1,52 +1,51 @@
+require File.join(File.dirname(__FILE__), '..', 'socialcast-git-extensions')
 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}"
+    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}"
+    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

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

@@ -3,12 +3,10 @@ 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
+    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

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "2.2.2"
+    VERSION = "2.2.3"
   end
 end

data/lib/socialcast-git-extensions.rb

@@ -4,17 +4,15 @@ require 'socialcast-git-extensions/github'
 
 module Socialcast
   module Gitx
-    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
+    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
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 2
-  - 2
-  version: 2.2.2
+  - 3
+  version: 2.2.3
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -20,7 +20,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   name: grit
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: git_remote_branch
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: socialcast
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,12 +73,12 @@ dependencies:
         - 3
         - 4
         version: 0.3.4
-  requirement: *id004
   type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,12 +89,12 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  requirement: *id005
   type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: json_pure
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,12 +103,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
   type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -119,8 +119,8 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  requirement: *id007
   type: :development
+  version_requirements: *id007
 description: GIT it done!
 email: 
 - ryan@socialcast.com
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: socialcast-git-extensions
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: git extension scripts for socialcast workflow