lita-github 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a74bbd8ca959d937503c0d0f676aafa83d8f4fe8
-  data.tar.gz: 8df94bb7c74863c82c66b436c60350f1d25b9a86
+  metadata.gz: ece12c721d1b5311529352629acae15998e6d487
+  data.tar.gz: 32877ccdac63d11a2ce09a1afe9368ad6a3000a4
 SHA512:
-  metadata.gz: 4db4682a4c9fd305c4685887d1241476270bbad98df0a5c381dd3e8c1562cfa8699c5767396fd5fa1ebda1a0a20e3c853bb99eca8f7adfbad5a62ee2cf5ec6e0
-  data.tar.gz: 8125f027de492262b1a5068afcc39471cd001478e0bfe6a4afee4157b22fadb60f6bd40f9155838ad338605b028d219bde80c7f2ea74d1d26482a1cf00e4134e
+  metadata.gz: d1baca6ba8a93e75740a0923e2e80947c01c175ca49acff466475247dae4d11357e4f2a21eab3cc24492b823ff394265a8de33e09aeaebe038c9d9de50ea2b4a
+  data.tar.gz: 5c1a9c8fa5d8edfe12c17f082211e7de4db1a36705fad6a0247c3807d586aa549ab3eb027385ac15ebe6617a59643ac795a9194c4d512de0c6034f6c287a363b

data/README.md

@@ -59,9 +59,9 @@ Here is the current functionality:
   * **Note:** This method is disabled by default, you need to enable it by setting `config.handlers.github.repo_delete_enabled = true` in your configuration file
 
 ### Github PR Handler
-* `!gh pr info #42 PagerDuty/lita-github`
+* `!gh pr info PagerDuty/lita-github #42`
   * output some information about the PR. Such as: state (open|closed|merged), build status, user who opened, user who merged, amongst others...
-* `!gh pr merge #42 PagerDuty/lita-github` or `!shipit #42 PagerDuty/lita-github`
+* `!gh pr merge PagerDuty/lita-github #42` or `!shipit PagerDuty/lita-github #42`
   * This merges the specified pull request
   * This method can be disabled by setting `config.handlers.github.pr_merge_enabled = false` in your configuration file
 * `!gh pr list PagerDuty/lita-github`

data/lib/lita-github/version.rb

@@ -16,6 +16,6 @@
 
 # Administer your Hub of Gits with Lita!
 module LitaGithub
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
   MAJ, MIN, REV = VERSION.split('.').map(&:to_i)
 end

data/lib/lita/handlers/github_pr.rb

@@ -36,19 +36,19 @@ module Lita
       on :loaded, :setup_octo # from LitaGithub::Octo
 
       route(
-        /#{LitaGithub::R::A_REG}pr\s+?info\s+?#(?<pr>\d+?)\s+?#{LitaGithub::R::REPO_REGEX}/,
+        /#{LitaGithub::R::A_REG}pr\s+?info\s+?#{LitaGithub::R::REPO_REGEX}\s+?#(?<pr>\d+?)$/,
         :pr_info,
         command: true,
-        help: { 'gh pr info #42 PagerDuty/lita-github' => 'show some information about the pull request' }
+        help: { 'gh pr info PagerDuty/lita-github #42' => 'show some information about the pull request' }
       )
 
       route(
-        /(?:#{LitaGithub::R::A_REG}(?:pr merge|shipit)|shipit)\s+?#(?<pr>\d+?)\s+?#{LitaGithub::R::REPO_REGEX}/,
+        /(?:#{LitaGithub::R::A_REG}(?:pr merge|shipit)|shipit)\s+?#{LitaGithub::R::REPO_REGEX}\s+?#(?<pr>\d+?)$/,
         :pr_merge, command: true, confirmation: true,
         help: {
-          'gh shipit #42 PagerDuty/lita-github' => 'ship it!',
-          'gh pr merge #42 PagerDuty/lita-github' => 'ship it!',
-          'shipit #42 PagerDuty/lita-github' => 'ship it!'
+          'gh shipit PagerDuty/lita-github #42' => 'ship it!',
+          'gh pr merge PagerDuty/lita-github #42' => 'ship it!',
+          'shipit PagerDuty/lita-github #42' => 'ship it!'
         }
       )
 

data/lib/lita/handlers/github_repo.rb

@@ -127,6 +127,9 @@ module Lita
           t_id = default_team(org)
           opts[:team_id] = t_id unless t_id.nil?
         end unless opts.key?(:team_id)
+
+        opts[:private] = should_repo_be_private?(opts[:private])
+
         opts
       end
 

data/lita-github.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '~> 1.5'
   s.add_development_dependency 'rake', '~> 10.2'
-  s.add_development_dependency 'rubocop', '~> 0.25.0'
+  s.add_development_dependency 'rubocop', '~> 0.26.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'fuubar', '~> 2.0'
   s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4', '>= 0.4.0'

data/spec/unit/lita/handlers/github_pr_spec.rb

@@ -3,9 +3,21 @@
 require 'spec_helper'
 
 describe Lita::Handlers::GithubPR, lita_handler: true do
-  it { routes_command('gh shipit #42 GrapeDuty/lita-test').to(:pr_merge) }
-  it { routes_command('gh pr merge #42 GrapeDuty/lita-test').to(:pr_merge) }
-  it { routes_command('shipit #42 GrapeDuty/lita-test').to(:pr_merge) }
+  # pr_merge command routing
+  it { routes_command('gh shipit GrapeDuty/lita-test #42').to(:pr_merge) }
+  it { routes_command('gh shipit lita-test #42').to(:pr_merge) }
+  it { routes_command('gh pr merge lita-test #42').to(:pr_merge) }
+  it { routes_command('gh pr merge GrapeDuty/lita-test #42').to(:pr_merge) }
+  it { routes_command('shipit GrapeDuty/lita-test #42').to(:pr_merge) }
+  it { routes_command('shipit lita-test #42').to(:pr_merge) }
+
+  # pr_info command routing
+  it { routes_command('gh pr info GrapeDuty/lita-test #42').to(:pr_info) }
+  it { routes_command('gh pr info lita-test #42').to(:pr_info) }
+
+  # pr_list command routing
+  it { routes_command('gh pr list GrapeDuty/lita-test').to(:pr_list) }
+  it { routes_command('gh pr list lita-test').to(:pr_list) }
 
   let(:github_pr) { Lita::Handlers::GithubPR.new('robot') }
   let(:github_org) { 'GrapeDuty' }
@@ -431,7 +443,7 @@ describe Lita::Handlers::GithubPR, lita_handler: true do
               'Head: 1234567 | Commits: 1 (+42/-0) :: ' \
               "https://github.com/GrapeDuty/lita-test/compare/0987654321...1234567890\n" \
               "PR Comments: 1 | Code Comments: 2\n"
-        send_command("gh pr info #42 #{github_org}/#{github_repo}")
+        send_command("gh pr info #{github_org}/#{github_repo} #42")
         expect(replies.last).to eql r
       end
     end
@@ -459,7 +471,7 @@ describe Lita::Handlers::GithubPR, lita_handler: true do
               'Head: 1234567 | Commits: 1 (+42/-0) :: ' \
               "https://github.com/GrapeDuty/lita-test/compare/0987654321...1234567890\n" \
               "PR Comments: 1 | Code Comments: 2\n"
-        send_command("gh pr info #42 #{github_org}/#{github_repo}")
+        send_command("gh pr info #{github_org}/#{github_repo} #42")
         expect(replies.last).to eql r
       end
     end
@@ -471,7 +483,7 @@ describe Lita::Handlers::GithubPR, lita_handler: true do
       end
 
       it 'should reply with the not found error' do
-        send_command("gh pr info #42 #{github_org}/#{github_repo}")
+        send_command("gh pr info #{github_org}/#{github_repo} #42")
         expect(replies.last).to eql 'Pull request #42 on GrapeDuty/lita-test not found'
       end
     end
@@ -495,7 +507,7 @@ describe Lita::Handlers::GithubPR, lita_handler: true do
       end
 
       it 'should no-op and say such' do
-        send_command("shipit #42 #{github_org}/#{github_repo}")
+        send_command("shipit #{github_org}/#{github_repo} #42")
         expect(replies.last).to eql disabled_reply
       end
     end
@@ -506,7 +518,7 @@ describe Lita::Handlers::GithubPR, lita_handler: true do
       end
 
       it 'should reply indicating it was invalid' do
-        send_command("shipit #42 #{github_org}/#{github_repo}")
+        send_command("shipit #{github_org}/#{github_repo} #42")
         expect(replies.last).to eql 'Pull request #42 on GrapeDuty/lita-test not found'
       end
     end
@@ -516,11 +528,11 @@ describe Lita::Handlers::GithubPR, lita_handler: true do
         expect(github_pr).to receive(:merge_pr).with(
           'GrapeDuty', 'lita-test', '42', "Merge pull request #42 from GrapeDuty/fix-some-bugs\n\nfix bug"
         )
-        send_command('shipit #42 GrapeDuty/lita-test')
+        send_command('shipit GrapeDuty/lita-test #42')
       end
 
       it 'should confirm merging of PR' do
-        send_command("shipit #42 #{github_org}/#{github_repo}")
+        send_command("shipit #{github_org}/#{github_repo} #42")
         expect(replies.last)
           .to eql "Merged pull request #42 from GrapeDuty/fix-some-bugs\nfix bug"
       end
@@ -533,7 +545,7 @@ describe Lita::Handlers::GithubPR, lita_handler: true do
       end
 
       it 'should confirm the failure' do
-        send_command("shipit #42 #{github_org}/#{github_repo}")
+        send_command("shipit #{github_org}/#{github_repo} #42")
         expect(replies.last)
           .to eql(
             "Failed trying to merge PR #42 (fix bug) :: https://github.com/GrapeDuty/lita-test/pull/42\n"\
@@ -550,7 +562,7 @@ describe Lita::Handlers::GithubPR, lita_handler: true do
       end
 
       it 'should confirm the failure' do
-        send_command("shipit #42 #{github_org}/#{github_repo}")
+        send_command("shipit #{github_org}/#{github_repo} #42")
         expect(replies.last)
           .to eql(
             'An unexpected exception was hit during the GitHub API operation. Please make sure all ' \

data/spec/unit/lita/handlers/github_repo_spec.rb

@@ -143,17 +143,25 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
       @c_obj = double('Lita::Configuration', default_team_slug: 'h3ckman')
       allow(github_repo).to receive(:config).and_return(@c_obj)
       allow(github_repo).to receive(:team_id_by_slug).and_return(42)
+      allow(github_repo).to receive(:should_repo_be_private?).and_return(true)
     end
 
-    it 'should set the :organization key and :team_id key' do
-      h = { organization: github_org, team_id: 42 }
+    it 'should set the :organization key, :team_id key, and :private key' do
+      h = { organization: github_org, team_id: 42, private: true }
       expect(github_repo.send(:extrapolate_create_opts, @eco_opts, github_org)).to eql h
     end
 
+    it 'should set the private key to the return of should_repo_be_private?' do
+      opts = { private: 'test', team_id: 42 }
+      expect(github_repo).to receive(:should_repo_be_private?).with('test').and_return :ohai
+      r = github_repo.send(:extrapolate_create_opts, opts, github_org)
+      expect(r[:private]).to eql :ohai
+    end
+
     context 'when there is no :team set' do
       context 'when default_team returns a team id' do
         it 'should get the default team_id' do
-          h = { organization: github_org, team_id: 44 }
+          h = { organization: github_org, team_id: 44, private: true }
           expect(github_repo).to receive(:default_team).with(github_org).and_return(44)
           expect(github_repo.send(:extrapolate_create_opts, @eco_opts, github_org)).to eql h
         end
@@ -166,7 +174,7 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
         end
 
         it 'should not set the :team_id key' do
-          h = { organization: github_org }
+          h = { organization: github_org, private: true }
           expect(github_repo).to receive(:default_team).with(github_org).and_return(nil)
           expect(github_repo.send(:extrapolate_create_opts, @eco_opts, github_org)).to eql h
         end
@@ -178,7 +186,7 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
         before { @eco_opts = { team: 'heckman' } }
 
         it 'should set the :team_id key' do
-          h = { organization: github_org, team_id: 84 }.merge!(@eco_opts)
+          h = { organization: github_org, team_id: 84, private: true }.merge!(@eco_opts)
           expect(github_repo).to receive(:team_id_by_slug).with('heckman', github_org).and_return(84)
           expect(github_repo.send(:extrapolate_create_opts, @eco_opts, github_org)).to eql h
         end
@@ -187,7 +195,7 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
       context 'when given an invalid slug' do
         context 'when there is a default slug set' do
           it 'should set the team to the default' do
-            h = { organization: github_org, team_id: 42 }.merge!(@eco_opts)
+            h = { organization: github_org, team_id: 42, private: true }.merge!(@eco_opts)
             expect(github_repo).to receive(:team_id_by_slug).with('h3ckman', github_org).and_return(42)
             expect(github_repo.send(:extrapolate_create_opts, @eco_opts, github_org)).to eql h
           end
@@ -195,7 +203,7 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
 
         context 'when there is no default slug set' do
           before do
-            @eco_opts = { team: 'h3ckman' }
+            @eco_opts = { team: 'h3ckman', private: true }
             c_obj = double('Lita::Configuration', default_team_slug: nil)
             allow(github_repo).to receive(:config).and_return(c_obj)
           end
@@ -212,7 +220,7 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
     end
 
     context 'when there is a :team_id key' do
-      before { @eco_opts = { team_id: 44 } }
+      before { @eco_opts = { team_id: 44, private: true } }
 
       it 'should just leave it alone...' do
         h = { organization: github_org }.merge!(@eco_opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-github
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Tim Heckman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-07 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement