pivotal_doc 1.4.0 → 1.4.1

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/lib/pivotal_doc.rb

@@ -16,13 +16,10 @@ require File.join('pivotal_doc/exceptions')
 require File.join('pivotal_doc/generator')
 
 #Core classes
-require File.join('pivotal_doc/work')
-require File.join('pivotal_doc/release')
 require File.join('pivotal_doc/sprint')
 
 #Generators
 require File.join('pivotal_doc/generators', 'base')
 require File.join('pivotal_doc/generators', 'html')
 require File.join('pivotal_doc/generators', 'csv')
-require File.join('pivotal_doc/generators', 'sprint')
 

data/lib/pivotal_doc/generator.rb

@@ -1,15 +1,13 @@
 module PivotalDoc
   class Generator    
     class << self
-      #TODO: Clean this mutatant up
       def generate(format, settings={})
         raise FormatNotSupported.new(format) unless generators.has_key?(format)
         config= PivotalDoc::Configuration.new(settings)
         config.authenticate!
-        releases= collect_releases!(config)
-        releases.each do |release|
-          generator= release.generator(format) if release.respond_to?(:generator)
-          (generator || generators[format]).new(release, config.settings).render_doc
+        sprints= collect_sprints!(config)
+        sprints.each do |sprint|
+          generators[format].new(sprint, config.settings).render_doc
         end
         true
       end      
@@ -18,17 +16,13 @@ module PivotalDoc
         { :html=>Generators::HTML, :csv=>Generators::CSV }
       end
     
-      def collect_releases!(config)
-        releases= []
+      def collect_sprints!(config)
+        sprints= []
         config.projects.each do |name, _attrs|
           project= PT::Project.find(_attrs['id'].to_i)
-          if _attrs['current']
-            releases << Sprint.new(project)
-          else
-            releases << Release.new(project)
-          end
+          sprints << PivotalDoc::Sprint.new(project, _attrs['current'])
         end
-        return releases
+        return sprints
       end
     end    
   end

data/lib/pivotal_doc/generators/base.rb

@@ -1,8 +1,10 @@
 module PivotalDoc
   module Generators
     class Base
-      def initialize(release, options={})
-        @release= release
+      TEMPLATE_PATH= "#{PROJECT_ROOT}/templates"
+      
+      def initialize(sprint, options={})
+        @sprint= sprint
         @options= options
       end
       
@@ -13,7 +15,7 @@ module PivotalDoc
       def output_file
         name= @options['output_file']
         unless name
-          name=@release.name || @release.project_name || self.object_id.to_s
+          name=@sprint.release_name || @sprint.project_name || self.object_id.to_s
           name.gsub!(/\//, '') and name.gsub!(/\s/,'')
         end
         File.join(output_path, (name + output_ext))  
@@ -40,7 +42,7 @@ module PivotalDoc
       end
       
       def template
-        path= File.join(PROJECT_ROOT, 'templates', template_name)
+        path= File.join(TEMPLATE_PATH, template_name)
         raise TemplateNonExistent.new(template_name) unless File.exists?(path)
         @template ||= File.read(path)
       end

data/lib/pivotal_doc/generators/csv.rb

@@ -11,7 +11,7 @@ module PivotalDoc
       def render_doc
         output = FasterCSV.generate do |csv|
           csv << COLUMNS.clone 
-          @release.features.each {|f| csv << fields(f) }              
+          @sprint.features.each {|f| csv << fields(f) }              
         end
         super(output)
       end

data/lib/pivotal_doc/generators/html.rb

@@ -6,7 +6,7 @@ module PivotalDoc
       end
       def output_ext; '.html' end
       def render_doc
-        html= Haml::Engine.new(template).render(Object.new, {:release=>@release})
+        html= Haml::Engine.new(template).render(Object.new, {:sprint=>@sprint})
         super(html)
       end
     end

data/lib/pivotal_doc/sprint.rb

@@ -1,24 +1,67 @@
 module PivotalDoc
-  class Sprint
-    include Work
+  class Sprint    
+    attr_reader :project, :iteration
+  
+    def initialize(project, current=false)
+      @project= project
+      @current= current
+      @iteration= (@current) ? current_iteration : latest_iteration
+    end
+    
+    def current?
+      @current
+    end
     
-    attr_reader :project
-    attr_reader :iteration
+    def project_name
+      @project.name
+    end
+    
+    def features
+      self.stories + self.bugs + self.chores
+    end     
+    
+    def stories
+      @stories ||= filter_stories
+    end
 
-    def initialize(project)
-      @project= project
-      @iteration= PT::Iteration.current(project)
+    def bugs
+      @bugs ||= filter_stories('bug')
+    end
+
+    def chores
+      @chores ||= filter_stories('chore')
+    end
+    
+    def release
+      @release ||= self.iteration.stories.detect{|s| s.story_type.downcase=='release'} if self.iteration.stories
     end
-  
-    def name; nil end
     
-    def generator(format=:html)
-      {:html=>PivotalDoc::Generators::Sprint}[format]
+    def release_name
+      release.name if release.respond_to?(:name) 
     end
     
+    def latest_iteration
+      PT::Iteration.done(@project, :offset=>'-1').first
+    end
+    
+    def current_iteration
+      PT::Iteration.current(@project)
+    end
+        
+    [:stories, :bugs, :chores].each do |m|
+      define_method("accepted_#{m}") do
+        self.send(m).reject{|s| s.current_state.downcase != 'accepted' }
+      end
+      define_method("#{m}_delivered") do
+        self.send("accepted_#{m}".to_sym).size 
+      end
+    end
+        
     private
     def filter_stories(type='feature')
-      self.iteration.stories.reject {|s| s.story_type.downcase != type }
+      self.iteration.stories.reject do |s|
+        s.story_type.downcase != type 
+      end
     end
   end
 end

data/lib/pivotal_doc/work.rb

@@ -1,23 +1,4 @@
 module PivotalDoc
   module Work
-    def project_name
-      @project.name
-    end
-    
-    def features
-      self.stories + self.bugs + self.chores
-    end     
-    
-    def stories
-      @stories ||= filter_stories
-    end
-
-    def bugs
-      @bugs ||= filter_stories('bug')
-    end
-
-    def chores
-      @chores ||= filter_stories('chore')
-    end
   end
 end

data/pivotal_doc.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pivotal_doc}
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Linquist"]
@@ -51,8 +51,6 @@ Gem::Specification.new do |s|
     "lib/pivotal_doc/generators/base.rb",
     "lib/pivotal_doc/generators/csv.rb",
     "lib/pivotal_doc/generators/html.rb",
-    "lib/pivotal_doc/generators/sprint.rb",
-    "lib/pivotal_doc/release.rb",
     "lib/pivotal_doc/sprint.rb",
     "lib/pivotal_doc/work.rb",
     "pivotal_doc.gemspec",
@@ -66,8 +64,6 @@ Gem::Specification.new do |s|
     "spec/lib/generators/base_spec.rb",
     "spec/lib/generators/csv_spec.rb",
     "spec/lib/generators/html_spec.rb",
-    "spec/lib/generators/sprint_spec.rb",
-    "spec/lib/release_spec.rb",
     "spec/lib/sprint_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb",
@@ -76,6 +72,7 @@ Gem::Specification.new do |s|
     "templates/fancy.haml",
     "templates/output.csv",
     "templates/output.haml",
+    "templates/release.haml",
     "templates/sprint.haml"
   ]
   s.homepage = %q{http://github.com/timo3377/pivotal_doc}
@@ -89,8 +86,6 @@ Gem::Specification.new do |s|
     "spec/lib/generators/base_spec.rb",
     "spec/lib/generators/csv_spec.rb",
     "spec/lib/generators/html_spec.rb",
-    "spec/lib/generators/sprint_spec.rb",
-    "spec/lib/release_spec.rb",
     "spec/lib/sprint_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/mocks_helper.rb",

data/spec/lib/generator_spec.rb

@@ -13,7 +13,7 @@ describe PivotalDoc::Generator do
   
   describe "Configuring" do
     before(:each) do
-      PivotalDoc::Generator.stub!(:collect_releases!).and_return([])
+      PivotalDoc::Generator.stub!(:collect_sprints!).and_return([])
     end
     it "should create a config object from the settings" do
       settings= {}
@@ -28,48 +28,28 @@ describe PivotalDoc::Generator do
     end    
   end
   
-  describe "releases" do
+  describe "sprints" do
     before(:each) do
-      @release= mocks_helper(:release)
-      PivotalDoc::Release.stub!(:new).and_return(@release)
+      @sprint= mocks_helper(:sprint)
+      PivotalDoc::Sprint.stub!(:new).and_return(@sprint)
     end
     
-    it "should create a release for each project" do
+    it "should create a sprint for each project" do
       PT::Iteration.stub!(:current).and_return(mocks_helper(:iteration))
       @config.projects.each do |name, settings| 
-        PT::Project.should_receive(:find).with(settings['id'].to_i).and_return(@release.project) 
-      end
-      releases= PivotalDoc::Generator.collect_releases!(@config)
-      releases.size.should eql(@config.projects.size)
-    end
-    
-    describe "current" do
-      it "create a current iteration for the release if current is set for the project" do
-        PT::Project.stub!(:find).and_return(@release.project)      
-        iteration= mocks_helper(:iteration)
-        PT::Iteration.should_receive(:current).exactly(:once).and_return(iteration)
-        PivotalDoc::Generator.collect_releases!(@config)
-      end
-      
-      it "create a sprint for the current iteration instead of a release" do
-        PT::Project.stub!(:find).and_return(@release.project)      
-        iteration= mocks_helper(:iteration)
-        PT::Iteration.stub!(:current).and_return(iteration)
-        releases= PivotalDoc::Generator.collect_releases!(@config)        
-        releases.last.should be_an_instance_of(PivotalDoc::Sprint)
+        PT::Project.should_receive(:find).with(settings['id'].to_i).and_return(@sprint.project) 
       end
+      sprints= PivotalDoc::Generator.collect_sprints!(@config)
+      sprints.size.should eql(@config.projects.size)
     end
   end
 
   describe "generation" do
     before(:each) do
       @config.stub!(:authenticate!).and_return(true)
-      @release = mocks_helper(:release)
-      PT::Iteration.stub!(:current).and_return(mocks_helper(:iteration))
-      @sprint =  PivotalDoc::Sprint.new(@release.project)
-      PT::Project.stub!(:find).and_return(@release.project)
+      @sprint = mocks_helper(:sprint)
+      PT::Project.stub!(:find).and_return(@sprint.project)
       PivotalDoc::Sprint.stub!(:new).and_return(@sprint)
-      PivotalDoc::Release.stub!(:new).and_return(@release)
     end
 
     describe "Formattting" do
@@ -78,15 +58,9 @@ describe PivotalDoc::Generator do
         @html_gen= PivotalDoc::Generators::HTML.new({})
         @html_gen.stub!(:render_doc)
       end
-      it "use the generators format if there is one" do
-        sprint_generator= mock('PivotalDoc::Generators::Sprint')
-        @sprint.generator(:html).should_receive(:new).exactly(:once).with(@sprint, @config.settings).and_return(sprint_generator)
-        sprint_generator.should_receive(:render_doc)
-        PivotalDoc::Generator.generate(:html)        
-      end
+
       it "should render the release with the specified format and custom settings" do
-        @sprint.generator(:html).stub!(:new).and_return(@html_gen)
-        PivotalDoc::Generators::HTML.should_receive(:new).with(@release, @config.settings).and_return(@html_gen)
+        PivotalDoc::Generators::HTML.should_receive(:new).with(@sprint, @config.settings).and_return(@html_gen)
         PivotalDoc::Generator.generate(:html)
       end
       it "should raise an error if the specified format isn't supported" do

data/spec/lib/generators/base_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe PivotalDoc::Generators::Base do
   before(:each) do
-    @release= mocks_helper(:release)
-    @base= PivotalDoc::Generators::Base.new(@release)
+    @sprint= mocks_helper(:sprint)
+    @base= PivotalDoc::Generators::Base.new(@sprint)
   end
   it "should raise an exception if the template doesn't exist" do
     @base.stub!(:template_name).and_return('non-existent.txt')
@@ -21,24 +21,24 @@ describe PivotalDoc::Generators::Base do
 
     describe "options" do
       it "should be a fully qualified file" do
-        base= PivotalDoc::Generators::Base.new(@release, {:output_file=>'my_file'})
+        base= PivotalDoc::Generators::Base.new(@sprint, {:output_file=>'my_file'})
         f= File.open(base.output_file, 'w')
         f.should be_an_instance_of(File)
         File.delete(f.path)
       end
 
       it "should use the output_file if present" do
-        base= PivotalDoc::Generators::Base.new(@release, {'output_file'=>'my_file'})
+        base= PivotalDoc::Generators::Base.new(@sprint, {'output_file'=>'my_file'})
         base.output_file.should =~ /\/my_file/
       end
 
       it "should default the output_file to the release's name (unique filename for multiple projects)" do
-        base= PivotalDoc::Generators::Base.new(@release)
-        base.output_file.should =~ /\/#{@release.name}/
+        base= PivotalDoc::Generators::Base.new(@sprint)
+        base.output_file.should =~ /\/#{@sprint.release_name}/
       end
 
       it "should use the output_path if present" do
-        base= PivotalDoc::Generators::Base.new(@release, {'output_path'=>'my_path'})
+        base= PivotalDoc::Generators::Base.new(@sprint, {'output_path'=>'my_path'})
         base.output_path.should =~ /^my_path/
       end
 

data/spec/lib/generators/csv_spec.rb

@@ -2,8 +2,8 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe PivotalDoc::Generators::CSV do
   before(:each) do
-    @release= mocks_helper(:release)
-    @csv= PivotalDoc::Generators::CSV.new(@release)
+    @sprint= mocks_helper(:sprint)
+    @csv= PivotalDoc::Generators::CSV.new(@sprint)
   end
   
   after(:each) do
@@ -15,7 +15,7 @@ describe PivotalDoc::Generators::CSV do
       @csv.render_doc
       output= File.read(@csv.output_file)
       output.should =~ /#{PivotalDoc::Generators::CSV::COLUMNS.join(',')}/
-      @release.features.each{|f| output =~ @csv.fields(f) }
+      @sprint.features.each{|f| output =~ @csv.fields(f) }
     end
 
     it "should read the file contents" do
@@ -27,7 +27,7 @@ describe PivotalDoc::Generators::CSV do
     end 
     
     it "include each field" do
-      fields= @csv.fields(@release.features.first)
+      fields= @csv.fields(@sprint.features.first)
       fields.should be_an_instance_of(Array)
       fields.should have(PivotalDoc::Generators::CSV::COLUMNS.size).items
     end   

data/spec/lib/generators/html_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe PivotalDoc::Generators::HTML do
   before(:each) do
-    @release= mocks_helper(:release)
-    @html= PivotalDoc::Generators::HTML.new(@release)
+    @sprint= mocks_helper(:sprint)
+    @html= PivotalDoc::Generators::HTML.new(@sprint)
     @engine= Haml::Engine.new('')
   end
   
@@ -24,7 +24,7 @@ describe PivotalDoc::Generators::HTML do
   
   it "should use the template_name if specified" do
     options= {'template_name'=>'fancy.html'}
-    html= PivotalDoc::Generators::HTML.new(@release, options)
+    html= PivotalDoc::Generators::HTML.new(@sprint, options)
     html.template_name.should eql(options['template_name'])
   end
   

data/spec/lib/sprint_spec.rb

@@ -3,42 +3,89 @@ require 'spec_helper'
 describe PivotalDoc::Sprint do
   before(:each) do
     @project= PT::Project.new
-    @iteration= PT::Iteration.new
-    PT::Iteration.stub!(:current).and_return([@iteration])
+    @latest_iteration, @current_iteration = PT::Iteration.new, PT::Iteration.new
+    PT::Iteration.stub!(:done).and_return([@latest_iteration])
     @sprint= PivotalDoc::Sprint.new(@project)
   end
 
-  it "not have a release name" do
-    @sprint.name.should be_nil
+  it "should get the last 'done' iteration for the project" do
+    PT::Iteration.should_receive(:done).with(@project, :offset=>'-1').and_return([@latest_iteration])
+    @sprint.latest_iteration.should eql(@latest_iteration)
   end
 
-  it "know the html generator" do
-    @sprint.generator(:html).should eql(PivotalDoc::Generators::Sprint)
+  it "should get the current iteration for the project" do
+    PT::Iteration.should_receive(:current).and_return(@current_iteration)
+    @sprint.current_iteration.should eql(@current_iteration)
   end
-
-  it "only know the html generator" do
-    @sprint.generator(:unknown).should be_nil
-  end
-
-  describe "stories" do
+  
+  describe "an iteration" do
     before(:each) do
-      @stories= PTApiHelpers::mock_stories
-      @sprint.iteration.stub!(:stories).and_return(@stories)
+      @sprint.stub!(:latest_iteration).and_return(@latest_iteration)
     end
-
-    it "should get the stories only" do
-      @sprint.iteration.should_receive(:stories).and_return(@stories)
-      @sprint.stories.each{|s| s.story_type.downcase.should eql('feature') }
+        
+    it "should default the iteration to the latest_iteration (last 'done') if current isn't set" do
+      PT::Iteration.should_receive(:done).and_return([@latest_iteration])
+      sprint= PivotalDoc::Sprint.new(@project)
+      sprint.iteration.should eql(@latest_iteration)
     end
-
-    it "should get the bugs only" do
-      @sprint.iteration.should_receive(:stories).and_return(@stories)
-      @sprint.bugs.each{|b| b.story_type.downcase.should eql('bug') }
+    
+    describe "release of sprint" do
+      before(:each) do
+        @stories= PTApiHelpers::mock_stories
+        @release= PTApiHelpers::mock_actual_release
+        @latest_iteration.stub!(:stories).and_return(@stories)
+      end
+      
+      it "should find the \"release\" if there is one" do
+        @latest_iteration.should_receive(:stories).and_return(@stories)
+        @sprint.release.story_type.should eql('release')
+      end
+      
+      it "should know the name of the release" do
+        @sprint.release_name.should eql(@release.name)
+      end
     end
 
-    it "should get the chores only" do
-      @sprint.iteration.should_receive(:stories).and_return(@stories)
-      @sprint.chores.each{|c| c.story_type.downcase.should eql('chore') }
+    describe "stories" do
+      before(:each) do
+        @stories= PTApiHelpers::mock_stories
+        @latest_iteration.stub!(:stories).and_return(@stories)
+      end
+      
+      it "should get the stories only" do
+        @latest_iteration.should_receive(:stories).and_return(@stories)
+        @sprint.stories.each{|s| s.story_type.downcase.should eql('feature') }
+      end
+
+      it "should get the bugs only" do
+        @latest_iteration.should_receive(:stories).and_return(@stories)
+        @sprint.bugs.each{|b| b.story_type.downcase.should eql('bug') }
+      end
+      
+      it "should get the chores only" do
+        @latest_iteration.should_receive(:stories).and_return(@stories)
+        @sprint.chores.each{|c| c.story_type.downcase.should eql('chore') }        
+      end
+
+      describe "finished work" do
+        [:stories, :chores, :bugs].each do |m|
+          it "should know the #{m} delivered in this release" do
+            @sprint.send("#{m}_delivered").should eql(@sprint.send("accepted_#{m}").size)
+          end
+        end
+        
+        it "should only get the \"delivered\" stories" do
+          @sprint.accepted_stories.each{|s| s.current_state.downcase.should eql('accepted')}
+        end
+
+        it "should only get the \"delivered\" bugs" do
+          @sprint.accepted_bugs.each{|b| b.current_state.downcase.should eql('accepted')}
+        end
+
+        it "should only get the \"accepted\" chores" do
+          @sprint.accepted_chores.each{|c| c.current_state.downcase.should eql('accepted')}
+        end
+      end      
     end
-  end
+  end  
 end

data/spec/support/mocks_helper.rb

@@ -5,12 +5,13 @@ module MocksHelper
   end
 
   private  
-  def release
-    release= PivotalDoc::Release.new(project, iteration)
-    release.stub!(:stories).and_return(PTApiHelpers::mock_stories)
-    release.stub!(:bugs).and_return(PTApiHelpers::mock_bugs)
-    release.stub!(:chores).and_return(PTApiHelpers::mock_chores)
-    release
+  def sprint
+    PT::Iteration.stub!(:current).and_return(iteration)
+    sprint= PivotalDoc::Sprint.new(project, iteration)
+    sprint.stub!(:stories).and_return(PTApiHelpers::mock_stories)
+    sprint.stub!(:bugs).and_return(PTApiHelpers::mock_bugs)
+    sprint.stub!(:chores).and_return(PTApiHelpers::mock_chores)
+    sprint
   end
   
   def project
@@ -23,7 +24,7 @@ module MocksHelper
   
   def mocks
     @@mocks= {
-      :release=>release,
+      :sprint=>sprint,
       :project=>project,
       :iteration=>iteration
     }

data/templates/output.haml

@@ -2,7 +2,7 @@
 %html 
   %head 
     %meta{'http-equiv' => 'Content-Type', :content => 'text/html;charset=utf-8'} 
-    %title= release.name
+    %title= sprint.release_name
     %style{:type => "text/css", :media => "screen"}
       :plain
         p,div,h1,h2,h3,h4,h5,h6,span,a {font-family: Arial}
@@ -19,35 +19,11 @@
         div.item {padding-left: .4em}
         div.item_info {padding-left: .4em}
   %body
-    #release_doc
-      #release_info
-        %h2= "Announcing the \"#{release.name}\" release for the #{release.project_name} project"
-        %p
-          = "This sprint began on #{release.iteration.start.fancy_format} and was completed on #{release.iteration.finish.fancy_format}.  It includes #{release.stories_delivered} new stories, #{release.bugs_delivered} bug fixes, and #{release.chores_delivered} miscellaneous chores."
-      #stories
-        %h3 Accepted Stories
-        - release.stories.each do |story|
-          .item
-            %h4= "Story ##{story.id} - #{story.name}"
-            .item_info
-              %p= "Requestor: #{story.requested_by}" 
-              %p= "Completed By: #{story.owned_by}"
-              %p= "Description: #{story.description}"
-      #bugs
-        %h3 Bug Fixes
-        - release.bugs.each do |bug|
-          .item
-            %h4= "Bug ##{bug.id} - #{bug.name}"
-            .item_info
-              %p= "Requestor: #{bug.requested_by}" 
-              %p= "Completed By: #{bug.owned_by}"
-              %p= "Description: #{bug.description}" 
-      #chores    
-        %h3 Miscellaneous Chores
-        - release.chores.each do |chore|
-          .item
-            %h4= "Chore ##{chore.id} - #{chore.name}"
-            .item_info
-              %p= "Requestor: #{chore.requested_by}" 
-              %p= "Completed By: #{chore.owned_by}"
-              %p= "Description: #{chore.description}" 
+    #doc 
+      #info
+      - path= PivotalDoc::Generators::Base::TEMPLATE_PATH
+      - if sprint.current?
+        %p= Haml::Engine.new(File.read(path + '/sprint.haml')).render(Object.new, {:sprint=>sprint})
+      - else
+        %p= Haml::Engine.new(File.read(path + '/release.haml')).render(Object.new, {:sprint=>sprint})
+        

data/templates/release.haml

@@ -0,0 +1,30 @@
+%h2= "Announcing the \"#{sprint.release_name}\" release for the #{sprint.project_name} project"
+%p
+  = "This sprint began on #{sprint.iteration.start.fancy_format} and was completed on #{sprint.iteration.finish.fancy_format}.  It includes #{sprint.stories_delivered} new stories, #{sprint.bugs_delivered} bug fixes, and #{sprint.chores_delivered} miscellaneous chores."
+#stories
+  %h3 Accepted Stories
+  - sprint.accepted_stories.each do |story|
+    .item
+      %h4= "Story ##{story.id} - #{story.name}"
+      .item_info
+        %p= "Requestor: #{story.requested_by}" 
+        %p= "Completed By: #{story.owned_by}"
+        %p= "Description: #{story.description}"
+#bugs
+  %h3 Bug Fixes
+  - sprint.accepted_bugs.each do |bug|
+    .item
+      %h4= "Bug ##{bug.id} - #{bug.name}"
+      .item_info
+        %p= "Requestor: #{bug.requested_by}" 
+        %p= "Completed By: #{bug.owned_by}"
+        %p= "Description: #{bug.description}" 
+#chores    
+  %h3 Miscellaneous Chores
+  - sprint.accepted_chores.each do |chore|
+    .item
+      %h4= "Chore ##{chore.id} - #{chore.name}"
+      .item_info
+        %p= "Requestor: #{chore.requested_by}" 
+        %p= "Completed By: #{chore.owned_by}"
+        %p= "Description: #{chore.description}" 

data/templates/sprint.haml

@@ -1,48 +1,25 @@
-!!! Strict 
-%html 
-  %head 
-    %meta{'http-equiv' => 'Content-Type', :content => 'text/html;charset=utf-8'} 
-    %title= sprint.iteration.start.fancy_format
-    %style{:type => "text/css", :media => "screen"}
-      :plain
-        p,div,h1,h2,h3,h4,h5,h6,span,a {font-family: Arial}
-        div#sprint_doc {padding-left: .5em;}
-        h2, h3 {padding: .5em 0;}
-        h3 {text-decoration: underline;}
-        div#sprint_doc {
-          width: 80%;
-          margin-left: auto;
-          margin-right: auto;
-          text-align: left;
-        }
-        div#chores, div#bugs, div#stories{ padding-left: 0.6em }
-        div.item {padding-left: .4em}
-        div.item_info {padding-left: .4em}
-  %body
-    #sprint_doc
-      #sprint_info
-        %h2= "This sprint begins on #{sprint.iteration.start.fancy_format} and ends on #{sprint.iteration.finish.fancy_format}."
-      #stories
-        %h3 Proposed Stories
-        - sprint.stories.each do |story|
-          .item
-            %h4= "Story ##{story.id} - #{story.name}"
-            .item_info
-              %p= "Requestor: #{story.requested_by}" 
-              %p= "Description: #{story.description}"
-      #bugs
-        %h3 Bug Fixes
-        - sprint.bugs.each do |bug|
-          .item
-            %h4= "Bug ##{bug.id} - #{bug.name}"
-            .item_info
-              %p= "Requestor: #{bug.requested_by}" 
-              %p= "Description: #{bug.description}" 
-      #chores    
-        %h3 Miscellaneous Chores
-        - sprint.chores.each do |chore|
-          .item
-            %h4= "Chore ##{chore.id} - #{chore.name}"
-            .item_info
-              %p= "Requestor: #{chore.requested_by}" 
-              %p= "Description: #{chore.description}" 
+%h2= "This sprint begins on #{sprint.iteration.start.fancy_format} and ends on #{sprint.iteration.finish.fancy_format}."
+#stories
+  %h3 Proposed Stories
+  - sprint.stories.each do |story|
+    .item
+      %h4= "Story ##{story.id} - #{story.name}"
+      .item_info
+        %p= "Requestor: #{story.requested_by}" 
+        %p= "Description: #{story.description}"
+#bugs
+  %h3 Bug Fixes
+  - sprint.bugs.each do |bug|
+    .item
+      %h4= "Bug ##{bug.id} - #{bug.name}"
+      .item_info
+        %p= "Requestor: #{bug.requested_by}" 
+        %p= "Description: #{bug.description}" 
+#chores    
+  %h3 Miscellaneous Chores
+  - sprint.chores.each do |chore|
+    .item
+      %h4= "Chore ##{chore.id} - #{chore.name}"
+      .item_info
+        %p= "Requestor: #{chore.requested_by}" 
+        %p= "Description: #{chore.description}" 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal_doc
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Tim Linquist
@@ -218,8 +218,6 @@ files:
 - lib/pivotal_doc/generators/base.rb
 - lib/pivotal_doc/generators/csv.rb
 - lib/pivotal_doc/generators/html.rb
-- lib/pivotal_doc/generators/sprint.rb
-- lib/pivotal_doc/release.rb
 - lib/pivotal_doc/sprint.rb
 - lib/pivotal_doc/work.rb
 - pivotal_doc.gemspec
@@ -233,8 +231,6 @@ files:
 - spec/lib/generators/base_spec.rb
 - spec/lib/generators/csv_spec.rb
 - spec/lib/generators/html_spec.rb
-- spec/lib/generators/sprint_spec.rb
-- spec/lib/release_spec.rb
 - spec/lib/sprint_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -243,6 +239,7 @@ files:
 - templates/fancy.haml
 - templates/output.csv
 - templates/output.haml
+- templates/release.haml
 - templates/sprint.haml
 has_rdoc: true
 homepage: http://github.com/timo3377/pivotal_doc
@@ -285,8 +282,6 @@ test_files:
 - spec/lib/generators/base_spec.rb
 - spec/lib/generators/csv_spec.rb
 - spec/lib/generators/html_spec.rb
-- spec/lib/generators/sprint_spec.rb
-- spec/lib/release_spec.rb
 - spec/lib/sprint_spec.rb
 - spec/spec_helper.rb
 - spec/support/mocks_helper.rb

data/lib/pivotal_doc/generators/sprint.rb

@@ -1,18 +0,0 @@
-module PivotalDoc
-  module Generators
-    class Sprint < Base
-      def initialize(sprint, options={})
-        @sprint=sprint
-        super(@sprint, options)
-      end
-      def template_name
-        @options['template_name'] || 'sprint.haml' 
-      end
-      def output_ext; '.html' end
-      def render_doc
-        html= Haml::Engine.new(template).render(Object.new, {:sprint=>@sprint})
-        super(html)
-      end
-    end
-  end
-end

data/lib/pivotal_doc/release.rb

@@ -1,36 +0,0 @@
-module PivotalDoc
-  class Release
-    include Work
-    
-    attr_reader :project
-    attr_reader :iteration
-  
-    def initialize(project, iteration=nil)
-      @project= project
-      @iteration= (iteration || latest_iteration)
-    end
-    
-    def me
-      @me ||= self.iteration.stories.detect{|s| s.story_type.downcase=='release'} if self.iteration.stories
-    end
-    
-    def name
-      me.name if me.respond_to?(:name) 
-    end
-    
-    def latest_iteration
-      PT::Iteration.done(@project, :offset=>'-1').first
-    end
-        
-    [:stories, :bugs, :chores].each do |m|
-      define_method("#{m}_delivered") { self.send(m).size }
-    end
-        
-    private
-    def filter_stories(type='feature')
-      self.iteration.stories.reject do |s|
-        s.story_type.downcase != type || s.current_state.downcase != 'accepted'
-      end
-    end
-  end
-end

data/spec/lib/generators/sprint_spec.rb

@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-describe PivotalDoc::Generators::Sprint do
-  before(:each) do
-    @release= mocks_helper(:release)
-    @sprint= PivotalDoc::Generators::Sprint.new(@release)
-    @engine= Haml::Engine.new('')
-  end
-  
-  after(:each) do
-    File.delete(@sprint.output_file) if File.exists?(@sprint.output_file)
-  end
-  
-  it "should open the output file and write the compiled haml (html)" do
-    Haml::Engine.stub!(:new).and_return(@engine)
-    @engine.stub!(:render).and_return('compiled haml')
-    @sprint.render_doc
-    File.read(@sprint.output_file).should eql('compiled haml')
-  end
-  
-  it "should read the file contents" do
-    @sprint.template.should be_an_instance_of(String)
-  end
-  
-  it "should use the template_name if specified" do
-    options= {'template_name'=>'fancy.sprint.html'}
-    html= PivotalDoc::Generators::HTML.new(@release, options)
-    html.template_name.should eql(options['template_name'])
-  end
-  
-  it "should know its template name" do
-    @sprint.template_name.should =~ /\.haml$/
-  end
-  
-  it "should render the release doc" do
-    Haml::Engine.should_receive(:new).with(@sprint.template).and_return(@engine)
-    @engine.should_receive(:render)
-    @sprint.render_doc
-  end
-end

data/spec/lib/release_spec.rb

@@ -1,92 +0,0 @@
-require 'spec_helper'
-
-describe PivotalDoc::Release do
-  before(:each) do
-    @project= PT::Project.new
-    @latest_iteration= PT::Iteration.new
-    PT::Iteration.stub!(:done).and_return([@latest_iteration])
-    @release= PivotalDoc::Release.new(@project)
-  end
-
-  it "should get the last 'done' iteration for the project" do
-    PT::Iteration.should_receive(:done).with(@project, :offset=>'-1')
-    @release.latest_iteration
-  end
-  
-  describe "the latest iteration" do
-    before(:each) do
-      @release.stub!(:latest_iteration).and_return(@latest_iteration)
-    end
-    
-    it "should use the iteration if specified" do
-      backlog= PTApiHelpers::mock_object('iterations')
-      release= PivotalDoc::Release.new(@project, backlog)
-      release.iteration.should eql(backlog)      
-    end
-    
-    it "should default the iteration to the latest_iteration (last 'done') if one isn't specified" do
-      PT::Iteration.should_receive(:done).and_return([@latest_iteration])
-      release= PivotalDoc::Release.new(@project)
-      release.iteration.should eql(@latest_iteration)
-    end
-    
-    describe "release of (me)" do
-      before(:each) do
-        @stories= PTApiHelpers::mock_stories
-        @me= PTApiHelpers::mock_actual_release
-        @latest_iteration.stub!(:stories).and_return(@stories)
-      end
-      
-      it "should find the \"release\" if there is one" do
-        @latest_iteration.should_receive(:stories).and_return(@stories)
-        @release.me.story_type.should eql('release')
-      end
-      
-      it "should know the name of the release" do
-        @release.name.should eql(@me.name)
-      end
-    end
-
-    describe "stories" do
-      before(:each) do
-        @stories= PTApiHelpers::mock_stories
-        @latest_iteration.stub!(:stories).and_return(@stories)
-      end
-      
-      it "should get the stories only" do
-        @latest_iteration.should_receive(:stories).and_return(@stories)
-        @release.stories.each{|s| s.story_type.downcase.should eql('feature') }
-      end
-
-      it "should get the bugs only" do
-        @latest_iteration.should_receive(:stories).and_return(@stories)
-        @release.bugs.each{|b| b.story_type.downcase.should eql('bug') }
-      end
-      
-      it "should get the chores only" do
-        @latest_iteration.should_receive(:stories).and_return(@stories)
-        @release.chores.each{|c| c.story_type.downcase.should eql('chore') }        
-      end
-
-      describe "finished work" do
-        [:stories, :chores, :bugs].each do |m|
-          it "should know the #{m} delivered in this release" do
-            @release.send("#{m}_delivered").should eql(@release.send(m).size)
-          end
-        end
-        
-        it "should only get the \"delivered\" stories" do
-          @release.stories.each{|s| s.current_state.downcase.should eql('accepted')}
-        end
-
-        it "should only get the \"delivered\" bugs" do
-          @release.bugs.each{|b| b.current_state.downcase.should eql('accepted')}
-        end
-
-        it "should only get the \"accepted\" chores" do
-          @release.chores.each{|c| c.current_state.downcase.should eql('accepted')}
-        end
-      end      
-    end
-  end  
-end