lita-github 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 807063c8ac3a37a3d99452dd97ca4697b25466ee
-  data.tar.gz: b05330632d6bec6b9e2de3dda514770ad5f5d4fb
+  metadata.gz: a74bbd8ca959d937503c0d0f676aafa83d8f4fe8
+  data.tar.gz: 8df94bb7c74863c82c66b436c60350f1d25b9a86
 SHA512:
-  metadata.gz: 89cccb87fe4a2a3dd8023fb53a8e5752bf45dfe1c4ef0d9d45442e5cecbbec80ffaa2040ffcc7d0e1f2ce644c8805be1e712d91fccad001c0dffe1829903d05a
-  data.tar.gz: a880e825a989589478bd1eef547c94d034192370e6b23c659cc92fa1ab791dd0b43e24c3692f3c071091f9ed67bca542f2754781e392c6dceeb85bcd94a58f1a
+  metadata.gz: 4db4682a4c9fd305c4685887d1241476270bbad98df0a5c381dd3e8c1562cfa8699c5767396fd5fa1ebda1a0a20e3c853bb99eca8f7adfbad5a62ee2cf5ec6e0
+  data.tar.gz: 8125f027de492262b1a5068afcc39471cd001478e0bfe6a4afee4157b22fadb60f6bd40f9155838ad338605b028d219bde80c7f2ea74d1d26482a1cf00e4134e

data/README.md

@@ -27,6 +27,7 @@ The configuration options will get their own in-depth doc a little further down
 * `config.handlers.github.default_org = ''`
   * Your company may only have one organization, the handler will allow you to type just the repo name (`lita-github`) instead of `PagerDuty/lita-github`.
 * `config.handlers.github.default_team_slug = ''`
+  * if no team is provided when adding a repo, it uses this team by default -- if unset, only owners can access repo
   * the default team that should be added to a repo based on the slug name:
     * When clicking on a team in your org you can use the URL to get the slug: https://github.com/orgs/<ORG>/teams/[slug]
 

data/lib/lita-github/version.rb

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

data/lib/lita/handlers/github.rb

@@ -59,6 +59,7 @@ module Lita
       def self.default_config(config)
         # when setting default configuration values please remember one thing:
         # secure and safe by default
+        config.default_team_slug    = nil
         config.repo_private_default = true
 
         ####

data/lib/lita/handlers/github_repo.rb

@@ -121,20 +121,26 @@ module Lita
         opts[:organization] = org
 
         if opts.key?(:team)
-          opts[:team_id] = team_by_slug(opts[:team], org) || team_by_slug(config.default_team_slug, org)
+          t_id = team_id_by_slug(opts[:team], org) || default_team(org)
+          opts[:team_id] = t_id unless t_id.nil?
         else
-          opts[:team_id] = team_by_slug(config.default_team_slug, org)
+          t_id = default_team(org)
+          opts[:team_id] = t_id unless t_id.nil?
         end unless opts.key?(:team_id)
         opts
       end
 
-      def team_by_slug(slug, org)
+      def team_id_by_slug(slug, org)
         octo.organization_teams(org).each do |team|
           return team[:id] if team[:slug] == slug
         end
         nil
       end
 
+      def default_team(org)
+        config.default_team_slug.nil? ? nil : team_id_by_slug(config.default_team_slug, org)
+      end
+
       def should_repo_be_private?(value)
         if value.nil? || value.empty?
           config.repo_private_default

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

@@ -84,7 +84,37 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
     end
   end
 
-  describe '.team_by_slug' do
+  describe '.default_team' do
+    before do
+      allow(github_repo).to receive(:team_id_by_slug).and_return(88)
+    end
+
+    context 'when the default team slug is set' do
+      before do
+        cfg_obj = double('Lita::Configuration', default_team_slug: 'heckman')
+        allow(github_repo).to receive(:config).and_return(cfg_obj)
+      end
+
+      it 'should return the team ID of the slug' do
+        expect(github_repo).to receive(:team_id_by_slug).with('heckman', 'GrapeDuty')
+          .and_return(42)
+        expect(github_repo.send(:default_team, github_org)).to eql 42
+      end
+    end
+
+    context 'when the default slug is not set' do
+      before do
+        cfg_obj = double('Lita::Configuration', default_team_slug: nil)
+        allow(github_repo).to receive(:config).and_return(cfg_obj)
+      end
+
+      it 'should return nil' do
+        expect(github_repo.send(:default_team, github_org)).to be_nil
+      end
+    end
+  end
+
+  describe '.team_id_by_slug' do
     before do
       @teams = [
         { id: 1, slug: 'hi' },
@@ -97,13 +127,13 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
 
     it 'should return the team id of the team matching the slug' do
       expect(@octo_obj).to receive(:organization_teams).with(github_org).and_return(@teams)
-      expect(github_repo.send(:team_by_slug, 'heckman', github_org)).to eql 42
-      expect(github_repo.send(:team_by_slug, 'orwell', github_org)).to eql 84
-      expect(github_repo.send(:team_by_slug, 'unknown', github_org)).to be_nil
+      expect(github_repo.send(:team_id_by_slug, 'heckman', github_org)).to eql 42
+      expect(github_repo.send(:team_id_by_slug, 'orwell', github_org)).to eql 84
+      expect(github_repo.send(:team_id_by_slug, 'unknown', github_org)).to be_nil
     end
 
     it 'should return nil if unknown' do
-      expect(github_repo.send(:team_by_slug, 'unknown', 'x')).to be_nil
+      expect(github_repo.send(:team_id_by_slug, 'unknown', 'x')).to be_nil
     end
   end
 
@@ -112,7 +142,7 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
       @eco_opts = {}
       @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_by_slug).and_return(42)
+      allow(github_repo).to receive(:team_id_by_slug).and_return(42)
     end
 
     it 'should set the :organization key and :team_id key' do
@@ -120,22 +150,63 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
       expect(github_repo.send(:extrapolate_create_opts, @eco_opts, github_org)).to eql h
     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 }
+          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
+      end
+
+      context 'when default_team returns nil' do
+        before do
+          @c_obj = double('Lita::Configuration', default_team_slug: nil)
+          allow(github_repo).to receive(:config).and_return(@c_obj)
+        end
+
+        it 'should not set the :team_id key' do
+          h = { organization: github_org }
+          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
+      end
+    end
+
     context 'when options contains :team and no :team_id' do
       context 'when given a valid slug' do
         before { @eco_opts = { team: 'heckman' } }
 
         it 'should set the :team_id key' do
           h = { organization: github_org, team_id: 84 }.merge!(@eco_opts)
-          expect(github_repo).to receive(:team_by_slug).with('heckman', github_org).and_return(84)
+          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
       end
 
       context 'when given an invalid slug' do
-        it 'should set the team to the default' do
-          h = { organization: github_org, team_id: 42 }.merge!(@eco_opts)
-          expect(github_repo).to receive(:team_by_slug).with('h3ckman', github_org).and_return(42)
-          expect(github_repo.send(:extrapolate_create_opts, @eco_opts, github_org)).to eql h
+        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)
+            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
+        end
+
+        context 'when there is no default slug set' do
+          before do
+            @eco_opts = { team: 'h3ckman' }
+            c_obj = double('Lita::Configuration', default_team_slug: nil)
+            allow(github_repo).to receive(:config).and_return(c_obj)
+          end
+
+          it 'should not set a :team_id' do
+            h = { organization: github_org }.merge!(@eco_opts)
+            expect(github_repo).to receive(:team_id_by_slug).with('h3ckman', github_org)
+              .and_return(nil)
+            expect(github_repo).to receive(:default_team).with(github_org).and_call_original
+            expect(github_repo.send(:extrapolate_create_opts, @eco_opts, github_org)).to eql h
+          end
         end
       end
     end
@@ -145,7 +216,7 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
 
       it 'should just leave it alone...' do
         h = { organization: github_org }.merge!(@eco_opts)
-        expect(github_repo).not_to receive(:team_by_slug)
+        expect(github_repo).not_to receive(:team_id_by_slug)
         expect(github_repo.send(:extrapolate_create_opts, @eco_opts, github_org)).to eql h
       end
     end

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

@@ -25,6 +25,10 @@ describe Lita::Handlers::Github, lita_handler: true do
   it { routes_command('gh token').to(:token_generate) }
 
   describe '#default_config' do
+    it 'should set default team to nil' do
+      expect(Lita.config.handlers.github.default_team_slug).to be_nil
+    end
+
     it 'should set repos to private by default' do
       expect(Lita.config.handlers.github.repo_private_default).to be_truthy
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-github
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tim Heckman