paratrooper 3.0.0.beta3 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f46fd762d6a6a118bf4a77be498de394fe17eb56
-  data.tar.gz: a50f59f0e00017a1424d2608dfcaf822aaef8fa8
+  metadata.gz: ec0cd33678d37387bbfa8998b12b3b6a33e1cf06
+  data.tar.gz: 47667f7cb489b49eb5aec4fa9d2dac06c18590a6
 SHA512:
-  metadata.gz: 124c08920a1a40499a1fa4791d4d99256b1807b90143f1d7636905c6e49cf30dbdaa1df081de7f92414865e41031058c9aa1e88d885e044571bcbed854624845
-  data.tar.gz: 36b2abf903f42c80fc222cfba4b0dec516160ccd5d75647f58e17f5ccf3f2959fad16cd42c298cb15ae825220f4bfe0f1cbe90fce86c93ff35c3fe90679483f3
+  metadata.gz: 7b3977cf28e03eaa58661950e02ad15baa9c40638835b1881944fac32bd31a0251aaa09077cc9ed137ccd08e0d378d2f2b8f576e0ce70ee1ec28aebe22448b31
+  data.tar.gz: 0ed7a25f8aef3fbff257184625170a167c59c9462076bf342610354e62bd169b68724135e81e28cf99e80faa036f35651fb10b3c9ce6fff3cbe11681b0bc98c7

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.0.2
+
+- Fixed reverse call on enumerator on `Paratrooper::HerokuWrapper#last_release_with_slug`
+
+## 3.0.1
+
+- Migrated to platform-api gem from heroku
+
 ## 3.0.0.beta1
 
 - Moved all state into configuration object

data/README.md

@@ -39,8 +39,8 @@ Paratrooper.deploy('amazing-app')
 You can also provide a tag:
 
 ```ruby
-Paratrooper.deploy('amazing-app') do |deploy|
-  deploy.tag = 'staging'
+Paratrooper.deploy('amazing-app') do |config|
+  config.tag = 'staging'
 end
 ```
 
@@ -51,8 +51,8 @@ You can authenticate your Heroku account in a few ways:
 * Provide an API Key
 
 ```ruby
-Paratrooper.deploy('app') do |deploy|
-  deploy.api_key = 'API_KEY'
+Paratrooper.deploy('app') do |config|
+  config.api_key = 'API_KEY'
 end
 ```
 
@@ -76,16 +76,16 @@ This method works via a local Netrc file handled via the [Heroku Toolbelt][] and
 If you use multiple SSH keys for managing multiple accounts, for example in your `.ssh/config`, you can set the `deployment_host` option:
 
 ```ruby
-Paratrooper.deploy('amazing-app') do |deploy|
-  deploy.deployment_host = 'HOST'
+Paratrooper.deploy('amazing-app') do |config|
+  config.deployment_host = 'HOST'
 end
 ```
 
 This also works if you're using the [heroku-accounts](https://github.com/ddollar/heroku-accounts) plugin:
 
 ```ruby
-Paratrooper.deploy('app') do |deploy|
-  deploy.deployment_host: 'heroku.ACCOUNT_NAME'
+Paratrooper.deploy('app') do |config|
+  config.deployment_host: 'heroku.ACCOUNT_NAME'
 end
 ```
 
@@ -149,13 +149,13 @@ to disable your application monitoring.
 namespace :deploy do
   desc 'Deploy app in production environment'
   task :production do
-    Paratrooper.deploy("amazing-production-app") do |deploy|
-      deploy.add_callback(:before_setup) do |output|
+    Paratrooper.deploy("amazing-production-app") do |config|
+      config.add_callback(:before_setup) do |output|
         output.display("Totally going to turn off newrelic")
         system %Q[curl https://rpm.newrelic.com/accounts/ACCOUNT_ID/applications/APPLICATION_ID/ping_targets/disable -X POST -H "X-Api-Key: API_KEY"]
       end
 
-      deploy.add_callback(:after_teardown) do |output|
+      config.add_callback(:after_teardown) do |output|
         system %Q[curl https://rpm.newrelic.com/accounts/ACCOUNT_ID/applications/APPLICATION_ID/ping_targets/enable -X POST -H "X-Api-Key: API_KEY"]
         output.display("Aaaannnd we're back")
       end
@@ -172,11 +172,11 @@ Or maybe you just want to run a rake task on your application. Since this task m
 namespace :deploy do
   desc 'Deploy app in production environment'
   task :production do
-    Paratrooper.deploy("amazing-production-app") do |deploy|
-      deploy.maintenance = true
-      deploy.add_callback(:after_teardown) do |output|
+    Paratrooper.deploy("amazing-production-app") do |config|
+      config.maintenance = true
+      config.add_callback(:after_teardown) do |output|
         output.display("Running some task that needs to run")
-        deploy.add_remote_task("rake some:task:to:run")
+        config.add_remote_task("rake some:task:to:run")
       end
     end
   end

data/lib/paratrooper/heroku_wrapper.rb

@@ -1,4 +1,4 @@
-require 'heroku-api'
+require 'platform-api'
 require 'rendezvous'
 require 'paratrooper/local_api_key_extractor'
 require 'paratrooper/error'
@@ -18,45 +18,56 @@ module Paratrooper
       @app_name      = app_name
       @key_extractor = options[:key_extractor] || LocalApiKeyExtractor
       @api_key       = options[:api_key] || key_extractor.get_credentials
-      @heroku_api    = options[:heroku_api] || Heroku::API.new(api_key: api_key)
+      @heroku_api    = options[:heroku_api] || PlatformAPI.connect_oauth(api_key)
       @rendezvous    = options[:rendezvous] || Rendezvous
     end
 
     def app_restart
-      client(:post_ps_restart, app_name)
+      client(:dyno, :restart_all, app_name)
     end
 
     def app_maintenance_off
-      app_maintenance('0')
+      client(:app, :update, app_name, 'maintenance' => 'false')
     end
 
     def app_maintenance_on
-      app_maintenance('1')
+      client(:app, :update, app_name, 'maintenance' => 'true')
+    end
+
+    def releases
+      @releases ||= client(:release, :list, app_name)
     end
 
     def run_migrations
       run_task('rake db:migrate')
     end
 
-    def run_task(task_name)
-      data = client(:post_ps, app_name, task_name, attach: 'true').body
-      rendezvous.start(url: data['rendezvous_url'])
+    def run_task(task)
+      payload = { 'command' => task, 'attach' => 'true' }
+      data    = client(:dyno, :create, app_name, payload)
+      rendezvous.start(url: data['attach_url'])
     end
 
     def last_deploy_commit
-      data = client(:get_releases, app_name).body
-      return nil if data.empty?
-      data.last['commit']
+      return nil if last_release_with_slug.nil?
+      slug_data = client(:slug, :info, app_name, get_slug_id(last_release_with_slug))
+      slug_data['commit']
+    end
+
+    def last_release_with_slug
+      # releases is an enumerator
+      releases.to_a.reverse.detect { |release| not release['slug'].nil? }
     end
 
     private
-    def app_maintenance(flag)
-      client(:post_app_maintenance, app_name, flag)
+
+    def get_slug_id(release)
+      release["slug"]["id"]
     end
 
-    def client(method, *args)
-      heroku_api.public_send(method, *args)
-    rescue Heroku::API::Errors::Forbidden => e
+    def client(delegatee, method, *args)
+      heroku_api.public_send(delegatee).public_send(method, *args)
+    rescue Excon::Errors::Forbidden => e
       raise ErrorNoAccess.new(app_name)
     end
   end

data/lib/paratrooper/version.rb

@@ -1,3 +1,3 @@
 module Paratrooper
-  VERSION = "3.0.0.beta3".freeze
+  VERSION = "3.0.2".freeze
 end

data/paratrooper.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'pry'
-  gem.add_dependency 'heroku-api', '~> 0.3'
+  gem.add_dependency 'platform-api', '~> 2.0'
   gem.add_dependency 'rendezvous', '~> 0.1'
   gem.add_dependency 'netrc', '~> 0.7'
   gem.add_dependency 'excon', '>= 0.44.4'

data/spec/paratrooper/heroku_wrapper_spec.rb

@@ -45,69 +45,110 @@ describe Paratrooper::HerokuWrapper do
 
   describe '#app_restart' do
     it "calls down to heroku api" do
-      expect(heroku_api).to receive(:post_ps_restart).with(app_name)
+      expect(heroku_api).to receive_message_chain(:dyno, :restart_all).with(app_name)
       wrapper.app_restart
     end
   end
 
   describe '#app_maintenance_off' do
     it "calls down to heroku api" do
-      expect(heroku_api).to receive(:post_app_maintenance).with(app_name, '0')
+      expect(heroku_api).to receive_message_chain(:app, :update).with(app_name, 'maintenance' => 'false')
       wrapper.app_maintenance_off
     end
   end
 
   describe '#app_maintenance_on' do
     it "calls down to heroku api" do
-      expect(heroku_api).to receive(:post_app_maintenance).with(app_name, '1')
+      expect(heroku_api).to receive_message_chain(:app, :update).with(app_name, 'maintenance' => 'true')
       wrapper.app_maintenance_on
     end
   end
 
   describe '#run_migrations' do
     it 'calls into the heroku api' do
-      expect(heroku_api).to receive(:post_ps).with(app_name, 'rake db:migrate', attach: 'true').and_return(double(body: ''))
+      expect(heroku_api).to receive_message_chain(:dyno, :create).with(app_name, {'command' => 'rake db:migrate', 'attach' => 'true' }).and_return(Hash.new)
       wrapper.run_migrations
     end
 
     it 'uses waits for db migrations to run using rendezvous' do
-      data = { 'rendezvous_url' => 'the_url' }
-      allow(heroku_api).to receive_message_chain(:post_ps, :body).and_return(data)
-      expect(rendezvous).to receive(:start).with(:url => data['rendezvous_url'])
+      data = { 'attach_url' => 'the_url' }
+      allow(heroku_api).to receive_message_chain(:dyno, :create).with(app_name, {'command' => 'rake db:migrate', 'attach' => 'true' }).and_return(data)
+      expect(rendezvous).to receive(:start).with(:url => data['attach_url'])
       wrapper.run_migrations
     end
   end
 
   describe "#last_deploy_commit" do
     context "when deploy data is returned" do
-      let(:response) do
-        double(:response, body: [{ 'commit' => 'SHA' }])
+      let(:slug_data) do
+        { 'commit' => 'SHA' }
+      end
+
+      let(:release_data) do
+        [{ 'slug' => { 'id' => '1' } }]
       end
+
       it "returns string of last deployed commit" do
-        expect(heroku_api).to receive(:get_releases).with(app_name)
-          .and_return(response)
+        slug_info = release_data.first["slug"]["id"]
+
+        allow(heroku_api).to receive_message_chain(:release, :list).and_return(release_data)
+        expect(heroku_api).to receive_message_chain(:slug, :info).with(app_name, slug_info)
+          .and_return(slug_data)
         expect(wrapper.last_deploy_commit).to eq('SHA')
       end
     end
 
     context "when no deploys have happened yet" do
       let(:response) do
-        double(:response, body: [])
+        Array.new
+      end
+
+      let(:data) do
+        [{ 'slug' => { 'id' => '1' } }]
       end
 
       it "returns nil" do
-        expect(heroku_api).to receive(:get_releases).with(app_name)
-          .and_return(response)
+        slug_info = data.first["slug"]["id"].to_i
+
+        allow(heroku_api).to receive_message_chain(:release, :list).and_return(response)
         expect(wrapper.last_deploy_commit).to eq(nil)
       end
     end
   end
 
+  describe '#last_release_with_slug' do
+    let(:releases) do
+      [
+        { 'slug' => { 'id' => '1' }, 'updated_at' => '1990' },
+        { 'slug' => { 'id' => '2' }, 'updated_at' => '2015' },
+        { 'slug' => nil }
+      ]
+    end
+    it 'returns the most current release that has a slug attribute' do
+      allow(heroku_api).to receive_message_chain(:release, :list).and_return(releases)
+      expect(wrapper.last_release_with_slug['updated_at']).to eq '2015'
+
+    end
+
+    it 'returns nil if none of the releases have a slug attribute' do
+      data = [{ 'slug' => nil }]
+      allow(heroku_api).to receive_message_chain(:release, :list).and_return(data)
+      expect(wrapper.last_release_with_slug).to be_nil
+    end
+
+    it 'returns nil if the releases array is empty' do
+      data = []
+      allow(heroku_api).to receive_message_chain(:release, :list).and_return(data)
+      expect(wrapper.last_release_with_slug).to be_nil
+    end
+  end
+
   describe "#run_task" do
     it 'calls into the heroku api' do
       task = 'rake some:task:to:run'
-      expect(heroku_api).to receive(:post_ps).with(app_name, task, attach: 'true').and_return(double(body: ''))
+      expect(heroku_api).to receive_message_chain(:dyno, :create).with(app_name, {'command' => task, 'attach' => 'true' }).and_return(Hash.new)
       wrapper.run_task(task)
     end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paratrooper
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta3
+  version: 3.0.2
 platform: ruby
 authors:
 - Matt Polito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,19 +54,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: heroku-api
+  name: platform-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rendezvous
   requirement: !ruby/object:Gem::Requirement
@@ -166,12 +166,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Library to create task for deployment to Heroku