thegarage-gitx 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 152c875f8eb8b86aad9094c529e6e547137a2212
-  data.tar.gz: 9f3db5ede9c825be43ca41b136ae2df7ed9dd29c
+  metadata.gz: ba83717e3ca477e8d78381ab9dd58802d78944b1
+  data.tar.gz: dab659256d11dcfc92ea739e89dfa89a19659779
 SHA512:
-  metadata.gz: 30e2e170892d5d28f703defed75a891bc0ce2c66b76901e8f2e443727c18eabf4cd567f131a5812a95150c8f02c226e4f099caf6f651a6a5d8cc3609c64f111d
-  data.tar.gz: 47c016b57019b11d853a5c7f6695cac46bf72025d9ca4fdee0553c7f605a327f829d0d813704d762d7a57d7b0961f7c0b79d9602a8bc20e529a098700f7930ec
+  metadata.gz: 1ec1f688077ea72a712997fb19238ec93ebfb0f1f69ed2690dbcee08a5105e7c3a52d0febb1b63fb4055272670dfe98644a252e2dcd75754b4adb77ea1f3ea98
+  data.tar.gz: 0be38d52627ff9b5f29146dfdbba90c30065a0bff09cb4034dd39414f2147f72c6127f86e20f17596623f3a12b915dd4a2d1ee9ecb3247d658716656d54bca38

data/.rspec

@@ -1,2 +1,3 @@
 --color
---format progress
+--warnings
+--require spec_helper

data/lib/thegarage/gitx/cli/review_command.rb

@@ -4,6 +4,7 @@ require 'thegarage/gitx/cli/base_command'
 require 'thegarage/gitx/cli/update_command'
 require 'json'
 require 'rest_client'
+require 'octokit'
 
 module Thegarage
   module Gitx
@@ -56,31 +57,22 @@ module Thegarage
 
           fail "Github user not configured.  Run: `git config --global github.user 'me@email.com'`" unless username
           password = ask("Github password for #{username}: ", :echo => false)
+          say ''
+          two_factor_auth_token = ask("Github two factor authorization token (if enabled): ", :echo => false)
 
-          client_name = "The Garage Git eXtensions - #{remote_origin_name}"
-          payload = {
+          timestamp = Time.now.utc.strftime('%Y-%m-%dT%H:%M:%S%z')
+          client_name = "The Garage Git eXtensions - #{remote_origin_name} #{timestamp}"
+          options = {
             :scopes => ['repo'],
             :note => client_name,
             :note_url => CLIENT_URL
-          }.to_json
-          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 => 'thegarage/gitx'
-            }
-          }).execute
-          data = JSON.parse response.body
-          token = data['token']
+          }
+          options[:headers] = {'X-GitHub-OTP' => two_factor_auth_token} if two_factor_auth_token
+          client = Octokit::Client.new(login: username, password: password)
+          response = client.create_authorization(options)
+          token = response.token
           repo.config['thegarage.gitx.githubauthtoken'] = token
           token
-        rescue RestClient::Exception => e
-          process_error e
         end
 
         # @see http://developer.github.com/v3/pulls/

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.2.0'
+    VERSION = '2.2.1'
   end
 end

data/spec/spec_helper.rb

@@ -2,22 +2,82 @@ require 'coveralls'
 Coveralls.wear!
 require 'rubygems'
 require 'bundler/setup'
-require 'pry'
-require 'webmock/rspec'
-require 'timecop'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.join(__dir__, "support/**/*.rb")].each { |f| require f }
 
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, make a
+# separate helper file that requires this one and then use it only in the specs
+# that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
   config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    expectations.syntax = :expect
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+    mocks.syntax = :expect
+
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended.
+    mocks.verify_partial_doubles = true
+  end
 end

data/spec/support/{meet_expectations_matcher.rb → matchers/meet_expectations_matcher.rb}

@@ -2,6 +2,6 @@
 RSpec::Matchers.define :meet_expectations do |expected|
   match do |actual|
     # do nothing
-    expect(true).to be_true
+    expect(true).to be true
   end
 end

data/spec/support/pry.rb

@@ -0,0 +1 @@
+require 'pry'

data/spec/support/timecop.rb

@@ -0,0 +1,9 @@
+require 'timecop'
+
+# use safe mode to prevent unexpected time leaking errors
+# see https://github.com/travisjeffery/timecop#timecopsafe_mode
+RSpec.configure do |config|
+  config.before do
+    Timecop.safe_mode = true
+  end
+end

data/spec/support/webmock.rb

@@ -0,0 +1 @@
+require 'webmock/rspec'

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

@@ -27,6 +27,7 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
     let(:pull_request) do
       {
         'html_url' => 'https://path/to/new/pull/request',
+        'issue_url' => 'https://api/path/to/new/pull/request',
         'head' => {
           'ref' => 'branch_name'
         }
@@ -80,14 +81,17 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
       end
       let(:authorization_token) { '123123' }
       before do
-        expect(cli).to receive(:authorization_token).and_return(authorization_token)
+        expect(cli).to receive(:authorization_token).and_return(authorization_token).at_least(:once)
         expect(cli).to receive(:find_pull_request).and_return(pull_request)
-        expect(cli).to receive(:assign_pull_request)
+
+        stub_request(:patch, 'https://api/path/to/new/pull/request').to_return(:status => 200)
 
         cli.review
       end
-      it 'calls assign_pull_request method' do
-        should meet_expectations
+      it 'updates github pull request' do
+        expect(WebMock).to have_requested(:patch, "https://api/path/to/new/pull/request").
+          with(:body => {title: 'branch_name', assignee: 'johndoe'}.to_json,
+               :headers => {'Accept'=>'application/json', 'Authorization'=>'token 123123', 'Content-Type'=>'application/json'})
       end
     end
     context 'when --open flag passed' do
@@ -126,19 +130,12 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
       end
       let(:github_password) { 'secretz' }
       let(:authorization_token) { '123981239123' }
-      let(:expected_auth_body) do
-        JSON.dump({
-         scopes: ["repo"],
-         note: "The Garage Git eXtensions - thegarage/thegarage-gitx",
-         note_url: "https://github.com/thegarage/thegarage-gitx"
-        })
-      end
       before do
         stub_request(:post, "https://ryan@codecrate.com:secretz@api.github.com/authorizations").
-          with(:body => expected_auth_body).
-          to_return(:status => 200, :body => JSON.dump(token: authorization_token), :headers => {})
+          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)
+        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', {:echo => false}).and_return(nil)
 
         @auth_token = cli.send(:authorization_token)
       end
@@ -161,6 +158,31 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
       end
       it { expect(@auth_token).to eq authorization_token }
     end
+    context 'when two factor authorization token given' 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' }
+      let(:two_factor_auth_token) { '456456' }
+      before do
+        stub_request(:post, "https://ryan@codecrate.com:secretz@api.github.com/authorizations").
+          with(headers: {'X-GitHub-OTP' => two_factor_auth_token}).
+          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)
+        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', {:echo => false}).and_return(two_factor_auth_token)
+
+        @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
   end
   describe '#create_pull_request' do
     context 'when there is an existing authorization_token' do

data/thegarage-gitx.gemspec

@@ -19,15 +19,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "rugged", '~> 0.19.0'
-  spec.add_runtime_dependency "rest-client", ">= 1.4.0"
   spec.add_runtime_dependency "thor"
+  spec.add_runtime_dependency "rest-client", ">= 1.4.0"
+  spec.add_runtime_dependency "octokit"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", '>= 2.11.0'
+  spec.add_development_dependency "rspec", '~> 3.0'
   spec.add_development_dependency "pry", '>= 0'
   spec.add_development_dependency "webmock", '>= 0'
-  spec.add_development_dependency "timecop", "~> 0.6.3"
+  spec.add_development_dependency "timecop", "~> 0.7.0"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "coveralls"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -84,16 +98,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +249,10 @@ files:
 - lib/thegarage/gitx/string_extensions.rb
 - lib/thegarage/gitx/version.rb
 - spec/spec_helper.rb
-- spec/support/meet_expectations_matcher.rb
+- spec/support/matchers/meet_expectations_matcher.rb
+- spec/support/pry.rb
+- spec/support/timecop.rb
+- spec/support/webmock.rb
 - spec/thegarage/gitx/cli/buildtag_command_spec.rb
 - spec/thegarage/gitx/cli/cleanup_command_spec.rb
 - spec/thegarage/gitx/cli/integrate_command_spec.rb
@@ -273,7 +290,10 @@ specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations
 test_files:
 - spec/spec_helper.rb
-- spec/support/meet_expectations_matcher.rb
+- spec/support/matchers/meet_expectations_matcher.rb
+- spec/support/pry.rb
+- spec/support/timecop.rb
+- spec/support/webmock.rb
 - spec/thegarage/gitx/cli/buildtag_command_spec.rb
 - spec/thegarage/gitx/cli/cleanup_command_spec.rb
 - spec/thegarage/gitx/cli/integrate_command_spec.rb