heroku_deployer 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cd94d777dc10d4348774d0b174f44d2f60f648c
-  data.tar.gz: a3dad8202873e2ec02aef060001b0d186abdc855
+  metadata.gz: 1106cf9722f06336b8b2b0d80ca77880c3276249
+  data.tar.gz: 2c29af4e74cf24df298311dcda7b1c3d6130a27d
 SHA512:
-  metadata.gz: 0fc2c7ac466613167b9c00d38d044369ca4bda3d9f8d9d1cc37a85abb6b17b3243a03794faf7d7c097b873ae5899322a6a3045c91dd8f5212f5e19776c593c48
-  data.tar.gz: c82ac7bb4a910cd123693c383201a70fb66475cdb48859adcad3fbd55bc792fe086fbbafbf11f4cdf723cdfe30ec3b4bc15d74a879707f1f82d92d9b08617fc9
+  metadata.gz: 17ff13e4170dedafb6004e3482e26283408e013d697178ebd82bed08105e442f42bcea635a5684e72935707692cc6a43dd5c70f01dd349a40ce2dd4acb9d58c7
+  data.tar.gz: 3be99d675817bb50aac17e1dbfc5f5993080a34db1dbe16b313c2ac506a722cb84c9027871da5acb2e5eb2cbee7ad88f86990ea93555e235f5963bb2349a9a4f

data/lib/amitree/git_client.rb

@@ -18,7 +18,7 @@ module Amitree
 
     def stories_worked_on_between(rev1, rev2)
       messages = commit_messages_between(rev1, rev2)
-      messages.map{|msg| msg.scan /(?<=#)\d+/}.flatten.uniq
+      messages.map{|msg| msg.scan /(?<=#)\d+/}.flatten.map(&:to_i).uniq
     end
 
     def link_to(rev)

data/lib/amitree/heroku_deployer.rb

@@ -55,14 +55,13 @@ module Amitree
       prod_commit = result.production_release['commit']
       puts "Production release is #{prod_commit}" if options[:verbose]
 
-      @git.stories_worked_on_between(prod_commit, 'HEAD').each do |story_id|
-        result.stories << ReleaseDetails::Story.new(tracker_data(story_id))
-      end
+      result.stories = stories_worked_on_between(prod_commit, 'HEAD')
+      all_stories = Hash[result.stories.map{|story| [story.id, story]}]
 
       staging_releases.reverse.each do |staging_release|
         staging_commit = staging_release['commit']
-        story_ids = @git.stories_worked_on_between(prod_commit, staging_commit).map(&:to_i)
-        stories = result.stories.select{|story| story_ids.include?(story.id)}
+        stories = all_stories.values_at(*@git.stories_worked_on_between(prod_commit, staging_commit)).compact
+        story_ids = stories.map(&:id)
 
         puts "- Trying staging release #{staging_release['name']} with commit #{staging_commit}" if options[:verbose]
         puts "  - Stories: #{story_ids.inspect}" if options[:verbose]
@@ -99,5 +98,13 @@ module Amitree
     def tracker_data(story_id)
       @tracker_cache[story_id] ||= @tracker_project.stories.find(story_id)
     end
+
+    def stories_worked_on_between(rev1, rev2)
+      @git.stories_worked_on_between(rev1, rev2).map do |story_id|
+        if story = tracker_data(story_id)
+          ReleaseDetails::Story.new(story)
+        end
+      end.compact
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_deployer
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Nick Wargnier
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec