heroku_deployer 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf46a1d4195720d38e9ed25531f209843c48901f
-  data.tar.gz: 422d9f49e108e016e7a3349bb016c6706c1ed6d0
+  metadata.gz: 984d7cbc5fde7f4340daaa9f049072b721c9e2c7
+  data.tar.gz: 9477d80aedeb32654ae09c9b57bacb69093cd559
 SHA512:
-  metadata.gz: 73d79b720e4b7ecc65cbb7451cf3dc8a07033e3f121ed5de6f1043739f8e48a27999a3cf38d7b31e98e79a726a3dd21fc431d36ff16e9f566f63ed88533830f4
-  data.tar.gz: 9361adf4789b1294dc512cbbbd11eea6206639c8694a8f035eb844b7482327fc0ca84626a3c6864997121f15b9a84d1efd4e46d9037df86f379e3e937ce7eb13
+  metadata.gz: 2f04ca2c0c3e250b8542a0ec04524bb5add5b27a86eb972f23e0acc79ba54aef2cec9475caecf1ae3e3c8db1beb272648704da53b498f761a01b99b28bbaca73
+  data.tar.gz: 11d2338360486ce90fbd41065e6b86e398938da12abb8537c80dd5d9524097e726723096ca9ef05df269213dd7fbd9c1e0cdf878165db9b97c37000b21a27b6e

data/lib/amitree/heroku_client.rb

@@ -44,7 +44,8 @@ module Amitree
       release['description'] =~ @promoted_release_regexp
     end
 
-    def staging_releases_since(staging_release_version)
+    def staging_releases_since(production_release)
+      staging_release_version = self.staging_release_version(production_release)
       staging_releases = get_releases(@staging_app_name)
       index = staging_releases.index { |release| release['version'] == staging_release_version }
       if index.nil?
@@ -53,7 +54,8 @@ module Amitree
       staging_releases.slice(index+1, staging_releases.length)
     end
 
-    def deploy_to_production(staging_release_version, options={})
+    def deploy_to_production(staging_release, options={})
+      staging_release_version = staging_release['version']
       slug = staging_slug(staging_release_version)
       puts "Deploying slug to production: #{slug}"
       unless options[:dry_run]
@@ -84,6 +86,10 @@ module Amitree
       end
     end
 
+    def version(release)
+      "v#{release['version']}"
+    end
+
   private
     def get_releases(app_name)
       # Use our own cache because of https://github.com/heroku/platform-api/issues/16

data/lib/amitree/heroku_deployer.rb

@@ -7,16 +7,11 @@ module Amitree
   class HerokuDeployer
     class ReleaseDetails
       attr_accessor :production_release, :staging_release_to_deploy, :stories
-      attr_writer :production_promoted_from_staging
 
       def initialize
         @stories = []
       end
 
-      def production_promoted_from_staging?
-        @production_promoted_from_staging
-      end
-
       class Story < DelegateClass(PivotalTracker::Story)
         attr_accessor :deliverable
         attr_reader :blocked_by
@@ -50,8 +45,7 @@ module Amitree
       result = ReleaseDetails.new
 
       result.production_release = @heroku.last_promoted_production_release
-      result.production_promoted_from_staging = @heroku.promoted_from_staging?(result.production_release)
-      staging_releases = @heroku.staging_releases_since(@heroku.staging_release_version(result.production_release))
+      staging_releases = @heroku.staging_releases_since(result.production_release)
 
       prod_commit = @heroku.get_production_commit(result.production_release)
       puts "Production release is #{prod_commit}" if options[:verbose]
@@ -64,7 +58,7 @@ module Amitree
         stories = all_stories.values_at(*@git.stories_worked_on_between(prod_commit, staging_commit)).compact
         story_ids = stories.map(&:id)
 
-        puts "- Trying staging release v#{staging_release['version']} with commit #{staging_commit}" if options[:verbose]
+        puts "- Trying staging release #{@heroku.version(staging_release)} with commit #{staging_commit}" if options[:verbose]
         puts "  - Stories: #{story_ids.inspect}" if options[:verbose]
 
         unaccepted_story_ids = story_ids.select { |story_id| get_tracker_status(story_id) != 'accepted' }

metadata

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