thegarage-gitx 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c60254f8675c8326d671e96ac965f222eb007808
-  data.tar.gz: 398dd0103e3a51063e1ad5d9a88d06e6ca471569
+  metadata.gz: c2e6a260e0bd7f13a9f8b2370fc820c12f38305d
+  data.tar.gz: 4f3cbe2290e5028707095755d9c724eca482e52b
 SHA512:
-  metadata.gz: 91de6e1d04a921889e24c80f80a39bad98c8ba7069c7781ac889870458967b6c163ad75059bd3ff823343a923418ea6a3e49d75a30ec13a49f7d8e2fd80829b5
-  data.tar.gz: e7d2fcdb382ba1fa9ba2562ced9b591c826e4a2ef22b40750fec4703a8e3748c7f71515d0ae7e6414711337ff2c4d4404f1ac0bf7d67368e3f1318a588408d1b
+  metadata.gz: ebb0db12d2acb6f3524e106441ea11cf5c9894871d86e0a2f762f4bceaf64007ab32ec5709ee21117dc5ea18dc7bc8ad5bb4b9051a95305c1e809dc30b70d3de
+  data.tar.gz: 6e3271a045068dadaaf5c015c4afd7ef447c5ac821305de953750435d0cb88e8d03257877cb9644f121b26f081ab6f9f07de586c8ba343da457ac5fd6c922cf8

data/lib/thegarage/gitx/github.rb

@@ -98,6 +98,9 @@ module Thegarage
         client = Octokit::Client.new(login: username, password: password)
         response = client.create_authorization(authorization_request_options)
         response.token
+      rescue Octokit::ClientError => e
+        say "Error creating authorization: #{e.message}", :red
+        retry
       end
 
       def authorization_request_options

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.10.1'
+    VERSION = '2.10.2'
   end
 end

data/spec/thegarage/gitx/cli/review_command_spec.rb

@@ -9,7 +9,7 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
       pretend: true
     }
   end
-  let(:cli) { Thegarage::Gitx::Cli::ReviewCommand.new(args, options, config) }
+  let(:cli) { described_class.new(args, options, config) }
   let(:repo) { double('fake repo', config: repo_config) }
   let(:repo_config) do
     {
@@ -232,6 +232,31 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
       end
       it { expect(@auth_token).to eq authorization_token }
     end
+    context 'when config.authorization_token is nil and first request fails' do
+      let(:repo_config) do
+        {
+          'remote.origin.url' => 'https://github.com/thegarage/thegarage-gitx',
+          'github.user' => 'ryan@codecrate.com'
+        }
+      end
+      let(:github_password) { 'secretz' }
+      let(:authorization_token) { '123981239123' }
+      before do
+        stub_request(:post, "https://ryan@codecrate.com:secretz@api.github.com/authorizations").
+          to_return(:status => 401, :body => JSON.dump(token: authorization_token), :headers => {'Content-Type' => 'application/json'}).
+          then.
+          to_return(:status => 200, :body => JSON.dump(token: authorization_token), :headers => {'Content-Type' => 'application/json'})
+
+        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', {:echo => false}).and_return(github_password).twice
+        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', {:echo => false}).and_return(nil).twice
+
+        @auth_token = cli.send(:authorization_token)
+      end
+      it 'stores authorization_token in git config' do
+        expect(repo_config).to include('thegarage.gitx.githubauthtoken' => authorization_token)
+      end
+      it { expect(@auth_token).to eq authorization_token }
+    end
     context 'when there is an existing authorization_token' do
       let(:authorization_token) { '123981239123' }
       let(:repo_config) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged