heroku_deployer 0.6.3 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a2c55e980f08f9bcc0b41a4d9f5e60b263ff50f
-  data.tar.gz: 2747881515b2bf19dd97da87196c1cadf340e477
+  metadata.gz: 2b37db385331039d22c8a8606c068690774e52e3
+  data.tar.gz: d83ad7799d516a0a07aecbc2f3d70507c833b59b
 SHA512:
-  metadata.gz: cb84423805106808cc39c5fd132957b1e86288f7892515fa975ae02ef80473e28c934b773ce76beae68cebc9d14875604009b87134fba0090ae0042a9790b7db
-  data.tar.gz: eed0db2d645213f641dbf10547e5c9bcc7319b98c1e6ebc9321f12a0b220c042b5eb1965b8146cb95caccc098ba40274e255f7946b41bdfb32fc6694f864db2e
+  metadata.gz: 577e8d776958ab6e9e02c54c68b12f14be2d398fb0b8b1c331a40aea665e8d77571b353ddad35b6f430feaeeacc527e9f2ab296ac645fe5b3dd87daa294c418e
+  data.tar.gz: 018b0dc7afd3c5cd3a67900a51e4aaa40c5fc60c0d229756307d8eaf9a0f160f2245bfaf1aca838a28c2e33b0e1f60a7441f660ec85cc5e9671ec16c5a81198a

data/lib/amitree/heroku_client.rb

@@ -1,5 +1,4 @@
-require 'heroku-api'
-require 'heroku/new_api'
+require 'platform-api'
 require 'rendezvous'
 
 module Amitree
@@ -11,14 +10,21 @@ module Amitree
     end
 
     def initialize(api_key, staging_app_name, production_app_name)
-      @heroku = Heroku::API.new(:api_key => api_key)
-      # We need to use the new API (not currently supported by the heroku-api gem) for deploy_to_production
-      @heroku_new = Heroku::NewAPI.new(:api_key => api_key)
+      @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+)/
     end
 
+    def get_staging_commit(release)
+      @heroku.slug.info(@staging_app_name, release['slug']['id'])['commit']
+    end
+
+    def get_production_commit(release)
+      @heroku.slug.info(@production_app_name, release['slug']['id'])['commit']
+    end
+
     def current_production_release
       get_releases(@production_app_name)[-1]
     end
@@ -51,7 +57,7 @@ module Amitree
       slug = staging_slug(staging_release_name)
       puts "Deploying slug to production: #{slug}"
       unless options[:dry_run]
-        @heroku_new.post_release(@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} #{staging_release_name}"})
         db_migrate_on_production(options)
       end
     end
@@ -60,8 +66,8 @@ module Amitree
       unless staging_release_name =~ /\Av(\d+)\z/
         raise Error.new "Unexpected release name: #{staging_release_name}"
       end
-      result = @heroku_new.get_release(@staging_app_name, $1)
-      result.body['slug']['id'] || raise(Error.new("Could not find slug in API response: #{result.inspect}"))
+      result = @heroku.release.info(@staging_app_name, $1)
+      result['slug']['id'] || raise(Error.new("Could not find slug in API response: #{result.inspect}"))
     end
 
     def db_migrate_on_production(options={}, attempts=0)
@@ -80,12 +86,14 @@ module Amitree
 
   private
     def get_releases(app_name)
-      @heroku.get_releases(app_name).body
+      # 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
     end
 
     def heroku_run(app_name, command)
       puts "Running command on #{app_name}: #{command}..."
-      data = @heroku.post_ps(app_name, command, { attach: true }).body
+      data = @heroku.dyno.create(app_name, { command: command, attach: true })
       read, write = IO.pipe
       Rendezvous.start(url: data['rendezvous_url'], input: read)
       read.close

data/lib/amitree/heroku_deployer.rb

@@ -52,14 +52,14 @@ module Amitree
       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))
 
-      prod_commit = result.production_release['commit']
-      puts "Production release is #{prod_commit}" if options[:verbose]
+      prod_commit = @heroku.get_production_commit(result.production_release)
+      puts "Production release is #{prod_commit_full}" if options[:verbose]
 
       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']
+        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)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_deployer
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: '0.7'
 platform: ruby
 authors:
 - Nick Wargnier
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -40,19 +40,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.7.1
 - !ruby/object:Gem::Dependency
-  name: heroku-api
+  name: platform-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.17
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.17
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rendezvous
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +91,6 @@ files:
 - lib/amitree/git_client.rb
 - lib/amitree/heroku_client.rb
 - lib/amitree/heroku_deployer.rb
-- lib/heroku/new_api.rb
 homepage: http://rubygems.org/gems/heroku_deployer
 licenses:
 - MIT

data/lib/heroku/new_api.rb

@@ -1,21 +0,0 @@
-require 'multi_json'
-
-module Heroku
-  class NewAPI < API
-    def initialize(options={})
-      options[:headers] ||= {}
-      options[:headers]['Accept'] = 'application/vnd.heroku+json; version=3'
-      super(options)
-    end
-
-    # POST /apps/:app/releases/:release
-    def post_release(app, query={})
-      request(
-        :expects  => 201,
-        :method   => :post,
-        :path     => "/apps/#{app}/releases",
-        :body     => MultiJson.dump(query)
-      )
-    end
-  end
-end