socialcast-git-extensions 3.1.12 → 3.1.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDY0NDg0NzYzOGFlZWU0YTczNjMxZDQxM2ZhYzU1ZDMzYTJkNzFlYw==
+    MzEwOTM0ZjE3NGM1MWFjMWFlNWFjMDU3MzJmMTJmOTcxZTFhMmJjNg==
   data.tar.gz: !binary |-
-    M2YzYjEwMGMxYzFjMGI2OTU4NGUyNDVkZDNhOWZhYzNlMTQ4OTQzMg==
+    ODA5YmU0ZGIxZDMzMTU4MTY2ODFiYjQ0ZjRlNTNiYTgxNjc4ZDNlMw==
 SHA512:
   metadata.gz: !binary |-
-    NGIwOGM1NmExNGE0M2Y5NGRhZTVhODkxNGJkOWM3ODg3YWY2OTc5YWU1Mzc4
-    MTY1YTFkYjcyZGUwYTg5MTJiZTgyNDMxNjFkMTM2MDQ3YzIwMzM5ZjBiZTc0
-    ODAyM2JhODg2MmY1OGZhNzZkNGE1N2FlMmUwOTkyOTA0YWI2YWI=
+    Mjg5OTRlNjU0NjExOWFmZjNhMWNiMWJlMzM1MjFlYjg5Mjc4NmUzMTI5MDdj
+    YzQ3NjlmMDA1OTgwYjkzZWJlZTdmODgxZDk1MGIwM2RjN2Y5M2VlZGM2OTFj
+    YThhNjI1NGIwNWU5MTUwM2RlYTk2ZDM4YzMzYTE1NzIzYjgxMGM=
   data.tar.gz: !binary |-
-    ODQwMzdhZGQ1MjgyMjViMDBiZjkzYzY5ZThlMTBiNzc2YmNkOWM5MjM3NDA0
-    NDNlMzVmMDEwY2Y2ZDA4ZjAzM2JiNzdlYWZjODUwZDI5MTdhOGYwMzFlMjI1
-    NzgxYmZiYzAyNzM1ZmE3ODkyNThiYjAzZTE3YjQyYzFkYmIyNTE=
+    ZTVlMmRjM2MxNWNhOTEyMDAzOGEzNmJhYzNkNzFhZjZmMmFkZTdlMmIyY2Rh
+    YzZiZWVlOWRmZmNiMDRjZDA1MWI3ZDYwYzBlN2MwMDEwNWU2NDQ1NDdmOWY2
+    ZDFlMGYzZThmODJjMmVhN2ZlN2VhZjE5ZmM5NTUxMzJkMjA2ZTA=

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

@@ -193,7 +193,7 @@ module Socialcast
       def post(message, params = {})
         return if options[:quiet]
         require 'socialcast'
-        require 'socialcast/message'
+        require 'socialcast/command_line/message'
         ActiveResource::Base.logger = Logger.new(STDOUT) if options[:trace]
         Socialcast::Message.configure_from_credentials
         Socialcast::Message.create params.merge(:body => message)

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

@@ -12,7 +12,7 @@ module Socialcast
       # @see http://developer.github.com/v3/oauth/#scopes
       # @see http://developer.github.com/v3/#user-agent-required
       def authorization_token
-        credentials = Socialcast.credentials
+        credentials = Socialcast::CommandLine.credentials
         return credentials[:scgitx_token] if credentials[:scgitx_token]
 
         username = current_user
@@ -23,7 +23,7 @@ module Socialcast
         response = RestClient::Request.new(:url => "https://api.github.com/authorizations", :method => "POST", :user => username, :password => password, :payload => payload, :headers => {:accept => :json, :content_type => :json, :user_agent => 'socialcast-git-extensions'}).execute
         data = JSON.parse response.body
         token = data['token']
-        Socialcast.credentials = credentials.merge(:scgitx_token => token)
+        Socialcast::CommandLine.credentials = credentials.merge(:scgitx_token => token)
         token
       rescue RestClient::Exception => e
         process_error e

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.12"
+    VERSION = "3.1.13"
   end
 end

data/socialcast-git-extensions.gemspec

@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "socialcast-git-extensions"
 
+  s.add_dependency(%q<json_pure>, [">= 0"])
   s.add_runtime_dependency(%q<grit>, [">= 0"])
-  s.add_runtime_dependency(%q<socialcast>, [">= 1.1.4"])
+  s.add_runtime_dependency(%q<socialcast>, [">= 1.3.0"])
   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 "rspec", '>= 2.11.0'

data/spec/cli_spec.rb

@@ -150,6 +150,7 @@ describe Socialcast::Gitx::CLI do
       before do
         Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog releasing FOO to master #scgitx")
         Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
+        Socialcast::Gitx::CLI.any_instance.should_receive(:cleanup)
         Socialcast::Gitx::CLI.start ['release']
       end
       it 'should post message to socialcast' do end # see expectations
@@ -167,10 +168,7 @@ describe Socialcast::Gitx::CLI do
           "git checkout staging",
           "git pull . master",
           "git push origin HEAD",
-          "git checkout master",
-          "git checkout master",
-          "git pull",
-          "git remote prune origin"
+          "git checkout master"
         ]
       end
     end
@@ -192,6 +190,7 @@ describe Socialcast::Gitx::CLI do
         Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog releasing FOO to special-master #scgitx")
         Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
         Socialcast::Gitx::CLI.any_instance.stub(:config).and_return( { 'base_branch' => 'special-master' })
+        Socialcast::Gitx::CLI.any_instance.should_receive(:cleanup)
         Socialcast::Gitx::CLI.start ['release']
       end
       it 'should post message to socialcast' do end # see expectations
@@ -212,10 +211,7 @@ describe Socialcast::Gitx::CLI do
           "git checkout staging",
           "git pull . special-master",
           "git push origin HEAD",
-          "git checkout special-master",
-          "git checkout special-master",
-          "git pull",
-          "git remote prune origin"
+          "git checkout special-master"
         ]
       end
     end
@@ -225,6 +221,7 @@ describe Socialcast::Gitx::CLI do
         Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog releasing FOO to special-master #scgitx")
         Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
         Socialcast::Gitx::CLI.any_instance.stub(:config).and_return({})
+        Socialcast::Gitx::CLI.any_instance.should_receive(:cleanup)
         ENV['BASE_BRANCH'] = 'special-master'
         Socialcast::Gitx::CLI.start ['release']
       end
@@ -249,10 +246,7 @@ describe Socialcast::Gitx::CLI do
           "git checkout staging",
           "git pull . special-master",
           "git push origin HEAD",
-          "git checkout special-master",
-          "git checkout special-master",
-          "git pull",
-          "git remote prune origin"
+          "git checkout special-master"
         ]
       end
     end
@@ -262,6 +256,7 @@ describe Socialcast::Gitx::CLI do
         Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog releasing FOO to special-master #scgitx")
         Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
         Socialcast::Gitx::CLI.any_instance.stub(:config).and_return({ 'base_branch' => 'extra-special-master' })
+        Socialcast::Gitx::CLI.any_instance.should_receive(:cleanup)
         ENV['BASE_BRANCH'] = 'special-master'
         Socialcast::Gitx::CLI.start ['release']
       end
@@ -287,10 +282,7 @@ describe Socialcast::Gitx::CLI do
           "git checkout staging",
           "git pull . special-master",
           "git push origin HEAD",
-          "git checkout special-master",
-          "git checkout special-master",
-          "git pull",
-          "git remote prune origin"
+          "git checkout special-master"
         ]
       end
     end
@@ -465,7 +457,7 @@ describe Socialcast::Gitx::CLI do
       }
 
       stub_request(:get, "https://api.github.com/search/issues?q=abc123%20type:pr%20repo:socialcast/socialcast-git-extensions").
-        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Authorization'=>'token 8e1936680681828863c314e955acefcb6c25b887', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}).
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Authorization'=>/token\s\w+/, 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}).
         to_return(:status => 200, :body => stub_response.to_json, :headers => {})
       Socialcast::Gitx::CLI.any_instance.should_receive(:findpr).and_call_original
       Socialcast::Gitx::CLI.any_instance.stub(:say).with do |message|
@@ -508,7 +500,9 @@ describe Socialcast::Gitx::CLI do
     context 'when review_buddies are specified via a /config YML file' do
       before do
         stub_request(:post, "https://api.github.com/repos/socialcast/socialcast-git-extensions/pulls").
-          to_return(:status => 200, :body => %q({"html_url": "http://github.com/repo/project/pulls/1"}), :headers => {})
+          to_return(:status => 200, :body => %q({"html_url": "http://github.com/repo/project/pulls/1", "issue_url": "http://github.com/repos/repo/project/issues/1"}), :headers => {})
+
+        stub_request(:patch, "http://github.com/repos/repo/project/issues/1").to_return(:status => 200)
 
         # The Review Buddy should be @mentioned in the message
         Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#reviewrequest for FOO #scgitx\n\n/cc @SocialcastDevelopers\n\nAssigned to @VanMiranda\n\ntesting\n\n", :url => 'http://github.com/repo/project/pulls/1', :message_type => 'review_request')

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.12
+  version: 3.1.13
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: socialcast
+  name: grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: socialcast
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement