socialcast-git-extensions 3.1.14 → 3.1.15

data/README.md

@@ -30,7 +30,7 @@ Find pull requests on github including a given commit
 create a pull request on github for peer review of the current branch.
 
 ### Optional:
-Specify a Review Buddy mapping that will reference the local Github username and @mention a pre-assigned review buddy in the Socialcast Review Request message.  Specify the mapping by creating a Configuration YML file relative to the Repo Root: config/scgitx.yml with the following format:
+Specify a Review Buddy mapping that will reference the local Github username and @mention a pre-assigned review buddy in the Socialcast Review Request message.  Specify the mapping by creating a .scgitx YML file relative to the Repo Root: config/scgitx.yml with the following format:
 
 ```yaml
 review_buddies:
@@ -44,6 +44,21 @@ review_buddies:
 
 In this example, when Emily runs `git reviewrequest` from her local machine, @BobDavis will receive an @mention in Socialcast notifying him to review her branch.  If Bob runs the command, Emily will receive a notice in Socialcast.
 
+Additionally you can specify a specialty reviewer, such that you can
+notify individuals in your organization with a specific skill set. Like Security, or API's
+
+``` yaml
+specialty_reviewers:
+  a:
+    label: API
+    command: (a)pi
+    socialcast_username: JohnSmith
+  s:
+    label: Security
+    command: (s)ecurity
+    socialcast_username: KellyWilliams
+```
+
 ## git release
 
 release the current feature branch to master

data/config/scgitx.yml

@@ -1,11 +1,21 @@
 # Map github usernames to Socialcast usernames and assign review buddies
 review_buddies:
-  vanm:
-    socialcast_username: VanMiranda
-    buddy: wireframe
-  wireframe:
-    socialcast_username: RyanSonnek
-    buddy: vanm
+  janesmith:
+    socialcast_username: JaneSmith
+    buddy: johndoe
+  johndoe:
+    socialcast_username: JohnDoe
+    buddy: janesmith
+
+specialty_reviewers:
+  a:
+    label: API
+    command: (a)pi
+    socialcast_username: JohnSmith
+  s:
+    label: Security
+    command: (s)ecurity
+    socialcast_username: KellyWilliams
 
 base_branch: master
 staging_branch: staging

data/lib/socialcast-git-extensions.rb

@@ -11,11 +11,13 @@ module Socialcast
     DEFAULT_PROTOTYPE_BRANCH = 'prototype'
 
     private
+
     # execute a shell command and raise an error if non-zero exit code is returned
     def run_cmd(cmd)
       say "\n$ "
       say cmd.gsub("'", ''), :red
       raise "#{cmd} failed" unless system cmd
     end
+
   end
 end

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

@@ -1,8 +1,9 @@
-require "thor"
+require 'thor'
 require 'rest_client'
 require 'socialcast-git-extensions'
 require 'socialcast'
 require 'socialcast/command_line/message'
+require 'highline/import'
 
 module Socialcast
   module Gitx
@@ -28,8 +29,10 @@ module Socialcast
 
       desc "reviewrequest", "Create a pull request on github"
       method_option :description, :type => :string, :aliases => '-d', :desc => 'pull request description'
+      method_option :additional_reviewers, :type => :string, :aliases => '-a', :desc => 'add additional reviewers to mention automatically, and skips the prompt'
+      method_option :skip_additional_reviewers, :type => :string, :aliases => '-s', :desc => 'Skips adding additional reviewers'
       # @see http://developer.github.com/v3/pulls/
-      def reviewrequest
+      def reviewrequest(*additional_reviewers)
         token = authorization_token
 
         update
@@ -38,6 +41,23 @@ module Socialcast
           "Assigned to @#{buddy}"
         end
 
+        if !specialty_reviewers.empty? && !options.key?('skip_additional_reviewers')
+          additional_reviewers = options[:additional_reviewers] || additional_reviewers
+
+          if additional_reviewers.empty?
+            prompt_text = "#{specialty_reviewers.map { |_,v| v['command'] }.join(", ")} or (or hit enter to continue): "
+            additional_reviewers = $terminal.ask("Notify additional people? #{prompt_text} ")
+          end
+
+          additional_reviewers = additional_reviewers.is_a?(String) ? additional_reviewers.split(" ") : additional_reviewers
+
+          (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"
+          end
+        end
+
         assignee = github_review_buddy(current_user)
 
         description = options[:description] || editor_input(PULL_REQUEST_DESCRIPTION)
@@ -107,14 +127,13 @@ module Socialcast
       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{ cpr-3922-api-fix-invalid-auth red-212-desktop-cleanup-avatar-markup red-3212-share-form-add-edit-link }.sample
           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|
-              q.validate = Proc.new { |branch|
-                branch =~ /^[A-Za-z0-9\-_]+$/ && !remote_branches.include?(branch)
-              }
-            }
+          ## Explicitly use Highline.ask
+          branch_name = $terminal.ask("What would you like to name your branch? (ex: #{example_branch})") do |q|
+            q.validate = lambda { |branch| branch =~ /^[A-Za-z0-9\-_]+$/ && !remote_branches.include?(branch) }
+            q.responses[:not_valid] = "This branch name is either already taken, or is not a valid branch name"
           end
         end
 
@@ -196,8 +215,8 @@ module Socialcast
         return if options[:quiet]
         ActiveResource::Base.logger = Logger.new(STDOUT) if options[:trace]
         Socialcast::CommandLine::Message.configure_from_credentials
-        Socialcast::CommandLine::Message.create params.merge(:body => message)
-        say "Message has been posted"
+        response = Socialcast::CommandLine::Message.create params.merge(:body => message)
+        say "Message has been posted: #{response.permalink_url}"
       end
     end
   end

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

@@ -173,6 +173,10 @@ module Socialcast
         config['review_buddies'] || {}
       end
 
+      def specialty_reviewers
+        config['specialty_reviewers'] || {}
+      end
+
       def base_branch
         ENV['BASE_BRANCH'] || config['base_branch'] || Socialcast::Gitx::DEFAULT_BASE_BRANCH
       end

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.14"
+    VERSION = "3.1.15"
   end
 end

data/spec/cli_spec.rb

@@ -14,11 +14,11 @@ describe Socialcast::Gitx::CLI do
   end
 
   def stub_message(message_body, params = {})
-    json_body = { :message => { :body => message_body }.merge(params) }
+    json_body = { :message => { :body => message_body }.merge!(params) }
 
     stub_request(:post, "https://testuser:testpassword@testdomain/api/messages.json")
-      .with(json_body)
-      .to_return(:status => 200)
+      .with(:body => json_body)
+      .to_return(:status => 200, :body => '', :headers => {})
   end
 
   before do
@@ -274,7 +274,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 integrating FOO to special-master #scgitx"
+        stub_message "#worklog releasing FOO to special-master #scgitx"
 
         Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
         Socialcast::Gitx::CLI.any_instance.stub(:config).and_return({ 'base_branch' => 'extra-special-master' })
@@ -347,7 +347,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 #scgitx\n/cc @SocialcastDevelopers"
 
         Socialcast::Gitx::CLI.start ['nuke', 'staging', '--destination', 'last_known_good_staging']
       end
@@ -511,7 +511,7 @@ describe Socialcast::Gitx::CLI do
             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\n", :url => 'http://github.com/repo/project/pulls/1', :message_type => 'review_request'
-          Socialcast::Gitx::CLI.start ['reviewrequest', '--description', 'testing']
+          Socialcast::Gitx::CLI.start ['reviewrequest', '--description', 'testing', '-s']
         end
         it 'should create github pull request' do end # see expectations
         it 'should post socialcast message' do end # see expectations
@@ -529,21 +529,33 @@ describe Socialcast::Gitx::CLI do
       before 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)
-
-        # The Review Buddy should be @mentioned in the message
-        stub_message "#reviewrequest for FOO #scgitx\n\n/cc @SocialcastDevelopers\n\nAssigned to @VanMiranda\n\ntesting\n\n", :url => 'http://github.com/repo/project/pulls/1', :message_type => 'review_request'
-        Socialcast::Gitx::CLI.start ['reviewrequest', '--description', 'testing']
       end
-      it 'should create github pull request' do end # see expectations
-      it 'should post socialcast message' do end # see expectations
-      it 'should run expected commands' do
-        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
-          "git pull origin FOO",
-          "git pull origin master",
-          "git push origin HEAD"
-        ]
+      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\n" }
+        before do
+          # 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'
+          Socialcast::Gitx::CLI.start ['reviewrequest', '--description', 'testing', '-a', 'a']
+        end
+        it 'should create github pull request' do end # see expectations
+        it 'should post socialcast message' do end # see expectations
+        it 'should run expected commands' do
+          Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+            "git pull origin FOO",
+            "git pull origin master",
+            "git push origin HEAD"
+          ]
+        end
+      end
+      context 'and additional reviewers are not specified' do
+        let(:message_body) { "#reviewrequest for FOO #scgitx\n\n/cc @SocialcastDevelopers\n\ntesting\n\n" }
+        before do
+          # 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'
+          Socialcast::Gitx::CLI.start ['reviewrequest', '--description', 'testing', '-s']
+        end
+        it 'should create github pull request' do end # see expectations
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'ostruct'
 require 'bundler/setup'
 require 'rspec/mocks'
 require 'webmock/rspec'
@@ -10,6 +11,11 @@ require 'socialcast-git-extensions/cli'
 RSpec.configure do |config|
   config.mock_with :rspec
 
+  config.before do
+    ## Needed because object does not have permalink url until after it has been posted
+    Socialcast::CommandLine::Message.any_instance.stub(:permalink_url).and_return('http://demo.socialcast.com/messages/123')
+  end
+
   def capture_with_status(stream)
     exit_status = 0
     begin

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.14
+  version: 3.1.15
+  prerelease: 
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: socialcast
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -180,6 +199,7 @@ files:
 - lib/socialcast-git-extensions/cli.rb
 - lib/socialcast-git-extensions/git.rb
 - lib/socialcast-git-extensions/github.rb
+- lib/socialcast-git-extensions/highline.rb
 - lib/socialcast-git-extensions/string_ext.rb
 - lib/socialcast-git-extensions/version.rb
 - socialcast-git-extensions.gemspec
@@ -187,26 +207,27 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/socialcast/socialcast-git-extensions
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: socialcast-git-extensions
-rubygems_version: 2.2.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: git extension scripts for socialcast workflow
 test_files:
 - spec/cli_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTQ3OGZmMzFiMjI0MTM4Y2ZjOTMzYzNlMzMxMGY2NzlmMDJhYTI1NA==
-  data.tar.gz: !binary |-
-    MTM3NzkyNzA1NTdhMGFmMzVmNDVhNGM4MTdkODI2ZDI4Y2E2YjA0MA==
-SHA512:
-  metadata.gz: !binary |-
-    YjY0YzAxNDFhNjBiYmJiNmFjOWY0ZTg3MDI1NjEwMDVhNTczY2VjZmM0NmNh
-    OWE5OTY1ZDlmMjYxNWU4YjMxMGI2Y2Y3N2E2NDg3MWUwZjUzODk3NjU1YTU0
-    YmQ5MDQ5YWExZGRlOTIyNzRjMjkwODRlYzU2MjRkYWZmMzBjYjI=
-  data.tar.gz: !binary |-
-    OGFjMDFkNTMwZmE5MDM2MDRiNTMxMjk0YWFhMGYxNGU0ODFiM2E2MTY5NTI5
-    ZDhhNmI4YmRlODY0Njk0YTEyMmZkYjk1YWVkYzFiMjk2ZDczNWI1ZDVmMGMx
-    MTI3NmJjNWJkYWVmZmZhMTkxODYxMWM0OWYyMTFmYTgxZWZiOTk=