thegarage-gitx 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ca247018abf7dcebd68cf0f1db75c0d28efd2a8
-  data.tar.gz: 6c28961ed17891bdf9c684c36b4354ac87c88144
+  metadata.gz: 26f049b47c5c5ff2de03b895f9f186cb034df5e6
+  data.tar.gz: e2719e6ea97ae55bdbd63cc617c66056d3dff533
 SHA512:
-  metadata.gz: 33a1f377085a090f14b3cfc85a7f890336ee66970dfed1b0cafa96d103fdcdf6c34b50c06b87fc0ce51bada64a2b6d83bf5d80019773547499964aa1e6fc1e40
-  data.tar.gz: fc3c002f80c9c67315f9b5dd164806c929215f2f40d178aa5a7ce509dee418f47476ef1b82b2228052abc1fce7809af8ceef83e679ee68c6a4e63b647457898f
+  metadata.gz: 3b377cfd0e9e8f2c67c9d0e68a57a5c4e20e7c41424a45bbe1e57ad95ce94ef4e671c2076cfcb446fcb5d59047978dfe7a976aa60f8ca1c9e45653c22348a71c
+  data.tar.gz: f2b8723bd283559acef6b2fa0f2593fc0e8db2db6833ba4f262ba721133c5b9c785782fdde46ee04c1b4d375c7fe1967d11e98db368e838a42b08e73d3d62350

data/lib/thegarage/gitx/cli.rb

@@ -26,11 +26,11 @@ module Thegarage
       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?
+          update
           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: '

data/lib/thegarage/gitx/github.rb

@@ -102,11 +102,11 @@ module Thegarage
       # @returns nil if no pull request found
       def find_pull_request(branch)
         head_reference = [remote_origin_name.split('/').first, branch].join(':')
-        payload = {
+        params = {
           head: head_reference,
-          state: open
-        }.to_json
-        response = RestClient::Request.new(:url => pull_request_url, :method => "GET", :payload => payload, :headers => request_headers).execute
+          state: 'open'
+        }
+        response = RestClient::Request.new(:url => pull_request_url, :method => "GET", :payload => payload, :headers => request_headers.merge(params: params)).execute
         data = JSON.parse(response.body)
         data.first
       rescue RestClient::Exception => e
@@ -148,8 +148,7 @@ module Thegarage
 
       def pull_request_body(changelog, description = nil)
         description_template = []
-        description_template << description if description
-        description_template << "\n"
+        description_template << "#{description}\n" if description
         description_template << '### Changelog'
         description_template << changelog
         description_template << PULL_REQUEST_FOOTER
@@ -175,8 +174,7 @@ module Thegarage
           end
           pid = fork { exec([editor, flags, f.path].join(' ')) }
           Process.waitpid(pid)
-          contents = File.read(f.path)
-          contents.chomp.strip
+          File.read(f.path)
         end
       end
     end

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '1.5.1'
+    VERSION = '1.5.2'
   end
 end

data/spec/thegarage/gitx/cli_spec.rb

@@ -286,10 +286,6 @@ describe Thegarage::Gitx::CLI do
     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' }
@@ -299,6 +295,9 @@ describe Thegarage::Gitx::CLI do
         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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Ryan Sonnek