fire_watch 0.2.6 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 225913cf4665a410cb89192be4f69707a5d442d8
-  data.tar.gz: ed894e110430aa644a25948e0678b4f8e717197b
+  metadata.gz: e69d5bd0206c3b3a44a41068f627b4bd13829eac
+  data.tar.gz: 2489f588654a612f250375ba71a92f32aed3dc2d
 SHA512:
-  metadata.gz: bd8f45ccf545a2fdee89d8b54f91fc8a5dbc3fc3e623009738b69fe57288ed47fdb1606c913f48dc46d18d93b3865de2a50af403767c4b0f78d76cbdb0e5d1d4
-  data.tar.gz: b0a920214522f5ea34c6949b29f58ba82872fe18a6e14bc65cfd40f891ebe1fa78aa858b5b714167a148e6db127e90f5bf801892df3327adccc5c7535fc46c0b
+  metadata.gz: 9e3f4d2b5bc3e387fd9960533d398e3d64aede979a7cef03d2327e530bfe057a4ed034efa6c78274e388bc72b3298e1d959f2542f3482268ac1be46c9dfbdf94
+  data.tar.gz: 76b98a17b6f8afea8c34aa9935ffc6169cb300cd5cb1c31ab410e3e042306727f5486d43efac4a57a1fdcf1582ae4fdafb7b04b379e9bfd4295ad15a21278eff

data/lib/fire_watch/runner.rb

@@ -4,6 +4,7 @@ require 'github_api'
 
 module FireWatch
   class Runner
+    ISSUE_REGEX = /.?#(\d+)/
     def self.invoke
       
         cli = HighLine.new
@@ -34,6 +35,7 @@ module FireWatch
         loop do
           cli.choose do |menu|
             menu.prompt = "Add/Remove Milestones (#{selected_milestones.map{|p| p.title}.join(', ')}): "
+            menu.choice("Done Adding Milestones") { done = true } if selected_milestones.count > 0
             milestones.each do |m|
               menu.choice(m.title) do
                 if selected_milestones.include? m
@@ -43,7 +45,6 @@ module FireWatch
                 end
               end
             end
-            menu.choice("Done Adding Milestones") { done = true } if selected_milestones.count > 0
           end
           break if done
         end
@@ -56,11 +57,14 @@ module FireWatch
         projects = @harvest_client.projects.all
         selected_projects = []
         done = false
+        show_all = false
         loop do
           cli.choose do |menu|
             menu.prompt = "Add/Remove Project (#{selected_projects.map{|p| p.name}.join(', ')}): "
+            menu.choice("Done Adding Projects") { done = true } if selected_projects.count > 0
             clients.sort_by(&:name).each do |client|
               projects.select{|p| p.client_id == client.id}.sort_by(&:name).each do |p|
+                next unless show_all || p.active
                 menu.choice("#{client.name} - #{p.name}") do
                   if selected_projects.include? p
                     selected_projects.delete(p)
@@ -70,7 +74,11 @@ module FireWatch
                 end
               end
             end
-            menu.choice("Done Adding Projects") { done = true } if selected_projects.count > 0
+            if show_all
+              menu.choice("Only Show Active Projects") { show_all = false }
+            else 
+              menu.choice("Include Inactive Projects") { show_all = true }
+            end
           end
           break if done
         end
@@ -118,12 +126,7 @@ module FireWatch
 
             issues.each do |issue|
               relevant_time_entries, time_entries  = time_entries.partition do |entry|
-                match_data = /.?#(?<issue_number>\d+)/.match(entry.notes)
-                if match_data.nil?
-                  false
-                else
-                  match_data["issue_number"].eql? issue.number.to_s
-                end
+                entry.notes.scan(ISSUE_REGEX).flatten.any?{|m| m.eql? issue.number.to_s }
               end
 
               if relevant_time_entries.empty?
@@ -151,7 +154,7 @@ module FireWatch
                     projects.select{|p| user_time_entries.map(&:project_id).uniq.include? p.id}.map(&:name).join(', '),
                     "#{user.first_name} #{user.last_name}", # Who
                     !issue.labels.nil? && !issue.labels.find{|l| l.name.include?"size:"}.nil? ? issue.labels.find{|l| l.name.include?"size:"}.name : "", 
-                    user_time_entries.inject(0){|sum, e| sum + e.hours },
+                    user_time_entries.inject(0){|sum, e| sum + (e.hours / e.notes.scan(ISSUE_REGEX).flatten.count) },
                     issue.state, 
                     "",
                     issue.labels.nil? ? "" : issue.labels.map{|l| l.name}.join(', ')
@@ -162,12 +165,7 @@ module FireWatch
 
             pull_requests.each do |pr|
               relevant_time_entries, time_entries  = time_entries.partition do |entry|
-                match_data = /.?#(?<issue_number>\d+)/.match(entry.notes)
-                if match_data.nil?
-                  false
-                else
-                  match_data["issue_number"].eql? pr.number.to_s
-                end
+                entry.notes.scan(ISSUE_REGEX).flatten.any?{|m| m.eql? issue.number.to_s }
               end
               if relevant_time_entries.empty?
                  csv << [
@@ -194,7 +192,7 @@ module FireWatch
                     projects.select{|p| user_time_entries.map(&:project_id).uniq.include? p.id}.map(&:name).join(', '),
                     "#{user.first_name} #{user.last_name}", # Who
                     !pr.labels.nil? && !pr.labels.find{|l| l.name.include?"size:"}.nil? ? pr.labels.find{|l| l.name.include?"size:"}.name : "",
-                    user_time_entries.inject(0){|sum, e| sum + e.hours },
+                    user_time_entries.inject(0){|sum, e| sum + (e.hours / e.notes.scan(ISSUE_REGEX).flatten.count) },
                     pr.state, 
                     pr.merged ? "Y" : "N",
                     pr.labels.nil? ? "" : issue.labels.map{|l| l.name}.join(', ')

data/lib/fire_watch/version.rb

@@ -1,3 +1,3 @@
 module FireWatch
-  VERSION = "0.2.6"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fire_watch
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.1
 platform: ruby
 authors:
 - Joe Weakley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: harvested