lita-github 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0edd68ade3e5fc642ccb5e606a94b09d40e08d8f
-  data.tar.gz: 8461b46c716ea556aa2c7cf50db4f91c994d91a6
+  metadata.gz: f9d776a2cd23860fda771d4efd3a3602b672cfb0
+  data.tar.gz: 074232e708387b5457e8162b247ab40042fee1cb
 SHA512:
-  metadata.gz: 4842ed8a61059de7b651561966c2f074f223c1cc1489ecd92f379dad78ac6c19e5d3d5d7eb727d5254eb4125450e486847aa5a144c9520bff9cdf287ae1aaa01
-  data.tar.gz: d3f24df978afe5d70bd924c8c6165c391b225d55af099c684c06549d3bb615fea9dc73ebd0fe668cfb5b3c0e5ea8e7854b4079c96ec8639968dcec995e73f4e6
+  metadata.gz: 656ec110d8e8461509241198219d5fa7cd7fca49cf92ce6f50bd0260ebfddc3e74a47cc09cfca4c4f948bbfa04d10f0ee614223f16c552a0d7cf86127cc5c80c
+  data.tar.gz: a8cb3ffc5acc22b40f504027d303978eff9043c00ae8bcce84dbc51d73e69adf08610c174edf316b0cea875917b54bf8bed5d2a8db44180d17ea4b029cea6ce5

data/README.md

@@ -80,3 +80,5 @@ Here is the current functionality:
 ### Github Organization Handler
 * `!gh org teams PagerDuty` & `!gh teams PagerDuty`
   * list the teams for the GitHub repo
+
+There is also an early version of organization team management (add / remove) not documented as well. Documentation is missing because it's not feature complete.

data/lib/lita-github/general.rb

@@ -0,0 +1,61 @@
+# -*- coding: UTF-8 -*-
+#
+# Copyright 2014 PagerDuty, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'lita-github/r'
+
+module LitaGithub
+  # Github handler common-use methods
+  #
+  # @author Tim Heckman <tim@pagerduty.com>
+  module General
+    # Parse the options in the command using the standard option regex
+    #
+    # @author Tim Heckman <tim@pagerduty.com>
+    # @param cmd [String] the full command line provided to Lita
+    # @return [Hash] the key:value pairs that were in the command string
+    def opts_parse(cmd)
+      o = {}
+      cmd.scan(LitaGithub::R::OPT_REGEX).flatten.each do |opt|
+        k, v = opt.strip.split(':')
+        k = k.to_sym
+        o[k] = v unless o.key?(k)
+      end
+      o
+    end
+
+    # Parse the options in the command using the extended option regex
+    #
+    # @author Tim Heckman <tim@pagerduty.com>
+    # @param cmd [String] the full command line provided to Lita
+    # @return [Hash] the key:value pairs that were in the command string
+    def e_opts_parse(cmd)
+      o = {}
+      cmd.scan(LitaGithub::R::E_OPT_REGEX).flatten.each do |opt|
+        k, v = opt.strip.split(':')
+        k = k.to_sym
+
+        # if it looks like we're using the extended option (first character is a " or '):
+        #   slice off the first and last character of the string
+        # otherwise:
+        #   do nothing
+        v = v.slice!(1, (v.length - 2)) if %w(' ").include?(v.slice(0))
+
+        o[k] = v unless o.key?(k)
+      end
+      o
+    end
+  end
+end

data/lib/lita-github/org.rb

@@ -16,13 +16,61 @@
 
 module LitaGithub
   # Github handler common-use Organization methods
+  #
+  # @author Tim Heckman <tim@pagerduty.com>
   module Org
+    # Uses default organization if one provided is nil or empty string
+    #
+    # @author Tim Heckman <tim@pagerduty.com>
+    # @param name [String,Nil] the name of the organization
+    # @return [String] the name of the organization to use
     def organization(name)
       name.nil? || name.empty? ? config.default_org : name
     end
 
+    # Sorts a list of Github team objects by name
+    #
+    # @author Tim Heckman <tim@pagerduty.com>
+    # @param teams [Array<Teams>] pass in the teams you want to sort by name
+    # @return [Array] the teams but sorted by name
     def sort_by_name(teams)
       teams.sort_by { |h| h[:name].downcase }
     end
+
+    # Get the Github team ID using its slug
+    #
+    # This depends on the `octo()` method from LitaGithub::Octo being within the same scope
+    #
+    # @author Tim Heckman <tim@pagerduty.com>
+    # @param slug [String] the slug of the team you're getting the ID for
+    # @param org [String] the organization this team should belong in
+    # @return [Nil] if no team was found nil is returned
+    # @return [Integer] if a team is found the team's ID is returned
+    def team_id_by_slug(slug, org)
+      octo.organization_teams(org).each do |team|
+        return team[:id] if team[:slug] == slug
+      end
+      nil
+    end
+
+    # Get the team id based on either the team slug or the team id
+    #
+    # @author Tim Heckman <tim@pagerduty.com>
+    # @param team [String,Integer] this is either the team's slug or the team's id
+    # @return [Integer] the team's id
+    def team_id(team, org)
+      /^\d+$/.match(team.to_s) ? team : team_id_by_slug(team, org)
+    end
+
+    # Check if a team exists
+    #
+    # @param id [Integer] the id number for the team
+    # @return [Sawyer::Resource(Github team)] if team exists
+    # @return [FalseClass] if team does not exist
+    def team?(id)
+      octo.team(id)
+    rescue Octokit::NotFound
+      false
+    end
   end
 end

data/lib/lita-github/r.rb

@@ -24,6 +24,10 @@ module LitaGithub
     # key1:value key2:value, etc.
     OPT_REGEX ||= /((?:\s+?[a-zA-Z0-9_]+?):(?:[a-zA-Z0-9_]+))/
 
+    # extended option regex, letting you scan the string for things like:
+    #  key1:value key2:"value2" key3:'a better value'
+    E_OPT_REGEX ||= /((?:\s+?[a-zA-Z0-9_]+?):(?:(?:".+?")|(?:'.+?')|(?:[a-zA-Z0-9_]+)))/
+
     # regex matcher for: Org/repo
     REPO_REGEX = '(?:(?<org>[a-zA-Z0-9_\-]+)(?:\s+?)?\/)?(?:\s+?)?(?<repo>[a-zA-Z0-9_\-]+)'
   end

data/lib/lita-github/version.rb

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

data/lib/lita/handlers/github.rb

@@ -79,6 +79,11 @@ module Lita
 
         # Lita::Handlers::GithubPR
         config.pr_merge_enabled = true
+
+        # Lita::Handlers::GithubOrg
+        config.org_team_add_enabled       = false
+        config.org_team_rm_enabled        = false
+        config.org_team_add_allowed_perms = %w(pull)
       end
 
       def status(response)

data/lib/lita/handlers/github_org.rb

@@ -15,22 +15,27 @@
 # limitations under the License.
 
 require 'lita-github/r'
+require 'lita-github/general'
 require 'lita-github/config'
 require 'lita-github/octo'
 require 'lita-github/org'
+require 'lita-github/filters'
 
 module Lita
   # Lita Handler
   module Handlers
     # GitHub Lita Handler
     class GithubOrg < Handler
+      include LitaGithub::General # Github handler common-use methods
       include LitaGithub::Config  # Github handler Lita configuration methods
       include LitaGithub::Octo    # Github handler common-use Octokit methods
       include LitaGithub::Org     # Github handler common-use Organization methods
+      include LitaGithub::Filters # Github handler common-use method filters
 
       on :loaded, :setup_octo # from LitaGithub::Octo
 
-      # rubocop:disable Metrics/LineLength
+      KNOWN_PERMS = %w(pull push admin)
+
       route(
         /#{LitaGithub::R::A_REG}(?:teams|org\s+?teams|org\s+?team\s+?list)(?<org>\s+[a-zA-Z0-9_\-]+)?/,
         :org_teams_list,
@@ -40,8 +45,29 @@ module Lita
           'gh teams [organization]' => 'an alias for gh org teams'
         }
       )
+
+      # rubocop:disable Metrics/LineLength
+      route(
+        # /#{LitaGithub::R::A_REG}org\s+?team\s+?add(?<org>\s+?[a-zA-Z0-9_\-]+)?(?<perm>\s+?[a-zA-Z]+)\s+?(?<name>.*)$/,
+        /#{LitaGithub::R::A_REG}org\s+?team\s+?add(?<org>\s+?[a-zA-Z0-9_\-]+)?/,
+        :org_team_add, command: true, confirmation: true,
+        help: {
+          'gh org team add PagerDuty name:"All Employees" perms:pull' => 'add an "All Engineers" team with pull permissions',
+          'gh org team add PagerDuty name:Leads perms:pull' => 'add a "Leads" team with admin permissions',
+          'gh org team add PagerDuty name:Ops perms:push' => 'add an "Ops" team with push permissions'
+        }
+      )
       # rubocop:enable Metrics/LineLength
 
+      route(
+        /#{LitaGithub::R::A_REG}org\s+?team\s+?rm(?<org>\s+?[a-zA-Z0-9_\-]+)?(?<team>\s+?[a-zA-Z0-9_\-]+)/,
+        :org_team_rm, command: true, confirmation: true,
+        help: {
+          'gh org team rm PagerDuty ops' => 'delete the Operations team',
+          'gh org team rm PagerDuty 42' => 'delete the team with id 42'
+        }
+      )
+
       def org_teams_list(response)
         md = response.match_data
         org = md[:org].nil? ? config.default_org : organization(md[:org].strip)
@@ -63,6 +89,62 @@ module Lita
 
         response.reply(reply)
       end
+
+      def org_team_add(response)
+        return response.reply(t('method_disabled')) if func_disabled?(__method__)
+
+        opts = e_opts_parse(response.message.body)
+        vo = validate_team_add_opts(opts)
+        return response.reply(vo[:msg]) unless vo[:success]
+
+        md = response.match_data
+        org, perm, name = [organization(md['org'].strip), opts[:perms].strip.downcase, opts[:name]]
+
+        return response.reply(
+          t('org_team_add.perm_not_permitted', perms: config.org_team_add_allowed_perms.join(', '))
+        ) unless permission_allowed?(perm)
+
+        begin
+          resp = octo.create_team(org, name: name, permission: perm)
+        rescue Octokit::NotFound
+          return response.reply(t('org_not_found', org: org))
+        end
+
+        response.reply(t('org_team_add.created_team', resp.to_h))
+      end
+
+      def org_team_rm(response)
+        return response.reply(t('method_disabled')) if func_disabled?(__method__)
+
+        md = response.match_data
+        org, team = [organization(md['org'].strip), md['team'].strip]
+
+        t_id = team_id(team, org)
+        t = team?(t_id)
+
+        return response.reply(t('team_not_found', team: team)) unless t
+
+        if octo.delete_team(t_id)
+          response.reply(t('org_team_rm.pass', t.to_h))
+        else
+          response.reply(t('org_team_rm.fail', t.to_h))
+        end
+      end
+
+      private
+
+      def validate_team_add_opts(opts)
+        h = { success: true, msg: '' }
+        h[:msg] << t('org_team_add.missing_option', opt: 'name') unless opts.key?(:name)
+        h[:msg] << t('org_team_add.missing_option', opt: 'perms') unless opts.key?(:perms)
+        h[:msg] << t('org_team_add.perm_invalid') if opts.key?(:perms) && !KNOWN_PERMS.include?(opts[:perms].downcase)
+        h[:success] = false unless h[:msg].empty?
+        h
+      end
+
+      def permission_allowed?(perm)
+        config.org_team_add_allowed_perms.include?(perm)
+      end
     end
 
     Lita.register_handler(GithubOrg)

data/lib/lita/handlers/github_repo.rb

@@ -16,6 +16,7 @@
 
 require 'uri'
 require 'lita-github/r'
+require 'lita-github/general'
 require 'lita-github/config'
 require 'lita-github/octo'
 require 'lita-github/org'
@@ -27,6 +28,7 @@ module Lita
   module Handlers
     # GitHub Lita Handler
     class GithubRepo < Handler
+      include LitaGithub::General # Github handler common-use methods
       include LitaGithub::Config  # Github handler Lita configuration methods
       include LitaGithub::Octo    # Github handler common-use Octokit methods
       include LitaGithub::Org     # Github handler common-use Organization methods
@@ -104,7 +106,7 @@ module Lita
           return response.reply(t('repo_create.exists', org: org, repo: repo))
         end
 
-        opts = extrapolate_create_opts(command_opts(response.args.join(' ')), org)
+        opts = extrapolate_create_opts(opts_parse(response.message.body), org)
 
         response.reply(create_repo(org, repo, opts))
       end
@@ -245,16 +247,6 @@ module Lita
         t('repo_update_homepage.updated', repo: full_name, url: resp[:homepage])
       end
 
-      def command_opts(cmd)
-        o = {}
-        cmd.scan(LitaGithub::R::OPT_REGEX).flatten.compact.each do |opt|
-          k, v = opt.strip.split(':')
-          k = k.to_sym
-          o[k] = v unless o.key?(k)
-        end
-        o
-      end
-
       def extrapolate_create_opts(opts, org)
         opts[:organization] = org
 
@@ -271,13 +263,6 @@ module Lita
         opts
       end
 
-      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
@@ -333,12 +318,12 @@ module Lita
       end
 
       def gh_team(org, team)
-        team_id = /^\d+$/.match(team.to_s) ? team : team_id_by_slug(team, org)
+        t_id = team_id(team, org)
 
-        return nil if team_id.nil?
+        return nil if t_id.nil?
 
         begin
-          octo.team(team_id)
+          octo.team(t_id)
         rescue Octokit::NotFound
           nil
         end

data/lita-github.gemspec

@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fuubar', '~> 2.0'
   s.add_development_dependency 'pry', '~> 0.10', '>= 0.10.1'
   s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4', '>= 0.4.0'
+  s.add_development_dependency 'yard', '~> 0.8.7'
 
   s.add_runtime_dependency 'lita', '~> 3.3'
   s.add_runtime_dependency 'octokit', '~> 3.3'

data/locales/en.yml

@@ -59,7 +59,17 @@ en:
           large_list: "You have more than %{max} open pull requests :(! Here are the ten newest oldest:\n"
           no_prs: "This repo has no open pull requests; good job!"
       github_org:
-        org_not_found: "The organization '%{org}' was not found. Does my user have ownership permission?"
+        method_disabled: "Sorry, this function has either been disabled or not enabled in the config"
+        org_not_found: "The organization '%{org}' was not found. Does my user have ownership perms?"
+        team_not_found: "Unable to match any teams based on: %{team}"
         org_teams_list:
           header: "Showing %{num_teams} team(s) for %{org}:\n"
           team: "Name: %{name}, Slug: %{slug}, ID: %{id}, Perms: %{permission}\n"
+        org_team_add:
+          missing_option: "Missing the %{opt} option\n"
+          perm_invalid: "Valid perms are: pull push admin -- they can be selectively enabled via the config\n"
+          perm_not_permitted: "Sorry, the permission level you requested was not allowed in the config. Right now the only perms permitted are: %{perms}"
+          created_team: "The '%{name}' team was created; Slug: %{slug}, ID: %{id}, Perms: %{permission}"
+        org_team_rm:
+          pass: "The '%{name}' team was deleted. Its ID was %{id}"
+          fail: "Something went wrong trying to delete the '%{name}' team. Is Github having issues?"

data/spec/unit/lita-github/filters_spec.rb

@@ -1,4 +1,18 @@
 # -*- coding: UTF-8 -*-
+#
+# Copyright 2014 PagerDuty, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 require 'spec_helper'
 

data/spec/unit/lita-github/general_spec.rb

@@ -0,0 +1,45 @@
+# -*- coding: UTF-8 -*-
+#
+# Copyright 2014 PagerDuty, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+
+describe LitaGithub::General do
+  include LitaGithub::General
+
+  describe '.opts_parse' do
+    it 'should find the valid options' do
+      o = ' private:true team:heckman bacon:always bacon:sometimes'
+      co = opts_parse(o)
+      expect(co).to be_an_instance_of Hash
+      expect(co[:private]).to eql 'true'
+      expect(co[:team]).to eql 'heckman'
+      expect(co[:bacon]).to eql 'always' # of course it's always
+    end
+  end
+
+  describe '.e_opts_parse' do
+    it 'should find the valid options' do
+      o = %q( private:true team:heckman bacon:always bacon:sometimes string1:"something here" string2:'something else')
+      co = e_opts_parse(o)
+      expect(co).to be_an_instance_of Hash
+      expect(co[:private]).to eql 'true'
+      expect(co[:team]).to eql 'heckman'
+      expect(co[:bacon]).to eql 'always' # of course it's always
+      expect(co[:string1]).to eql 'something here'
+      expect(co[:string2]).to eql 'something else'
+    end
+  end
+end

data/spec/unit/lita-github/org_spec.rb

@@ -1,4 +1,18 @@
 # -*- coding: UTF-8 -*-
+#
+# Copyright 2014 PagerDuty, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 require 'spec_helper'
 
@@ -46,4 +60,71 @@ describe LitaGithub::Org do
       expect(sort_by_name(unsorted_list)).to eql sorted_list
     end
   end
+
+  describe '.team_id_by_slug' do
+    before do
+      @teams = [
+        { id: 1, slug: 'hi' },
+        { id: 42, slug: 'heckman' },
+        { id: 84, slug: 'orwell' }
+      ]
+      @octo_obj = double('Octokit::Client', organization_teams: @teams)
+      allow(self).to receive(:octo).and_return(@octo_obj)
+    end
+
+    it 'should return the team id of the team matching the slug' do
+      expect(@octo_obj).to receive(:organization_teams).with('GrapeDuty').and_return(@teams)
+      expect(team_id_by_slug('heckman', 'GrapeDuty')).to eql 42
+      expect(team_id_by_slug('orwell', 'GrapeDuty')).to eql 84
+      expect(team_id_by_slug('unknown', 'GrapeDuty')).to be_nil
+    end
+
+    it 'should return nil if unknown' do
+      expect(team_id_by_slug('unknown', 'x')).to be_nil
+    end
+  end
+
+  describe '.team_id' do
+    before { allow(self).to receive(:team_id_by_slug).and_return(84) }
+
+    context 'when value is an "Integer"' do
+      it 'should return the value passed in' do
+        v = 42
+        expect(team_id(v, 'GrapeDuty')).to eql v
+      end
+    end
+
+    context 'when the value is not an Integer' do
+      it 'should return the id from team_id_by_slug()' do
+        expect(self).to receive(:team_id_by_slug).with('TestIt', 'GrapeDuty').and_return(84)
+        expect(team_id('TestIt', 'GrapeDuty')).to eql 84
+      end
+    end
+  end
+
+  describe '.team?' do
+    before do
+      @octo_obj = double('Octokit::Client', team: {})
+      allow(self).to receive(:octo).and_return(@octo_obj)
+    end
+
+    it 'should try to load the team' do
+      expect(@octo_obj).to receive(:team).with(42).and_return(nil)
+      team?(42)
+    end
+
+    context 'when team exists' do
+      it 'should return true' do
+        expect(team?(42)).to be_truthy
+      end
+    end
+
+    context 'when team does not exist' do
+      before { allow(@octo_obj).to receive(:team).and_raise(Octokit::NotFound.new) }
+
+      it 'should return false' do
+        expect(team?(42)).to be_falsey
+      end
+    end
+  end
 end

data/spec/unit/lita-github/r_spec.rb

@@ -47,39 +47,95 @@ describe LitaGithub::R do
     context 'it should match' do
       it 'test:pass' do
         s = ' test:pass'
-        m = s.scan(subject).flatten.compact
-        expect(m).to eql [' test:pass']
+        m = s.scan(subject).flatten.map(&:strip)
+        expect(m).to eql ['test:pass']
       end
 
       it 'test7_pass:pAss_test' do
         s = ' test7_pass:pAss_test'
-        m = s.scan(subject).flatten.compact
-        expect(m).to eql [' test7_pass:pAss_test']
+        m = s.scan(subject).flatten.map(&:strip)
+        expect(m).to eql ['test7_pass:pAss_test']
       end
 
       it 'test:pass bacon:always test:coverage' do
         s = ' test:pass bacon:always test:coverage'
-        m = s.scan(subject).flatten.compact
-        expect(m).to eql [' test:pass', ' bacon:always', ' test:coverage']
+        m = s.scan(subject).flatten.map(&:strip)
+        expect(m).to eql ['test:pass', 'bacon:always', 'test:coverage']
       end
     end
 
     context 'it should not match' do
       it 'test-stuff:fail' do
         s = ' test-stuff:fail'
-        m = s.scan(subject).flatten.compact
+        m = s.scan(subject).flatten
         expect(m).to be_empty
       end
 
       it 'test: fail' do
         s = ' test: fail'
-        m = s.scan(subject).flatten.compact
+        m = s.scan(subject).flatten
         expect(m).to be_empty
       end
 
       it 'test:fail (no leading space)' do
         s = 'test:fail'
-        m = s.scan(subject).flatten.compact
+        m = s.scan(subject).flatten
+        expect(m).to be_empty
+      end
+    end
+  end
+
+  describe '::E_OPT_REGEX' do
+    subject { LitaGithub::R::E_OPT_REGEX }
+
+    context 'it should match' do
+      it 'test:pass' do
+        s = ' test:pass'
+        m = s.scan(subject).flatten.map(&:strip)
+        expect(m).to eql ['test:pass']
+      end
+
+      it 'test7_pass:pAss_test' do
+        s = ' test7_pass:pAss_test'
+        m = s.scan(subject).flatten.map(&:strip)
+        expect(m).to eql ['test7_pass:pAss_test']
+      end
+
+      it 'test:pass bacon:always test:coverage' do
+        s = ' test:pass bacon:always test:coverage'
+        m = s.scan(subject).flatten.map(&:strip)
+        expect(m).to eql ['test:pass', 'bacon:always', 'test:coverage']
+      end
+
+      it 'testing:"hi" test:"hello there"' do
+        s = ' testing:"hi" test:"hello there"'
+        m = s.scan(subject).flatten.map(&:strip)
+        expect(m).to eql ['testing:"hi"', 'test:"hello there"']
+      end
+
+      it "testing:'hello' test:'what is up?'" do
+        s = " testing:'hello' test:'what is up?'"
+        m = s.scan(subject).flatten.map(&:strip)
+        expect(m).to eql ["testing:'hello'", "test:'what is up?'"]
+      end
+    end
+
+    context 'it should not match' do
+      it 'test-stuff:fail' do
+        s = ' test-stuff:fail'
+        m = s.scan(subject).flatten
+        expect(m).to be_empty
+      end
+
+      it 'test: fail' do
+        s = ' test: fail'
+        m = s.scan(subject).flatten
+        expect(m).to be_empty
+      end
+
+      it 'test:fail (no leading space)' do
+        s = 'test:fail'
+        m = s.scan(subject).flatten
         expect(m).to be_empty
       end
     end

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

@@ -17,15 +17,92 @@
 require 'spec_helper'
 
 describe Lita::Handlers::GithubOrg, lita_handler: true do
+  # org_team_list routing
   it { routes_command('gh teams PagerDuty').to(:org_teams_list) }
   it { routes_command('gh org teams GrapeDuty').to(:org_teams_list) }
-  it { routes_command('gh org team list PagerDuty').to(:org_teams_list) }
+  it { routes_command('gh org team list GrapeDuty').to(:org_teams_list) }
   it { routes_command('gh teams').to(:org_teams_list) }
   it { routes_command('gh org teams').to(:org_teams_list) }
   it { routes_command('gh org team list').to(:org_teams_list) }
 
+  # org_team_add routing
+  it { routes_command('gh org team add GrapeDuty name:"All Staff" perms:pull').to(:org_team_add) }
+  it { routes_command('gh org team add name:"All Staff" perms:pull').to(:org_team_add) }
+
   let(:github_org) { Lita::Handlers::GithubOrg.new('robot') }
 
+  ####
+  # Helper Methods
+  ####
+  describe '.validate_team_add_opts' do
+    context 'when opts are valid' do
+      let(:opts) { { name: 'hi', perms: 'pull' } }
+
+      it 'should return with happy Hash' do
+        expect(github_org.send(:validate_team_add_opts, opts)).to eql success: true, msg: ''
+      end
+    end
+
+    context 'when name is missing' do
+      let(:opts) { { perms: 'pull' } }
+
+      it 'should return a bad has with a proper message' do
+        r = github_org.send(:validate_team_add_opts, opts)
+        expect(r).to eql success: false, msg: "Missing the name option\n"
+      end
+    end
+
+    context 'when perms is missing' do
+      let(:opts) { { name: 'hi' } }
+
+      it 'should return a bad has with a proper message' do
+        r = github_org.send(:validate_team_add_opts, opts)
+        expect(r).to eql success: false, msg: "Missing the perms option\n"
+      end
+    end
+
+    context 'when perms is invalid' do
+      let(:opts) { { name: 'hi', perms: 'something' } }
+
+      it 'should return a bad has with a proper message' do
+        r = github_org.send(:validate_team_add_opts, opts)
+        expect(r).to eql(
+          success: false, msg: "Valid perms are: pull push admin -- they can be selectively enabled via the config\n"
+        )
+      end
+    end
+  end
+
+  describe '.permission_allowed?' do
+    before do
+      @perms = %w(pull push)
+      @conf_obj = double('Lita::Config', org_team_add_allowed_perms: @perms)
+      allow(github_org).to receive(:config).and_return(@conf_obj)
+    end
+
+    context 'always' do
+      it 'should validate perm against the config' do
+        expect(@perms).to receive(:include?).with('pull').and_call_original
+        github_org.send(:permission_allowed?, 'pull')
+      end
+    end
+
+    context 'when the permission is enabled' do
+      it 'should return true' do
+        expect(github_org.send(:permission_allowed?, 'pull')).to be_truthy
+      end
+    end
+
+    context 'when the permission is not enabled' do
+      it 'should return false' do
+        expect(github_org.send(:permission_allowed?, 'admin')).to be_falsey
+      end
+    end
+  end
+
+  ####
+  # Handlers
+  ####
   describe '.org_teams_list' do
     before do
       @teams = [
@@ -57,9 +134,119 @@ Name: HeckmanTest, Slug: heckmantest, ID: 42, Perms: push
       it 'should return a message indicating it could not find the organization' do
         send_command('gh teams GrapeDuty')
         expect(replies.last).to eql(
-          "The organization 'GrapeDuty' was not found. Does my user have ownership permission?"
+          "The organization 'GrapeDuty' was not found. Does my user have ownership perms?"
         )
       end
     end
   end
+
+  describe '.org_team_add' do
+    before do
+      @team = { name: 'HeckmanTest', id: 42, slug: 'heckmantest', permission: 'pull' }
+      @octo_obj = double('Octokit::Client', create_team: @team)
+      @perms = %w(pull push)
+      @conf_obj = double('Lita::Config', org_team_add_allowed_perms: @perms)
+      allow(github_org).to receive(:config).and_return(@conf_obj)
+      allow(github_org).to receive(:func_disabled?).and_return(false)
+      allow(github_org).to receive(:octo).and_return(@octo_obj)
+    end
+
+    context 'when all goes well' do
+      it 'should return that the team was created' do
+        expect(@octo_obj).to receive(:create_team).with('GrapeDuty', name: 'HeckmanTest', permission: 'pull')
+          .and_return(@team)
+        send_command('gh org team add GrapeDuty name:"HeckmanTest" perms:pull')
+        expect(replies.last).to eql "The 'HeckmanTest' team was created; Slug: heckmantest, ID: 42, Perms: pull"
+      end
+    end
+
+    context 'when the method is disabled' do
+      before { allow(github_org).to receive(:func_disabled?).and_return(true) }
+
+      it 'should return the method disabled error' do
+        send_command('gh org team add GrapeDuty name:"HeckmanTest" perms:pull')
+        expect(replies.last).to eql 'Sorry, this function has either been disabled or not enabled in the config'
+      end
+    end
+
+    context 'when all the options are missing' do
+      it 'should respond with an error listing each one' do
+        send_command('gh org team add GrapeDuty')
+        expect(replies.last).to eql "Missing the name option
+Missing the perms option
+"
+      end
+    end
+
+    context 'when the permission level is not a known one' do
+      it 'should respond telling you the permission is unknown' do
+        send_command('gh org team add GrapeDuty name:testing perms:something')
+        expect(replies.last).to eql 'Valid perms are: pull push admin -- they can be ' \
+                                    "selectively enabled via the config\n"
+      end
+    end
+
+    context 'when the permission is now allowed in the config' do
+      it 'should respond informing you of the permitted permissions' do
+        send_command('gh org team add GrapeDuty name:testing perms:admin')
+        expect(replies.last).to eql 'Sorry, the permission level you requested was not allowed in the '\
+                                    'config. Right now the only perms permitted are: pull, push'
+      end
+    end
+
+    context 'when the organization is not found' do
+      before { allow(@octo_obj).to receive(:create_team).and_raise(Octokit::NotFound.new) }
+
+      it 'should reply that the org was not found' do
+        send_command('gh org team add GrapeDuty name:testing perms:pull')
+        expect(replies.last).to eql "The organization 'GrapeDuty' was not found. Does my user have ownership perms?"
+      end
+    end
+  end
+
+  describe '.org_team_rm' do
+    before do
+      @team = { name: 'HeckmanTest', id: 42, slug: 'heckmantest', permission: 'pull' }
+      @octo_obj = double('Octokit::Client', delete_team: true)
+      allow(github_org).to receive(:config).and_return(@conf_obj)
+      allow(github_org).to receive(:func_disabled?).and_return(false)
+      allow(github_org).to receive(:octo).and_return(@octo_obj)
+      allow(github_org).to receive(:team?).with('42').and_return(@team)
+    end
+
+    context 'when all goes well' do
+      it 'should return the success message' do
+        send_command('gh org team rm GrapeDuty 42')
+        expect(replies.last).to eql "The 'HeckmanTest' team was deleted. Its ID was 42"
+      end
+    end
+
+    context 'when the method is disabled' do
+      before { allow(github_org).to receive(:func_disabled?).and_return(true) }
+
+      it 'should return the method disabled error' do
+        send_command('gh org team rm GrapeDuty 42')
+        expect(replies.last).to eql 'Sorry, this function has either been disabled or not enabled in the config'
+      end
+    end
+
+    context 'when the team does not exist' do
+      before { allow(github_org).to receive(:team?).with('42').and_return(false) }
+
+      it 'should respond with the team not found error' do
+        send_command('gh org team rm GrapeDuty 42')
+        expect(replies.last).to eql 'Unable to match any teams based on: 42'
+      end
+    end
+
+    context 'when deletion fails' do
+      before { allow(@octo_obj).to receive(:delete_team).and_return(false) }
+
+      it 'should respond with the action failure message' do
+        send_command('gh org team rm GrapeDuty 42')
+        expect(replies.last).to eql "Something went wrong trying to delete the 'HeckmanTest' " \
+                                    'team. Is Github having issues?'
+      end
+    end
+  end
 end

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

@@ -152,29 +152,6 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
     end
   end
 
-  describe '.team_id_by_slug' do
-    before do
-      @teams = [
-        { id: 1, slug: 'hi' },
-        { id: 42, slug: 'heckman' },
-        { id: 84, slug: 'orwell' }
-      ]
-      @octo_obj = double('Octokit::Client', organization_teams: @teams)
-      allow(github_repo).to receive(:octo).and_return(@octo_obj)
-    end
-
-    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_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_id_by_slug, 'unknown', 'x')).to be_nil
-    end
-  end
-
   describe '.extrapolate_create_opts' do
     before do
       @eco_opts = {}
@@ -268,17 +245,6 @@ describe Lita::Handlers::GithubRepo, lita_handler: true do
     end
   end
 
-  describe '.command_opts' do
-    it 'should find the valid options' do
-      o = ' private:true team:heckman bacon:always bacon:sometimes'
-      co = github_repo.send(:command_opts, o)
-      expect(co).to be_an_instance_of Hash
-      expect(co[:private]).to eql 'true'
-      expect(co[:team]).to eql 'heckman'
-      expect(co[:bacon]).to eql 'always' # of course it's always
-    end
-  end
-
   describe '.create_repo' do
     before do
       allow(github_repo).to receive(:octo).and_return(double('Octokit::Client', create_repository: nil))

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

@@ -60,6 +60,18 @@ describe Lita::Handlers::Github, lita_handler: true do
     it 'should enable Lita::Handlers::GithubPR.pr_merge by default' do
       expect(Lita.config.handlers.github.pr_merge_enabled).to be_truthy
     end
+
+    it 'should disable Lita::Handlers::GithubOrg.org_team_add by default' do
+      expect(Lita.config.handlers.github.org_team_add_enabled).to be_falsey
+    end
+
+    it 'should disable Lita::Handlers::GithubOrg.org_team_rm by default' do
+      expect(Lita.config.handlers.github.org_team_rm_enabled).to be_falsey
+    end
+
+    it 'should allow only teams with "pull" permissions to be created by default' do
+      expect(Lita.config.handlers.github.org_team_add_allowed_perms).to eql %w(pull)
+    end
   end
 
   describe '.status' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-github
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Tim Heckman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: lita
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +208,7 @@ files:
 - lib/lita-github.rb
 - lib/lita-github/config.rb
 - lib/lita-github/filters.rb
+- lib/lita-github/general.rb
 - lib/lita-github/octo.rb
 - lib/lita-github/org.rb
 - lib/lita-github/r.rb
@@ -208,6 +223,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/lita-github/config_spec.rb
 - spec/unit/lita-github/filters_spec.rb
+- spec/unit/lita-github/general_spec.rb
 - spec/unit/lita-github/octo_spec.rb
 - spec/unit/lita-github/org_spec.rb
 - spec/unit/lita-github/r_spec.rb
@@ -247,6 +263,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/lita-github/config_spec.rb
 - spec/unit/lita-github/filters_spec.rb
+- spec/unit/lita-github/general_spec.rb
 - spec/unit/lita-github/octo_spec.rb
 - spec/unit/lita-github/org_spec.rb
 - spec/unit/lita-github/r_spec.rb