thegarage-gitx 2.2.2 → 2.2.3.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 394005ee7f89f43fbb1864a7e62510f7f3e8f34d
-  data.tar.gz: debac14bd4e25cc6bc9746e39b85d41d59872888
+  metadata.gz: e0b14ee5697a2883977afed2c228ab55bffb1465
+  data.tar.gz: aef6ef947211f421c07b0e3aef71da696c2e9c31
 SHA512:
-  metadata.gz: 72ce85dbe43da457cdf46d252ffe15fb4540ba8b5fe7d1600ca7e06c947849fbd2c910e972b8c2627dc4663f7d2cba56cf0b1e4522285ce079cbd7856f217c73
-  data.tar.gz: c67b6292dcabcb5b219e57acb334056e77c69df6a049453ea167ac84e44e206fe0ab47872ec00e9e0a0f8f44ff9cdea7741607ff6359a5ffa6f121ef091b5ba9
+  metadata.gz: 0dad8dba2b0b25ef97c4cd0a1628ba88227270ed2ce68de7cc53777206e762c90ce3e6833bd7ea509b0f8ef8f227d33364b8cb38c94fb364bf7e9baad63ada2f
+  data.tar.gz: 4ddd4bd7aa598289b85962a2d6065ce40a242090fdb8084382bea447c9e20041e19299d39781453bdf9b5010b51a83fefbbc86ca083fcb7b464b5473940239a4

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec do
+guard :rspec, cmd: 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

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

@@ -17,8 +17,6 @@ module Thegarage
         method_option :trace, :type => :boolean, :aliases => '-v'
         def initialize(*args)
           super(*args)
-          RestClient.proxy = ENV['HTTPS_PROXY'] if ENV.has_key?('HTTPS_PROXY')
-          RestClient.log = Logger.new(STDOUT) if options[:trace]
         end
 
         private

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

@@ -21,7 +21,7 @@ module Thegarage
           say target_branch, :green
 
           refresh_branch_from_remote target_branch
-          run_cmd "git pull . #{branch}"
+          run_cmd "git merge #{branch}"
           run_cmd "git push origin HEAD"
           checkout_branch branch
         end

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

@@ -2,8 +2,6 @@ require 'thor'
 require 'thegarage/gitx'
 require 'thegarage/gitx/cli/base_command'
 require 'thegarage/gitx/cli/update_command'
-require 'json'
-require 'rest_client'
 require 'octokit'
 
 module Thegarage
@@ -29,37 +27,48 @@ module Thegarage
           fail 'Github authorization token not found' unless authorization_token
 
           branch = current_branch.name
-          pull_request = find_pull_request(branch)
-          if pull_request.nil?
-            UpdateCommand.new.update
-            changelog = run_cmd "git log #{Thegarage::Gitx::BASE_BRANCH}...#{branch} --no-merges --pretty=format:'* %s%n%b'"
-            pull_request = create_pull_request(branch, changelog, options)
-            say 'Pull request created: '
-            say pull_request['html_url'], :green
-          end
-          assign_pull_request(pull_request, options[:assignee]) if options[:assignee]
+          pull_request = find_or_create_pull_request(branch)
+          assign_pull_request(pull_request) if options[:assignee]
 
-          run_cmd "open #{pull_request['html_url']}" if options[:open]
+          run_cmd "open #{pull_request.html_url}" if options[:open]
         end
 
         private
 
-        # returns [Hash] data structure of created pull request
-        # request github authorization token
-        # User-Agent is required
-        # store the token in local git config
-        # @returns [String] auth token stored in git (current repo, user config or installed global settings)
+        def find_or_create_pull_request(branch)
+          pull_request = find_pull_request(branch)
+          return pull_request if pull_request
+
+          UpdateCommand.new.update
+          pull_request = create_pull_request(branch)
+          say 'Pull request created: '
+          say pull_request.html_url, :green
+
+          pull_request
+        end
+
+        # token is cached in local git config for future use
+        # @return [String] auth token stored in git (current repo, user config or installed global settings)
         # @see http://developer.github.com/v3/oauth/#scopes
         # @see http://developer.github.com/v3/#user-agent-required
         def authorization_token
           auth_token = repo.config['thegarage.gitx.githubauthtoken']
           return auth_token unless auth_token.to_s.blank?
 
-          fail "Github user not configured.  Run: `git config --global github.user 'me@email.com'`" unless username
+          auth_token = create_authorization
+          repo.config['thegarage.gitx.githubauthtoken'] = auth_token
+          auth_token
+        end
+
+        def create_authorization
           password = ask("Github password for #{username}: ", :echo => false)
           say ''
-          two_factor_auth_token = ask("Github two factor authorization token (if enabled): ", :echo => false)
+          client = Octokit::Client.new(login: username, password: password)
+          response = client.create_authorization(authorization_request_options)
+          response.token
+        end
 
+        def authorization_request_options
           timestamp = Time.now.utc.strftime('%Y-%m-%dT%H:%M:%S%z')
           client_name = "The Garage Git eXtensions - #{remote_origin_name} #{timestamp}"
           options = {
@@ -67,18 +76,14 @@ module Thegarage
             :note => client_name,
             :note_url => CLIENT_URL
           }
+          two_factor_auth_token = ask("Github two factor authorization token (if enabled): ", :echo => false)
+          say ''
           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
+          options
         end
 
         # @see http://developer.github.com/v3/pulls/
-        def create_pull_request(branch, changelog, options = {})
-          body = pull_request_body(changelog, options[:description])
-
+        def create_pull_request(branch)
           say "Creating pull request for "
           say "#{branch} ", :green
           say "against "
@@ -86,71 +91,45 @@ module Thegarage
           say "in "
           say remote_origin_name, :green
 
-          payload = {
-            :title => branch,
-            :base => Thegarage::Gitx::BASE_BRANCH,
-            :head => branch,
-            :body => body
-          }.to_json
-          response = RestClient::Request.new(:url => pull_request_url, :method => "POST", :payload => payload, :headers => request_headers).execute
-          pull_request = JSON.parse response.body
-
-          pull_request
-        rescue RestClient::Exception => e
-          process_error e
+          client = Octokit::Client.new(:access_token => authorization_token)
+          title = branch
+          body = pull_request_body(branch)
+          client.create_pull_request(remote_origin_name, Thegarage::Gitx::BASE_BRANCH, branch, title, body)
         end
 
-        def assign_pull_request(pull_request, assignee)
+        def assign_pull_request(pull_request)
+          assignee = options[:assignee]
           say "Assigning pull request to "
           say assignee, :green
 
-          branch = pull_request['head']['ref']
-          payload = {
-            :title => branch,
-            :assignee => assignee
-          }.to_json
-          RestClient::Request.new(:url => pull_request['issue_url'], :method => "PATCH", :payload => payload, :headers => request_headers).execute
-        rescue RestClient::Exception => e
-          process_error e
+          client = Octokit::Client.new(:access_token => authorization_token)
+          title = pull_request.title
+          body = pull_request.body
+          options = {
+            assignee: assignee
+          }
+          client.update_issue(remote_origin_name, pull_request.number, title, body, options)
         end
 
-        # @returns [Hash] data structure of pull request info if found
-        # @returns nil if no pull request found
+        # @return [Sawyer::Resource] data structure of pull request info if found
+        # @return nil if no pull request found
         def find_pull_request(branch)
-          head_reference = [remote_origin_name.split('/').first, branch].join(':')
+          head_reference = "#{repo_organization_name}:#{branch}"
           params = {
             head: head_reference,
             state: 'open'
           }
-          response = RestClient::Request.new(:url => pull_request_url, :method => "GET", :headers => request_headers.merge(params: params)).execute
-          data = JSON.parse(response.body)
-          data.first
-        rescue RestClient::Exception => e
-          process_error e
-        end
-
-        def process_error(e)
-          data = JSON.parse e.http_body
-          say "Github request failed: #{data['message']}", :red
-          throw e
-        end
-
-        def pull_request_url
-          "https://api.github.com/repos/#{remote_origin_name}/pulls"
-        end
-
-        def request_headers
-          {
-            :accept => :json,
-            :content_type => :json,
-            'Authorization' => "token #{authorization_token}"
-          }
+          client = Octokit::Client.new(:access_token => authorization_token)
+          pull_requests = client.pull_requests(remote_origin_name, params)
+          pull_requests.first
         end
 
-        # @returns [String] github username (ex: 'wireframe') of the current github.user
-        # @returns empty [String] when no github.user is set on the system
+        # @return [String] github username (ex: 'wireframe') of the current github.user
+        # @raise error if github.user is not configured
         def username
-          repo.config['github.user']
+          username = repo.config['github.user']
+          fail "Github user not configured.  Run: `git config --global github.user 'me@email.com'`" unless username
+          username
         end
 
         # lookup the current repository of the PWD
@@ -160,7 +139,14 @@ module Thegarage
           remote.to_s.gsub(/\.git$/,'').split(/[:\/]/).last(2).join('/')
         end
 
-        def pull_request_body(changelog, description = nil)
+        def repo_organization_name
+          remote_origin_name.split('/').first
+        end
+
+        def pull_request_body(branch)
+          changelog = run_cmd "git log #{Thegarage::Gitx::BASE_BRANCH}...#{branch} --no-merges --pretty=format:'* %s%n%b'"
+          description = options[:description]
+
           description_template = []
           description_template << "#{description}\n" if description
           description_template << '### Changelog'

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.2.2'
+    VERSION = '2.2.3.pre1'
   end
 end

data/spec/fixtures/vcr_cassettes/pull_request_does_exist.yml

@@ -0,0 +1,81 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.github.com/repos/thegarage/thegarage-gitx/pulls?head=thegarage:feature-branch&state=open
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 3.2.0
+      Authorization:
+      - token 123123
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Tue, 05 Aug 2014 16:36:03 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Status:
+      - 200 OK
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4991'
+      X-Ratelimit-Reset:
+      - '1407257585'
+      Cache-Control:
+      - private, max-age=60, s-maxage=60
+      Etag:
+      - '"6d00d48abf2adf1877c8244700cd4c6f"'
+      X-Oauth-Scopes:
+      - repo
+      X-Accepted-Oauth-Scopes:
+      - ''
+      Vary:
+      - Accept, Authorization, Cookie, X-GitHub-OTP
+      - Accept-Encoding
+      X-Github-Media-Type:
+      - github.v3; format=json
+      Link:
+      - <https://api.github.com/repositories/17608725/pulls?head=thegarage%3Afeature-branch&state=open&page=0>;
+        rel="last"
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Content-Length:
+      - '2'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Github-Request-Id:
+      - 46C5E25C:1E4F:1642AD9:53E107F3
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains
+      X-Content-Type-Options:
+      - nosniff
+      X-Served-By:
+      - d818ddef80f4c7d10683dd483558952a
+    body:
+      encoding: UTF-8
+      string: '[{"html_url":"https://path/to/html/pull/request","issue_url":"https://api/path/to/issue/url","number":10,"head":{"ref":"branch_name"}}]'
+    http_version:
+  recorded_at: Tue, 05 Aug 2014 16:36:03 GMT
+recorded_with: VCR 2.9.2

data/spec/fixtures/vcr_cassettes/pull_request_does_not_exist.yml

@@ -0,0 +1,65 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.github.com/repos/thegarage/thegarage-gitx/pulls?head=thegarage:feature-branch&state=open
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 3.2.0
+      Authorization:
+      - token 123123
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Tue, 05 Aug 2014 17:14:02 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Status:
+      - 401 Unauthorized
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '59'
+      X-Ratelimit-Reset:
+      - '1407262442'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Content-Length:
+      - '83'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Github-Request-Id:
+      - 46C5E25C:552F:1BC5411:53E110DA
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '[]'
+    http_version:
+  recorded_at: Tue, 05 Aug 2014 17:14:02 GMT
+recorded_with: VCR 2.9.2

data/spec/support/stub_execution.rb

@@ -0,0 +1,7 @@
+# protip to prevent execution of shell commands during testsuite
+# see http://stackoverflow.com/questions/1628586/mock-system-call-in-ruby
+module Kernel
+  def `(cmd)
+    puts "stubbing execution within tests of command: #{cmd}"
+  end
+end

data/spec/support/vcr.rb

@@ -0,0 +1,6 @@
+require 'vcr'
+
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
+  c.hook_into :webmock
+end

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

@@ -28,7 +28,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with("git branch -D staging", allow_failure: true).ordered
         expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
         expect(cli).to receive(:run_cmd).with("git checkout staging").ordered
-        expect(cli).to receive(:run_cmd).with("git pull . feature-branch").ordered
+        expect(cli).to receive(:run_cmd).with("git merge feature-branch").ordered
         expect(cli).to receive(:run_cmd).with("git push origin HEAD").ordered
         expect(cli).to receive(:run_cmd).with("git checkout feature-branch").ordered
 
@@ -45,7 +45,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with("git branch -D prototype", allow_failure: true).ordered
         expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
         expect(cli).to receive(:run_cmd).with("git checkout prototype").ordered
-        expect(cli).to receive(:run_cmd).with("git pull . feature-branch").ordered
+        expect(cli).to receive(:run_cmd).with("git merge feature-branch").ordered
         expect(cli).to receive(:run_cmd).with("git push origin HEAD").ordered
         expect(cli).to receive(:run_cmd).with("git checkout feature-branch").ordered
 

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

@@ -21,30 +21,34 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
   before do
     allow(cli).to receive(:repo).and_return(repo)
     allow(cli).to receive(:current_branch).and_return(branch)
+    allow(cli).to receive(:input_from_editor).and_return('description')
   end
 
   describe '#review' 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'
-        }
-      }
-    end
     context 'when pull request does not exist' do
       let(:authorization_token) { '123123' }
       let(:changelog) { '* made some fixes' }
       let(:fake_update_command) { double('fake update command', update: nil) }
+      let(:new_pull_request) do
+        {
+          html_url: "https://path/to/html/pull/request",
+          issue_url: "https://api/path/to/issue/url",
+          number: 10,
+          head: {
+            ref: "branch_name"
+          }
+        }
+      end
       before do
         expect(Thegarage::Gitx::Cli::UpdateCommand).to receive(:new).and_return(fake_update_command)
 
-        expect(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(cli).to receive(:find_pull_request).and_return(nil)
-        expect(cli).to receive(:create_pull_request).and_return(pull_request)
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect(cli).to receive(:run_cmd).with("git log master...feature-branch --no-merges --pretty=format:'* %s%n%b'").and_return("2013-01-01 did some stuff").ordered
-        cli.review
+
+        stub_request(:post, 'https://api.github.com/repos/thegarage/thegarage-gitx/pulls').to_return(:status => 201, :body => new_pull_request.to_json, :headers => {'Content-Type' => 'application/json'})
+        VCR.use_cassette('pull_request_does_not_exist') do
+          cli.review
+        end
       end
       it 'creates github pull request' do
         should meet_expectations
@@ -56,18 +60,19 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
     context 'when authorization_token is missing' do
       let(:authorization_token) { nil }
       it do
-        expect(cli).to receive(:authorization_token).and_return(authorization_token)
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect { cli.review }.to raise_error(/token not found/)
       end
     end
     context 'when pull request already exists' do
       let(:authorization_token) { '123123' }
       before do
-        expect(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(cli).to receive(:find_pull_request).and_return(pull_request)
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect(cli).to_not receive(:create_pull_request)
 
-        cli.review
+        VCR.use_cassette('pull_request_does_exist') do
+          cli.review
+        end
       end
       it 'does not create new pull request' do
         should meet_expectations
@@ -81,17 +86,16 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
       end
       let(:authorization_token) { '123123' }
       before do
-        expect(cli).to receive(:authorization_token).and_return(authorization_token).at_least(:once)
-        expect(cli).to receive(:find_pull_request).and_return(pull_request)
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
-        stub_request(:patch, 'https://api/path/to/new/pull/request').to_return(:status => 200)
+        stub_request(:patch, 'https://api.github.com/repos/thegarage/thegarage-gitx/issues/10').to_return(:status => 200)
 
-        cli.review
+        VCR.use_cassette('pull_request_does_exist') do
+          cli.review
+        end
       end
       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'})
+        expect(WebMock).to have_requested(:patch, "https://api.github.com/repos/thegarage/thegarage-gitx/issues/10")
       end
     end
     context 'when --open flag passed' do
@@ -102,10 +106,11 @@ 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(:find_pull_request).and_return(pull_request)
-        expect(cli).to receive(:run_cmd).with("open #{pull_request['html_url']}").ordered
-        cli.review
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+        expect(cli).to receive(:run_cmd).with("open https://path/to/html/pull/request").ordered
+        VCR.use_cassette('pull_request_does_exist') do
+          cli.review
+        end
       end
       it 'runs open command with pull request url' do
         should meet_expectations
@@ -184,29 +189,4 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
       it { expect(@auth_token).to eq authorization_token }
     end
   end
-  describe '#create_pull_request' do
-    context 'when there is an existing authorization_token' do
-      let(:authorization_token) { '123981239123' }
-      let(:repo_config) do
-        {
-          'remote.origin.url' => 'https://github.com/thegarage/thegarage-gitx',
-          'github.user' => 'ryan@codecrate.com',
-          'thegarage.gitx.githubauthtoken' => authorization_token
-        }
-      end
-      before do
-        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 => {})
-
-        expect(cli).to receive(:input_from_editor).and_return('scrubbed text')
-        cli.send(:create_pull_request, 'example-branch', 'changelog')
-      end
-      it 'should create github pull request' do
-        should meet_expectations
-      end
-      it 'should run expected commands' do
-        should meet_expectations
-      end
-    end
-  end
 end

data/thegarage-gitx.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rugged", '~> 0.21.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"
@@ -29,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry", '>= 0'
   spec.add_development_dependency "webmock", '>= 0'
   spec.add_development_dependency "timecop", "~> 0.7.0"
+  spec.add_development_dependency "vcr"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "coveralls"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3.pre1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,6 @@ executables:
 - git-start
 - git-track
 - git-update
-- git-wtf
 extensions: []
 extra_rdoc_files: []
 files:
@@ -232,7 +231,6 @@ files:
 - bin/git-start
 - bin/git-track
 - bin/git-update
-- bin/git-wtf
 - lib/thegarage/gitx.rb
 - lib/thegarage/gitx/cli/base_command.rb
 - lib/thegarage/gitx/cli/buildtag_command.rb
@@ -245,13 +243,16 @@ files:
 - lib/thegarage/gitx/cli/start_command.rb
 - lib/thegarage/gitx/cli/track_command.rb
 - lib/thegarage/gitx/cli/update_command.rb
-- lib/thegarage/gitx/runner.rb
 - lib/thegarage/gitx/string_extensions.rb
 - lib/thegarage/gitx/version.rb
+- spec/fixtures/vcr_cassettes/pull_request_does_exist.yml
+- spec/fixtures/vcr_cassettes/pull_request_does_not_exist.yml
 - spec/spec_helper.rb
 - spec/support/matchers/meet_expectations_matcher.rb
 - spec/support/pry.rb
+- spec/support/stub_execution.rb
 - spec/support/timecop.rb
+- spec/support/vcr.rb
 - spec/support/webmock.rb
 - spec/thegarage/gitx/cli/buildtag_command_spec.rb
 - spec/thegarage/gitx/cli/cleanup_command_spec.rb
@@ -279,9 +280,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -289,10 +290,14 @@ signing_key:
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations
 test_files:
+- spec/fixtures/vcr_cassettes/pull_request_does_exist.yml
+- spec/fixtures/vcr_cassettes/pull_request_does_not_exist.yml
 - spec/spec_helper.rb
 - spec/support/matchers/meet_expectations_matcher.rb
 - spec/support/pry.rb
+- spec/support/stub_execution.rb
 - spec/support/timecop.rb
+- spec/support/vcr.rb
 - spec/support/webmock.rb
 - spec/thegarage/gitx/cli/buildtag_command_spec.rb
 - spec/thegarage/gitx/cli/cleanup_command_spec.rb

data/bin/git-wtf

@@ -1,364 +0,0 @@
-#!/usr/bin/env ruby
-
-HELP = <<EOS
-git-wtf displays the state of your repository in a readable, easy-to-scan
-format. It's useful for getting a summary of how a branch relates to a remote
-server, and for wrangling many topic branches.
-
-git-wtf can show you:
-- How a branch relates to the remote repo, if it's a tracking branch.
-- How a branch relates to integration branches, if it's a feature branch.
-- How a branch relates to the feature branches, if it's an integration
-  branch.
-
-git-wtf is best used before a git push, or between a git fetch and a git
-merge. Be sure to set color.ui to auto or yes for maximum viewing pleasure.
-EOS
-
-KEY = <<EOS
-KEY:
-() branch only exists locally
-{} branch only exists on a remote repo
-[] branch exists locally and remotely
-
-x merge occurs both locally and remotely
-~ merge occurs only locally
-  (space) branch isn't merged in
-
-(It's possible for merges to occur remotely and not locally, of course, but
-that's a less common case and git-wtf currently doesn't display anything
-special for it.)
-EOS
-
-USAGE = <<EOS
-Usage: git wtf [branch+] [options]
-
-If [branch] is not specified, git-wtf will use the current branch. The possible
-[options] are:
-
-  -l, --long          include author info and date for each commit
-  -a, --all           show all branches across all remote repos, not just
-                      those from origin
-  -A, --all-commits   show all commits, not just the first 5
-  -s, --short         don't show commits
-  -k, --key           show key
-  -r, --relations     show relation to features / integration branches
-      --dump-config   print out current configuration and exit
-
-git-wtf uses some heuristics to determine which branches are integration
-branches, and which are feature branches. (Specifically, it assumes the
-integration branches are named "master", "next" and "edge".) If it guesses
-incorrectly, you will have to create a .git-wtfrc file.
-
-To start building a configuration file, run "git-wtf --dump-config >
-.git-wtfrc" and edit it. The config file is a YAML file that specifies the
-integration branches, any branches to ignore, and the max number of commits to
-display when --all-commits isn't used.  git-wtf will look for a .git-wtfrc file
-starting in the current directory, and recursively up to the root.
-
-IMPORTANT NOTE: all local branches referenced in .git-wtfrc must be prefixed
-with heads/, e.g. "heads/master". Remote branches must be of the form
-remotes/<remote>/<branch>.
-EOS
-
-COPYRIGHT = <<EOS
-git-wtf Copyright 2008--2009 William Morgan <wmorgan at the masanjin dot nets>.
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation, either version 3 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-You can find the GNU General Public License at: http://www.gnu.org/licenses/
-EOS
-
-require 'yaml'
-CONFIG_FN = ".git-wtfrc"
-
-class Numeric; def pluralize s; "#{to_s} #{s}" + (self != 1 ? "s" : "") end end
-
-if ARGV.delete("--help") || ARGV.delete("-h")
-  puts USAGE
-  exit
-end
-
-## poor man's trollop
-$long = ARGV.delete("--long") || ARGV.delete("-l")
-$short = ARGV.delete("--short") || ARGV.delete("-s")
-$all = ARGV.delete("--all") || ARGV.delete("-a")
-$all_commits = ARGV.delete("--all-commits") || ARGV.delete("-A")
-$dump_config = ARGV.delete("--dump-config")
-$key = ARGV.delete("--key") || ARGV.delete("-k")
-$show_relations = ARGV.delete("--relations") || ARGV.delete("-r")
-ARGV.each { |a| abort "Error: unknown argument #{a}." if a =~ /^--/ }
-
-## search up the path for a file
-def find_file fn
-  while true
-    return fn if File.exist? fn
-    fn2 = File.join("..", fn)
-    return nil if File.expand_path(fn2) == File.expand_path(fn)
-    fn = fn2
-  end
-end
-
-want_color = `git config color.wtf`
-want_color = `git config color.ui` if want_color.empty?
-$color = case want_color.chomp
-  when "true"; true
-  when "auto"; $stdout.tty?
-end
-
-def red s; $color ? "\033[31m#{s}\033[0m" : s end
-def green s; $color ? "\033[32m#{s}\033[0m" : s end
-def yellow s; $color ? "\033[33m#{s}\033[0m" : s end
-def cyan s; $color ? "\033[36m#{s}\033[0m" : s end
-def grey s; $color ? "\033[1;30m#{s}\033[0m" : s end
-def purple s; $color ? "\033[35m#{s}\033[0m" : s end
-
-## the set of commits in 'to' that aren't in 'from'.
-## if empty, 'to' has been merged into 'from'.
-def commits_between from, to
-  if $long
-    `git log --pretty=format:"- %s [#{yellow "%h"}] (#{purple "%ae"}; %ar)" #{from}..#{to}`
-  else
-    `git log --pretty=format:"- %s [#{yellow "%h"}]" #{from}..#{to}`
-  end.split(/[\r\n]+/)
-end
-
-def show_commits commits, prefix="    "
-  if commits.empty?
-    puts "#{prefix} none"
-  else
-    max = $all_commits ? commits.size : $config["max_commits"]
-    max -= 1 if max == commits.size - 1 # never show "and 1 more"
-    commits[0 ... max].each { |c| puts "#{prefix}#{c}" }
-    puts grey("#{prefix}... and #{commits.size - max} more (use -A to see all).") if commits.size > max
-  end
-end
-
-def ahead_behind_string ahead, behind
-  [ahead.empty? ? nil : "#{ahead.size.pluralize 'commit'} ahead",
-   behind.empty? ? nil : "#{behind.size.pluralize 'commit'} behind"].
-   compact.join("; ")
-end
-
-def widget merged_in, remote_only=false, local_only=false, local_only_merge=false
-  left, right = case
-    when remote_only; %w({ })
-    when local_only; %w{( )}
-    else %w([ ])
-  end
-  middle = case
-    when merged_in && local_only_merge; green("~")
-    when merged_in; green("x")
-    else " "
-  end
-  print left, middle, right
-end
-
-def show b
-  have_both = b[:local_branch] && b[:remote_branch]
-
-  pushc, pullc, oosync = if have_both
-    [x = commits_between(b[:remote_branch], b[:local_branch]),
-     y = commits_between(b[:local_branch], b[:remote_branch]),
-     !x.empty? && !y.empty?]
-  end
-
-  if b[:local_branch]
-    puts "Local branch: " + green(b[:local_branch].sub(/^heads\//, ""))
-
-    if have_both
-      if pushc.empty?
-        puts "#{widget true} in sync with remote"
-      else
-        action = oosync ? "push after rebase / merge" : "push"
-        puts "#{widget false} NOT in sync with remote (you should #{action})"
-        show_commits pushc unless $short
-      end
-    end
-  end
-
-  if b[:remote_branch]
-    puts "Remote branch: #{cyan b[:remote_branch]} (#{b[:remote_url]})"
-
-    if have_both
-      if pullc.empty?
-        puts "#{widget true} in sync with local"
-      else
-        action = pushc.empty? ? "merge" : "rebase / merge"
-        puts "#{widget false} NOT in sync with local (you should #{action})"
-        show_commits pullc unless $short
-      end
-    end
-  end
-
-  puts "\n#{red "WARNING"}: local and remote branches have diverged. A merge will occur unless you rebase." if oosync
-end
-
-def show_relations b, all_branches
-  ibs, fbs = all_branches.partition { |name, br| $config["integration-branches"].include?(br[:local_branch]) || $config["integration-branches"].include?(br[:remote_branch]) }
-  if $config["integration-branches"].include? b[:local_branch]
-    puts "\nFeature branches:" unless fbs.empty?
-    fbs.each do |name, br|
-      next if $config["ignore"].member?(br[:local_branch]) || $config["ignore"].member?(br[:remote_branch])
-      next if br[:ignore]
-      local_only = br[:remote_branch].nil?
-      remote_only = br[:local_branch].nil?
-      name = if local_only
-        purple br[:name]
-      elsif remote_only
-        cyan br[:name]
-      else
-        green br[:name]
-      end
-
-      ## for remote_only branches, we'll compute wrt the remote branch head. otherwise, we'll
-      ## use the local branch head.
-      head = remote_only ? br[:remote_branch] : br[:local_branch]
-
-      remote_ahead = b[:remote_branch] ? commits_between(b[:remote_branch], head) : []
-      local_ahead = b[:local_branch] ? commits_between(b[:local_branch], head) : []
-
-      if local_ahead.empty? && remote_ahead.empty?
-        puts "#{widget true, remote_only, local_only} #{name} #{local_only ? "(local-only) " : ""}is merged in"
-      elsif local_ahead.empty?
-        puts "#{widget true, remote_only, local_only, true} #{name} merged in (only locally)"
-      else
-        behind = commits_between head, (br[:local_branch] || br[:remote_branch])
-        ahead = remote_only ? remote_ahead : local_ahead
-        puts "#{widget false, remote_only, local_only} #{name} #{local_only ? "(local-only) " : ""}is NOT merged in (#{ahead_behind_string ahead, behind})"
-        show_commits ahead unless $short
-      end
-    end
-  else
-    puts "\nIntegration branches:" unless ibs.empty? # unlikely
-    ibs.sort_by { |v, br| v }.each do |v, br|
-      next if $config["ignore"].member?(br[:local_branch]) || $config["ignore"].member?(br[:remote_branch])
-      next if br[:ignore]
-      local_only = br[:remote_branch].nil?
-      remote_only = br[:local_branch].nil?
-      name = remote_only ? cyan(br[:name]) : green(br[:name])
-
-      ahead = commits_between v, (b[:local_branch] || b[:remote_branch])
-      if ahead.empty?
-        puts "#{widget true, local_only} merged into #{name}"
-      else
-        #behind = commits_between b[:local_branch], v
-        puts "#{widget false, local_only} NOT merged into #{name} (#{ahead.size.pluralize 'commit'} ahead)"
-        show_commits ahead unless $short
-      end
-    end
-  end
-end
-
-#### EXECUTION STARTS HERE ####
-
-## find config file and load it
-$config = { "integration-branches" => %w(heads/master heads/next heads/edge), "ignore" => [], "max_commits" => 5 }.merge begin
-  fn = find_file CONFIG_FN
-  if fn && (h = YAML::load_file(fn)) # yaml turns empty files into false
-    h["integration-branches"] ||= h["versions"] # support old nomenclature
-    h
-  else
-    {}
-  end
-end
-
-if $dump_config
-  puts $config.to_yaml
-  exit
-end
-
-## first, index registered remotes
-remotes = `git config --get-regexp ^remote\.\*\.url`.split(/[\r\n]+/).inject({}) do |hash, l|
-  l =~ /^remote\.(.+?)\.url (.+)$/ or next hash
-  hash[$1] ||= $2
-  hash
-end
-
-## next, index followed branches
-branches = `git config --get-regexp ^branch\.`.split(/[\r\n]+/).inject({}) do |hash, l|
-  case l
-  when /branch\.(.*?)\.remote (.+)/
-    name, remote = $1, $2
-
-    hash[name] ||= {}
-    hash[name].merge! :remote => remote, :remote_url => remotes[remote]
-  when /branch\.(.*?)\.merge ((refs\/)?heads\/)?(.+)/
-    name, remote_branch = $1, $4
-    hash[name] ||= {}
-    hash[name].merge! :remote_mergepoint => remote_branch
-  end
-  hash
-end
-
-## finally, index all branches
-remote_branches = {}
-`git show-ref`.split(/[\r\n]+/).each do |l|
-  sha1, ref = l.chomp.split " refs/"
-
-  if ref =~ /^heads\/(.+)$/ # local branch
-    name = $1
-    next if name == "HEAD"
-    branches[name] ||= {}
-    branches[name].merge! :name => name, :local_branch => ref
-  elsif ref =~ /^remotes\/(.+?)\/(.+)$/ # remote branch
-    remote, name = $1, $2
-    remote_branches["#{remote}/#{name}"] = true
-    next if name == "HEAD"
-    ignore = !($all || remote == "origin")
-
-    branch = name
-    if branches[name] && branches[name][:remote] == remote
-      # nothing
-    else
-      name = "#{remote}/#{branch}"
-    end
-
-    branches[name] ||= {}
-    branches[name].merge! :name => name, :remote => remote, :remote_branch => "#{remote}/#{branch}", :remote_url => remotes[remote], :ignore => ignore
-  end
-end
-
-## assemble remotes
-branches.each do |k, b|
-  next unless b[:remote] && b[:remote_mergepoint]
-  b[:remote_branch] = if b[:remote] == "."
-    b[:remote_mergepoint]
-  else
-    t = "#{b[:remote]}/#{b[:remote_mergepoint]}"
-    remote_branches[t] && t # only if it's still alive
-  end
-end
-
-show_dirty = ARGV.empty?
-targets = if ARGV.empty?
-  [`git symbolic-ref HEAD`.chomp.sub(/^refs\/heads\//, "")]
-else
-  ARGV.map { |x| x.sub(/^heads\//, "") }
-end.map { |t| branches[t] or abort "Error: can't find branch #{t.inspect}." }
-
-targets.each do |t|
-  show t
-  show_relations t, branches if $show_relations || t[:remote_branch].nil?
-end
-
-modified = show_dirty && `git ls-files -m` != ""
-uncommitted = show_dirty &&  `git diff-index --cached HEAD` != ""
-
-if $key
-  puts
-  puts KEY
-end
-
-puts if modified || uncommitted
-puts "#{red "NOTE"}: working directory contains modified files." if modified
-puts "#{red "NOTE"}: staging area contains staged but uncommitted files." if uncommitted
-
-# the end!

data/lib/thegarage/gitx/runner.rb

@@ -1,24 +0,0 @@
-require 'English'
-
-module Thegarage
-  module Gitx
-    class Runner
-      attr_accessor :shell, :options
-
-      def initialize(shell, options = {})
-        @shell = shell
-        @options = options
-      end
-
-      # execute a shell command and raise an error if non-zero exit code is returned
-      # return the string output from the command
-      def run_cmd(cmd, options = {})
-        shell.say "$ #{cmd}"
-        output = `#{cmd}`
-        success = $CHILD_STATUS.to_i == 0
-        fail "#{cmd} failed" unless success || options[:allow_failure]
-        output
-      end
-    end
-  end
-end