heroku_deployer 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27968f17a3e95c34581da21e78f483fc3022c423
-  data.tar.gz: 9b0e2575ea4d85fc03063364ecd4f5512d60ef5a
+  metadata.gz: 3db83a27010baf2e84d285cef09c3f8f93167617
+  data.tar.gz: c1b3f6dd12f42822df380a4cd6d8cf6c2b2905bc
 SHA512:
-  metadata.gz: b0c8dbc1420dd29e1a964c97ac14c7535c47a54f83239ac903d87a8921b7f3c5163bf469bed553692701a37bb917c70faee832bfdc92d1f1268315323da7fb89
-  data.tar.gz: 8204e6b73ffa3865de513f1d4052a6944fe05c534f2d595f774f0a12cc8c01b61506c644cff9dabab37e77d737c2764e462954d1884397687025891a6a75609f
+  metadata.gz: 02219466d91190457d41273d26c547aa4c7468d187fa0144f7ae2a8071fe84c3bdb5e50c15fd52aa48eeb6518d605360d39fa696afcdb71e91e00260395ba7b5
+  data.tar.gz: a88632436f76212ccc7d0882b8fddf04b9031c5e1206ce131567e1711b16a436b681908865142eda04294a7081ecd638359a7c5bea685b11edcf5b56b9d94e47

data/lib/amitree/heroku_client.rb

@@ -14,7 +14,7 @@ module Amitree
       @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+)/
+      @promoted_release_regexp = /Promote #{@staging_app_name} v(\d+)/
     end
 
     def get_staging_commit(release)
@@ -33,38 +33,38 @@ module Amitree
       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!"
     end
 
-    def staging_release_name(production_release)
+    def staging_release_version(production_release)
       unless production_release['description'] =~ @promoted_release_regexp
         raise Error.new "Production release was not promoted from staging: #{production_release['description']}"
       end
-      $1
+      $1.to_i
     end
 
     def promoted_from_staging?(release)
       release['description'] =~ @promoted_release_regexp
     end
 
-    def staging_releases_since(staging_release_name)
+    def staging_releases_since(staging_release_version)
       staging_releases = get_releases(@staging_app_name)
-      index = staging_releases.index { |release| release['name'] == staging_release_name }
+      index = staging_releases.index { |release| release['version'] == staging_release_version }
       if index.nil?
-        raise Error.new "Could not find staging release #{staging_release_name}"
+        raise Error.new "Could not find staging release #{staging_release_version}"
       end
       staging_releases.slice(index+1, staging_releases.length)
     end
 
-    def deploy_to_production(staging_release_name, options={})
-      slug = staging_slug(staging_release_name)
+    def deploy_to_production(staging_release_version, options={})
+      slug = staging_slug(staging_release_version)
       puts "Deploying slug to production: #{slug}"
       unless options[:dry_run]
-        @heroku.release.create(@production_app_name, {'slug' => slug, 'description' => "Promote #{@staging_app_name} #{staging_release_name}"})
+        @heroku.release.create(@production_app_name, {'slug' => slug, 'description' => "Promote #{@staging_app_name} v#{staging_release_version}"})
         db_migrate_on_production(options)
       end
     end
 
-    def staging_slug(staging_release_name)
-      unless staging_release_name =~ /\Av(\d+)\z/
-        raise Error.new "Unexpected release name: #{staging_release_name}"
+    def staging_slug(staging_release_version)
+      unless staging_release_version.is_a?(Fixnum)
+        raise Error.new "Unexpected release version: #{staging_release_version}"
       end
       result = @heroku.release.info(@staging_app_name, $1)
       result['slug']['id'] || raise(Error.new("Could not find slug in API response: #{result.inspect}"))

data/lib/amitree/heroku_deployer.rb

@@ -50,7 +50,7 @@ module Amitree
 
       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_name(result.production_release))
+      staging_releases = @heroku.staging_releases_since(@heroku.staging_release_version(result.production_release))
 
       prod_commit = @heroku.get_production_commit(result.production_release)
       puts "Production release is #{prod_commit_full}" if options[:verbose]
@@ -63,7 +63,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 #{staging_release['name']} with commit #{staging_commit}" if options[:verbose]
+        puts "- Trying staging release v#{staging_release['version']} 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.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Nick Wargnier