story_branch 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51fb5eb1e204d970116356bb1f2f273ac0de0804
-  data.tar.gz: 6ae1d58a21ae39e5def105f4b58d327147fd83a9
+  metadata.gz: d9cc200c930d34b90699a03c634f1de29e2c599b
+  data.tar.gz: 7abb7d7e9c1001d9e4d1c2236925995de29ff39b
 SHA512:
-  metadata.gz: 010f313b23b8b1604af7dd9fd679d60f9c67b8109fc4083c39932480be23f1ed544fcbe8ad5a3e488df9b3a68af67581e7e8c3a7edec2f82f7553d3650913fea
-  data.tar.gz: 2d227dfd93c2a3655f78a512f1ee3d7adf5d57c2c41c6fb96264bd88dc738bd94185dc5c611057d1ea52d3a997704b87d14f0f24bf249e9db418714a45ad94e0
+  metadata.gz: dd86ebf0d42dcbc66a70ab1e4e2d9403996ddce94a422b8ae2ccd46921cd5ddb1eec096f127678f7f506604f219083be4717c2760e21b2f9390b8363c637236b
+  data.tar.gz: 4e7e215be23201bd48cc94fec811f76dcb87eaae3bd3214994bae5c1e3b4d25761b4638d7c36b899dd1e3bad64f378dc35e43f59adc53fdadf6da2b7ed9d850e

data/README.md

@@ -17,8 +17,8 @@ accept. The branch will be created (the story_id will automatically
 be used as a suffix in the branch name)
 
 **git start**: Start a story in Pivotal Tracker from the terminal.
-List all unstarted stories in your current project. Entering a
-partial string will fuzzy match against the list.
+Lists all unstarted stories in your current project. Select a story 
+from the displayed list, and it will tell Pivotal Tracker to start it.
 
 **git finish**: Create a finishing commit + message, for example:
 "[Finishes #1234567] My Story Title" - optionally Finishes the story

data/lib/story_branch.rb

@@ -5,7 +5,7 @@
 #          Dominic Wong <dominic.wong.617@gmail.com>
 #          Gabe Hollombe <gabe@neo.com>
 #
-# Version: 0.2.0
+# Version: 0.2.1
 #
 # ## Description
 #
@@ -77,10 +77,17 @@ require 'git'
 require 'active_support/core_ext/string/inflections'
 require 'levenshtein'
 
+trap('INT') {exit}
+
 module StoryBranch
 
   class Main
 
+    ERRORS = {
+      "Stories in the started state must be estimated." =>
+      "Error: Pivotal won't allow you to start an unestimated story"
+    }
+
     PIVOTAL_CONFIG_FILES = ['.story_branch',"#{ENV['HOME']}/.story_branch"]
 
     attr_accessor :p
@@ -97,13 +104,14 @@ module StoryBranch
 
     def create_story_branch
       begin
+        puts "Connecting with Pivotal Tracker"
         @p.get_project
-        stories = @p.display_stories :started
+        puts "Getting stories..."
+        stories = @p.display_stories :started, false
         if stories.length < 1
-          puts "No stories started... exiting"
+          puts "No stories started, exiting"
           exit
         end
-        puts "[0] Exit"
         story   = @p.select_story stories
         if story
           @p.create_feature_branch story
@@ -114,16 +122,20 @@ module StoryBranch
       end
     end
 
-    def story_start
+    def pick_and_update filter, hash, msg, is_estimated
       begin
+        puts "Connecting with Pivotal Tracker"
         @p.get_project
-        # TODO: Use a predicate for Estimated and Backlog'ed stories
-        stories = @p.display_stories :unstarted
-        puts "[0] Exit"
+        puts "Getting stories..."
+        stories = @p.filtered_stories_list filter, is_estimated
         story = @p.select_story stories
         if story
-          story.update :current_state => "started"
-          puts "#{story.id} started"
+          result = story.update hash
+          if result.errors.count > 0
+            puts result.errors.to_a.uniq.map{|e| ERRORS[e] }
+            return nil
+          end
+          puts "#{story.id} #{msg}"
         end
       rescue RestClient::Unauthorized
         puts "Pivotal API key or Project ID invalid"
@@ -131,16 +143,24 @@ module StoryBranch
       end
     end
 
+    def story_start
+      pick_and_update(:unstarted, {:current_state => "started"}, "started", true)
+    end
+
     def story_unstart
-      # TODO: unstart a started story.
+      pick_and_update(:started, {:current_state => "unstarted"}, "unstarted", false)
+    end
+
+    def story_estimate
+      # TODO: estimate a story
     end
 
     def story_finish
       begin
+        puts "Connecting with Pivotal Tracker"
         @p.get_project
         unless @p.is_current_branch_a_story?
-          puts "Your current branch: #{GitUtils.current_branch}"
-          puts "is not linked to a started story."
+          puts "Your current branch: '#{GitUtils.current_branch}' is not linked to a Pivotal Tracker story."
           return
         end
 
@@ -158,7 +178,7 @@ module StoryBranch
         end
 
         puts "Use standard finishing commit message: [y/N]?"
-        commit_message = "[Finishes ##{GitUtils.current_branch_story_parts[:id]}] #{GitUtils.current_branch_story_parts[:description]}"
+        commit_message = "[Finishes ##{GitUtils.current_branch_story_parts[:id]}] #{GitUtils.current_branch_story_parts[:description].StringUtils.undashed}"
         puts commit_message
 
         if gets.chomp!.downcase == "y"
@@ -202,6 +222,10 @@ module StoryBranch
       s.tr '\'"%!@#$(){}[]*\\?', ''
     end
 
+    def self.undashed s
+      s.underscore.humanize
+    end
+
   end
 
   class GitUtils
@@ -297,8 +321,9 @@ module StoryBranch
     end
 
     def is_current_branch_a_story?
+      GitUtils.current_story and
       GitUtils.current_story.length == 3 and
-        filtered_stories_list(:started).map(&:id).include? GitUtils.current_story[2].to_i
+        filtered_stories_list(:started, true).map(&:id).include? GitUtils.current_story[2].to_i
     end
 
     def story_from_current_branch
@@ -310,32 +335,46 @@ module StoryBranch
     # Filtering on tags/labels
     # Filtering on estimation (estimated?, 0 point, 1 point etc.)
 
-    def filtered_stories_list state
+    def filtered_stories_list state, estimated
       project = get_project
-      project.stories.all({current_state: state})
+      stories = project.stories.all({current_state: state})
+      if estimated
+        stories.select{|s| s.estimate and s.estimate > 1 }
+      else
+        stories
+      end
     end
 
-    def display_stories state
-      filtered_stories_list(state).each_with_index {|s,i| puts one_line_story s, i}
+    def display_stories state, estimated
+      filtered_stories_list(state, estimated).each {|s| puts one_line_story s }
     end
 
-    def one_line_story s, i
-      "[#{i+1}] ##{s.id} : #{s.name}"
+    def one_line_story s
+      "#{s.id} - #{s.name}"
     end
 
     def select_story stories
-      story_selection = nil
-      while story_selection == nil or story_selection.to_i > stories.length + 1
-        puts "invalid selection" if story_selection != nil
-        story_texts = Range.new(1,stories.length).to_a.map(&:to_s)
-        story_selection = readline("Select a story: ", story_texts)
+      story_texts = stories.map{|s| one_line_story s }
+      puts "Leave blank to exit, use <up>/<down> to scroll through stories, TAB to list all and auto-complete"
+      story_selection = readline("Select a story: ", story_texts)
+      if story_selection == "" or story_selection.nil?
+        return nil
       end
-      if story_selection.to_i == 0
+      story = stories.select{|s| story_matcher s, story_selection }.first
+      if story.nil?
+        puts "Not found: #{story_selection}"
         return nil
+      else
+        puts "Selected : #{one_line_story story}"
+        return story
       end
-      story = stories[story_selection.to_i - 1]
-      puts "Selected : ##{story.id} : #{story.name}"
-      return story
+    end
+
+    def story_matcher story, selection
+      m = selection.match(/^(\d*) /)
+      return false unless m
+      id = m.captures.first
+      return story.id.to_s == id
     end
 
     def create_feature_branch story
@@ -343,7 +382,7 @@ module StoryBranch
       feature_branch_name = nil
       puts "You are checked out at: #{GitUtils.current_branch}"
       while feature_branch_name == nil or feature_branch_name == ""
-        puts "Provide a new branch name... (C-p or <up> for suggested name)" if [nil, ""].include? feature_branch_name
+        puts "Provide a new branch name... (TAB for suggested name)" if [nil, ""].include? feature_branch_name
         feature_branch_name = readline("Name of feature branch: ", [dashed_story_name])
       end
       feature_branch_name.chomp!
@@ -361,14 +400,14 @@ module StoryBranch
       end
       existing_name_score = GitUtils.is_existing_branch?(name)
       unless existing_name_score == -1
-        puts <<-END.strip_heredoc
+        puts <<-EOD.strip_heredoc
         Name Collision Error:
 
         #{name}
 
         This is too similar to the name of an existing
         branch, a more unique name is required
-      END
+      EOD
       end
     end
 
@@ -379,15 +418,16 @@ module StoryBranch
       name.match valid
     end
 
-    def readline prompt, history=[]
-      if history.length > 0
-        history.each {|i| Readline::HISTORY.push i}
-      end
-      begin
-        Readline.readline(prompt, false)
-      rescue Interrupt
+    def readline prompt, completions=[]
+      # Store the state of the terminal
+      Readline::HISTORY.clear
+      if completions.length > 0
+        completions.each {|i| Readline::HISTORY.push i}
+        Readline.special_prefixes = " .{}()[]!?\"'_-#@$%^&*"
+        Readline.completion_proc = proc {|s| completions.grep(/#{Regexp.escape(s)}/) }
+        Readline.completion_append_character = ""
       end
+      Readline.readline(prompt, false)
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story_branch
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Milkins
@@ -17,56 +17,56 @@ dependencies:
   name: pivotal-tracker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: levenshtein-ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Simple gem that fetches the available stories in your pivotaltracker
@@ -120,12 +120,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []