robopigeon 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25d50f00dc30aa78bd9389cee8da7d93aa04920e4db5c10433f39c2df4d97b0f
-  data.tar.gz: c0f86cfe9dc63bb753d4ee5e88cfe16512fce547fcdb649ffe4776282c3162dd
+  metadata.gz: e79ffa789106a62a231ad2f47d77a0a4f40d6f10f402a5d850854a8d6fc28e6b
+  data.tar.gz: 68cf7d61408fae7074e0866a0ed8617206d6298d89d0efd840576dd436eed43c
 SHA512:
-  metadata.gz: 9f980108a24e6e081f073e9747efca1fcb4cb14f776aa911cb4a60c769529401abf140b0f09de6c68208f1d78dde56a6ea8f8ae899b8ab3d943676be34bf8a80
-  data.tar.gz: 94b3b6a2f9631eb610ddfb2bf13fc8f885d3962d65a5dbdcfeb7c56ad44bbdf25d298db7fdf7b08ad9b3cd463cabc65a9c88c3310fd7a0b3a21960be94af7e0e
+  metadata.gz: 71ed0f3218d805e49954f88257b29a218c5c1e28983e57e403e8c8576c375074b732eda9b548b8aa408be2fc22b25a9c3fcce9bc46491782d631c9707eb15f28
+  data.tar.gz: e1721290eba3a076d1801c4ef14d3806e48a932d7fd7cd0d89dc2317b0cefc5e9adcb2155199d6ae0129678f6be9bc4c286b2e1301d1bcbc170eb828cd34a8cd

data/.version

@@ -1 +1 @@
-0.3.0
+0.3.1

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.3.1 (2019-04-8)
+
+### Added
+
+- Allow slack user methods to take an email and name
+- Add helper for code change stats since deployment
+
+### Fixed
+
+- Show line numbers and file name in robopigeon.rb correctly
+- Helpers are included even if defined after the main gem
+- All dsls should extend base
+- Fix jira ticket slack formatter issue
+- Remove trailing slash from some lookups that Jira seems to dislike
+
 ## 0.3.0 (2019-04-8)
 
 ### Added

data/exe/robopigeon

@@ -2,6 +2,8 @@
 
 require 'robopigeon'
 
+Bundler.require if defined?(Bundler)
+
 def usage(bot)
   bot.usage
   exit 1

data/lib/robopigeon/dsl.rb

@@ -15,9 +15,8 @@ module RoboPigeon::Dsl
       init_help
       init_new
       if File.exist?(file)
-        instance_exec do
-          eval(File.read(file))
-        end
+        contents = File.read(file)
+        instance_eval(contents, file)
       else
         init_job
       end

data/lib/robopigeon/dsl/base.rb

@@ -3,6 +3,19 @@ module RoboPigeon::Dsl
   # extensions. That's very helpful if you're trying to write an
   # extension that interfaces with another extension or built in.
   class Base < RoboPigeon::Dsl::Job
-    include RoboPigeon::Dsl::Helpers
+    def respond_to_missing?(method, include_private)
+      RoboPigeon::Dsl::Helpers.instance_methods(include_private).include?(method)
+    end
+
+    def method_missing(method, *args)
+      self.class.class_exec do
+        include RoboPigeon::Dsl::Helpers
+      end
+      if respond_to?(method)
+        send(method, *args)
+      else
+        super
+      end
+    end
   end
 end

data/lib/robopigeon/dsl/job.rb

@@ -28,6 +28,7 @@ module RoboPigeon::Dsl
     end
 
     def job(*args, &block)
+      initial_name = args.shift
       this_job = {
         desc: args.pop,
         action: proc do
@@ -35,7 +36,7 @@ module RoboPigeon::Dsl
           job.instance_eval(&block)
         end
       }
-      jobs[args.shift] = this_job
+      jobs[initial_name] = this_job
       args.each do |arg|
         jobs[arg] = this_job.merge(hidden: true)
       end

data/lib/robopigeon/gitlab/client.rb

@@ -20,7 +20,7 @@ module RoboPigeon::GitLab
           page: page
         )
         deployment = deployments.select { |dep| dep.environment.name == environment }.first
-        return get_deployment(environment, project, page + 1) if deployment.nil? && deployments.has_next_page?
+        return get_deployment(environment, page + 1) if deployment.nil? && deployments.has_next_page?
 
         deployment
       end

data/lib/robopigeon/gitlab/commit_dsl.rb

@@ -1,6 +1,6 @@
 require 'gitlab'
 module RoboPigeon::Dsl
-  class GitLabCommit
+  class GitLabCommit < RoboPigeon::Dsl::Base
     attr_accessor :commit
     def initialize
       self.commit = RoboPigeon::GitLab::Commit.new

data/lib/robopigeon/gitlab/helper_dsl.rb

@@ -24,7 +24,7 @@ module RoboPigeon::Dsl
       RoboPigeon::Documentarian.add_command('deployment_shortlog', block: ['helpers'], params: [{ name: 'environment', type: 'String', desc: 'the name of a gitlab operations environment', example: 'production' }], desc: 'get a shortlog of changes between head and the specified environment')
       def deployment_shortlog(environment)
         dep = RoboPigeon::GitLab::Client.get_deployment(environment)
-        `git shortlog --no-merges #{dep.sha}..`
+        `git shortlog --no-merges #{dep.sha}..`.strip
       end
 
       RoboPigeon::Documentarian.add_command('deployment_time', block: ['helpers'], params: [{ name: 'environment', type: 'String', desc: 'the name of a gitlab operations environment', example: 'production' }], desc: 'get the time the last deployment for the given environment happened')
@@ -39,6 +39,12 @@ module RoboPigeon::Dsl
         "#{ENV['CI_PROJECT_URL']}/environments/#{dep.environment.id}"
       end
 
+      RoboPigeon::Documentarian.add_command('deployment_code_change_stats', block: ['helpers'], params: [{ name: 'environment', type: 'String', desc: 'the name of a gitlab operations environment', example: 'production' }], desc: 'Get code change stats since the latest deployment')
+      def deployment_code_change_stats(environment)
+        dep = RoboPigeon::GitLab::Client.get_deployment(environment)
+        `git diff --shortstat #{dep.sha}`.strip
+      end
+
       RoboPigeon::Documentarian.add_command(
         'deployment_git_log_jira_tickets',
         block: ['helpers'],

data/lib/robopigeon/jenkins/dsl.rb

@@ -1,5 +1,5 @@
 module RoboPigeon::Dsl
-  class JenkinsRoot
+  class JenkinsRoot < RoboPigeon::Dsl::Base
     def self.run(&block)
       instance = new
       instance.instance_eval(&block)
@@ -53,7 +53,7 @@ module RoboPigeon::Dsl
       RoboPigeon::Jenkins::Client.token = token
     end
   end
-  class Jenkins
+  class Jenkins < JenkinsRoot
     attr_accessor :job
     def initialize
       self.job = RoboPigeon::Jenkins::Job.new

data/lib/robopigeon/jira/helper_dsl.rb

@@ -17,7 +17,7 @@ module RoboPigeon::Dsl
       def jira_last_created_ticket_slack_link
         issue_id = RoboPigeon::Jira::Client.last_created_ticket
         jira_url = RoboPigeon::Jira::Client.api_url
-        "<#{issue_id}|#{jira_url}/browse/#{issue_id}>"
+        "<#{jira_url}/browse/#{issue_id}|#{issue_id}>"
       end
 
       RoboPigeon::Documentarian.add_command(

data/lib/robopigeon/jira/ticket.rb

@@ -5,19 +5,19 @@ module RoboPigeon::Jira
     MAX_TRANSITIONS = 10
     ISSUE_PATH = '/rest/api/2/issue'.freeze
     attr_accessor :ticket, :project, :issue_type, :summary, :fields,
-                  :assignee, :reporter, :description
+                  :assignee, :duedate, :reporter, :description
 
     def initialize(ticket = nil)
       self.ticket = ticket
       self.fields = {}
-      update_from_server
+      attempt_update_from_server
       self.project = ticket.split('-')[0] if ticket
     end
 
-    def update_from_server
+    def attempt_update_from_server
       return unless ticket
 
-      get = jira_request.get("#{ISSUE_PATH}/#{ticket}/")
+      get = jira_request.get("#{ISSUE_PATH}/#{ticket}")
       raise "Failed to look up issue #{ticket}" unless get.status < 400
 
       raw = JSON.parse(get.body)
@@ -40,6 +40,7 @@ module RoboPigeon::Jira
             project: { key: project },
             issuetype: { name: issue_type },
             summary: summary,
+            duedate: duedate,
             description: description,
             assignee: { name: reporter }
           }.merge(fields)
@@ -97,13 +98,15 @@ module RoboPigeon::Jira
 
       self.fields[field] = if fields[field]['allowedValues'].nil?
                              value
+                           elsif fields[field]['schema']['type'] == 'array'
+                             [{ name: value }]
                            else
                              { value: value }
                            end
 
       if ticket
         post = jira_request.put do |req|
-          req.url "#{ISSUE_PATH}/#{ticket}/"
+          req.url "#{ISSUE_PATH}/#{ticket}"
           req.body = { fields: self.fields }.to_json
         end
       end
@@ -124,7 +127,7 @@ module RoboPigeon::Jira
 
     def perform_transition(transition)
       require_ticket
-      get_fields = jira_request.get("#{ISSUE_PATH}/#{ticket}/transitions?expand=transitions.fields")
+      get_fields = jira_request.get("#{ISSUE_PATH}/#{ticket}?expand=transitions.fields")
       transition_details = JSON.parse(get_fields.body)['transitions'].find do |trans|
         trans['name'].casecmp(transition).zero?
       end
@@ -139,7 +142,7 @@ module RoboPigeon::Jira
     def current_state
       require_ticket
       get = jira_request.get do |req|
-        req.url "#{ISSUE_PATH}/#{ticket}/"
+        req.url "#{ISSUE_PATH}/#{ticket}"
       end
       JSON.parse(get.body)['fields']['status']['name']
     end

data/lib/robopigeon/jira/ticket_dsl.rb

@@ -1,5 +1,5 @@
 module RoboPigeon::Dsl
-  class JiraTicket
+  class JiraTicket < RoboPigeon::Dsl::Base
     include RoboPigeon::Dsl::Helpers
     attr_accessor :ticket
 
@@ -110,7 +110,7 @@ module RoboPigeon::Dsl
       'field',
       block: %w[job jira ticket],
       params: [
-        { name: 'field_name', type: 'String', desc: 'the name of the field you want to set', example: 'duedate' },
+        { name: 'field_name', type: 'String', desc: 'the name of the field you want to set', example: 'Regression Test Release Date' },
         { name: 'field_value', type: 'String', desc: 'what to set that field to', example: '2/10/2030' }
       ],
       desc: 'set or update a field to a value'

data/lib/robopigeon/slack/attachments_dsl.rb

@@ -1,6 +1,5 @@
 module RoboPigeon::Dsl
-  class SlackAttachment
-    include RoboPigeon::Dsl::Helpers
+  class SlackAttachment < RoboPigeon::Dsl::Base
     attr_accessor :attachment
 
     def initialize

data/lib/robopigeon/slack/client.rb

@@ -28,15 +28,18 @@ module RoboPigeon::Slack
       end
 
       def get_user(search)
+        lookup = search.shift
         begin
-          users = client.users_search(user: search.downcase).try(:members)
+          users = client.users_search(user: lookup.downcase).try(:members) unless lookup.nil?
         rescue ::Faraday::Error => e
           puts "Giving up on slack user lookup because the slack client raised a #{e.class}:\n#{e.message}"
           users = nil
         end
 
         if users.nil? || users.empty? || users.length != 1
-          nil
+          return nil if search.empty?
+
+          get_user(search)
         else
           users.try(:first)
         end

data/lib/robopigeon/slack/dsl.rb

@@ -46,7 +46,7 @@ module RoboPigeon::Dsl
     end
 
     RoboPigeon::Documentarian.add_command('user', block: %w[job slack], params: [{ name: 'search', type: 'String', desc: 'the name, email, or slack handle of a user to search for', example: 'robopigeon@ives.dev' }], desc: 'add a single user recipient to your message, can be used multiple times')
-    def user(user)
+    def user(*user)
       message.users.push(RoboPigeon::Slack::Client.get_user(user).try(:id))
     end
 

data/lib/robopigeon/slack/helper_dsl.rb

@@ -2,7 +2,7 @@ module RoboPigeon::Dsl
   module Helpers
     module Slack
       RoboPigeon::Documentarian.add_command('slack_user_for', block: ['helpers'], params: [{ name: 'search', type: 'String', desc: 'the name, email, or slack handle of a user to search for', example: 'robopigeon@ives.dev' }], desc: 'Searches for a given user and returns a formatted slack message mention')
-      def slack_user_for(search)
+      def slack_user_for(*search)
         uid = RoboPigeon::Slack::Client.get_user(search).try(:id)
         return '' if uid.nil?
 
@@ -10,11 +10,12 @@ module RoboPigeon::Dsl
       end
 
       RoboPigeon::Documentarian.add_command('slack_name_for', block: ['helpers'], params: [{ name: 'search', type: 'String', desc: 'the name, email, or slack handle of a user to search for', example: 'robopigeon@ives.dev' }], desc: 'Searches for a given user and returns their slack handle with an @')
-      def slack_name_for(search)
-        name = RoboPigeon::Slack::Client.get_user(search).try(:name)
+      def slack_name_for(*search)
+        uid = RoboPigeon::Slack::Client.get_user(search).try(:name)
+
         return '' if uid.nil?
 
-        "@#{name}"
+        "@#{uid}"
       end
 
       RoboPigeon::Documentarian.add_command('slack_user_group', block: ['helpers'], params: [{ name: 'id', type: 'String', desc: 'the usergroup id to mention', example: 'robopigeon@ives.dev' }], desc: 'a message formatted mention of the given slack group id')

data/lib/robopigeon/slack/message.rb

@@ -24,10 +24,10 @@ module RoboPigeon::Slack
     end
 
     def send!
-      users.each do |user|
+      users.reject(&:nil?).each do |user|
         send_message(user)
       end
-      channels.each do |channel|
+      channels.reject(&:nil?).each do |channel|
         send_message(channel)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robopigeon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Alex Ives
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab