heroku_deployer 0.7.11 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 984d7cbc5fde7f4340daaa9f049072b721c9e2c7
-  data.tar.gz: 9477d80aedeb32654ae09c9b57bacb69093cd559
+  metadata.gz: 913df55faa73f62f743bd022ae4e7a2bff0b80f0
+  data.tar.gz: ca9e00e1fefac6ade5dcec3bef5a1aa792e4df6b
 SHA512:
-  metadata.gz: 2f04ca2c0c3e250b8542a0ec04524bb5add5b27a86eb972f23e0acc79ba54aef2cec9475caecf1ae3e3c8db1beb272648704da53b498f761a01b99b28bbaca73
-  data.tar.gz: 11d2338360486ce90fbd41065e6b86e398938da12abb8537c80dd5d9524097e726723096ca9ef05df269213dd7fbd9c1e0cdf878165db9b97c37000b21a27b6e
+  metadata.gz: 539cdb3bacf5fe8dbd45df4fa8822bc4ed42e7ce01a93b36137b2e3178bb5c358036d94d6237bfb95bb94363505ade9674b69b79091c0300be0ebb48150d709d
+  data.tar.gz: c5584ea06036e1d9e8437b2fd627e32843fef7ace243e1389a85405e4ad56a14f5070593bc02c9601c24813ca0fa068c0ab04939f28565246d5f0eee8b2a9cb7

data/lib/amitree/heroku_client.rb

@@ -11,7 +11,6 @@ module Amitree
 
     def initialize(api_key, staging_app_name, production_app_name)
       @heroku = PlatformAPI.connect(api_key)
-      @heroku_no_cache = PlatformAPI.connect(api_key, cache: Moneta.new(:Null))
       @staging_app_name = staging_app_name
       @production_app_name = production_app_name
       @promoted_release_regexp = /Promote #{@staging_app_name} v(\d+)/
@@ -26,11 +25,11 @@ module Amitree
     end
 
     def current_production_release
-      get_releases(@production_app_name)[-1]
+      get_releases(@production_app_name).to_a.last
     end
 
     def last_promoted_production_release
-      get_releases(@production_app_name).reverse.detect{|release| promoted_from_staging?(release)} or raise Error.new "Can't find a production release that was promoted from staging!"
+      get_releases(@production_app_name).to_a.reverse.detect{|release| promoted_from_staging?(release)} or raise Error.new "Can't find a production release that was promoted from staging!"
     end
 
     def staging_release_version(production_release)
@@ -46,7 +45,7 @@ module Amitree
 
     def staging_releases_since(production_release)
       staging_release_version = self.staging_release_version(production_release)
-      staging_releases = get_releases(@staging_app_name)
+      staging_releases = get_releases(@staging_app_name).to_a
       index = staging_releases.index { |release| release['version'] == staging_release_version }
       if index.nil?
         raise Error.new "Could not find staging release #{staging_release_version}"
@@ -92,9 +91,7 @@ module Amitree
 
   private
     def get_releases(app_name)
-      # Use our own cache because of https://github.com/heroku/platform-api/issues/16
-      @release_cache ||= {}
-      @release_cache[app_name] ||= @heroku_no_cache.release.list(app_name).to_a
+      @heroku.release.list(app_name)
     end
 
     def heroku_run(app_name, command)

data/lib/amitree/heroku_deployer.rb

@@ -54,32 +54,39 @@ module Amitree
       all_stories = Hash[result.stories.map{|story| [story.id, story]}]
 
       staging_releases.reverse.each do |staging_release|
-        staging_commit = @heroku.get_staging_commit(staging_release)
-        stories = all_stories.values_at(*@git.stories_worked_on_between(prod_commit, staging_commit)).compact
-        story_ids = stories.map(&:id)
+        begin
+          staging_commit = @heroku.get_staging_commit(staging_release)
 
-        puts "- Trying staging release #{@heroku.version(staging_release)} with commit #{staging_commit}" if options[:verbose]
-        puts "  - Stories: #{story_ids.inspect}" if options[:verbose]
+          puts "- Trying staging release #{@heroku.version(staging_release)} with commit #{staging_commit}" if options[:verbose]
 
-        unaccepted_story_ids = story_ids.select { |story_id| get_tracker_status(story_id) != 'accepted' }
+          stories = all_stories.values_at(*@git.stories_worked_on_between(prod_commit, staging_commit)).compact
+          story_ids = stories.map(&:id)
 
-        if unaccepted_story_ids.length > 0
-          stories.each do |story|
-            story.blocked_by = unaccepted_story_ids
-          end
-          puts "    - Some stories are not yet accepted: #{unaccepted_story_ids.inspect}" if options[:verbose]
-        else
-          story_ids_referenced_later = story_ids & @git.stories_worked_on_between(staging_commit, 'HEAD')
-          if story_ids_referenced_later.length > 0
-            puts "    - Some stories have been worked on in a later commit: #{story_ids_referenced_later}" if options[:verbose]
-          else
+          puts "  - Stories: #{story_ids.inspect}" if options[:verbose]
+
+          unaccepted_story_ids = story_ids.select { |story_id| get_tracker_status(story_id) != 'accepted' }
+
+          if unaccepted_story_ids.length > 0
             stories.each do |story|
               story.blocked_by = unaccepted_story_ids
             end
-            puts "    - This release is good to go!" if options[:verbose]
-            result.staging_release_to_deploy = staging_release
-            break
+            puts "    - Some stories are not yet accepted: #{unaccepted_story_ids.inspect}" if options[:verbose]
+          else
+            story_ids_referenced_later = story_ids & @git.stories_worked_on_between(staging_commit, 'HEAD')
+            if story_ids_referenced_later.length > 0
+              puts "    - Some stories have been worked on in a later commit: #{story_ids_referenced_later}" if options[:verbose]
+            else
+              stories.each do |story|
+                story.blocked_by = unaccepted_story_ids
+              end
+              puts "    - This release is good to go!" if options[:verbose]
+              result.staging_release_to_deploy = staging_release
+              break
+            end
           end
+        rescue => error
+          puts "  - Skipping candidate staging release because an error was encountered"
+          puts "\n#{error.class} (#{error.message}):\n  " + error.backtrace.join("\n  ") + "\n"
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_deployer
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.13
 platform: ruby
 authors:
 - Nick Wargnier
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec