socialcast-git-extensions 3.1.33 → 3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8ea01b7fd80ae11dd510c1adc02a7b542fff16b
-  data.tar.gz: 4feb1e553b2a19e94c5380f15975128246ab4daa
+  metadata.gz: ecdfa89c3f7f393389f3bde1e5d26a9a48776536
+  data.tar.gz: 4a49a0336e87e091f3dd5301e17a9254fbc2689d
 SHA512:
-  metadata.gz: 7038bed4dbfba680c9c92501d46970ffe5dc47fdfcb349e1c8b89d7d4a7b0c7f6221a485970cebfa5595b92bb5893f65e5c279be8821678ec8d4d84a5ab5e024
-  data.tar.gz: 661f2006acac98cc336c3fbe568a18f8c339a024e0e43fd9c5f3c55419810847557814cb24518f9f9e53d7bdde11b0e03da6e1d4083df26853b4f09888c20b8e
+  metadata.gz: 16673110b211af70bbd33b5ec58035976932b576c3f221e22ac2df8b00ee62dcc88f7317fc1ff765cbda6d915dfa9223c5ffb165aadf96604a3ef24ba5ac26be
+  data.tar.gz: 8e0d1ac0094f6229cc672f65261732d86fa7062c2d43ec465578ae31c87c1e6b90dd8f1fa75476b0c459222d64d5b921fc5ca41439d854655cd64b02d48f7ba3

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

@@ -157,7 +157,7 @@ module Socialcast
       def start(branch_name = nil)
         unless branch_name
           example_branch = %w{ cpr-3922-api-fix-invalid-auth red-212-desktop-cleanup-avatar-markup red-3212-share-form-add-edit-link }.sample
-          repo = Grit::Repo.new(Dir.pwd)
+          repo = Rugged::Repository.new(Dir.pwd)
           remote_branches = repo.remotes.collect {|b| b.name.split('/').last }
           ## Explicitly use Highline.ask
           branch_name = $terminal.ask("What would you like to name your branch? (ex: #{example_branch})") do |q|

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

@@ -1,4 +1,4 @@
-require 'grit'
+require 'rugged'
 require 'pathname'
 
 module Socialcast
@@ -21,8 +21,8 @@ module Socialcast
 
       # lookup the current branch of the PWD
       def current_branch
-        repo = Grit::Repo.new(Dir.pwd)
-        Grit::Head.current(repo).name
+        repo = Rugged::Repository.new(Dir.pwd)
+        repo.head.name.split('/').last # refs/heads/<branch-name>
       end
 
       # lookup the current repository of the PWD
@@ -39,7 +39,7 @@ module Socialcast
       end
 
       def backport_to(branch, shas)
-        run_cmd "git checkout #{base_branch}"
+        refresh_branch_from_remote base_branch
         run_cmd "git checkout -b #{branch}"
         begin
           run_cmd "git cherry-pick #{shas.join(' ')}"

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.33"
+    VERSION = "3.2"
   end
 end

data/socialcast-git-extensions.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "socialcast-git-extensions"
 
-  s.add_runtime_dependency 'grit', '~> 2.5.0'
+  s.add_runtime_dependency 'rugged', '>= 0.23'
   s.add_runtime_dependency 'socialcast', '~> 1.3.0'
   s.add_runtime_dependency 'activesupport', '~> 4.0'
   s.add_runtime_dependency 'rest-client', '~> 1.7'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.33
+  version: '3.2'
 platform: ruby
 authors:
 - Socialcast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: socialcast
   requirement: !ruby/object:Gem::Requirement