pivotal-brancher 0.0.3 → 0.0.4

data/lib/pivotal-brancher/cli.rb

@@ -8,8 +8,10 @@ module PivotalBrancher
     default_task :start
 
     no_commands do
-      def story_branch_name(story)
-        ([story.id] + story.name.split(/[^\w]+/).map(&:downcase)).join("_")
+      def story_branch_name(story, ids=nil)
+        ids ||= [story.id]
+        name = story.name.split(/[:-]\s*/, 2).last.gsub(/'/, '')
+        (name.split(/[^\w]+/).map(&:downcase) + ids).join("_")
       end
 
       def app=(app)
@@ -26,22 +28,36 @@ module PivotalBrancher
     def start
       stories = app.started_stories
       if stories.empty?
-        say "No started stories found - could be you haven't started any stories yet?"
-        exit
       end
-      story = stories.shift
 
-      #Need to handle empty case ( you should probably start a story...)
-      #
+      branch_name =
+        case stories.length
+        when 0
+          say "No started stories found - could be you haven't started any stories yet?"
+          exit
+        when 1
+          story = stories.first
+          say "Switching to branch for:"
+          say "#{story.id}: #{story.name}"
+          story_branch_name(story)
+        when (2..4)
+          say "There are #{stories.length} stories started"
+          stories.each do |story|
+            say "  #{story.id}: #{story.name}"
+          end
+          say
+          branchname = story_branch_name(stories.first, stories.map(&:id))
+          unless yes?("Start branch named #{branchname}?")
+            exit 1
+          end
+          branchname
+        else
+          say "You have #{stories.length} stories started - save some for later"
+          exit 1
+        end
 
-      say "Switching to branch for:"
-      say "#{story.id}: #{story.name}"
-      say ""
-      say "Other started stories are:"
-      stories.each do |story|
-        say "#{story.id}: #{story.name}"
-      end
-      git_command = "git checkout -b #{story_branch_name(story)}"
+
+      git_command = "git checkout -b #{branch_name}"
       if options.pretend?
         say "Would run: #{git_command}"
       else

data/spec/start.rb

@@ -8,6 +8,12 @@ describe PivotalBrancher::Cli do
     end
   end
 
+  let :brancher_app do
+    PivotalBrancher::App.new.tap do |app|
+      app.stub(:started_stories).and_return(stories)
+    end
+  end
+
   let :cli do
     described_class.new.tap do |cli|
       cli.app = brancher_app
@@ -15,13 +21,28 @@ describe PivotalBrancher::Cli do
     end
   end
 
-  describe "with started stories" do
-    let :brancher_app do
-      PivotalBrancher::App.new.tap do |app|
-        app.stub(:started_stories).and_return(stories)
+  describe "with two started stories" do |app|
+    let :stories do
+      [
+        OpenStruct.new(:id => "123456", :name => "This: is a story"),
+        OpenStruct.new(:id => "123457", :name => "Whereas - a tale")
+      ]
+    end
+
+    before :each do
+      cli.stub(:yes? => true)
+    end
+
+    it "should build branch name" do
+      cli.should_receive(:run).with("git checkout -b is_a_story_123456_123457")
+      capture_stdout do
+        cli.start
       end
     end
+  end
 
+
+  describe "with started stories" do
     let :stories do
       [
         OpenStruct.new(:id => "123456", :name => "This: is a story")
@@ -35,11 +56,11 @@ describe PivotalBrancher::Cli do
     end
 
     it "should build branch names" do
-      expect(cli.story_branch_name(stories.first)).to eql("123456_this_is_a_story")
+      expect(cli.story_branch_name(stories.first)).to eql("is_a_story_123456")
     end
 
     it "should execute git checkout -b" do
-      cli.should_receive(:run).with("git checkout -b 123456_this_is_a_story")
+      cli.should_receive(:run).with("git checkout -b is_a_story_123456")
       capture_stdout do
         cli.start
       end
@@ -47,10 +68,8 @@ describe PivotalBrancher::Cli do
   end
 
   describe "with no started stories" do
-    let :brancher_app do
-      PivotalBrancher::App.new.tap do |app|
-        app.stub(:started_stories).and_return([])
-      end
+    let :stories do
+      []
     end
 
     it "should not execute git" do

metadata

@@ -2,14 +2,14 @@
 name: pivotal-brancher
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -105,7 +105,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- pivotal-brancher-0.0.3 Documentation
+- pivotal-brancher-0.0.4 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 795572577
+      hash: 304253647
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement