thegarage-gitx 1.3.0 → 1.4.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9601c51e9fb7c39a2290715c05e752aeb5898c58
-  data.tar.gz: f0947bba05dcedbae40a94a770075b837f0b8fb3
+  metadata.gz: 742702af29fe7faca6d421caa1baef609eb0cac4
+  data.tar.gz: d37fab96da9f0477fa23d101c54518c76a6a63ea
 SHA512:
-  metadata.gz: 8fb42815aa779d1b86f52d5c3c07f34fe1d06a8b97992a950d2e5cb7b1a9ab02d35d8131756cf780193039b5cfaf96bee9256204355878a6a8677a1ec6c07034
-  data.tar.gz: 5efd37b850dd801e9dd91537c70dc7e0616f1a4c601407789cf71594e9decbf5d5db221f8b90a4b0cd2b3b46dddc34066c7db7c4bd958c44e31093479fb2dc6f
+  metadata.gz: c907b35e58cc397cc791fcf0e65a7a45e685ec72475f857f7f82dd41d1fe1edade4e21b96de2f761c9365d6cc2d30f2509abb90f1ebedcca540091c54b540fd6
+  data.tar.gz: 4d56ae5a5484a841170660df9820a6d7117d1ed74bd953fea1200c293de61b4f7e55c469e5941a6b0067ff8a05fab157d70623b33536942d12ee193cd8bf7397

data/lib/thegarage/gitx/cli.rb

@@ -30,12 +30,13 @@ module Thegarage
 
       desc "reviewrequest", "Create 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'
       # @see http://developer.github.com/v3/pulls/
       def reviewrequest
+        fail 'Github authorization token not found' unless authorization_token
         update
 
-        token = authorization_token
-        changelog = run_cmd "git log #{BASE_BRANCH}...#{current_branch} --no-merges --pretty=format:'%ci - %s%n%b'"
+        changelog = run_cmd "git log #{BASE_BRANCH}...#{current_branch} --no-merges --pretty=format:'%s%n%b%n'"
         description_template = []
         description_template << options[:description]
         description_template << "\n"
@@ -45,10 +46,9 @@ module Thegarage
         description_template << PULL_REQUEST_FOOTER
 
         description = editor_input(description_template.join("\n"))
-        branch = current_branch
-        repo = current_remote_repo
-        url = create_pull_request token, branch, repo, description
-        say "Pull request created: #{url}", :green
+        url = create_pull_request description, options[:assignee]
+        say 'Pull request created: '
+        say url, :green
       end
 
       # TODO: use --no-edit to skip merge messages

data/lib/thegarage/gitx/github.rb

@@ -12,7 +12,7 @@ module Thegarage
       private
       # request github authorization token
       # User-Agent is required
-      # store the token in ~/.socialcast/credentials.yml for future reuse
+      # store the token in local git config
       # @see http://developer.github.com/v3/oauth/#scopes
       # @see http://developer.github.com/v3/#user-agent-required
       def authorization_token
@@ -50,16 +50,23 @@ module Thegarage
 
       # returns the url of the created pull request
       # @see http://developer.github.com/v3/pulls/
-      def create_pull_request(token, branch, repo, body)
-        payload = {:title => branch, :base => Thegarage::Gitx::BASE_BRANCH, :head => branch, :body => body}.to_json
+      def create_pull_request(body, assignee = nil)
+        branch = current_branch
+        repo = current_remote_repo
+
         say "Creating pull request for "
         say "#{branch} ", :green
         say "against "
         say "#{Thegarage::Gitx::BASE_BRANCH} ", :green
         say "in "
         say repo, :green
-        response = RestClient::Request.new(:url => "https://api.github.com/repos/#{repo}/pulls", :method => "POST", :payload => payload, :headers => {:accept => :json, :content_type => :json, 'Authorization' => "token #{token}"}).execute
+
+        payload = {:title => branch, :base => Thegarage::Gitx::BASE_BRANCH, :head => branch, :body => body}.to_json
+        response = RestClient::Request.new(:url => "https://api.github.com/repos/#{repo}/pulls", :method => "POST", :payload => payload, :headers => github_request_headers).execute
         data = JSON.parse response.body
+
+        assign_pull_request(branch, assignee, data) if assignee
+
         url = data['html_url']
         url
       rescue RestClient::Exception => e
@@ -67,9 +74,24 @@ module Thegarage
         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 => github_request_headers).execute
+      rescue RestClient::Exception => e
+        process_error e
+      end
+
       def process_error(e)
         data = JSON.parse e.http_body
-        say "Failed to create pull request: #{data['message']}", :red
+        say "Github request failed: #{data['message']}", :red
+      end
+
+      def github_request_headers
+        {
+          :accept => :json,
+          :content_type => :json,
+          'Authorization' => "token #{authorization_token}"
+        }
       end
     end
   end

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '1.3.0'
+    VERSION = '1.4.0.pre1'
   end
 end

data/spec/thegarage/gitx/cli_spec.rb

@@ -279,9 +279,6 @@ describe Thegarage::Gitx::CLI do
       let(:current_user) { nil }
       it 'raises error' do
         allow(cli).to receive(:current_user).and_return(current_user)
-        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 do
           cli.reviewrequest
@@ -309,14 +306,14 @@ describe Thegarage::Gitx::CLI do
           to_return(:status => 200, :body => %q({"html_url": "http://github.com/repo/project/pulls/1"}), :headers => {})
 
         allow(cli).to receive(:current_user).and_return(current_user)
-        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', {:echo => false}).and_return(github_password)
-        expect(cli).to receive(:github_auth_token=).with(authorization_token)
+        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', {:echo => false}).and_return(github_password).any_number_of_times
+        allow(cli).to receive(:github_auth_token=).with(authorization_token)
 
         expect(cli).to receive(:editor_input).and_return('scrubbed text')
         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:'%ci - %s%n%b'", capture: true).and_return("2013-01-01 did some stuff").ordered
+        expect(cli).to receive(:run).with("git log master...feature-branch --no-merges --pretty=format:'%s%n%b%n'", capture: true).and_return("2013-01-01 did some stuff").ordered
 
         cli.reviewrequest
       end
@@ -337,13 +334,13 @@ describe Thegarage::Gitx::CLI 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(:authorization_token).and_return(authorization_token)
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
         expect(cli).to receive(:editor_input).and_return('scrubbed text')
         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:'%ci - %s%n%b'", capture: true).and_return("2013-01-01 did some stuff").ordered
+        expect(cli).to receive(:run).with("git log master...feature-branch --no-merges --pretty=format:'%s%n%b%n'", capture: true).and_return("2013-01-01 did some stuff").ordered
 
         cli.reviewrequest
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0.pre1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -199,9 +199,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