pivo_flow 0.2.3 → 0.2.5

data/lib/pivo_flow/base.rb

@@ -13,7 +13,7 @@ module PivoFlow
       @git_hook_path = File.join(@git_dir, 'hooks', 'prepare-commit-msg')
       @pf_git_hook_name = 'pf-prepare-commit-msg'
       @pf_git_hook_path = File.join(@git_dir, 'hooks', @pf_git_hook_name)
-
+      @pf_git_hook_cmd = "#{@pf_git_hook_path} $1"
       @options[:repository] = Grit::Repo.new(@git_dir)
       install_git_hook if git_hook_needed?
       git_config_ok? ? parse_git_config : add_git_config
@@ -29,8 +29,8 @@ module PivoFlow
       hook_path = File.join(File.dirname(__FILE__), '..', '..', 'bin', @pf_git_hook_name)
       FileUtils.cp(hook_path, @pf_git_hook_path, preserve: true)
       puts "File copied..."
-      unless File.exists?(@git_hook_path) && File.read(@git_hook_path).match(/#{@pf_git_hook_name} \$1/)
-        File.open(@git_hook_path, "a") { |f| f.puts("#{@pf_git_hook_path} $1") }
+      unless File.exists?(@git_hook_path) && File.read(@git_hook_path).match(@pf_git_hook_cmd)
+        File.open(@git_hook_path, "a") { |f| f.puts(@pf_git_hook_cmd) }
         puts "Reference to pf-prepare-commit-msg added to prepare-commit-msg..."
       end
       unless File.executable?(@git_hook_path)

data/lib/pivo_flow/pivotal.rb

@@ -21,6 +21,10 @@ module PivoFlow
       @options[:stories] ||= fetch_stories
     end
 
+    def other_users_stories
+      project_stories.select{ |story| story.owned_by != user_name }
+    end
+
     def unasigned_stories
       project_stories.select{ |story| story.owned_by == nil }
     end
@@ -49,9 +53,11 @@ module PivoFlow
             requested_by: story.requested_by,
             name: story.name,
             story_type: story_type_icon(story),
-            estimate: estimate_points(story)
+            estimate: estimate_points(story),
+            owner: story_owner(story),
+            started: story.current_state == "started" ? "started >" : ""
           }
-          story_text = "[#%{story_id}] %{story_type} [%{estimate} pts.] (requested by: %{requested_by}) %{name}" % vars
+          story_text = "%{started} [#%{story_id}] %{story_type} [%{estimate} pts.] %{owner} %{name}" % vars
           story_text += "\n   Description: #{story.description}" unless story.description
           menu.choice(story_text) { |answer| pick_up_story(answer.match(/\[#(?<id>\d+)\]/)[:id])}
         end
@@ -67,6 +73,14 @@ module PivoFlow
       end
     end
 
+    def story_owner story
+      story.owned_by.nil? ? "" : "(#{initials(story.owned_by)})"
+    end
+
+    def initials name
+      name.split.map{ |n| n[0]}.join
+    end
+
     def estimate_points story
       unless story.estimate.nil?
         story.estimate < 0 ? "?" : story.estimate
@@ -83,7 +97,9 @@ module PivoFlow
       story = @options[:project].stories.find(story_id)
       if story.nil?
         puts "Story not found, sorry."
+        return
       end
+      state = :accepted if story.story_type == "chore" && state == :finished
       if story.update(owned_by: user_name, current_state: state).errors.count.zero?
         puts "Story updated in Pivotal Tracker"
         true
@@ -112,15 +128,11 @@ module PivoFlow
     end
 
     def show_stories
-      stories = user_stories + unasigned_stories
-      if stories.count.zero?
-        puts "hmm... there is no story assigned to you! I'll better check for unasigned stories!"
-        stories = unasigned_stories
-      end
-      list_stories_to_output stories.first(10)
+      stories = user_stories + other_users_stories
+      list_stories_to_output stories.first(9)
     end
 
-    def fetch_stories(count = 100, state = "unstarted,unscheduled")
+    def fetch_stories(count = 100, state = "unstarted,started,unscheduled")
       conditions = { current_state: state, limit: count }
       @options[:stories] = @options[:project].stories.all(conditions)
     end

data/lib/pivo_flow/version.rb

@@ -1,3 +1,3 @@
 module PivoFlow
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivo_flow
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker