fire_watch 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42866a6f16766334f9250fb64271d64061b72459
-  data.tar.gz: 3db62951a2d47609bab3ad27330214fd5b7d483e
+  metadata.gz: 57d4b71fc02d5213dc2c7c00b3414e6c665d1c6e
+  data.tar.gz: 8ce7dc1d897de21d5a257dd548a4f7639f81422e
 SHA512:
-  metadata.gz: 485a5ca08ec72aa301dedb9bf8a762ba733ae89d433c71dc92b8455b28816b29ac7d6a448b87e26784862bc8e1b745ed72b61c01c8e8671043a1d15ea46c5f84
-  data.tar.gz: a0022133f742d01da81dfd99612491bf20170551cc374b7f5ddceccce1c2e7e36e33150749ee46faa0dff9d96569e8d967841954e66f056005eb1855b75939e8
+  metadata.gz: e58dc096455a3439ce557214e7b997ef17cbdae2db3ae15aeef2024d55b434a59e18657eb0ede0386cb2926146adb65cebd9e1782ad41dbf1894bef50ce6e3ba
+  data.tar.gz: 09ab2ebaeb8c6fc79ff04190571f4e765c97873b8516b209d5f14c9c0efbacf177c30884a7ccdcde60634b65c430b4cb11425b13990cacdabb22fe6d784ca12d

data/lib/fire_watch/runner.rb

@@ -135,7 +135,7 @@ module FireWatch
             pull_requests = pull_request_issues.map do |i|
               @github_client.pull_requests.get(user: 'wildland', repo: selected_repo.name, number: i.number).body
             end
-
+            
             issues.each do |issue|
               relevant_time_entries, time_entries  = time_entries.partition do |entry|
                 entry.notes.nil? ? false : entry.notes.scan(ISSUE_REGEX).flatten.any?{|m| m.eql? issue.number.to_s }
@@ -172,6 +172,9 @@ module FireWatch
                     issue.labels.nil? ? "" : issue.labels.map{|l| l.name}.join(', ')
                   ]
                 end
+                time_entries.concat relevant_time_entries.select { |entry|
+                  entry.notes.nil? ? false : entry.notes.scan(ISSUE_REGEX).flatten.count > 1
+                }
               end
               progressbar.increment
             end
@@ -180,6 +183,7 @@ module FireWatch
               relevant_time_entries, time_entries  = time_entries.partition do |entry|
                 entry.notes.nil? ? false : entry.notes.scan(ISSUE_REGEX).flatten.any?{|m| m.eql? pr.number.to_s }
               end
+
               if relevant_time_entries.empty?
                  csv << [
                   selected_repo.name, 
@@ -211,6 +215,9 @@ module FireWatch
                     pr.labels.nil? ? "" : issue.labels.map{|l| l.name}.join(', ')
                   ]
                 end
+                time_entries.concat relevant_time_entries.select { |entry|
+                  entry.notes.nil? ? false : entry.notes.scan(ISSUE_REGEX).flatten.count > 1
+                }
               end
               progressbar.increment
             end

data/lib/fire_watch/version.rb

@@ -1,3 +1,3 @@
 module FireWatch
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

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