fire_watch 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf637f8c3306b80859e71da69845909e8857fa5e
-  data.tar.gz: b66b910931b402ba8415da646c12fe3974c86418
+  metadata.gz: 9318eee1f045e2414c745fad818fd230c62e1076
+  data.tar.gz: 2a0630f217ece84f8abf28b9c694998769885d71
 SHA512:
-  metadata.gz: cc64f6f3f9f5f8bf5e210254f507be032645eb3cfd9cd48b918afe2f53817861485ae39c4ab16addb3a3a1e30c58b9f64141b7e75d0ecaa7fdd24532f839f2fb
-  data.tar.gz: 792fa2e234b0192fa7e8843caee140c4d210a582a6c4fa081fdbb9729dbb4b52cea5d6e25d85876bd5998c036ed7191936bf9844c05bfa5e13b778469e67b812
+  metadata.gz: 17ace434edd54fbd83e7d7ce72f627d638fbd1d55e132f80e1b5e532764c1f867ed8af595b632241068fb8a425a190823db33107786be9367b69d804071ea0e7
+  data.tar.gz: 1f3bdbaeb09eed00c3c7286068ecf3310fe497240265eba4f2dcb3d35c35935d7d5a411197d7d0267db4c39426f191f9ce18d0dea09063aad462a8847ef836dd

data/fire_watch.gemspec

@@ -29,10 +29,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "harvested", "~> 3.1"
+  spec.add_runtime_dependency "harvested", "~> 4.0"
   spec.add_runtime_dependency "highline", "~> 1.7"
   spec.add_runtime_dependency "github_api", "~> 0.17"
   spec.add_runtime_dependency "ruby-progressbar", "~>1.8"
+  spec.add_runtime_dependency 'parallel', '1.12.0'
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/fire_watch.rb

@@ -1,4 +1,5 @@
 require "fire_watch/version"
+require "fire_watch/report_builder"
 
 module FireWatch
   # Your code goes here...

data/lib/fire_watch/report_builder.rb

@@ -0,0 +1,93 @@
+require 'parallel'
+module FireWatch
+  class ReportBuilder
+    ISSUE_REGEX = /.?#(\d+)/
+    attr_reader :github_client, :harvest_client, :github_repos, :harvest_clients, :harvest_projects, :harvest_users, :time_entries
+
+    def initialize(github_client:, harvest_client:)
+      @github_client = github_client
+      @harvest_client = harvest_client
+      @github_repos, @harvest_clients, @harvest_projects, @harvest_users = Parallel.map([
+        @github_client.repos.list(org: 'wildland').sort_by{|r| r.name},
+        @harvest_client.clients.all,
+        @harvest_client.projects.all,
+        @harvest_client.users.all
+      ]) {|j| j}
+    end
+
+    def issue_pull_request_report(selected_github_repo:, selected_github_milestones:, selected_harvest_projects:)
+      @time_entries = Parallel.map(
+        selected_harvest_projects.select{|p| !p.starts_on.nil?}.map do |project|
+          @harvest_client.reports.time_by_project(
+            project, 
+            Time.parse(project.starts_on), 
+            project.ends_on.nil? ? Time.now : Time.parse(project.ends_on)
+          )
+        end
+      ){|j| j}
+      @time_entries.flatten!
+      github_report = []
+
+      selected_github_milestones.each do |selected_milestone|
+        issues, pull_request_issues = @github_client.issues.list(user: 'wildland', repo: selected_github_repo.name, milestone: selected_milestone.number, state: 'all').partition{|i| i.pull_request == nil}
+        pull_requests = pull_request_issues.map do |i|
+          @github_client.pull_requests.get(user: 'wildland', repo: selected_github_repo.name, number: i.number).body
+        end
+        
+        issues.each do |issue|
+          github_report << report_line(
+            issue: issue, 
+            pull_request: nil,
+            selected_github_repo: selected_github_repo,
+            selected_github_milestone: selected_milestone
+          )
+        end
+
+        pull_requests.each do |pr|
+          github_report << report_line(
+            issue: pr, 
+            pull_request: pr,
+            selected_github_repo: selected_github_repo,
+            selected_github_milestone: selected_milestone
+          )
+        end
+      end
+
+      return github_report, @time_entries.map do |e| 
+        {
+          time_entry: e,
+          harvest_user: @harvest_users.find{|u| u.id == e.user_id}
+        }
+      end # TODO format time_entries that are missing
+    end
+
+    def report_line(issue:, pull_request:, selected_github_repo:, selected_github_milestone:)
+      github_report_line = {
+        github_repo: selected_github_repo,
+        github_milestone: selected_github_milestone,
+        github_estimated_size_label: !issue.labels.nil? && !issue.labels.find{|l| l.name.include?"size:"}.nil? ? issue.labels.find{|l| l.name.include?"size:"} : nil,
+        issue: issue,
+        pull_request: pull_request,
+        harvest_time_entries: []
+      }
+      relevant_time_entries, @time_entries = @time_entries.partition do |entry|
+        entry.notes.nil? ? false : entry.notes.scan(ISSUE_REGEX).flatten.any?{|m| m.eql? github_report_line[:issue].number.to_s }
+      end
+      if !relevant_time_entries.empty?
+        relevant_time_entries.chunk{|i| i.user_id }.each do |user_id, user_time_entries|
+          user = harvest_users.find{|u| u.id == user_id}
+          github_report_line[:harvest_time_entries] << {
+            harvest_user: user, 
+            time_entries: user_time_entries,
+            harvest_projects: @harvest_projects.select{|p| user_time_entries.map(&:project_id).uniq.include? p.id}
+          }
+        end
+
+       @time_entries.concat relevant_time_entries.select { |entry|
+          entry.notes.nil? ? false : entry.notes.scan(ISSUE_REGEX).flatten.count > 1
+        }
+      end
+      return github_report_line
+    end
+  end
+end

data/lib/fire_watch/runner.rb

@@ -5,36 +5,41 @@ require 'ruby-progressbar'
 
 module FireWatch
   class Runner
-    ISSUE_REGEX = /.?#(\d+)/
     def self.invoke
       
         cli = HighLine.new
         # Github Client
         github_login = cli.ask('Github Login: ')
         github_password = cli.ask('Github Password: ') { |q| q.echo = 'x' }
-        @github_client = Github.new(auto_pagination: true) do |config|
+        github_client = Github.new(auto_pagination: true) do |config|
           config.basic_auth         = "#{github_login}:#{github_password}"
           if cli.agree("Do you use Two-Factor authentication (non-sms)?")
             config.connection_options = { headers: {"X-GitHub-OTP" => cli.ask('Two-Factor Code')} }
           end
         end
 
-        puts "Fetching Repos from Github..."
-        repos = @github_client.repos.list(org: 'wildland').sort_by{|r| r.name}
+         # Harvest Client
+        harvest_username = cli.ask('Harvest Username: ')
+        harvest_password = cli.ask('Harvest Password: ') { |q| q.echo = 'x' }
+        harvest_client = Harvest.client(username: harvest_username, password: harvest_password, subdomain: 'wildland')
+
+        @report_builder = ReportBuilder.new(
+          github_client: github_client,
+          harvest_client: harvest_client
+        )
         
 
         selected_repo = nil
         cli.choose do |menu|
           menu.prompt = "Select Github Repo:"
-          repos.each do |r|
+          @report_builder.github_repos.each do |r|
             menu.choice(r.name) do
               selected_repo = r
             end
           end
         end
 
-        puts "Fetching Milestones from Github..."
-        milestones = @github_client.issues.milestones.list(user: 'wildland',repo: selected_repo.name, state: 'all').sort_by{|m| m.title}
+        milestones = @report_builder.github_client.issues.milestones.list(user: 'wildland',repo: selected_repo.name, state: 'all').sort_by{|m| m.title}
 
         selected_milestones = []
         done = false
@@ -55,15 +60,6 @@ module FireWatch
           break if done
         end
 
-        # Harvest Client
-        harvest_username = cli.ask('Harvest Username: ')
-        harvest_password = cli.ask('Harvest Password: ') { |q| q.echo = 'x' }
-        @harvest_client = Harvest.client(username: harvest_username, password: harvest_password, subdomain: 'wildland')
-
-        puts "Fetching Clients and Projects from Harvest..."
-        clients = @harvest_client.clients.all
-        projects = @harvest_client.projects.all
-
         selected_projects = []
         done = false
         show_all = false
@@ -71,8 +67,8 @@ module FireWatch
           cli.choose do |menu|
             menu.prompt = "Add/Remove Project (#{selected_projects.map(&: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|
+            @report_builder.harvest_clients.sort_by(&:name).each do |client|
+              @report_builder.harvest_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
@@ -92,29 +88,16 @@ module FireWatch
           break if done
         end
 
-        puts "Fetching Users from Harvest..."
-        harvest_users = @harvest_client.users.all
-
-        time_entries = []
-
-        selected_projects.each do |project|
-          if project.starts_on.nil? 
-            puts "No start date for #{project.name}"
-            next
-          end
-          time_entries += @harvest_client.reports.time_by_project(
-            project, 
-            Time.parse(project.starts_on), 
-            project.ends_on.nil? ? Time.now : Time.parse(project.ends_on)
-          )
-        end
-
         #Process Data
         csv_file_name = cli.ask('File name for report?').concat('.csv')
 
         puts "Generating Report with " + selected_milestones.map(&:title).join(', ') + " vs " + selected_projects.map(&:name).join(', ')
         puts "Saving to #{csv_file_name}"
-        progressbar = ProgressBar.create(format: "%a %b\u{15E7}%i %p%% %t", progress_mark: ' ', remainder_mark: "\u{FF65}", starting_at: 10)
+        github_report, missing_harvest_time_entries = @report_builder.issue_pull_request_report(
+          selected_github_repo: selected_repo, 
+          selected_github_milestones: selected_milestones, 
+          selected_harvest_projects: selected_projects
+        )
         CSV.open(csv_file_name, "wb", force_quotes: true) do |csv|
           csv << [
             "Repo", 
@@ -130,102 +113,42 @@ module FireWatch
             "Labels"
           ]
 
-          selected_milestones.each do |selected_milestone|
-            issues, pull_request_issues = @github_client.issues.list(user: 'wildland', repo: selected_repo.name, milestone: selected_milestone.number, state: 'all').partition{|i| i.pull_request == nil}
-            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 }
-              end
-
-              if relevant_time_entries.empty?
-                 csv << [
-                    selected_repo.name, 
-                    selected_milestone.title, 
-                    issue.number, 
-                    issue.title, 
-                    "",
-                    "",
-                    !issue.labels.nil? && !issue.labels.find{|l| l.name.include?"size:"}.nil? ? issue.labels.find{|l| l.name.include?"size:"}.name : "", 
-                    "",
-                    issue.state, 
-                    "",
-                    issue.labels.nil? ? "" : issue.labels.compact.map{|l| l.name}.join(', ')
-                  ]
-              else 
-                relevant_time_entries.chunk{|i| i.user_id }.each do |user_id, user_time_entries|
-                  user = harvest_users.find{|u| u.id == user_id}
-                  csv << [
-                    selected_repo.name, 
-                    selected_milestone.title, 
-                    issue.number, 
-                    issue.title, 
-                    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 / e.notes.scan(ISSUE_REGEX).flatten.count) },
-                    issue.state, 
-                    "",
-                    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
-
-            pull_requests.each do |pr|
-              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, 
-                  selected_milestone.title, 
-                  pr.number, 
-                  pr.title, 
-                  "",
-                  "",
-                  !pr.labels.nil? && !pr.labels.find{|l| l.name.include?"size:"}.nil? ? pr.labels.find{|l| l.name.include?"size:"}.name : "", 
-                  "",
-                  pr.state, 
-                  pr.merged ? "Y" : "N",
-                  pr.labels.nil? ? "" : pr.labels.map{|l| l.name}.join(', ')
+          github_report.each do |row|
+            if !row[:harvest_time_entries].any?
+              csv << [
+                row[:github_repo].name,
+                row[:github_milestone].title,
+                row[:issue].number,
+                row[:issue].title,
+                '',
+                '',
+                (row[:github_estimated_size_label].nil? ? '' : row[:github_estimated_size_label].name),
+                '',
+                row[:issue].state,
+                (row[:pull_request].nil? ? '' : (row[:pull_request].merged ? 'Y' : 'N')),
+                (row[:issue].labels.nil? ? '' : row[:issue].labels.map{|label| label.name}.join(' , ')),
+              ]
+            else
+              row[:harvest_time_entries].each do |harvest_entries|
+                csv << [
+                  row[:github_repo].name,
+                  row[:github_milestone].title,
+                  row[:issue].number,
+                  row[:issue].title,
+                  harvest_entries[:harvest_projects].map(&:name).join(', '),
+                  "#{harvest_entries[:harvest_user].first_name} #{harvest_entries[:harvest_user].last_name}",
+                  (row[:github_estimated_size_label].nil? ? '' : row[:github_estimated_size_label].name),
+                  (harvest_entries[:time_entries].inject(0){|sum, e| sum + (e.hours / e.notes.scan(ReportBuilder::ISSUE_REGEX).flatten.count) }),
+                  row[:issue].state,
+                  (row[:pull_request].nil? ? '' : (row[:pull_request].merged ? 'Y' : 'N')),
+                  (row[:issue].labels.nil? ? '' : row[:issue].labels.map{|label| label.name}.join(' , '))
                 ]
-              else 
-                relevant_time_entries.chunk{|i| i.user_id }.each do |user_id, user_time_entries|
-                  user = harvest_users.find{|u| u.id == user_id}
-                  csv << [
-                    selected_repo.name, 
-                    selected_milestone.title, 
-                    pr.number, 
-                    pr.title, 
-                    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 / e.notes.scan(ISSUE_REGEX).flatten.count) },
-                    pr.state, 
-                    pr.merged ? "Y" : "N",
-                    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
           end
         end
-        progressbar.finish
 
-        if time_entries.count > 0 && cli.agree("#{time_entries.count} Time entries not in this milestone. Create a list of them?")
+        if missing_harvest_time_entries.count > 0 && cli.agree("#{missing_harvest_time_entries.count} Time entries not in this milestone. Create a list of them?")
           time_entries_file_name = cli.ask('File name for report?').concat('.csv')
           CSV.open(time_entries_file_name, "wb", force_quotes: true) do |csv|
             csv << [
@@ -234,12 +157,12 @@ module FireWatch
               "Hours",
               "Notes"
             ]
-            time_entries.each do |entry|
+            missing_harvest_time_entries.each do |l|
               csv << [
-                entry.created_at,
-                "#{harvest_users.find{|u| u.id == entry.user_id}.first_name} #{harvest_users.find{|u| u.id == entry.user_id}.last_name}",
-                entry.hours,
-                entry.notes
+                l[:time_entry].created_at,
+                "#{l[:harvest_user].first_name} #{l[:harvest_user].last_name}",
+                l[:time_entry].hours,
+                l[:time_entry].notes
               ]
             end
           end

data/lib/fire_watch/version.rb

@@ -1,3 +1,3 @@
 module FireWatch
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fire_watch
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Joe Weakley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: harvested
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +141,7 @@ files:
 - exe/fire_watch
 - fire_watch.gemspec
 - lib/fire_watch.rb
+- lib/fire_watch/report_builder.rb
 - lib/fire_watch/runner.rb
 - lib/fire_watch/version.rb
 homepage: https://github.com/wildland/fire_watch