socialcast-git-extensions 3.1.28 → 3.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1516e606c16241ca86c4596ad1bf93feac9ea33
-  data.tar.gz: c87c317647a112f2e2bf1987a320dcb1b0119147
+  metadata.gz: 7a79f2c472e34c9de110dc2c4c5b3de219b28c61
+  data.tar.gz: b6bd3bbc36b8b27190d24ca79083cf902baeb4f6
 SHA512:
-  metadata.gz: 51c932ce23424136d20bf8ba0f97f05983db9f0f22b07b792e4bf9be72990349c096deb624d59c9292049495efae5b82cbc61af385a642fbcb9495691101e4ea
-  data.tar.gz: 7928655b4e3ec2846e30c0c3e6b4404df535197a7d9f43d1562b9cedf93dc21652de785a326227d7d049b5846bb1ac757a83e6d3043ed486b4f1ffdbf2a08cc4
+  metadata.gz: 2a4a5a14c98877756c9dde689cb23ae87657ae2ad272756d554e04f45bc7be1afb0282535cf34432c8d69e014a9a3c6afa2465621bf3a1b78a2d085b2513b159
+  data.tar.gz: ef03eaae3f57a4235d9ad3d69c3c42cab64797f6f3b341ec4706d4f6c862f4ba5eb0e38ddd012bd43199ca1e8e1df369dde1543a81be349ca7790c5fe001e1dd

data/lib/socialcast-git-extensions/cli.rb

@@ -36,10 +36,11 @@ module Socialcast
       def reviewrequest(*additional_reviewers)
         update
 
-        review_mention = if buddy = socialcast_review_buddy(current_user)
-          "Assigned to @#{buddy}"
+        primary_mention = if buddy = socialcast_review_buddy(current_user)
+          "assigned to @#{buddy}"
         end
 
+        secondary_mention = nil
         if !specialty_reviewers.empty? && !options.key?('skip_additional_reviewers')
           additional_reviewers = options[:additional_reviewers] || additional_reviewers
 
@@ -52,8 +53,8 @@ module Socialcast
 
           (specialty_reviewers.keys & additional_reviewers).each do |command|
             reviewer = specialty_reviewers[command]
-            review_mention = review_mention || ''
-            review_mention += "\nAssigned additionally to @#{reviewer['socialcast_username']} for #{reviewer['label']} review"
+            secondary_mention ||= ''
+            secondary_mention += "\nAssigned additionally to @#{reviewer['socialcast_username']} for #{reviewer['label']} review"
           end
         end
 
@@ -65,8 +66,8 @@ module Socialcast
         url = create_pull_request branch, repo, description, assignee
         say "Pull request created: #{url}"
 
-        review_message = ["#reviewrequest for #{branch} in #{current_repo} #scgitx", "/cc @#{developer_group}", review_mention, description, changelog_summary(branch)].compact.join("\n\n")
-        post review_message, :url => url, :message_type => 'review_request'
+        review_message = ["#reviewrequest for #{branch} in #{current_repo}", "PR #{url} #{primary_mention}", '', description, '', secondary_mention, "/cc @#{developer_group} #scgitx", '', changelog_summary(branch)].compact.join("\n").gsub(/\n{2,}/, "\n\n")
+        post review_message, :message_type => 'review_request'
       end
 
       desc "findpr", "Find pull requests including a given commit"

data/lib/socialcast-git-extensions/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.28"
+    VERSION = "3.1.29"
   end
 end

data/spec/cli_spec.rb

@@ -959,7 +959,7 @@ describe Socialcast::Gitx::CLI do
           stub_request(:post, "https://api.github.com/repos/socialcast/socialcast-git-extensions/pulls").
             to_return(:status => 200, :body => %q({"html_url": "http://github.com/repo/project/pulls/1"}), :headers => {})
 
-          stub_message "#reviewrequest for FOO in socialcast/socialcast-git-extensions #scgitx\n\n/cc @SocialcastDevelopers\n\ntesting\n\n1 file changed", :url => 'http://github.com/repo/project/pulls/1', :message_type => 'review_request'
+          stub_message "#reviewrequest for FOO in socialcast/socialcast-git-extensions\nPR http://github.com/repo/project/pulls/1 \n\ntesting\n\n/cc @SocialcastDevelopers #scgitx\n\n1 file changed", :message_type => 'review_request'
           allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:changelog_summary).and_return('1 file changed')
           Socialcast::Gitx::CLI.start ['reviewrequest', '--description', 'testing', '-s']
         end
@@ -980,13 +980,13 @@ describe Socialcast::Gitx::CLI do
         stub_request(:post, "https://api.github.com/repos/socialcast/socialcast-git-extensions/pulls").
           to_return(:status => 200, :body => %q({"html_url": "http://github.com/repo/project/pulls/1", "issue_url": "http://github.com/repos/repo/project/issues/1"}), :headers => {})
         stub_request(:patch, "http://github.com/repos/repo/project/issues/1").to_return(:status => 200)
-      end
+        allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:socialcast_review_buddy).and_return('JaneDoe')
+        end
       context 'and additional reviewers are specified' do
-        let(:message_body) { "#reviewrequest for FOO in socialcast/socialcast-git-extensions #scgitx\n\n/cc @SocialcastDevelopers\n\n\nAssigned additionally to @JohnSmith for API review\n\ntesting\n\n1 file changed" }
+        let(:message_body) { "#reviewrequest for FOO in socialcast/socialcast-git-extensions\nPR http://github.com/repo/project/pulls/1 assigned to @JaneDoe\n\ntesting\n\nAssigned additionally to @JohnSmith for API review\n/cc @SocialcastDevelopers #scgitx\n\n1 file changed" }
         before do
           allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:changelog_summary).and_return('1 file changed')
-          # The Review Buddy should be @mentioned in the message
-          stub_message message_body, :url => 'http://github.com/repo/project/pulls/1', :message_type => 'review_request'
+          stub_message message_body, :message_type => 'review_request'
           Socialcast::Gitx::CLI.start ['reviewrequest', '--description', 'testing', '-a', 'a']
         end
         it 'should create github pull request' do end # see expectations
@@ -1000,23 +1000,21 @@ describe Socialcast::Gitx::CLI do
         end
       end
       context 'and a developer group is specified' do
-        let(:message_body) { "#reviewrequest for FOO in socialcast/socialcast-git-extensions #scgitx\n\n/cc @#{another_group}\n\ntesting\n\n1 file changed" }
+        let(:message_body) { "#reviewrequest for FOO in socialcast/socialcast-git-extensions\nPR http://github.com/repo/project/pulls/1 assigned to @JaneDoe\n\ntesting\n\n/cc @#{another_group} #scgitx\n\n1 file changed" }
         let(:another_group) { 'AnotherDeveloperGroup' }
         before do
           allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:changelog_summary).and_return('1 file changed')
           allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:config).and_return({'developer_group' => another_group})
-          # The Review Buddy should be @mentioned in the message
-          stub_message message_body, :url => 'http://github.com/repo/project/pulls/1', :message_type => 'review_request'
+          stub_message message_body, :message_type => 'review_request'
           Socialcast::Gitx::CLI.start ['reviewrequest', '--description', 'testing', '-s']
         end
         it 'should create github pull request with a different group mentioned' do end # see expectations
       end
       context 'and additional reviewers are not specified' do
-        let(:message_body) { "#reviewrequest for FOO in socialcast/socialcast-git-extensions #scgitx\n\n/cc @SocialcastDevelopers\n\ntesting\n\n1 file changed" }
+        let(:message_body) { "#reviewrequest for FOO in socialcast/socialcast-git-extensions\nPR http://github.com/repo/project/pulls/1 assigned to @JaneDoe\n\ntesting\n\n/cc @SocialcastDevelopers #scgitx\n\n1 file changed" }
         before do
           allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:changelog_summary).and_return('1 file changed')
-          # The Review Buddy should be @mentioned in the message
-          stub_message message_body, :url => 'http://github.com/repo/project/pulls/1', :message_type => 'review_request'
+          stub_message message_body, :message_type => 'review_request'
           Socialcast::Gitx::CLI.start ['reviewrequest', '--description', 'testing', '-s']
         end
         it 'should create github pull request' do end # see expectations

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.28
+  version: 3.1.29
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: socialcast-git-extensions
-rubygems_version: 2.4.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: git extension scripts for socialcast workflow