thegarage-gitx 1.4.1 → 1.5.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e53179bded6c6d5e54e69a8bacb3116ffcd411e
-  data.tar.gz: 770a7742c1daec8aafb3b8dee9291f3455498161
+  metadata.gz: 9da76850a18efd35f1ad4755e580f74b2bddda17
+  data.tar.gz: c80377d9cf9269445ab266348a60c93777061992
 SHA512:
-  metadata.gz: 80522f4bbe1c40bb3078b74f945f5921c10797bec6f2ea5f7cf659e2af9e0cceb6fde07c0f71919e4377914afe3f402cc2e00d9f5612a816d0d793136ea23fc1
-  data.tar.gz: 49e817eb55e0efb84e8feaa93c0c2eced2c3f791472510f88ed92dd04a316b00ae82ae3fa6f20aebcfe659bd588501463c75c530d74ac4c913769bc7daff4aff
+  metadata.gz: d8461ef865ca67baf61344ccfdd29a0cf4820878343c606cfac1bde2892e658e6ca116575484097e81cec7809da617fcb08f5fc1c5b9871cd26a6c655d656ffc
+  data.tar.gz: 5965d506c234b42a3c014f87a1649173aeceaea0814a31537c0089bed3abafddb641f0f0d0a0bed35fe171a76df3b6098cd609e4a1f1fabe57e3b7d80374b15f

data/lib/thegarage/gitx/cli.rb

@@ -20,17 +20,25 @@ module Thegarage
         RestClient.log = Logger.new(STDOUT) if options[:trace]
       end
 
-      desc "reviewrequest", "Create a pull request on github"
+      desc "reviewrequest", "Create or update a pull request on github"
       method_option :description, :type => :string, :aliases => '-d', :desc => 'pull request description'
       method_option :assignee, :type => :string, :aliases => '-a', :desc => 'pull request assignee'
+      method_option :open, :type => :boolean, :aliases => '-o', :desc => 'open the pull request in a web browser'
       # @see http://developer.github.com/v3/pulls/
       def reviewrequest
         update
+        fail 'Github authorization token not found' unless github.authorization_token
+
+        pull_request = github.find_pull_request(current_branch)
+        if pull_request.nil?
+          changelog = run_cmd "git log #{Thegarage::Gitx::BASE_BRANCH}...#{current_branch} --no-merges --pretty=format:'* %s%n%b'"
+          pull_request = github.create_pull_request(current_branch, changelog, options)
+          say 'Pull request created: '
+          say pull_request['html_url'], :green
+        end
+        github.assign_pull_request(pull_request, options[:assignee]) if options[:assignee]
 
-        changelog = run_cmd "git log #{Thegarage::Gitx::BASE_BRANCH}...#{current_branch} --no-merges --pretty=format:'* %s%n%b'"
-        url = github.create_pull_request(current_branch, changelog, options)
-        say 'Pull request created: '
-        say url, :green
+        run_cmd "open #{pull_request['html_url']}" if options[:open]
       end
 
       # TODO: use --no-edit to skip merge messages
@@ -73,7 +81,7 @@ module Thegarage
       desc 'start', 'start a new git branch with latest changes from master'
       def start(branch_name = nil)
         unless branch_name
