saga 0.9.1 → 0.10.0

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.10.0

data/lib/saga/document.rb

@@ -12,14 +12,29 @@ module Saga
       @definitions  = ActiveSupport::OrderedHash.new
     end
     
-    def stories_as_flat_list
+    def copy_story(story)
+      copied = {}
+      [:id, :iteration, :status, :estimate, :description].each do |attribute|
+        copied[attribute] = story[attribute] if story[attribute]
+      end; copied
+    end
+    
+    def flatten_stories(stories)
       stories_as_flat_list = []
-      stories.values.flatten.each do |story|
-        stories_as_flat_list << story
-        stories_as_flat_list.concat(story[:stories]) if story[:stories]
+      stories.flatten.each do |story|
+        if story[:stories]
+          stories_as_flat_list << copy_story(story)
+          stories_as_flat_list.concat(story[:stories])
+        else
+          stories_as_flat_list << story
+        end
       end; stories_as_flat_list
     end
     
+    def stories_as_flat_list
+      flatten_stories(stories.values)
+    end
+    
     def _binding
       binding
     end
@@ -53,10 +68,19 @@ module Saga
       length == 0
     end
     
+    def _autofill_ids(stories, unused_ids)
+      stories.each do |story|
+        story[:id] ||= unused_ids.shift
+        if story[:stories]
+          _autofill_ids(story[:stories], unused_ids)
+        end
+      end
+    end
+    
     def autofill_ids
       unused_ids = unused_ids(length - used_ids.length)
-      stories_as_flat_list.each do |story|
-        story[:id] ||= unused_ids.shift
+      stories.each do |section, data|
+        _autofill_ids(data, unused_ids)
       end
     end
   end

data/lib/saga/planning.rb

@@ -35,6 +35,16 @@ module Saga
       unestimated
     end
     
+    def range_estimated
+      range_estimated = 0
+      @document.stories_as_flat_list.each do |story|
+        if story[:estimate] && story[:estimate][1] == :range
+          range_estimated += 1
+        end
+      end
+      range_estimated
+    end
+    
     def statusses
       statusses = {}
       @document.stories_as_flat_list.each do |story|
@@ -61,6 +71,7 @@ module Saga
         if unestimated > 0 or !statusses.empty?
           parts << ''
           parts << self.class.format_unestimated(unestimated) if unestimated > 0
+          parts << self.class.format_range_estimated(range_estimated) if range_estimated > 0
           parts << self.class.format_statusses(statusses) unless statusses.empty?
         end
         parts.shift if parts[0] == ''
@@ -76,6 +87,8 @@ module Saga
         estimate[0] * 8
       when :weeks
         estimate[0] * 40
+      when :range
+        0
       else
         estimate[0]
       end
@@ -87,12 +100,20 @@ module Saga
       else
         label = 'Total'
       end
-      story_column = (properties[:story_count] == 1) ? "#{properties[:story_count]} story" : "#{properties[:story_count]} stories"
+      story_column = format_stories_count(properties[:story_count])
       "#{label.ljust(FIRST_COLUMN_WIDTH)}: #{properties[:estimate_total_in_hours]} (#{story_column})"
     end
     
     def self.format_unestimated(unestimated)
-      "Unestimated   : #{unestimated > 1 ? "#{unestimated} stories" : 'one story' }"
+      "Unestimated   : #{format_stories_count(unestimated)}"
+    end
+    
+    def self.format_range_estimated(range_estimated)
+      "Range-estimate: #{format_stories_count(range_estimated)}"
+    end
+    
+    def self.format_stories_count(count)
+      count > 1 ? "#{count} stories" : 'one story'
     end
     
     def self.format_statusses(statusses)

data/lib/saga/tokenizer.rb

@@ -49,6 +49,10 @@ module Saga
       end
     end
     
+    RE_STORY_NUMBER = /\#(\d+)/
+    RE_STORY_ITERATION = /i(\d+)/
+    RE_STORY_ESTIMATE_PART = /(\d+)(d|w|h|)/
+    
     def self.tokenize_story_attributes(input)
       return {} if input.nil?
       
@@ -59,11 +63,14 @@ module Saga
       parts.each do |part|
         if part.strip == ''
           next
-        elsif match = /\#(\d+)/.match(part)
+        elsif match = RE_STORY_NUMBER.match(part)
           attributes[:id] = match[1].to_i
-        elsif match = /i(\d+)/.match(part)
+        elsif match = RE_STORY_ITERATION.match(part)
           attributes[:iteration] = match[1].to_i
-        elsif match = /(\d+)(d|w|h|)/.match(part)
+        elsif match = /#{RE_STORY_ESTIMATE_PART}-#{RE_STORY_ESTIMATE_PART}/.match(part)
+          estimate = "#{match[1,2].join}-#{match[3,2].join}"
+          attributes[:estimate] = [estimate, :range]
+        elsif match = RE_STORY_ESTIMATE_PART.match(part)
           attributes[:estimate] = [match[1].to_i, interval(match[2])]
         else
           rest << part

metadata

@@ -1,90 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: saga
-version: !ruby/object:Gem::Version 
-  hash: 57
+version: !ruby/object:Gem::Version
+  version: 0.10.0
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 1
-  version: 0.9.1
 platform: ruby
-authors: 
+authors:
 - Manfred Stienstra
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: erubis
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70121805102580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70121805102580
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70121805101940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70121805101940
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &70121805101480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha-on-bacon
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70121805101480
+- !ruby/object:Gem::Dependency
+  name: mocha-on-bacon
+  requirement: &70121805100960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *70121805100960
 description: Saga is a tool to convert stories syntax to a nicely formatted document.
 email: manfred@fngtps.com
-executables: 
+executables:
 - saga
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -104,36 +83,26 @@ files:
 - bin/saga
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Saga is a tool to convert stories syntax to a nicely formatted document.
 test_files: []
-