deploy_log 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccbe91ec7a739d08b9f41ea94337f3b7df8bef343ee66ad3583950207e2a985f
-  data.tar.gz: c0f482427799350c9f665a802f8f650fb32a4e2d23395b70f02373ccc3e80ff1
+  metadata.gz: ef93d5a2afbcc419b9f158b649025ead5cbed923937f8f3fd45fdacbb666e807
+  data.tar.gz: ab722cf7af7ce6b961b86e7710052f5baa314db360b26a341cbe966aaf9852f6
 SHA512:
-  metadata.gz: 151e8cb216f20ce041c40ba81d38c84a644f30c731a73882bbadb8cf13ddea34e452ea3ffa6dd593bb0e3d8e68e9398144d328cceca4e3c3d61eed1c4f84f170
-  data.tar.gz: 8d08ec5d7934525c7e0e88c931d134935c2200e17e6a40a1378615dcaec4ef0dea530e7e8edd64cde0d4c3263d456770186ab2b8e7d34138c11b69e992471117
+  metadata.gz: fa1a856e43ad6c276ab50536de857027a8c8aaf45d1b9f7de4eff22fce267d333d41e1fda2d13b16ac6cf99140a3f2769acef8c0812722235b6e7d83989dd3c3
+  data.tar.gz: d955a037e8b3c149a79a03aa6dc48265bf696623eec01b4d132250b04e2d5cfdd96ae023b4627becb8a83a6fb9914447a3941c8596dd5cc4de65ffe23241e1a9

data/bin/deploy_log

@@ -31,7 +31,7 @@ OptionParser.new do |opt|
   end
 
   opt.on('-c', '--clean', 'Pull data from api, ignore cache') do
-    system('rm -f /tmp/github-deploys-*.log')
+    FileUtils.rm '/tmp/github-deploys-*.log'
     Notify.info 'Cleared cache'
     exit
   end

data/lib/deploy_log/github/deploys.rb

@@ -13,14 +13,14 @@ module DeployLog
 
         finish = Date.today.to_time + (24 * 60 * 60) - 1 if finish.nil?
 
-        @github.pulls_in_timeframe(start, finish)
+        render @github.pulls_in_timeframe(start, finish)
       end
 
       def merged_today
         start = Date.today.to_time # 12:00AM this morning
         finish = Date.today.to_time + (24 * 60 * 60) - 1 # 11:59PM tonight
 
-        @github.pulls_in_timeframe(start, finish)
+        render @github.pulls_in_timeframe(start, finish)
       end
 
       def merged_on(start)
@@ -28,7 +28,7 @@ module DeployLog
 
         finish = start + 24 * 60 * 60 - 1
 
-        @github.pulls_in_timeframe(start, finish)
+        render @github.pulls_in_timeframe(start, finish)
       end
 
       def merged_during_week(week_num)
@@ -36,15 +36,21 @@ module DeployLog
 
         week = @calendar.week(week_num.to_i)
 
-        @github.pulls_in_timeframe(week[:first], week[:last])
+        render @github.pulls_in_timeframe(week[:first], week[:last])
       end
 
       def pr_title(title)
-        @github.search_pulls_by(title, :title)
+        render @github.search_pulls_by(title, :title)
       end
 
       def pr_for_branch(branch)
-        @github.search_pulls_by(branch, :ref)
+        render @github.search_pulls_by(branch, :ref)
+      end
+
+      private
+
+      def render(data)
+        puts data
       end
     end
   end

data/lib/deploy_log/github/helper.rb

@@ -5,6 +5,8 @@ require 'fileutils'
 
 module DeployLog
   module Github
+    class FileNotFound < StandardError; end
+
     class Helper
       LINE_FORMAT = "%s (%s)\n - Created by %s\n - Branch: %s\n - Merged by %s on %s\n - Changes: %s\n -- %s\n\n"
 
@@ -14,8 +16,8 @@ module DeployLog
       end
 
       def pulls_in_timeframe(date_start = nil, date_end = nil)
-        cache = cache_file(date_start, date_end)
-        return cache[:contents] if should_show_cache(cache)
+        cache_path = cache(date_start, date_end)
+        return cat(cache_path) if should_show_cache(cache_path)
 
         @client.auto_paginate = true
         list = @client.pull_requests(@repo_location,
@@ -26,7 +28,7 @@ module DeployLog
 
         prs_covered = 0
 
-        File.open(cache[:path], 'w+') do |f|
+        File.open(cache_path, 'w+') do |f|
           list.each do |pr|
             next unless (date_start..date_end).cover? pr.merged_at
 
@@ -52,12 +54,12 @@ module DeployLog
 
         return ::Notify.warning("No pull requests have been merged in the requested date range (#{date_start} - #{date_end})") if prs_covered.zero?
 
-        cache[:contents]
+        cat(cache_path)
       end
 
       def search_pulls_by(value, field = :title)
-        cache = cache_file(value, field)
-        return cache[:contents] if should_show_cache(cache)
+        cache_path = cache_file(value, field)
+        return cat(cache_path) if should_show_cache(cache_path)
 
         list = @client.pull_requests(@repo_location,
           :state => :all,
@@ -65,7 +67,7 @@ module DeployLog
           )
         prs_covered = 0
 
-        File.open(cache[:path], 'w+') do |f|
+        File.open(cache_path, 'w+') do |f|
           list.each do |pr|
             next unless nested_hash_value(pr, field).match?(/#{value}\b/)
 
@@ -91,7 +93,7 @@ module DeployLog
 
         return ::Notify.warning("No pull requests match the requested term (#{value})") if prs_covered.zero?
 
-        cache[:contents]
+        cat(cache_path)
       end
 
       private
@@ -108,18 +110,21 @@ module DeployLog
         end
       end
 
-      def cache_file(*args)
+      def cache(*args)
         hash = Digest::MD5.hexdigest(@repo_location + args.join('|'))
         path = FileUtils.touch "/tmp/github-deploys-#{hash}.log"
 
-        {
-          contents: system("cat #{path.first}"),
-          path: path.first
-        }
+        path.first
+      end
+
+      def should_show_cache(cache_file_path)
+        File.exist?(cache_file_path) && !File.size(cache_file_path).zero?
       end
 
-      def should_show_cache(cache)
-        File.exist?(cache[:path]) && !File.size(cache[:path]).zero?
+      def cat(path)
+        raise FileNotFound unless should_show_cache(path)
+
+        File.read(path)
       end
 
       def formatted_time(time, use_local_time = false)

data/lib/deploy_log/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploy_log
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Ryan Priebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler