fire_watch 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a051f6dadf6bd20755ecf81cf0c5dd8a257986f
-  data.tar.gz: 539bdf8d4968eaaf1a5e278985f29610d389eb03
+  metadata.gz: 087216a36c3964a570ea5473b84d810acf0a013c
+  data.tar.gz: 48660e85354cbd04ccf736624add18db58664203
 SHA512:
-  metadata.gz: 9e7927f3db060acd14b86255a0a356bb3c855c31bb49bf7857a5f98f6fbf4ae5345b1e0c8eed1e01ad3d84320c3f7b8fe2c7637a9d7e32a4b7ec67006813dd8a
-  data.tar.gz: 7a5fef0ea269c95f64f719c82451d94d8103bb974356738c2188fafc22ead5855f47e6e0bba06521ccb569727078a414db5f7079bb5ccb90b7c124eba36c0b0e
+  metadata.gz: acf8da1ac0f7f4f7434686302af8409b457151dbbbb7203a56e7e525eb3a4757ef57c71fed20d468cd256e2e7e3256ece58df44a573f98c04ab34fa1dcf82583
+  data.tar.gz: 56ce9df1ca8a7a2fc3bc590c638896e21000c7b43584873c62b1540a06e7a4a0a3dcbfdb0eac41d778adfe858699bb098c0617b3c1b8d8bf300392364535c51c

data/lib/fire_watch/runner.rb

@@ -1,6 +1,7 @@
 require 'highline'
 require 'harvested'
 require 'github_api'
+require 'pry'
 
 module FireWatch
   class Runner
@@ -52,19 +53,21 @@ module FireWatch
         harvest_username = cli.ask('Harvest Username: ')
         harvest_password = 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}
+        clients = @harvest_client.clients.all
+        projects = @harvest_client.projects.all
         selected_projects = []
         done = false
         loop do
           cli.choose do |menu|
             menu.prompt = "Add/Remove Project (#{selected_projects.map{|p| p.name}.join(', ')}): "
-            projects.each do |p|
-              menu.choice(p.name) do
-                if selected_projects.include? p
-                  selected_projects.delete(p)
-                else 
-                  selected_projects.push(p)
+            clients.sort_by(&:name).each do |client|
+              projects.select{|p| p.client_id == client.id}.sort_by(&:name).each do |p|
+                menu.choice("#{client.name} - #{p.name}") do
+                  if selected_projects.include? p
+                    selected_projects.delete(p)
+                  else 
+                    selected_projects.push(p)
+                  end
                 end
               end
             end

data/lib/fire_watch/version.rb

@@ -1,3 +1,3 @@
 module FireWatch
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fire_watch
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Joe Weakley