deploy_log 0.1.8a → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8efe330a5904b33493a0c20ea2b1eddf39c9fc8483ab6d7450a772f60b6a5f14
-  data.tar.gz: 16cc0a1aeaca9548b31d1a190d27f0010f276c600b6631b2b602ee09ff79049b
+  metadata.gz: 0be5986780967ad9c7fe713a71f69b392919affb3ebaf82cab6adbb7c20dad22
+  data.tar.gz: 44e92a417ff45c4833939879c1b5e4adc7e8f3a2b309350e42a003f6f52222ae
 SHA512:
-  metadata.gz: 733bba8d06fe7d725a50b66acfd2b7139e2aaf562079c1bcf6731013d11aa8565353c299b0162b5f735290b4bc3b754a52d00c6b11de8e23788b8ed8ca33c8b6
-  data.tar.gz: 55cf93d87df9255b0edf4f8142746671932e645e96efac3454fed64d040e5443827eb1f06ecdf8814e1b49dec2a616b92ddf7150490ef333be0fbc5efb7bc555
+  metadata.gz: 82bda4ccab174bf8c523f86d4ab04d1f29e2b8b26fb9db0b26e799d7d443ab051d7acbd83ac653ccaa92e6667603417e46c3e0e26c713029ee74f2c415532dcc
+  data.tar.gz: 533e5362acfbe7d55970ceca4d3aea9e7f583e377465175a5600df2df903188fdb80aeec7ab70e52c59374d1917f90ee7758a48ab39f23a3de9b30b55ea38dac

data/lib/deploy_log/github/helper.rb

@@ -5,13 +5,11 @@ require 'octokit'
 module DeployLog
   module Github
     class Helper
-      LINE_FORMAT = "%s (%s)\n - Created by %s\n - Branch: %s\n - Merged by %s on %s\n - Changes: %s\n\n"
+      LINE_FORMAT = "%s (%s)\n - Created by %s\n - Branch: %s\n - Merged by %s on %s\n - Changes: %s\n -- %s\n\n"
 
       def initialize(user_repo)
         @client = ::Octokit::Client.new(login: ENV['GITHUB_USER'], password: ENV['GITHUB_TOKEN'])
         @repo_location = user_repo
-        # cache last API response
-        @last_response = nil
       end
 
       def pulls_in_timeframe(date_start = nil, date_end = nil)
@@ -27,7 +25,6 @@ module DeployLog
         File.open('/tmp/github-deploys.log', 'w+') do |f|
           list.each do |pr|
             next unless (date_start..date_end).cover? pr.merged_at
-            _c = committers_for(pr.number)
 
             prs_covered += 1
 
@@ -39,8 +36,9 @@ module DeployLog
                 pr.user.login,
                 pr.head.ref,
                 user_who_merged(pr.number),
-                formatted_time(pr.merged_at),
-                pr.diff_url
+                formatted_time(pr.merged_at, true),
+                pr.diff_url,
+                committers_for(pr.number).join("\n -- ")
               )
             )
           end
@@ -74,8 +72,9 @@ module DeployLog
                 pr.user.login,
                 pr.head.ref,
                 user_who_merged(pr.number),
-                formatted_time(pr.merged_at),
-                pr.diff_url
+                formatted_time(pr.merged_at, true),
+                pr.diff_url,
+                committers_for(pr.number).join("\n -- ")
               )
             )
           end
@@ -90,22 +89,26 @@ module DeployLog
 
       private
 
-      def user_who_merged(pr_number)
-        pr = @client.pull_request(@repo_location, pr_number)
-        @last_response = pr
-
+      def user_who_merged(num)
+        pr = @client.pull_request(@repo_location, num)
         pr.merged_by.login
       end
 
       def committers_for(num)
-        puts @last_response.inspect
-        # pr = @client.pull_request(@repo_location, num)
+        commits = @client.pull_request_commits(@repo_location, num)
+        commits.map do |c|
+          "#{c.author.login} committed '#{c.commit.message}'"
+        end
       end
 
-      def formatted_time(time, correct_utc = false)
+      def formatted_time(time, use_local_time = false)
         time = Time.now if time.nil?
-        time = time.localtime if correct_utc
-        time.strftime('%e/%-m/%Y @ %I:%M:%S%P')
+        time = time.localtime if use_local_time
+
+        fmt = '%e/%-m/%Y @ %I:%M:%S%P'
+        fmt += ' UTC' unless use_local_time
+
+        time.strftime(fmt)
       end
 
       def nested_hash_value(obj, key)

data/lib/deploy_log/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeployLog
-  VERSION = '0.1.8a'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_log
 version: !ruby/object:Gem::Version
-  version: 0.1.8a
+  version: 0.1.8
 platform: ruby
 authors:
 - Ryan Priebe
@@ -118,9 +118,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.1
 signing_key: