thegarage-gitx 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a44d5b6d944ad83cefaf44b1bef94c182321e80
-  data.tar.gz: 79f0b6b3fcede708628605d02276ac3854259e68
+  metadata.gz: 80aafd556ae6dca4c266fe24a0bdfb5800b35f14
+  data.tar.gz: 3832c3bc543af63458d8e3aa903c01f4b6cda9ba
 SHA512:
-  metadata.gz: 84ecc83c73103cc2a0a847f1582a460deb17d400c2a43fecb126dc6ee4a1a56eb8e20f3eb490ea7e23dfe95c407dd2164066a12d023c3bc51fd725760ec76f85
-  data.tar.gz: 64fba4122a8ac716a6e231ab43ed408e9893d04e7de1f5a0aa25f3b7f65507083f5c6351e7040ef7eb9dd171d6a8ec62aaa0d17dcbd691c999d2088a14fbeadb
+  metadata.gz: 63a56af292e550422d1cce4160cf4dd85185cb3a7ea0af4c8a56c4f200644e386a3317d17c9c59fc546f937ad207ec38c1f93480a3c582d568bfaa286c07c129
+  data.tar.gz: 37c2ce8e2a6919ab9f9ea8ab7581e1af0f86d436862763cd59fe68d1703ea0357ef052297c3551d5fc6a9bff2ae09132365edc7372bec1b03ebcecdc0905ab18

data/.travis.yml

@@ -1,8 +1,3 @@
 language: ruby
 rvm:
-  - '2.0.0'
-
-after_success:
-  - git config --global user.email "builds@travis-ci.com"
-  - git config --global user.name "Travis CI"
-  - git buildtag
+  - '2.0.0'

data/lib/thegarage/gitx/git.rb

@@ -25,7 +25,7 @@ module Thegarage
       # ex: git@github.com:socialcast/thegarage/gitx.git OR https://github.com/socialcast/thegarage/gitx.git
       def current_remote_repo
         repo = current_repo.config['remote.origin.url']
-        repo.gsub(/\.git$/,'').split(/[:\/]/).last(2).join('/')
+        repo.to_s.gsub(/\.git$/,'').split(/[:\/]/).last(2).join('/')
       end
 
       # @returns [String] github username (ex: 'wireframe') of the current github.user

data/lib/thegarage/gitx/github.rb

@@ -19,9 +19,8 @@ module Thegarage
         auth_token = github_auth_token
         return auth_token unless auth_token.to_s.blank?
 
-        username = current_user
-        raise "Github user not configured.  Run: `git config --global github.user 'me@email.com'`" if username.empty?
-        password = ask("Github password for #{username}: ", :echo => false)
+        raise "Github user not configured.  Run: `git config --global github.user 'me@email.com'`" unless current_user
+        password = ask("Github password for #{current_user}: ", :echo => false)
 
         payload = {
           :scopes => ['repo'],
@@ -31,7 +30,7 @@ module Thegarage
         response = RestClient::Request.new({
           :url => "https://api.github.com/authorizations",
           :method => "POST",
-          :user => username,
+          :user => current_user,
           :password => password,
           :payload => payload,
           :headers => {

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/spec/thegarage/gitx/cli_spec.rb

@@ -276,6 +276,57 @@ describe Thegarage::Gitx::CLI do
   end
 
   describe '#reviewrequest' do
+    context 'when github.user is not configured' do
+      it 'raises error' do
+        expect(cli).to receive(:run).with("git pull origin feature-branch", capture: true).ordered
+        expect(cli).to receive(:run).with("git pull origin master", capture: true).ordered
+        expect(cli).to receive(:run).with("git push origin HEAD", capture: true).ordered
+
+        expect do
+          cli.reviewrequest
+        end.to raise_error /Github user not configured/
+      end
+    end
+    context 'when authorization_token is nil' do
+      let(:options) { {description: 'testing'} }
+      let(:current_user) { 'ryan@codecrate.com' }
+      let(:github_password) { 'secretz' }
+      let(:authorization_token) { 'auth_token' }
+      let(:expected_auth_body) do
+        JSON.dump({
+         scopes: ["repo"],
+         note: "The Garage Git eXtensions",
+         note_url: "https://github.com/thegarage/thegarage-gitx"
+        })
+      end
+      before do
+        stub_request(:post, "https://#{current_user}:#{github_password}@api.github.com/authorizations").
+          with(:body => expected_auth_body).
+          to_return(:status => 200, :body => JSON.dump(token: authorization_token), :headers => {})
+
+        stub_request(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/pulls").
+          to_return(:status => 200, :body => %q({"html_url": "http://github.com/repo/project/pulls/1"}), :headers => {})
+
+        allow(cli).to receive(:current_user).and_return(current_user)
+        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', {:echo => false}).and_return(github_password)
+        expect(cli).to receive(:github_auth_token=).with(authorization_token)
+
+        expect(cli).to receive(:run).with("git pull origin feature-branch", capture: true).ordered
+        expect(cli).to receive(:run).with("git pull origin master", capture: true).ordered
+        expect(cli).to receive(:run).with("git push origin HEAD", capture: true).ordered
+
+        cli.reviewrequest
+      end
+      it 'creates authorization_token' do
+        should meet_expectations
+      end
+      it 'should create github pull request' do
+        should meet_expectations
+      end
+      it 'should run expected commands' do
+        should meet_expectations
+      end
+    end
     context 'when description != null and there is an existing authorization_token' do
       let(:options) { {description: 'testing'} }
       let(:authorization_token) { '123981239123' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations