Finishing a chore or release marks it accepted

karmajunkie · Dec 10, 2008 · 2fc1dfd · 2fc1dfd
1 parent 64f1216
commit 2fc1dfd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/lib/pickler/feature.rb b/lib/pickler/feature.rb
@@ -66,9 +66,13 @@ def push
     end
 
     def finish
-      story.current_state = "finished" unless story.complete?
-      story.to_s = local_body if filename
-      story.save
+      if filename
+        story.finish
+        story.to_s = local_body
+        story.save
+      else
+        story.finish!
+      end
     end
 
     def id

diff --git a/lib/pickler/tracker/story.rb b/lib/pickler/tracker/story.rb
@@ -25,14 +25,28 @@ def transition!(state)
         raise Pickler::Tracker::Error, "Invalid state #{state}", caller unless STATES.include?(state)
         self.current_state = state
         if id
-          xml = "<story><current-state>#{state}</current-state></story>"
+          xml = "<story><current_state>#{state}</current_state></story>"
           error = tracker.request_xml(:put, resource_url, xml).fetch("errors",{})["error"] || true
         else
           error = save
         end
         raise Pickler::Tracker::Error, Array(error).join("\n"), caller unless error == true
       end
 
+      def finish
+        case story_type
+        when "bug", "feature"
+          self.current_state = "finished" unless complete?
+        when "chore", "release"
+          self.current_state = "accepted"
+        end
+        current_state
+      end
+
+      def finish!
+        transition!(finish)
+      end
+
       def backlog?(as_of = Date.today)
         iteration && iteration.start >= as_of
       end