pivo_flow 0.3.8 → 0.3.9

data/README.md

@@ -17,7 +17,15 @@ All the required information is gathered on demand, but it's a good idea to prep
 * project's Pivotal Tracker ID
 * your Pivotal Tracker API token
 
-Get list of current stories
+Show help
+
+    pf help
+
+or
+
+    pf --help
+
+Get list of current stories with an interactive choice menu
 
     pf stories
 
@@ -33,6 +41,10 @@ Clear current story without notifying Pivotal
 
     pf clear
 
+Show finished stories and select the one you would like to deliver
+
+    pf deliver
+
 Display current gem version
 
     pf version
@@ -50,18 +62,18 @@ This gem installs a `pepare-commit-msg` hook by adding a reference to `pf-prepar
 
 ### 0.3 Current release
 
-* single-story view
+* single-story view with comments and tasks
 * flow:
   * select story
   * read the story description
   * accept or back to story selection
 * `pf info` displaying info about current task
-* `pf --help` and other options via OptionParser
-* comments and tasks in a single-story view
+* `pf deliver` ability to deliver finished stories [#6]
+* options via `OptionParser`
 
 ### 0.2
 
-* git hoook
+* git hook
 * formatted output
 * bugfixes
 

data/lib/pivo_flow/cli.rb

@@ -36,17 +36,29 @@ module PivoFlow
     end
 
     def finish story_id=nil
-      if File.exists? @file_story_path
-        story_id = File.open(@file_story_path).read.strip
+      unless current_story_id
+        puts no_story_found_message
+        return 1
       end
-      pivotal_object.finish_story(story_id)
+      pivotal_object.finish_story(current_story_id)
+    end
+
+    def deliver
+      pivotal_object.deliver
     end
 
     def clear
-      if File.exists? @file_story_path
+      unless current_story_id.nil?
         FileUtils.remove_file(@file_story_path)
+        puts "Current pivotal story id cleared."
+      else
+        puts no_story_found_message
+        return 1
       end
-      puts "Current pivotal story id cleared."
+    end
+
+    def current
+      puts current_story_id || no_story_found_message
     end
 
     def reconfig
@@ -67,6 +79,10 @@ module PivoFlow
       @pivotal_object ||= PivoFlow::Pivotal.new(@options)
     end
 
+    def no_story_found_message
+      "No story found in #{@file_story_path}"
+    end
+
     def no_method_error
       puts "You forgot a method name"
     end
@@ -75,6 +91,11 @@ module PivoFlow
       puts "Ups, no such method..."
     end
 
+    def current_story_id
+      return nil unless File.exists?(@file_story_path)
+      File.open(@file_story_path).read.strip
+    end
+
     def parse_argv(args)
       @options = {}
 
@@ -82,11 +103,14 @@ module PivoFlow
         opts.banner =   "Usage: pf <COMMAND> [OPTIONS]\n"
         opts.separator  "Commands"
         opts.separator  "     clear:             clears STORY_ID from temp file"
-        opts.separator  "     info:              shows info about current story"
+        opts.separator  "     deliver:           shows finished stories and mark selected as delivered in Pivotal Tracker"
+        opts.separator  "     help               shows this message"
         opts.separator  "     finish [STORY_ID]: finish story on Pivotal"
+        opts.separator  "     info:              shows info about current story"
         opts.separator  "     reconfig:          clears API_TOKEN and PROJECT_ID from git config"
         opts.separator  "     start <STORY_ID>:  start a story of given ID"
         opts.separator  "     stories:           list stories for current project"
+        opts.separator  "     version:           show gem version"
         opts.separator  ""
         opts.separator  "Options"
 
@@ -113,21 +137,15 @@ module PivoFlow
       opt_parser.parse!(args)
 
       case args[0]
-      when "clear"
-        clear
-      when "reconfig"
-        reconfig
-      when "start"
-        start args[1]
-      when "stories"
-        stories
-      when "finish"
-        finish args[1]
-      when "info"
-        info
+      when "start", "finish"
+        self.send(args[0].to_sym, args[1])
+      when "help"
+        puts opt_parser
+      when "clear", "current", "deliver", "info", "reconfig", "stories"
+        self.send(args[0].to_sym)
       when nil
         no_method_error
-        puts opt_parser.to_s
+        puts opt_parser
         return 1
       else
         invalid_method_error
@@ -138,4 +156,5 @@ module PivoFlow
     end
 
   end
+
 end

data/lib/pivo_flow/pivotal.rb

@@ -35,6 +35,10 @@ module PivoFlow
       project_stories.select{ |story| story.owned_by == nil }
     end
 
+    def finished_stories
+      fetch_stories(10, "finished")
+    end
+
     def current_story force = false
       if (@options[:current_story] && !force)
         @options[:current_story]
@@ -44,6 +48,11 @@ module PivoFlow
     end
 
     def list_stories_to_output stories
+      if (stories.nil? || stories.empty?)
+        puts "No stories to show"
+        return 1
+      end
+
       HighLine.new.choose do |menu|
         menu.header = "\n--- STORIES FROM PIVOTAL TRACKER ---\nWhich one would you like to start?   "
         menu.prompt = "story no.? "
@@ -54,13 +63,18 @@ module PivoFlow
       end
     end
 
+    def deliver
+      list_stories_to_output finished_stories
+    end
+
     def show_story story_id
       story = find_story(story_id)
       show_info story
-      proceed = ask_question "Do you want to start this story?"
+      ask_for = story.current_state == "finished" ? "deliver" : "start"
+      proceed = ask_question "Do you want to #{ask_for} this story?"
       accepted_answers = %w[yes y sure ofc jup yep yup ja tak]
       if accepted_answers.include?(proceed.downcase)
-        pick_up_story(story_id)
+        story.current_state == "finished" ? deliver_story(story_id) : pick_up_story(story_id)
       else
         show_stories
       end
@@ -94,7 +108,7 @@ module PivoFlow
         owner: story_owner(story),
         description: story.description,
         labels: story_labels(story),
-        started: story.current_state == "started" ? "S" : "N"
+        started: story_state_sign(story)
       }
       if long
         "STORY %{started} %{story_type} [#%{story_id}]
@@ -148,6 +162,11 @@ module PivoFlow
       story.labels.nil? ? "" : story.labels.split(",").map{ |l| "##{l}" }.join(", ")
     end
 
+    def story_state_sign story
+      return "*" if story.current_state == "unstarted"
+      story.current_state[0].capitalize
+    end
+
     def initials name
       name.split.map{ |n| n[0] }.join
     end
@@ -189,6 +208,10 @@ module PivoFlow
       remove_story_id_file if story_id.nil? or update_story(story_id, :finished)
     end
 
+    def deliver_story story_id
+      update_story(story_id, :delivered)
+    end
+
     def remove_story_id_file
       FileUtils.remove_file(@story_id_file_path)
     end
@@ -203,7 +226,7 @@ module PivoFlow
       list_stories_to_output stories.first(9)
     end
 
-    def fetch_stories(count = 100, state = "unstarted,started,unscheduled")
+    def fetch_stories(count = 100, state = "unstarted,started,unscheduled,rejected")
       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.3.8"
+  VERSION = "0.3.9"
 end

data/spec/pivo_flow/cli_spec.rb

@@ -60,8 +60,65 @@ describe PivoFlow::Cli do
     end
 
   end
+
+  describe "reads story id from file" do
+
+    it "and returns nil if there is no such file" do
+      File.stub(:exists?).and_return(false)
+      PivoFlow::Cli.new.send(:current_story_id).should be_nil
+    end
+
+    it "and returns story id if file exists" do
+      File.stub(:exists?).and_return(true)
+      f = mock('File', :read => "123")
+      File.stub(:open).and_return(f)
+      PivoFlow::Cli.new.send(:current_story_id).should eq "123"
+    end
+  end
+
+  describe "finish method" do
+
+    it "calls finish_story on pivotal object on finish method" do
+      pivo = mock("PivoFlow::Pivotal")
+      PivoFlow::Cli.any_instance.should_receive(:pivotal_object).and_return(pivo)
+      pivo.should_receive(:finish_story).with("123")
+      PivoFlow::Cli.any_instance.should_receive(:current_story_id).twice.and_return("123")
+      PivoFlow::Cli.new("finish").go!
+    end
+
+    it "returns 1 if there is no current_story_id" do
+      PivoFlow::Cli.any_instance.should_receive(:current_story_id).and_return(nil)
+      PivoFlow::Cli.new.send(:finish).should eq 1
+    end
+  end
+
+  describe "start method" do
+
+    it "returns 1 if no story given" do
+      PivoFlow::Cli.new.send(:start).should eq 1
+    end
+
+  end
+
+  describe "clear method" do
+
+    it "returns 1 if current story is nil" do
+      PivoFlow::Cli.any_instance.should_receive(:current_story_id).and_return(nil)
+      PivoFlow::Cli.new.send(:clear).should eq 1
+    end
+
+
+    it "removes file if current story is present" do
+      PivoFlow::Cli.any_instance.should_receive(:current_story_id).and_return(1)
+      FileUtils.should_receive(:remove_file).and_return(true)
+      PivoFlow::Cli.new.send(:clear)
+    end
+
+  end
+
+
   describe "should allow to run command named" do
-    methods = [:stories, :start, :info, :finish, :clear, :reconfig]
+    methods = [:stories, :start, :info, :finish, :clear, :help, :reconfig, :current, :deliver]
     methods.each do |method|
       it "#{method.to_s}" do
         PivoFlow::Cli.any_instance.stub(method)

data/spec/pivo_flow/pivotal_spec.rb

@@ -44,9 +44,91 @@ describe PivoFlow::Pivotal do
       pivotal.unasigned_stories.should eq [@story_unassigned]
     end
 
+    it "show_stories should display stories on output" do
+      pivotal.should_receive(:list_stories_to_output)
+      pivotal.show_stories
+    end
+
+    describe "story_string" do
+
+      it "includes story id" do
+        pivotal.story_string(@story_feature).should match(/[##{@story_feature.id}]/)      end
+
+      it "includes story name" do
+        pivotal.story_string(@story_feature).should match(/#{@story_feature.name}/)
+      end
+
+    end
+
+    describe "deliver" do
+
+      it "list only the stories with 'finished' status" do
+        @project.stub_chain(:stories, :all).and_return([@story_finished])
+        pivotal.should_receive(:list_stories_to_output).with([@story_finished])
+        pivotal.deliver
+      end
+
+    end
+
+    describe "list_stories_to_output" do
+
+      it "returns 1 if stories are nil" do
+        pivotal.list_stories_to_output(nil).should eq 1
+      end
+
+      it "returns 1 if stories are []" do
+        pivotal.list_stories_to_output([]).should eq 1
+      end
+
+    end
+
+    describe "show_story" do
+
+      after(:each) do
+        pivotal.stub(:show_stories)
+        # pivotal.stub(:update_story)
+        pivotal.stub(:show_info)
+
+        pivotal.show_story 1
+      end
+
+      describe "if story's state is 'finished'" do
+
+        before(:each) do
+          @story_feature.stub(:current_state).and_return("finished")
+          pivotal.stub(:ask_question).and_return("y")
+        end
+
+        it "ask for deliver the story" do
+          pivotal.should_receive(:ask_question).with(/deliver/)
+        end
+
+        it "updates story on pivotal with 'delivered' status" do
+          @story_feature.should_receive(:update).with({ owned_by: @story_feature.owned_by, current_state: :delivered })
+        end
+
+      end
+
+
+      it "shows info about the story" do
+        pivotal.stub(:ask_question).and_return("no")
+        pivotal.should_receive(:show_info)
+      end
+
+      it "updates the story if user response is 'yes'" do
+        pivotal.stub(:ask_question).and_return("yes")
+        pivotal.should_receive(:update_story)
+      end
+
+      it "show stories if user response is 'no'" do
+        pivotal.stub(:ask_question).and_return("no")
+        pivotal.should_receive(:show_stories)
+      end
+    end
+
     describe "start_story" do
+
       before(:each) do
-        @story_feature.stub_chain(:update, :errors, :count).and_return(0)
         @story_feature.should_receive(:update).with({ current_state: :started, owned_by: pivotal.user_name })
       end
 
@@ -112,7 +194,10 @@ def stub_pivotal_project
     requested_by: "Paul Newman",
     owned_by: "Adam Newman",
     labels: "first,second")
-  @story_unassigned = PivotalTracker::Story.new(owned_by: nil)
-  @project.stub_chain(:stories, :all).and_return([@story_feature, @story_unassigned])
+  @story_feature.stub_chain(:update).and_return(mock(errors: []))
+  @story_unassigned = PivotalTracker::Story.new(owned_by: nil, name: "test", current_state: "started")
+  @story_rejected = PivotalTracker::Story.new(current_state: "rejected", owned_by: "Mark Marco", name: "test_rejected")
+  @story_finished = PivotalTracker::Story.new(current_state: "finished", owned_by: "Mark Marco", name: "finished")
+  @project.stub_chain(:stories, :all).and_return([@story_feature, @story_unassigned, @story_rejected, @story_finished])
   PivotalTracker::Project.stub(:find).and_return(@project)
 end

metadata

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