socialcast-git-extensions 3.1.23 → 3.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b980b68e25c9e7d9a362521e696a6a2ac9765d28
-  data.tar.gz: 31ef169e62e027d408fc18206dda74261b197dcf
+  metadata.gz: 37d095475a120df4785586167bed1e1a02d33ba3
+  data.tar.gz: 05f528bbf77ff776c39d5055b2308a9e5edb7adb
 SHA512:
-  metadata.gz: 1a5e2859d6a3aa9c5203dd737aca06309eda03e1dcdb6598fb7e0beebbae16628647f98e302ee15f9218b79d1f15277283f2702de01fb477d3397dcf3e9f6477
-  data.tar.gz: be9c48c3d885f8142cf826ba8fe3299c888f6d50f593047dad0ca041c152b62f38b6f2002def99a830603a60d2181ebd326d817144f248b2ab52552feb1aa9ff
+  metadata.gz: 611680354aebd1374cbbd6792461a6ee69f2738358db014804587db8af3d55c8f856975b7c91c8581d6a5471d856341bf81c958885044a2dc519e42a9926e014
+  data.tar.gz: 2169efa6a7ec64c577b96c4dc7f8619ee75f1b12d27db44b4aea995d563252d43653756097e04ab32c3c9dceb83f1c83a94f8485bf294924991b8bf8094c929b

data/.ruby-gemset

@@ -0,0 +1 @@
+socialcast-git-extensions

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.3

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

@@ -4,6 +4,7 @@ require 'socialcast-git-extensions'
 require 'socialcast'
 require 'socialcast/command_line/message'
 require 'highline/import'
+require 'active_support/core_ext'
 
 module Socialcast
   module Gitx
@@ -64,7 +65,7 @@ module Socialcast
         url = create_pull_request branch, repo, description, assignee
         say "Pull request created: #{url}"
 
-        review_message = ["#reviewrequest for #{branch} #scgitx", "/cc @#{developer_group}", review_mention, description, changelog_summary(branch)].compact.join("\n\n")
+        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'
       end
 
@@ -104,7 +105,7 @@ module Socialcast
 
         pull_request_url = create_pull_request(backport_branch, repo, description, assignee)
 
-        review_message = ["#reviewrequest backport ##{pull_request_num} to #{maintenance_branch} #scgitx"]
+        review_message = ["#reviewrequest backport ##{pull_request_num} to #{maintenance_branch} in #{current_repo} #scgitx"]
         if socialcast_reviewer
           review_message << "/cc @#{socialcast_reviewer} for #backport track"
         end
@@ -168,7 +169,12 @@ module Socialcast
         run_cmd 'git pull'
         run_cmd "git checkout -b #{branch_name}"
 
-        post "#worklog starting work on #{branch_name} #scgitx"
+        message = <<-EOS.strip_heredoc
+          #worklog starting work on #{branch_name} in #{current_repo} #scgitx
+          /cc @#{developer_group}
+        EOS
+
+        post message.strip
       end
 
       desc 'share', 'Share the current branch in the remote repository'
@@ -185,7 +191,12 @@ module Socialcast
         integrate_branch(target_branch, prototype_branch) if target_branch == staging_branch
         run_cmd "git checkout #{branch}"
 
-        post "#worklog integrating #{branch} into #{target_branch} #scgitx"
+        message = <<-EOS.strip_heredoc
+          #worklog integrating #{branch} into #{target_branch} in #{current_repo} #scgitx
+          /cc @#{developer_group}
+        EOS
+
+        post message.strip
       end
 
       desc 'promote', '(DEPRECATED) promote the current branch into staging'
@@ -205,15 +216,20 @@ module Socialcast
         removed_branches = nuke_branch(bad_branch, good_branch)
         nuke_branch("last_known_good_#{bad_branch}", good_branch)
 
-        message_parts = []
-        message_parts << "#worklog resetting #{bad_branch} branch to #{good_branch} #scgitx"
-        message_parts << "/cc @#{developer_group}"
+        message = <<-EOS.strip_heredoc
+          #worklog resetting #{bad_branch} branch to #{good_branch} in #{current_repo} #scgitx
+          /cc @#{developer_group}
+        EOS
+
         if removed_branches.any?
-          message_parts << ""
-          message_parts << "the following branches were affected:"
-          message_parts += removed_branches.map{|b| ['*', b].join(' ')}
+          message += <<-EOS.strip_heredoc
+
+            the following branches were affected:
+            #{removed_branches.map{|b| ['*', b].join(' ')}.join("\n")}
+          EOS
         end
-        post message_parts.join("\n")
+
+        post message.strip
       end
 
       desc 'release', 'release the current branch to production'
@@ -232,7 +248,12 @@ module Socialcast
         integrate_branch(base_branch, staging_branch)
         cleanup
 
-        post "#worklog releasing #{branch} to #{base_branch} #scgitx"
+        message = <<-EOS.strip_heredoc
+          #worklog releasing #{branch} to #{base_branch} in #{current_repo} #scgitx
+          /cc @#{developer_group}
+        EOS
+
+        post message.strip
       end
 
       private

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.23"
+    VERSION = "3.1.24"
   end
 end

data/socialcast-git-extensions.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'grit', '~> 2.5.0'
   s.add_runtime_dependency 'socialcast', '~> 1.3.0'
+  s.add_runtime_dependency 'activesupport', '~> 4.0'
   s.add_runtime_dependency 'rest-client', '~> 1.6'
   s.add_runtime_dependency 'thor', '~> 0.19.1'
   s.add_runtime_dependency 'rake', '~> 10.3.2'

data/spec/cli_spec.rb

@@ -14,11 +14,7 @@ describe Socialcast::Gitx::CLI do
   end
 
   def stub_message(message_body, params = {})
-    json_body = { :message => params.merge!(:body => message_body) }
-
-    stub_request(:post, "https://testuser:testpassword@testdomain/api/messages.json")
-      .with(:body => json_body.to_json)
-      .to_return(:status => 200, :body => '', :headers => {})
+    expect(Socialcast::CommandLine::Message).to receive(:create).with(params.merge(:body => message_body)).and_return(double(:permalink_url => 'https://community.socialcast.com/messages/1234'))
   end
 
   before do
@@ -50,7 +46,7 @@ describe Socialcast::Gitx::CLI do
   describe '#integrate' do
     context 'when target branch is ommitted' do
       before do
-        stub_message "#worklog integrating FOO into prototype #scgitx"
+        stub_message "#worklog integrating FOO into prototype in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
 
         Socialcast::Gitx::CLI.start ['integrate']
       end
@@ -74,7 +70,7 @@ describe Socialcast::Gitx::CLI do
       before do
         allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:prototype_branch).and_return('special-prototype')
 
-        stub_message "#worklog integrating FOO into special-prototype #scgitx"
+        stub_message "#worklog integrating FOO into special-prototype in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
 
         Socialcast::Gitx::CLI.start ['integrate']
       end
@@ -96,7 +92,7 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when target branch == prototype' do
       before do
-        stub_message "#worklog integrating FOO into prototype #scgitx"
+        stub_message "#worklog integrating FOO into prototype in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
 
         Socialcast::Gitx::CLI.start ['integrate', 'prototype']
       end
@@ -118,7 +114,7 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when target branch == staging' do
       before do
-        stub_message "#worklog integrating FOO into staging #scgitx"
+        stub_message "#worklog integrating FOO into staging in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
 
         Socialcast::Gitx::CLI.start ['integrate', 'staging']
       end
@@ -170,7 +166,7 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when user confirms release' do
       before do
-        stub_message "#worklog releasing FOO to master #scgitx"
+        stub_message "#worklog releasing FOO to master in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
 
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:yes?).and_return(true)
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:cleanup)
@@ -212,7 +208,7 @@ describe Socialcast::Gitx::CLI do
 
     context 'with reserved_branches via config file' do
       before do
-        stub_message "#worklog releasing FOO to master #scgitx"
+        stub_message "#worklog releasing FOO to master in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:yes?).and_return(true)
         allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:config).and_return( { 'reserved_branches' => ['dont-del-me','dont-del-me-2'] })
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:cleanup)
@@ -226,7 +222,7 @@ describe Socialcast::Gitx::CLI do
 
     context 'with alternative base branch via config file' do
       before do
-        stub_message "#worklog releasing FOO to special-master #scgitx"
+        stub_message "#worklog releasing FOO to special-master in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
 
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:yes?).and_return(true)
         allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:config).and_return( { 'base_branch' => 'special-master' })
@@ -262,7 +258,7 @@ describe Socialcast::Gitx::CLI do
 
     context 'with alternative base branch via environment variable' do
       before do
-        stub_message "#worklog releasing FOO to special-master #scgitx"
+        stub_message "#worklog releasing FOO to special-master in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
 
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:yes?).and_return(true)
         allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:config).and_return({})
@@ -302,7 +298,7 @@ describe Socialcast::Gitx::CLI do
 
     context 'with alternative base branch via environment variable overriding base branch in config' do
       before do
-        stub_message "#worklog releasing FOO to special-master #scgitx"
+        stub_message "#worklog releasing FOO to special-master in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
 
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:yes?).and_return(true)
         allow_any_instance_of(Socialcast::Gitx::CLI).to receive(:config).and_return({ 'base_branch' => 'extra-special-master' })
@@ -348,7 +344,7 @@ describe Socialcast::Gitx::CLI do
         prototype_branches = %w( dev-foo dev-bar )
         master_branches = %w( dev-foo )
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:branches).and_return(prototype_branches, master_branches, prototype_branches, master_branches)
-        stub_message "#worklog resetting prototype branch to last_known_good_master #scgitx\n/cc @SocialcastDevelopers\n\nthe following branches were affected:\n* dev-bar"
+        stub_message "#worklog resetting prototype branch to last_known_good_master in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers\n\nthe following branches were affected:\n* dev-bar"
         Socialcast::Gitx::CLI.start ['nuke', 'prototype', '--destination', 'master']
       end
       it 'should publish message into socialcast' do end # see expectations
@@ -379,7 +375,7 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when target branch == staging and --destination == last_known_good_staging' do
       before do
-        stub_message "#worklog resetting staging branch to last_known_good_staging #scgitx\n/cc @SocialcastDevelopers"
+        stub_message "#worklog resetting staging branch to last_known_good_staging in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
 
         Socialcast::Gitx::CLI.start ['nuke', 'staging', '--destination', 'last_known_good_staging']
       end
@@ -400,7 +396,7 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when target branch == prototype and destination prompt == nil' do
       before do
-        stub_message "#worklog resetting prototype branch to last_known_good_prototype #scgitx\n/cc @SocialcastDevelopers"
+        stub_message "#worklog resetting prototype branch to last_known_good_prototype in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
 
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:ask).and_return('')
         Socialcast::Gitx::CLI.start ['nuke', 'prototype']
@@ -422,7 +418,7 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when target branch == prototype and destination prompt = master' do
       before do
-        stub_message "#worklog resetting prototype branch to last_known_good_master #scgitx\n/cc @SocialcastDevelopers"
+        stub_message "#worklog resetting prototype branch to last_known_good_master in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
 
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:ask).and_return('master')
         Socialcast::Gitx::CLI.start ['nuke', 'prototype']
@@ -849,10 +845,9 @@ describe Socialcast::Gitx::CLI do
               :headers => { 'Accept' => 'application/json', 'Accept-Encoding' => 'gzip, deflate', 'Authorization' => /token\s\w+/, 'Content-Type' => 'application/json', 'User-Agent'=>'socialcast-git-extensions' }).
          to_return(:status => 200, :body => '{"html_url": "https://github.com/socialcast/socialcast-git-extensions/pulls/60"}', :headers => { 'Content-Type' => 'application/json' })
 
-      stub_message "#reviewrequest backport #59 to v1.x #scgitx\n\n/cc @SocialcastDevelopers", :url => 'https://github.com/socialcast/socialcast-git-extensions/pulls/60', :message_type => 'review_request'
+      stub_message "#reviewrequest backport #59 to v1.x in socialcast/socialcast-git-extensions #scgitx\n\n/cc @SocialcastDevelopers", :url => 'https://github.com/socialcast/socialcast-git-extensions/pulls/60', :message_type => 'review_request'
 
       expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:backportpr).and_call_original
-      expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:post).with("#reviewrequest backport #59 to v1.x #scgitx\n\n/cc @SocialcastDevelopers", { :url => "https://github.com/socialcast/socialcast-git-extensions/pulls/60", :message_type => "review_request" })
       Socialcast::Gitx::CLI.start ['backportpr', '59', 'v1.x']
     end
     it 'creates a branch based on v1.x and cherry-picks in PR 59' do end
@@ -933,7 +928,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 #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 #scgitx\n\n/cc @SocialcastDevelopers\n\ntesting\n\n1 file changed", :url => 'http://github.com/repo/project/pulls/1', :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
@@ -956,7 +951,7 @@ describe Socialcast::Gitx::CLI do
         stub_request(:patch, "http://github.com/repos/repo/project/issues/1").to_return(:status => 200)
       end
       context 'and additional reviewers are specified' do
-        let(:message_body) { "#reviewrequest for FOO #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 #scgitx\n\n/cc @SocialcastDevelopers\n\n\nAssigned additionally to @JohnSmith for API review\n\ntesting\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
@@ -974,7 +969,7 @@ describe Socialcast::Gitx::CLI do
         end
       end
       context 'and a developer group is specified' do
-        let(:message_body) { "#reviewrequest for FOO #scgitx\n\n/cc @#{another_group}\n\ntesting\n\n1 file changed" }
+        let(:message_body) { "#reviewrequest for FOO in socialcast/socialcast-git-extensions #scgitx\n\n/cc @#{another_group}\n\ntesting\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')
@@ -986,7 +981,7 @@ describe Socialcast::Gitx::CLI do
         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 #scgitx\n\n/cc @SocialcastDevelopers\n\ntesting\n\n1 file changed" }
+        let(:message_body) { "#reviewrequest for FOO in socialcast/socialcast-git-extensions #scgitx\n\n/cc @SocialcastDevelopers\n\ntesting\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
@@ -1000,7 +995,7 @@ describe Socialcast::Gitx::CLI do
 
   describe '#promote' do
     before do
-      stub_message "#worklog integrating FOO into staging #scgitx"
+      stub_message "#worklog integrating FOO into staging in socialcast/socialcast-git-extensions #scgitx\n/cc @SocialcastDevelopers"
       Socialcast::Gitx::CLI.start ['promote']
     end
     it 'should integrate into staging' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.23
+  version: 3.1.24
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +158,8 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".gitignore"
-- ".rvmrc"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE

data/.rvmrc

@@ -1 +0,0 @@
-rvm use default@socialcast-git-extensions --create