pivotal-cli 0.0.2 → 0.0.3

data/bin/pivotal

@@ -13,11 +13,11 @@ version PivotalCli::VERSION
 # Shared re-usable actions
 
 def setup_config
-  username   = ask("What's your full name? ")
-  project_id = ask("Project Id? ", Integer)
-  token      = ask("API Token? (Available at https://www.pivotaltracker.com/profile) ") {|q| q.validate = /\A[A-Za-z0-9]{32}\z/ }
+  username    = ask("What's your full name? ")
+  project_ids = ask("Project Id(s)? (For multiple projects, comma separate Ids) ")
+  token       = ask("API Token? (Available at https://www.pivotaltracker.com/profile) ") {|q| q.validate = /\A[A-Za-z0-9]{32}\z/ }
 
-  @tracker.setup(username, project_id, token)
+  @tracker.setup(username, project_ids, token)
   puts Rainbow("Configuration has been saved to `#{@tracker.config_file}`.").yellow
 end
 
@@ -46,11 +46,14 @@ desc 'Display pivotal items assigned to you'
 command :list do |c|
   c.action do |global_options,options,args|
     ensure_setup_complete
-    stories = @tracker.my_stories
-    puts Rainbow("\n  You have #{stories.length} stories assigned to you.\n").green
+    stories_per_project = @tracker.my_stories_per_project
+    stories_per_project.each do |id, name, stories|
+      next if stories.length == 0
 
-    stories.each_with_index do |story, index|
-      puts formatted_story(story)
+      puts Rainbow("\n  == #{name} - #{stories.length} stor#{stories.length == 1 ? 'y' : 'ies'} assigned to you.\n").green
+      stories.each do |story|
+        puts formatted_story(story)
+      end
     end
   end
 end
@@ -65,32 +68,50 @@ command :branch do |c|
       next
     end
 
-    stories = @tracker.my_stories
+    stories_per_project = @tracker.my_stories_per_project
+    stories_per_id = []
+    stories = stories_per_project.map(&:last).flatten
+
     branch_name = args[0]
     task_id     = args[1].to_i
     story       = task_id && stories.find { |story| story.id == task_id }
-    new_story   = PivotalTracker::Story.new(name: '<Create a new story>', id: '????????', current_state: '', estimate: -1)
 
     # Ask the user to select a task from the menu
     if story.nil?
-      puts Rainbow("\n  You have #{stories.length} stories assigned to you.\n").green
 
-      # Create a dummy new story
-      stories << new_story
-      stories.each_with_index do |story, index|
-        puts formatted_story(story, index + 1)
+      story_index = 1
+      stories_per_project.each do |id, name, stories|
+        puts Rainbow("\n  == #{name} - #{stories.length} stor#{stories.length == 1 ? 'y' : 'ies'} assigned to you.\n").green
+
+        # Create a dummy new story
+        new_story = PivotalTracker::Story.new(
+            name: '<Create a new story>',
+            id: '????????',
+            current_state: '',
+            estimate: -1,
+            project_id: id
+        )
+
+        # Show all, yay!
+        stories << new_story
+        stories.each do |story|
+          puts formatted_story(story, story_index)
+          stories_per_id[story_index] = story
+          story_index += 1
+        end
       end
 
-      question   = Rainbow("\nWhich of the #{stories.length} stories are you starting? ").green
-      task_index = ask(question, Integer) { |q| q.in = 1..(stories.length) }
-      story = stories[task_index - 1]
+      question = Rainbow("\nWhich of the #{story_index - 1} stories are you starting? ").green
+      selected_index = ask(question, Integer) { |q| q.in = 1..(story_index - 1) }
+      story = stories_per_id[selected_index]
     end
 
     # Create the new story on the fly
-    if story == new_story
-      story_name = ask(Rainbow('Story name? ').green)
-      story_description = ask(Rainbow('Story description? ').green)
-      story = @tracker.create_story(story_name, story_description)
+    if story.id.include? '?'
+      story.id = nil
+      story.name = ask(Rainbow('Story name? ').green)
+      story.description = ask(Rainbow('Story description? ').green)
+      story = @tracker.create_story(story)
       if story.errors && story.errors.count > 0
         puts Rainbow("Whoops, something went wrong when creating the story:").red
         story.errors.each do |error|

data/lib/pivotal_cli/tracker.rb

@@ -2,7 +2,7 @@ require 'pivotal-tracker'
 
 module PivotalCli
   class Tracker
-    attr_accessor :project, :username
+    attr_accessor :projects, :username
 
     def config_file
       @config_file ||= "#{ENV['HOME']}/.pivotal"
@@ -12,27 +12,26 @@ module PivotalCli
       File.exists?(config_file)
     end
 
-    def setup(username, project_id, token)
+    def setup(username, project_ids, token)
       username = username.strip
       File.open(config_file, 'w') do |file|
         file.puts(username)
-        file.puts(project_id)
+        file.puts(project_ids)
         file.puts(token)
       end
     end
 
-    def my_stories
-      @project.stories.all(owned_by: username).reject { |s| s.current_state =~ /accepted/ }
+    def my_stories_per_project
+      projects.map do |project|
+        stories = project.stories.all(owned_by: username).reject { |s| s.current_state =~ /accepted/ }
+        [project.id, project.name, stories]
+      end
     end
 
-    def create_story(name, description)
-      attributes = {
-          story_type: 'feature',
-          name: name,
-          description: description,
-          owned_by: username
-      }
-      @project.stories.create(attributes)
+    def create_story(story)
+      story.story_type = 'feature'
+      story.owned_by = username
+      story.create # Return a new story object (with id)
     end
 
     def set_points(story, points)
@@ -46,13 +45,13 @@ module PivotalCli
     def load_configuration
       File.open(config_file, 'r') do |file|
         lines = file.readlines
-        @username  = lines[0].strip
-        token      = lines[2].strip
-        project_id = lines[1].strip
+        @username   = lines[0].strip
+        token       = lines[2].strip
+        project_ids = lines[1].split(',').map(&:strip)
 
         PivotalTracker::Client.token = token
         PivotalTracker::Client.use_ssl = true
-        @project = PivotalTracker::Project.find(project_id)
+        @projects = project_ids.map { |project_id| PivotalTracker::Project.find(project_id) }
       end
     end
   end

data/lib/pivotal_cli/version.rb

@@ -1,3 +1,3 @@
 module PivotalCli
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli