git_story 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+**0.2.1** 28/05/2012 a43e15ffde884810d8769a9706b2b37df10ab463
+
+ - Multiple projects supported
+ - Auto-project discovery

data/lib/git_story.rb

@@ -3,6 +3,7 @@ require_relative "git_story/version"
 require_relative 'manual_git_commit_lister'
 require_relative 'split_and_match_processor'
 require_relative 'tracker_fetched_mapper'
+require_relative 'typhoeus_tracker_connector'
 require_relative 'puts_renderer'
 
 module GitStory
@@ -15,11 +16,16 @@ module GitStory
     commit_state_factory.list(since, until_commit)
   end
 
-  def commit_state_factory
+  def commit_state_factory()
     renderer = PutsRenderer.new
-    state_mapper = TrackerFetchedMapper.new(renderer)
+    tracker_connector = TyphoeusTrackerConnector.new(tracker_project_ids, ENV['TRACKER_TOKEN'])
+    state_mapper = TrackerFetchedMapper.new(renderer, tracker_connector)
     commit_processor = SplitAndMatchProcessor.new(state_mapper)
     ManualGitCommitLister.new(commit_processor)
   end
 
+  def tracker_project_ids
+    (ENV['TRACKER_PROJECT_ID'] || '').split(",")
+  end
+
 end

data/lib/git_story/version.rb

@@ -1,3 +1,3 @@
 module GitStory
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/puts_renderer.rb

@@ -1,8 +1,8 @@
 class PutsRenderer
-  def render(commit_story_state)
-    commit_story_state.each do |commit, story_state|
-      unless story_state['state'] == :accepted
-        puts "#{commit} ##{story_state['story']} #{story_state['state']}"
+  def render(commit_story_state_project)
+    commit_story_state_project.each do |commit, ssp|
+      unless ssp['state'] == :accepted
+        puts "#{commit} ##{ssp['story']} #{ssp['state']} from #{ssp['project']}"
       end
     end
   end

data/lib/tracker_fetched_mapper.rb

@@ -1,71 +1,20 @@
 class TrackerFetchedMapper
 
-  def initialize(renderer)
+  def initialize(renderer, tracker_connector)
     @renderer = renderer
+    @tracker = tracker_connector
   end
 
   def execute(story_commit)
-    @renderer.render(map(story_commit))
+    map = map(story_commit)
+    @renderer.render(map)
   end
 
   def map(story_commit)
     {}.tap do |h|
-      fetch(story_commit.keys).each do |story, state|
-        h[story_commit[story]] = {'story' => story, 'state' => state}
+      @tracker.details_for(story_commit.keys).each do |story, project_state|
+        h[story_commit[story]] = {'story' => story, 'state' => project_state[1], 'project' => project_state[0]}
       end
     end
   end
-
-  def fetch(stories)
-    require 'rubygems'
-    require 'net/http'
-    require 'uri'
-    require 'nokogiri'
-    require 'typhoeus'
-
-    hydra = Typhoeus::Hydra.new
-
-    if ENV['TRACKER_PROJECT_ID']
-      projects = ENV['TRACKER_PROJECT_ID'].split(",")
-    else
-      request = Typhoeus::Request.new(
-        "http://www.pivotaltracker.com/services/v3/projects",
-        headers: {'X-TrackerToken' => ENV['TRACKER_TOKEN']})
-      request.on_complete do |response|
-        doc = Nokogiri::XML(response.body)
-        
-        doc.xpath('//projects/project').map do |e|
-          e.xpath('id').text.to_i
-        end        
-      end
-      hydra.queue request
-      hydra.run
-      projects = request.handled_response
-    end
-    stories_qs = stories.join(',')
-
-    requests = []
-    projects.each do |project_id|
-      request = Typhoeus::Request.new(
-        "http://www.pivotaltracker.com/services/v3/projects/#{project_id}/stories?filter=id:#{stories_qs}&includedone:true",
-        headers: {'X-TrackerToken' => ENV['TRACKER_TOKEN']})
-
-      request.on_complete do |response|
-        doc = Nokogiri::XML(response.body)
-
-        {}.tap do |h|
-          doc.xpath('//stories/story').map do |e|
-            h[e.xpath('id').text] = e.xpath('current_state').text.to_sym
-          end
-        end        
-      end
-
-      requests << request
-      hydra.queue request
-    end
-    hydra.run
-
-    requests.inject({}){|acc, r| acc.merge(r.handled_response) }
-  end
-
 end

data/lib/typhoeus_tracker_connector.rb

@@ -0,0 +1,58 @@
+require 'nokogiri'
+require 'typhoeus'
+
+class TyphoeusTrackerConnector
+
+  def initialize(project_ids = [], tracker_token)
+    @hydra = Typhoeus::Hydra.new
+    @project_ids = project_ids
+    @token = tracker_token
+  end
+
+  def details_for(stories)
+    stories_qs = stories.join(',')
+    requests = []
+    projects.each do |id, name|
+      request = Typhoeus::Request.new(
+          "http://www.pivotaltracker.com/services/v3/projects/#{id}/stories?filter=id:#{stories_qs}&includedone:true",
+          headers: {'X-TrackerToken' => @token})
+
+      request.on_complete do |response|
+        doc = Nokogiri::XML(response.body)
+
+        {}.tap do |h|
+          doc.xpath('//stories/story').map do |e|
+            h[e.xpath('id').text] = [name, e.xpath('current_state').text.to_sym]
+          end
+        end
+      end
+
+      requests << request
+      @hydra.queue request
+    end
+    @hydra.run
+
+    requests.inject({}) { |acc, r| acc.merge(r.handled_response) }
+  end
+
+  private
+  def projects
+    request = Typhoeus::Request.new("http://www.pivotaltracker.com/services/v3/projects", headers: {'X-TrackerToken' => @token})
+    request.on_complete do |response|
+      doc = Nokogiri::XML(response.body)
+
+      {}.tap do |h|
+        doc.xpath('//projects/project').map do |e|
+          h[e.xpath('id').text.to_i] = e.xpath('name').text
+        end
+      end
+    end
+    @hydra.queue request
+    @hydra.run
+
+    all_projects = request.handled_response
+    all_projects.select { |k,_| @project_ids.include?(k.to_s) } unless @project_ids.empty?
+    all_projects
+  end
+
+end

data/spec/git_story_spec.rb

@@ -10,6 +10,7 @@ describe GitStory do
   let(:commits) { %w(8670b5ee48d9ea26a91b22f6eeee2234098b3a08 5257d758a95d37441e65d0b5198cbc9dae8cd2cf 70c9112ddf9f02e6680797f490e418d95a3836ed 13351e6dfc28e05cc4c13ea039654b95c62185a0) }
   let(:stories) { %w(29981485 29521391 29977427 29977409) }
   let(:states) { %w(accepted rejected finished started).each(&:to_sym) }
+  let(:project_names) { %w(proj_a proj_b proj_a proj_c) }
 
   def set_up_parameters
     ENV['TRACKER_TOKEN'] = 'fake tracker token'
@@ -26,7 +27,7 @@ raw_git_commit
   end
 
   def stub_network
-    TrackerFetchedMapper.any_instance.stub(:fetch).with(stories).and_return(Hash[stories.zip(states)])
+    TyphoeusTrackerConnector.any_instance.stub(:details_for).with(stories).and_return(Hash[stories.zip(project_names.zip(states))])
   end
 
   it "run through CommitLister to Renderer" do
@@ -34,8 +35,8 @@ raw_git_commit
     stub_git
     stub_network
     render_input = {}.tap do |h|
-      commits.zip(stories).zip(states).map(&:flatten).each do |css|
-        h[css[0]] = {'story' => css[1], 'state' => css[2]}
+      commits.zip(stories).zip(states).zip(project_names).map(&:flatten).each do |cssp|
+        h[cssp[0]] = {'story' => cssp[1], 'state' => cssp[2], 'project' => cssp[3]}
       end
     end
     PutsRenderer.any_instance.should_receive(:render).with(render_input)

data/spec/tracker_fetched_state_spec.rb

@@ -3,10 +3,9 @@ require_relative '../lib/tracker_fetched_mapper'
 describe TrackerFetchedMapper do
 
   let(:renderer) { mock('renderer') }
+  let(:tracker_connector) { mock('tracker_connector') }
 
-  subject { TrackerFetchedMapper.new(renderer) }
-
-  it { should respond_to :fetch }
+  subject { TrackerFetchedMapper.new(renderer, tracker_connector) }
 
   describe "#execute" do
     it "calls #map and passes result to Renderer" do
@@ -22,18 +21,18 @@ describe TrackerFetchedMapper do
 
   describe '#map' do
     it "maps { story_id => commit } to { commit => { story => story_id, state => state_symbol } }" do
-      subject.should_receive(:fetch).with(['123', '234']).and_return({ '123' => :accepted, '234' => :rejected })
+      tracker_connector.stub(:details_for).with(['123', '234']).and_return({ '123' => ['proj_a', :accepted], '234' => ['proj_b', :rejected] })
       subject.map({ '123' => 'x', '234' => 'y' }).should ==
           {
-              'x' => { 'story' => '123', 'state' => :accepted },
-              'y' => { 'story' => '234', 'state' => :rejected }
+              'x' => { 'story' => '123', 'state' => :accepted, 'project' => 'proj_a' },
+              'y' => { 'story' => '234', 'state' => :rejected, 'project' => 'proj_b' }
           }
     end
 
     it "ignores commit that corresponding story is not returned from #fetch" do
-      subject.should_receive(:fetch).with(['123', '234']).and_return({ '234' => :rejected })
+      tracker_connector.should_receive(:details_for).with(['123', '234']).and_return({ '234' => ['proj_b', :rejected] })
       subject.map({ '123' => 'x', '234' => 'y' }).should ==
-          { 'y' => {'story' => '234', 'state' => :rejected } }
+          { 'y' => {'story' => '234', 'state' => :rejected, 'project' => 'proj_b' } }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_story
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -71,6 +71,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -83,6 +84,7 @@ files:
 - lib/puts_renderer.rb
 - lib/split_and_match_processor.rb
 - lib/tracker_fetched_mapper.rb
+- lib/typhoeus_tracker_connector.rb
 - spec/git_story_spec.rb
 - spec/split_and_match_processor_spec.rb
 - spec/tracker_fetched_state_spec.rb