lib/commands/pick.rb in git-pivotal-0.2.3 vs lib/commands/pick.rb in git-pivotal-0.8.0

@@ -1,70 +1,74 @@
 require 'commands/base'
 
 module Commands
   class Pick < Base
-  
+
     def type
       raise Error("must define in subclass")
     end
-    
+
     def plural_type
       raise Error("must define in subclass")
     end
-  
+
     def branch_suffix
       raise Error("must define in subclass")
     end
-    
+
     def run!
-      super
+      response = super
+      return response if response > 0
 
       msg = "Retrieving latest #{plural_type} from Pivotal Tracker"
       if options[:only_mine]
         msg += " for #{options[:full_name]}"
       end
       put "#{msg}..."
-      
+
       unless story
         put "No #{plural_type} available!"
         return 0
       end
-    
+
       put "Story: #{story.name}"
       put "URL:   #{story.url}"
 
       put "Updating #{type} status in Pivotal Tracker..."
-      if story.start!(:owned_by => options[:full_name])
-    
-        suffix = branch_suffix
-        unless options[:quiet]
-          put "Enter branch name (will be prepended by #{story.id}) [#{suffix}]: ", false
-          suffix = input.gets.chomp
-      
-          suffix = "feature" if suffix == ""
+      if story.update(:owned_by => options[:full_name], :current_state => :started)
+
+        suffix_or_prefix = ""
+        unless options[:quiet] || options[:defaults]
+          put "Enter branch name (will be #{options[:append_name] ? 'appended' : 'prepended'} by #{story.id}) [#{suffix_or_prefix}]: ", false
+          suffix_or_prefix = input.gets.chomp
         end
+        suffix_or_prefix = branch_suffix if suffix_or_prefix == ""
 
-        branch = "#{story.id}-#{suffix}"
+        if options[:append_name]
+          branch = "#{suffix_or_prefix}-#{story.id}"
+        else
+          branch = "#{story.id}-#{suffix_or_prefix}"
+        end
         if get("git branch").match(branch).nil?
-          put "Creating #{branch} branch..."
+          put "Switched to a new branch '#{branch}'"
           sys "git checkout -b #{branch}"
         end
-    
+
         return 0
       else
         put "Unable to mark #{type} as started"
-        
+
         return 1
       end
     end
 
   protected
 
     def story
       return @story if @story
-      
-      conditions = { :story_type => type, :current_state => :unstarted }
+
+      conditions = { :story_type => type, :current_state => "unstarted", :limit => 1, :offset => 0 }
       conditions[:owned_by] = options[:full_name] if options[:only_mine]
-      @story = project.stories.find(:conditions => conditions, :limit => 1).first
+      @story = project.stories.all(conditions).first
     end
   end
 end