fire_watch 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48916752484ddabddd8c8fe0444173b0746fb3b0
-  data.tar.gz: 839961ba315d486a03d16e184f4ca66b94ee21a2
+  metadata.gz: 1fc4bf1112190b8cf13ac8fd1f19f02d7cfdba58
+  data.tar.gz: d59a610ffec4d26386657d512525b658bb81b354
 SHA512:
-  metadata.gz: 088196f7b5f0290b75521ee6678d3c5d02f2acf8072af0f58aed7963e00c87581fd59f1f9227872c4d5a4c9234be18dd36732b306dbcb5775fbbe95baf9b850b
-  data.tar.gz: ead16f0d9c9ed7c4e6bede5dbc05938ba715a60da7ed3c4cec0b06caf59ddf3ce4803ec61f9c7257d72e3465743aad09e786d59dcdfdf8c8edf18bf23e3d805f
+  metadata.gz: 75bfe76cf818d83c3de36df1398bdd828ccd4429573c1017ba6a4701a9a1ee5f4190fb0ea97171706e440fa36fba7c58056a69b1b25efd9a59e5ddaf3135670c
+  data.tar.gz: ff9b43e8f72f39c407f8ff7c75abe6cf336997a989cd9c87870102a5afc45c91a5d7bfc1db179a22ada41a85834111aaac392d5fec0262d330f77391eeb24aef

data/lib/fire_watch/runner.rb

@@ -9,8 +9,8 @@ module FireWatch
       
         cli = HighLine.new
         # Github Client
-        github_login = cli.ask('Github Login: ')
-        github_password = cli.ask('Github Password: ') { |q| q.echo = false }
+        github_login = "joew@samjoe.com"# cli.ask('Github Login: ')
+        github_password = "VPcYdAk9PFx3^uPn" # cli.ask('Github Password: ') { |q| q.echo = false }
         @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)?")
@@ -30,25 +30,28 @@ module FireWatch
         end
 
         milestones = @github_client.issues.milestones.list(user: 'wildland',repo: selected_repo.name, state: 'all').sort_by{|m| m.title}
-        selected_milestone = nil
-        cli.choose do |menu|
-          menu.prompt = "Select Milestone:"
-          milestones.each do |m|
-            menu.choice(m.title) do
-              selected_milestone = m
+        selected_milestones = []
+        done = false
+        loop do
+          cli.choose do |menu|
+            menu.prompt = "Add/Remove Milestones (#{selected_milestones.map{|p| p.title}.join(', ')}): "
+            milestones.each do |m|
+              menu.choice(m.title) do
+                if selected_milestones.include? m
+                  selected_milestones.delete(m)
+                else 
+                  selected_milestones.push(m)
+                end
+              end
             end
+            menu.choice("Done Adding Milestones") { done = true }
           end
-        end
-
-        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
+          break if done
         end
 
         # Harvest Client
-        harvest_username = cli.ask('Harvest Username: ')
-        harvest_password = cli.ask('Harvest Password: ') { |q| q.echo = false }
+        harvest_username = "joe@wild.land" #cli.ask('Harvest Username: ')
+        harvest_password = "]ztJyVszDnI{96uB" #cli.ask('Harvest Password: ') { |q| q.echo = false }
         @harvest_client = Harvest.client(username: harvest_username, password: harvest_password, subdomain: 'wildland')
         
         projects = @harvest_client.projects.all.sort_by{|p| p.name}
@@ -105,89 +108,97 @@ module FireWatch
             "Labels"
           ]
 
-          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
+          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
 
-            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:"}.name, 
-                  user_time_entries.inject(0){|sum, e| sum + e.hours },
-                  issue.state, 
-                  "",
-                  issue.labels.nil? ? "" : issue.labels.map{|l| l.name}.join(', ')
-                ]
+            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
               end
-            end
-          end
 
-          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
+              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:"}.name, 
+                    user_time_entries.inject(0){|sum, e| sum + e.hours },
+                    issue.state, 
+                    "",
+                    issue.labels.nil? ? "" : issue.labels.map{|l| l.name}.join(', ')
+                  ]
+                end
               end
             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:"}.name, 
-                "",
-                pr.state, 
-                pr.merged ? "Y" : "N",
-                pr.labels.nil? ? "" : pr.labels.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 << [
+
+            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
+              end
+              if relevant_time_entries.empty?
+                 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? ? "" : issue.labels.find{|l| l.name.include?"size:"}.name, 
-                  user_time_entries.inject(0){|sum, e| sum + e.hours },
+                  "",
+                  "",
+                  pr.labels.nil? ? "" : pr.labels.find{|l| l.name.include?"size:"}.name, 
+                  "",
                   pr.state, 
                   pr.merged ? "Y" : "N",
-                  pr.labels.nil? ? "" : issue.labels.map{|l| l.name}.join(', ')
+                  pr.labels.nil? ? "" : pr.labels.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, 
+                    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? ? "" : issue.labels.find{|l| l.name.include?"size:"}.name, 
+                    user_time_entries.inject(0){|sum, e| sum + e.hours },
+                    pr.state, 
+                    pr.merged ? "Y" : "N",
+                    pr.labels.nil? ? "" : issue.labels.map{|l| l.name}.join(', ')
+                  ]
+                end
               end
             end
           end

data/lib/fire_watch/version.rb

@@ -1,3 +1,3 @@
 module FireWatch
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fire_watch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Joe Weakley
@@ -111,6 +111,7 @@ files:
 - bin/console
 - bin/setup
 - exe/fire_watch
+- fire_watch-0.1.0.gem
 - fire_watch.gemspec
 - lib/fire_watch.rb
 - lib/fire_watch/runner.rb