-          example_branch = %w{ api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link }.sort_by { rand }.first
+          example_branch = %w{ api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link }.shuffle.first
           repo = Grit::Repo.new(Dir.pwd)
           remote_branches = repo.remotes.collect {|b| b.name.split('/').last }
           until branch_name = ask("What would you like to name your branch? (ex: #{example_branch})") {|q|

data/lib/thegarage/gitx/github.rb

@@ -23,40 +23,7 @@ module Thegarage
         @shell = shell
       end
 
-      # returns the url of the created pull request
-      # @see http://developer.github.com/v3/pulls/
-      def create_pull_request(branch, changelog, options = {})
-        fail 'Github authorization token not found' unless authorization_token
-        remote = remote_origin_name
-        body = pull_request_body(changelog, options[:description])
-
-        shell.say "Creating pull request for "
-        shell.say "#{branch} ", :green
-        shell.say "against "
-        shell.say "#{Thegarage::Gitx::BASE_BRANCH} ", :green
-        shell.say "in "
-        shell.say remote, :green
-
-        payload = {
-          :title => branch,
-          :base => Thegarage::Gitx::BASE_BRANCH,
-          :head => branch,
-          :body => body
-        }.to_json
-        response = RestClient::Request.new(:url => "https://api.github.com/repos/#{remote}/pulls", :method => "POST", :payload => payload, :headers => request_headers).execute
-        data = JSON.parse response.body
-
-        assign_pull_request(branch, options[:assignee], data) if options[:assignee]
-
-        url = data['html_url']
-        url
-      rescue RestClient::Exception => e
-        process_error e
-        throw e
-      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
@@ -93,19 +60,64 @@ module Thegarage
         token
       rescue RestClient::Exception => e
         process_error e
-        throw e
       end
 
-      def assign_pull_request(branch, assignee, data)
-        issue_payload = { :title => branch, :assignee => assignee }.to_json
-        RestClient::Request.new(:url => data['issue_url'], :method => "PATCH", :payload => issue_payload, :headers => request_headers).execute
+      # @see http://developer.github.com/v3/pulls/
+      def create_pull_request(branch, changelog, options = {})
+        remote = remote_origin_name
+        body = pull_request_body(changelog, options[:description])
+
+        shell.say "Creating pull request for "
+        shell.say "#{branch} ", :green
+        shell.say "against "
+        shell.say "#{Thegarage::Gitx::BASE_BRANCH} ", :green
+        shell.say "in "
+        shell.say remote, :green
+
+        payload = {
+          :title => branch,
+          :base => Thegarage::Gitx::BASE_BRANCH,
+          :head => branch,
+          :body => body
+        }.to_json
+        response = RestClient::Request.new(:url => "https://api.github.com/repos/#{remote}/pulls", :method => "POST", :payload => payload, :headers => request_headers).execute
+        pull_request = JSON.parse response.body
+
+        pull_request
+      rescue RestClient::Exception => e
+        process_error e
+      end
+
+      def assign_pull_request(pull_request, assignee)
+        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
+      end
+
+      # @returns [Hash] data structure of pull request info if found
+      # @returns nil if no pull request found
+      def find_pull_request(branch)
+        payload = {
+          course: branch
+        }.to_json
+        response = RestClient::Request.new(:url => "https://api.github.com/repos/#{remote}/pulls", :method => "GET", :payload => payload, :headers => request_headers).execute
+        data = JSON.parse(response.body)
+        data.first
       rescue RestClient::Exception => e
         process_error e
       end
 
+      private
+
       def process_error(e)
         data = JSON.parse e.http_body
         shell.say "Github request failed: #{data['message']}", :red
+        throw e
       end
 
       def request_headers

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '1.4.1'
+    VERSION = '1.5.0.pre1'
   end
 end

data/spec/thegarage/gitx/cli_spec.rb

@@ -24,7 +24,7 @@ describe Thegarage::Gitx::CLI do
 
       cli.update
     end
-    it 'should run expected commands' do
+    it 'runs expected commands' do
       should meet_expectations
     end
   end
@@ -45,7 +45,7 @@ describe Thegarage::Gitx::CLI do
 
         cli.integrate
       end
-      it 'should default to staging' do
+      it 'defaults to staging branch' do
         should meet_expectations
       end
     end
@@ -64,12 +64,12 @@ describe Thegarage::Gitx::CLI do
 
         cli.integrate 'prototype'
       end
-      it 'should run expected commands' do
+      it 'runs expected commands' do
         should meet_expectations
       end
     end
     context 'when target branch != staging || prototype' do
-      it 'should raise an error' do
+      it 'raises an 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
@@ -92,7 +92,7 @@ describe Thegarage::Gitx::CLI do
 
         cli.release
       end
-      it 'should only run update commands' do
+      it 'only runs update commands' do
         should meet_expectations
       end
     end
@@ -122,7 +122,7 @@ describe Thegarage::Gitx::CLI do
 
         cli.release
       end
-      it 'should run expected commands' do
+      it 'runs expected commands' do
         should meet_expectations
       end
     end
@@ -153,7 +153,7 @@ describe Thegarage::Gitx::CLI do
 
         cli.nuke 'prototype'
       end
-      it 'should run expected commands' do
+      it 'runs expected commands' do
         should meet_expectations
       end
     end
@@ -181,7 +181,7 @@ describe Thegarage::Gitx::CLI do
 
         cli.nuke 'staging'
       end
-      it 'should run expected commands' do
+      it 'runs expected commands' do
         should meet_expectations
       end
     end
@@ -229,17 +229,17 @@ describe Thegarage::Gitx::CLI do
 
         cli.nuke 'prototype'
       end
-      it 'should run expected commands' do
+      it 'runs expected commands' do
         should meet_expectations
       end
     end
     context 'when target branch != staging || prototype' do
-      it 'should raise error' do
+      it 'raises error' do
         lambda {
           expect(cli).to receive(:ask).and_return('master')
           expect(cli).to receive(:yes?).and_return(true)
           cli.nuke 'not-an-integration-branch'
-        }.should raise_error /Only aggregate branches are allowed to be reset/
+        }.should raise_error(/Only aggregate branches are allowed to be reset/)
       end
     end
     context 'when user does not confirm nuking the target branch' do
@@ -255,7 +255,7 @@ describe Thegarage::Gitx::CLI do
 
         cli.nuke 'prototype'
       end
-      it 'should run expected commands' do
+      it 'runs expected commands' do
         should meet_expectations
       end
     end
@@ -269,29 +269,99 @@ describe Thegarage::Gitx::CLI do
         expect(cli).to receive(:run).with("git fetch --tags", capture: true).ordered
         expect(cli).to receive(:run).with("git tag -l 'build-master-*'", capture: true).and_return(buildtags).ordered
 
-        expect { cli.nuke('prototype') }.to raise_error /No known good tag found for branch/
+        expect { cli.nuke('prototype') }.to raise_error(/No known good tag found for branch/)
       end
     end
   end
 
   describe '#reviewrequest' do
-    context 'when github configured correctly' do
-      let(:github) { double('fake github') }
+    let(:github) { double('fake github') }
+    let(:pull_request) do
+      {
+        'html_url' => 'https://path/to/new/pull/request',
+        'head' => {
+          'ref' => 'branch_name'
+        }
+      }
+    end
+    before do
+      allow(cli).to receive(:github).and_return(github)
+
+      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
+    end
+    context 'when pull request does not exist' do
+      let(:authorization_token) { '123123' }
+      let(:changelog) { '* made some fixes' }
       before do
-        expect(cli).to receive(:github).and_return(github)
-        expect(github).to receive(:create_pull_request).and_return('https://path/to/new/pull/request')
+        expect(github).to receive(:authorization_token).and_return(authorization_token)
+        expect(github).to receive(:find_pull_request).and_return(nil)
+        expect(github).to receive(:create_pull_request).and_return(pull_request)
 
-        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(cli).to receive(:run).with("git log master...feature-branch --no-merges --pretty=format:'* %s%n%b'", capture: true).and_return("2013-01-01 did some stuff").ordered
+        cli.reviewrequest
+      end
+      it 'creates github pull request' do
+        should meet_expectations
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
+    end
+    context 'when authorization_token is missing' do
+      let(:authorization_token) { nil }
+      it do
+        expect(github).to receive(:authorization_token).and_return(authorization_token)
+        expect { cli.reviewrequest }.to raise_error(/token not found/)
+      end
+    end
+    context 'when pull request already exists' do
+      let(:authorization_token) { '123123' }
+      before do
+        expect(github).to receive(:authorization_token).and_return(authorization_token)
+        expect(github).to receive(:find_pull_request).and_return(pull_request)
+        expect(github).to_not receive(:create_pull_request)
 
         cli.reviewrequest
       end
-      it 'should create github pull request' do
+      it 'does not create new pull request' do
         should meet_expectations
       end
-      it 'should run expected commands' do
+    end
+    context 'when --assignee option passed' do
+      let(:options) do
+        {
+          assignee: 'johndoe'
+        }
+      end
+      let(:authorization_token) { '123123' }
+      before do
+        expect(github).to receive(:authorization_token).and_return(authorization_token)
+        expect(github).to receive(:find_pull_request).and_return(pull_request)
+        expect(github).to receive(:assign_pull_request)
+
+        cli.reviewrequest
+      end
+      it 'calls assign_pull_request method' do
+        should meet_expectations
+      end
+    end
+    context 'when --open flag passed' do
+      let(:options) do
+        {
+          open: true
+        }
+      end
+      let(:authorization_token) { '123123' }
+      before do
+        expect(github).to receive(:authorization_token).and_return(authorization_token)
+        expect(github).to receive(:find_pull_request).and_return(pull_request)
+
+        expect(cli).to receive(:run).with("open #{pull_request['html_url']}", capture: true).ordered
+        cli.reviewrequest
+      end
+      it 'runs open command with pull request url' do
         should meet_expectations
       end
     end
@@ -307,7 +377,7 @@ describe Thegarage::Gitx::CLI do
       ENV['TRAVIS_BUILD_NUMBER'] = env_travis_build_number
     end
     context 'when ENV[\'TRAVIS_BRANCH\'] is nil' do
-      it 'should raise Unknown Branch error' do
+      it 'raises Unknown Branch error' do
         expect { cli.buildtag }.to raise_error "Unknown branch. ENV['TRAVIS_BRANCH'] is required."
       end
     end
@@ -344,7 +414,7 @@ describe Thegarage::Gitx::CLI do
           cli.buildtag
         end
       end
-      it 'should create a tag for the branch and push it to github' do
+      it 'creates a tag for the branch and push it to github' do
         should meet_expectations
       end
     end

data/spec/thegarage/gitx/github_spec.rb

@@ -10,12 +10,12 @@ describe Thegarage::Gitx::Github do
   let(:shell) { double('fake shell', say: nil, ask: nil) }
   subject { Thegarage::Gitx::Github.new(repo, shell) }
 
-  describe '#create_pull_request' do
+  describe '#authorization_token' do
     context 'when github.user is not configured' do
       it 'raises error' do
         expect do
-          subject.create_pull_request 'example-branch', 'changelog'
-        end.to raise_error /Github user not configured/
+          subject.authorization_token
+        end.to raise_error(/Github user not configured/)
       end
     end
     context 'when config.authorization_token is nil' do
@@ -39,24 +39,31 @@ describe Thegarage::Gitx::Github do
           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 => {})
-
-        expect(shell).to receive(:ask).with('Github password for ryan@codecrate.com: ', {:echo => false}).and_return(github_password).any_number_of_times
+        expect(shell).to receive(:ask).with('Github password for ryan@codecrate.com: ', {:echo => false}).and_return(github_password)
 
-        expect(subject).to receive(:input_from_editor).and_return('scrubbed text')
-        subject.create_pull_request 'example-branch', 'changelog'
+        @auth_token = subject.authorization_token
       end
-      it 'creates authorization_token' do
+      it 'stores authorization_token in git config' do
         expect(repo_config).to include('thegarage.gitx.githubauthtoken' => authorization_token)
       end
-      it 'should create github pull request' do
-        should meet_expectations
+      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
+        {
+          'remote.origin.url' => 'https://github.com/thegarage/thegarage-gitx',
+          'github.user' => 'ryan@codecrate.com',
+          'thegarage.gitx.githubauthtoken' => authorization_token
+        }
       end
-      it 'should run expected commands' do
-        should meet_expectations
+      before do
+        @auth_token = subject.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
       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: 1.4.1
+  version: 1.5.0.pre1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -200,9 +200,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.0.3