pogo 2.31.2 → 2.32.14

data/lib/heroku/updater.rb

@@ -5,8 +5,8 @@ require 'heroku/helpers'
 module Heroku
   module Updater
 
-    def self.autoupdating_path
-      File.join(Heroku::Helpers.home_directory, ".heroku", "autoupdating")
+    def self.updating_lock_path
+      File.join(Heroku::Helpers.home_directory, ".heroku", "updating")
     end
 
     def self.installed_client_path
@@ -47,67 +47,72 @@ module Heroku
       end
     end
 
-    def self.update(url, autoupdate=false)
-      if ENV['HEROKU_AUTOUPDATE'] == 'true'
-        if File.exists?(autoupdating_path)
-          Heroku::Helpers.error('autoupdate in progress')
+    def self.wait_for_lock(path, wait_for=5, check_every=0.5)
+      start = Time.now.to_i
+      while File.exists?(path)
+        sleep check_every
+        if (Time.now.to_i - start) > wait_for
+          Heroku::Helpers.error "Unable to acquire update lock"
         end
       end
+      begin
+        FileUtils.touch path
+        ret = yield
+      ensure
+        FileUtils.rm_f path
+      end
+      ret
+    end
 
-      require "excon"
-      require "heroku"
-      require "tmpdir"
-      require "zip/zip"
-
-      latest_version = Heroku::Helpers.json_decode(Excon.get('http://rubygems.org/api/v1/gems/heroku.json', :nonblock => false).body)['version']
-
-      if compare_versions(latest_version, latest_local_version) > 0
-        Dir.mktmpdir do |download_dir|
-
-          # follow redirect, if one exists
-          headers = Excon.head(
-            url,
-            :headers => {
-              'User-Agent' => Heroku.user_agent
-            },
-            :nonblack => false
-          ).headers
-          if headers['Location']
-            url = headers['Location']
-          end
+    def self.autoupdate?
+      true
+    end
 
-          File.open("#{download_dir}/heroku.zip", "wb") do |file|
-            file.print Excon.get(url, :nonblock => false).body
-          end
+    def self.update(url, autoupdate=false)
+      wait_for_lock(updating_lock_path, 5) do
+        require "excon"
+        require "heroku"
+        require "heroku/excon"
+        require "tmpdir"
+        require "zip/zip"
+
+        latest_version = Excon.get_with_redirect("http://assets.heroku.com/heroku-client/VERSION", :nonblock => false).body.chomp
+
+        if compare_versions(latest_version, latest_local_version) > 0
+          Dir.mktmpdir do |download_dir|
+            File.open("#{download_dir}/heroku.zip", "wb") do |file|
+              file.print Excon.get_with_redirect(url, :nonblock => false).body
+            end
 
-          Zip::ZipFile.open("#{download_dir}/heroku.zip") do |zip|
-            zip.each do |entry|
-              target = File.join(download_dir, entry.to_s)
-              FileUtils.mkdir_p File.dirname(target)
-              zip.extract(entry, target) { true }
+            Zip::ZipFile.open("#{download_dir}/heroku.zip") do |zip|
+              zip.each do |entry|
+                target = File.join(download_dir, entry.to_s)
+                FileUtils.mkdir_p File.dirname(target)
+                zip.extract(entry, target) { true }
+              end
             end
-          end
 
-          FileUtils.rm "#{download_dir}/heroku.zip"
+            FileUtils.rm "#{download_dir}/heroku.zip"
 
-          old_version = latest_local_version
-          new_version = client_version_from_path(download_dir)
+            old_version = latest_local_version
+            new_version = client_version_from_path(download_dir)
 
-          if compare_versions(new_version, old_version) < 0 && !autoupdate
-            Heroku::Helpers.error("Installed version (#{old_version}) is newer than the latest available update (#{new_version})")
-          end
+            if compare_versions(new_version, old_version) < 0 && !autoupdate
+              Heroku::Helpers.error("Installed version (#{old_version}) is newer than the latest available update (#{new_version})")
+            end
 
-          FileUtils.rm_rf updated_client_path
-          FileUtils.mkdir_p File.dirname(updated_client_path)
-          FileUtils.cp_r  download_dir, updated_client_path
+            FileUtils.rm_rf updated_client_path
+            FileUtils.mkdir_p File.dirname(updated_client_path)
+            FileUtils.cp_r  download_dir, updated_client_path
 
-          new_version
+            new_version
+          end
+        else
+          false # already up to date
         end
-      else
-        false # already up to date
       end
     ensure
-      FileUtils.rm_f(autoupdating_path)
+      FileUtils.rm_f(updating_lock_path)
     end
 
     def self.compare_versions(first_version, second_version)
@@ -130,29 +135,28 @@ module Heroku
       background_update!
     end
 
-    def self.autoupdate?
-      !@disable && File.exists?(File.join(Heroku::Helpers.home_directory, ".heroku", "autoupdate"))
+    def self.last_autoupdate_path
+      File.join(Heroku::Helpers.home_directory, ".heroku", "autoupdate.last")
     end
 
     def self.background_update!
-      # default autoupdate for users with no plugins who haven't updated before
-      unless File.exists?(File.join(Heroku::Helpers.home_directory, '.heroku'))
-        FileUtils.mkdir_p(File.join(Heroku::Helpers.home_directory, '.heroku'))
-        FileUtils.touch(File.join(Heroku::Helpers.home_directory, '.heroku', 'autoupdate'))
+      # if we've updated in the last 300 seconds, dont try again
+      if File.exists?(last_autoupdate_path)
+        return if (Time.now.to_i - File.mtime(last_autoupdate_path).to_i) < 300
       end
-      if autoupdate? && !File.exists?(autoupdating_path)
-        FileUtils.touch(autoupdating_path)
-        log_path = File.join(Heroku::Helpers.home_directory, '.heroku', 'autoupdate.log')
-        pid = if defined?(RUBY_VERSION) and RUBY_VERSION =~ /^1\.8\.\d+/
-          fork do
-            ENV['HEROKU_AUTOUPDATE'] = 'true'
-            exec("heroku update &> #{log_path}")
-          end
-        else
-          spawn(ENV.to_hash.merge({'HEROKU_AUTOUPDATE' => 'true'}), "heroku update", {:err => :out, :out => log_path})
+      log_path = File.join(Heroku::Helpers.home_directory, '.heroku', 'autoupdate.log')
+      FileUtils.mkdir_p File.dirname(log_path)
+      heroku_binary = File.expand_path($0)
+      pid = if defined?(RUBY_VERSION) and RUBY_VERSION =~ /^1\.8\.\d+/
+        fork do
+          exec("\"#{heroku_binary}\" update &> #{log_path} 2>&1")
         end
-        Process.detach(pid)
+      else
+        spawn("\"#{heroku_binary}\" update", {:err => log_path, :out => log_path})
       end
+      Process.detach(pid)
+      FileUtils.mkdir_p File.dirname(last_autoupdate_path)
+      FileUtils.touch last_autoupdate_path
     end
   end
 end

data/lib/heroku/version.rb

@@ -1,3 +1,3 @@
 module Heroku
-  VERSION = "2.31.2"
+  VERSION = "2.32.14"
 end

data/spec/heroku/client/heroku_postgresql_spec.rb

@@ -3,32 +3,69 @@ require "heroku/client/heroku_postgresql"
 require "digest"
 
 describe Heroku::Client::HerokuPostgresql do
-
   include Heroku::Helpers
 
-  let(:url)     { 'postgres://somewhere/somedb' }
-  let(:url_sha) { Digest::SHA2.hexdigest url }
-  let(:client)  { Heroku::Client::HerokuPostgresql.new(url) }
+  before do
+    Heroku::Auth.stub :user => 'user@example.com', :password => 'apitoken'
+  end
+
+  let(:attachment) { double('attachment', :resource_name => 'something-something-42', :starter_plan? => false) }
+  let(:client)  { Heroku::Client::HerokuPostgresql.new(attachment) }
+
+  describe 'api choosing' do
+    it "sends an ingress request to the client for production plans" do
+      attachment.stub! :starter_plan? => false
+      host = 'postgres-api.heroku.com'
+      url  = "https://user@example.com:apitoken@#{host}/client/v11/databases/#{attachment.resource_name}/ingress"
+
+      stub_request(:put, url).to_return(
+        :body => json_encode({"message" => "ok"}),
+        :status => 200
+      )
 
-  it "sends an ingress request to the client" do
-    url = "https://shogun.heroku.com/client/v10/databases/#{url_sha}/ingress"
+      client.ingress
 
-    stub_request(:put, url).to_return(
-      :body => json_encode({"message" => "ok"}),
-      :status => 200
-    )
+      a_request(:put, url).should have_been_made.once
+    end
 
-    client.ingress
+    it "sends an ingress request to the client for production plans" do
+      attachment.stub! :starter_plan? => true
+      host = 'postgres-starter-api.heroku.com'
+      url  = "https://user@example.com:apitoken@#{host}/client/v11/databases/#{attachment.resource_name}/ingress"
 
-    a_request(:put, url).should have_been_made.once
+      stub_request(:put, url).to_return(
+        :body => json_encode({"message" => "ok"}),
+        :status => 200
+      )
+
+      client.ingress
+
+      a_request(:put, url).should have_been_made.once
+    end
   end
 
-  it "retries on error, then raises" do
-    url = "https://shogun.heroku.com/client/v10/databases/#{url_sha}"
-    stub_request(:get, url).to_return(:body => "error", :status => 500)
-    client.stub(:sleep)
-    lambda { client.get_database }.should raise_error RestClient::InternalServerError
-    a_request(:get, url).should have_been_made.times(4)
+  describe '#get_database' do
+    let(:url) { "https://user@example.com:apitoken@postgres-api.heroku.com/client/v11/databases/#{attachment.resource_name}" }
+
+    it 'works without the extended option' do
+      stub_request(:get, url).to_return :body => '{}'
+      client.get_database
+      a_request(:get, url).should have_been_made.once
+    end
+
+    it 'works with the extended option' do
+      url2 = url + '?extended=true'
+      stub_request(:get, url2).to_return :body => '{}'
+      client.get_database(true)
+      a_request(:get, url2).should have_been_made.once
+    end
+
+    it "retries on error, then raises" do
+      stub_request(:get, url).to_return(:body => "error", :status => 500)
+      client.stub(:sleep)
+      lambda { client.get_database }.should raise_error RestClient::InternalServerError
+      a_request(:get, url).should have_been_made.times(4)
+    end
   end
 
 end

data/spec/heroku/command/addons_spec.rb

@@ -195,9 +195,25 @@ STDOUT
 
       it "should translate --fork and --follow" do
         %w{fork follow}.each do |switch|
-          @addons.stub!(:app_config_vars).and_return({ 'HEROKU_POSTGRESQL_RED_URL' => 'foo'})
+          @addons.stub!(:app_config_vars).and_return({})
+          @addons.stub!(:app_attachments).and_return([Heroku::Helpers::HerokuPostgresql::Attachment.new({
+              'config_var' => 'HEROKU_POSTGRESQL_RED_URL',
+              'resource' => {'name'  => 'loudly-yelling-1232',
+                             'value' => 'postgres://red_url',
+                             'type'  => 'heroku-postgresql:ronin' }})
+          ])
           @addons.stub!(:args).and_return("heroku-postgresql --#{switch} HEROKU_POSTGRESQL_RED".split)
-          @addons.heroku.should_receive(:install_addon).with('myapp', 'heroku-postgresql', {switch => 'foo'})
+          @addons.heroku.should_receive(:install_addon).with('myapp', 'heroku-postgresql', {switch => 'postgres://red_url'})
+          @addons.add
+        end
+      end
+
+      it "should NOT translate --fork and --follow if passed in a full postgres url even if there are no databases" do
+        %w{fork follow}.each do |switch|
+          @addons.stub!(:app_config_vars).and_return({})
+          @addons.stub!(:app_attachments).and_return([])
+          @addons.stub!(:args).and_return("heroku-postgresql --#{switch} postgres://foo:yeah@awesome.com:234/bestdb".split)
+          @addons.heroku.should_receive(:install_addon).with('myapp', 'heroku-postgresql', {switch => 'postgres://foo:yeah@awesome.com:234/bestdb'})
           @addons.add
         end
       end

data/spec/heroku/command/labs_spec.rb

@@ -18,13 +18,12 @@ module Heroku::Command
       stderr, stdout = execute("labs:list")
       stderr.should == ""
       stdout.should == <<-STDOUT
-=== App Available Features
-sigterm-all:      When stopping a dyno, send SIGTERM to all processes rather than only to the root process.
-user_env_compile: Add user config vars to the environment during slug compilation
-
-=== User Available Features
-sumo-rankings: Heroku Sumo ranks and visualizes the scale of your app, and suggests the optimum combination of dynos and add-ons to take it to the next level.
+=== User Features (email@example.com)
+[ ] sumo-rankings  Heroku Sumo ranks and visualizes the scale of your app, and suggests the optimum combination of dynos and add-ons to take it to the next level.
 
+=== App Features (myapp)
+[+] sigterm-all       When stopping a dyno, send SIGTERM to all processes rather than only to the root process.
+[ ] user_env_compile  Add user config vars to the environment during slug compilation
 STDOUT
     end
 
@@ -33,10 +32,12 @@ STDOUT
       stderr, stdout = execute("labs")
       stderr.should == ""
       stdout.should == <<-STDOUT
-=== myapp Enabled Features
-sigterm-all: When stopping a dyno, send SIGTERM to all processes rather than only to the root process.
+=== User Features (email@example.com)
+[ ] sumo-rankings  Heroku Sumo ranks and visualizes the scale of your app, and suggests the optimum combination of dynos and add-ons to take it to the next level.
 
-email@example.com has no enabled features.
+=== App Features (myapp)
+[+] sigterm-all       When stopping a dyno, send SIGTERM to all processes rather than only to the root process.
+[ ] user_env_compile  Add user config vars to the environment during slug compilation
 STDOUT
     end
 

data/spec/heroku/command/pg_spec.rb

@@ -9,9 +9,30 @@ module Heroku::Command
       api.post_app "name" => "myapp"
       api.put_config_vars "myapp", {
         "DATABASE_URL" => "postgres://database_url",
-        "SHARED_DATABASE_URL" => "postgres://other_database_url",
+        "SHARED_DATABASE_URL" => "postgres://shared_database_url",
+        "HEROKU_POSTGRESQL_IVORY_URL" => "postgres://database_url",
         "HEROKU_POSTGRESQL_RONIN_URL" => "postgres://ronin_database_url"
       }
+
+      any_instance_of(Heroku::Command::Pg) do |pg|
+        stub(pg).app_attachments.returns([
+          Heroku::Helpers::HerokuPostgresql::Attachment.new({
+            'config_var' => 'HEROKU_POSTGRESQL_IVORY_URL',
+            'resource' => {'name'  => 'loudly-yelling-1232',
+                           'value' => 'postgres://database_url',
+                           'type'  => 'heroku-postgresql:ronin' }}),
+          Heroku::Helpers::HerokuPostgresql::Attachment.new({
+            'config_var' => 'HEROKU_POSTGRESQL_RONIN_URL',
+            'resource' => {'name'  => 'softly-mocking-123',
+                           'value' => 'postgres://ronin_database_url',
+                           'type'  => 'heroku-postgresql:ronin' }}),
+          Heroku::Helpers::HerokuPostgresql::Attachment.new({
+            'config_var' => 'HEROKU_POSTGRESQL_FOLLOW_URL',
+            'resource' => {'name'  => 'whatever-somethign-2323',
+                           'value' => 'postgres://follow_database_url',
+                           'type'  => 'heroku-postgresql:ronin' }})
+        ])
+      end
     end
 
     after do
@@ -24,7 +45,7 @@ module Heroku::Command
       stderr, stdout = execute("pg:reset RONIN --confirm myapp")
       stderr.should == ""
       stdout.should == <<-STDOUT
-Resetting HEROKU_POSTGRESQL_RONIN... done
+Resetting HEROKU_POSTGRESQL_RONIN_URL... done
 STDOUT
     end
 
@@ -63,14 +84,33 @@ STDERR
           {"name"=>"PG Version", "values"=>["9.1.4"]},
           {"name"=>"Fork/Follow", "values"=>["Available"]},
           {"name"=>"Created", "values"=>["2011-12-13 00:00 UTC"]},
-          {"name"=>"Conn Info", "values"=>["[Deprecated] Please use `heroku pg:credentials HEROKU_POSTGRESQL_RONIN` to view connection info"]},
           {"name"=>"Maintenance", "values"=>["not required"]}
         ])
 
         stderr, stdout = execute("pg")
         stderr.should == ""
         stdout.should == <<-STDOUT
-=== HEROKU_POSTGRESQL_RONIN
+=== HEROKU_POSTGRESQL_FOLLOW_URL
+Plan:        Ronin
+Status:      available
+Data Size:   1 MB
+Tables:      1
+PG Version:  9.1.4
+Fork/Follow: Available
+Created:     2011-12-13 00:00 UTC
+Maintenance: not required
+
+=== HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)
+Plan:        Ronin
+Status:      available
+Data Size:   1 MB
+Tables:      1
+PG Version:  9.1.4
+Fork/Follow: Available
+Created:     2011-12-13 00:00 UTC
+Maintenance: not required
+
+=== HEROKU_POSTGRESQL_RONIN_URL
 Plan:        Ronin
 Status:      available
 Data Size:   1 MB
@@ -78,7 +118,6 @@ Tables:      1
 PG Version:  9.1.4
 Fork/Follow: Available
 Created:     2011-12-13 00:00 UTC
-Conn Info:   [Deprecated] Please use `heroku pg:credentials HEROKU_POSTGRESQL_RONIN` to view connection info
 Maintenance: not required
 
 === SHARED_DATABASE
@@ -99,14 +138,13 @@ STDOUT
           {"name"=>"Fork/Follow", "values"=>["Available"]},
           {"name"=>"Forked From", "values"=>["postgres://username:password@postgreshost.com:5432/database_name"], "resolve_db_name" => "true"},
           {"name"=>"Created", "values"=>["2011-12-13 00:00 UTC"]},
-          {"name"=>"Conn Info", "values"=>["[Deprecated] Please use `heroku pg:credentials HEROKU_POSTGRESQL_RONIN` to view connection info"]},
           {"name"=>"Maintenance", "values"=>["not required"]}
         ])
 
         stderr, stdout = execute("pg:info RONIN")
         stderr.should == ""
         stdout.should == <<-STDOUT
-=== HEROKU_POSTGRESQL_RONIN
+=== HEROKU_POSTGRESQL_RONIN_URL
 Plan:        Ronin
 Status:      available
 Data Size:   1 MB
@@ -115,7 +153,6 @@ PG Version:  9.1.4
 Fork/Follow: Available
 Forked From: Database on postgreshost.com:5432/database_name
 Created:     2011-12-13 00:00 UTC
-Conn Info:   [Deprecated] Please use `heroku pg:credentials HEROKU_POSTGRESQL_RONIN` to view connection info
 Maintenance: not required
 
 STDOUT
@@ -127,19 +164,11 @@ STDOUT
         stderr, stdout = execute("pg:promote RONIN --confirm myapp")
         stderr.should == ""
         stdout.should == <<-STDOUT
-Promoting HEROKU_POSTGRESQL_RONIN to DATABASE_URL... done
+Promoting HEROKU_POSTGRESQL_RONIN_URL to DATABASE_URL... done
 STDOUT
         api.get_config_vars("myapp").body["DATABASE_URL"].should == "postgres://ronin_database_url"
       end
 
-      it "promotes the specified database url case-sensitively" do
-        stderr, stdout = execute("pg:promote postgres://john:S3nsit1ve@my.example.com/db_name --confirm=myapp")
-        stderr.should == ""
-        stdout.should == <<-STDOUT
-Promoting Custom URL to DATABASE_URL... done
-STDOUT
-      end
-
       it "fails if no database is specified" do
         stderr, stdout = execute("pg:promote")
         stderr.should == <<-STDERR
@@ -151,20 +180,13 @@ STDERR
     end
 
     context "credential resets" do
-      before do
-        api.put_config_vars "myapp", {
-          "DATABASE_URL" => "postgres:///to_reset_credentials",
-          "HEROKU_POSTGRESQL_RESETME_URL" => "postgres:///to_reset_credentials"
-        }
-      end
-
       it "resets credentials and promotes to DATABASE_URL if it's the main DB" do
         stub_pg.rotate_credentials
-        stderr, stdout = execute("pg:credentials resetme --reset")
-        stderr.should be_empty
+        stderr, stdout = execute("pg:credentials iv --reset")
+        stderr.should == ''
         stdout.should == <<-STDOUT
-Resetting credentials for HEROKU_POSTGRESQL_RESETME (DATABASE_URL)... done
-Promoting HEROKU_POSTGRESQL_RESETME (DATABASE_URL)... done
+Resetting credentials for HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)... done
+Promoting HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)... done
 STDOUT
       end
 
@@ -174,26 +196,17 @@ STDOUT
           "DATABASE_URL" => "postgres://to_reset_credentials",
           "HEROKU_POSTGRESQL_RESETME_URL" => "postgres://something_else"
         }
-        stderr, stdout = execute("pg:credentials resetme --reset")
-        stderr.should be_empty
+        stderr, stdout = execute("pg:credentials follo --reset")
+        stderr.should == ''
         stdout.should_not include("Promoting")
       end
 
     end
 
     context "unfollow" do
-      before do
-        api.put_config_vars "myapp", {
-          "DATABASE_URL" => "postgres://database_url",
-          "SHARED_DATABASE_URL" => "postgres://other_database_url",
-          "HEROKU_POSTGRESQL_RONIN_URL" => "postgres://ronin_database_url",
-          "HEROKU_POSTGRESQL_OTHER_URL" => "postgres://other_database_url"
-        }
-      end
-
       it "sends request to unfollow" do
         hpg_client = double('Heroku::Client::HerokuPostgresql')
-        Heroku::Client::HerokuPostgresql.should_receive(:new).twice.with('postgres://other_database_url').and_return(hpg_client)
+        Heroku::Client::HerokuPostgresql.should_receive(:new).twice.and_return(hpg_client)
         hpg_client.should_receive(:unfollow)
         hpg_client.should_receive(:get_database).and_return(
           :following => 'postgresql://user:pass@roninhost/database',
@@ -209,12 +222,12 @@ STDOUT
             {"name"=>"Maintenance", "values"=>["not required"]}
           ]
         )
-        stderr, stdout = execute("pg:unfollow HEROKU_POSTGRESQL_OTHER --confirm myapp")
+        stderr, stdout = execute("pg:unfollow HEROKU_POSTGRESQL_FOLLOW_URL --confirm myapp")
         stderr.should == ""
         stdout.should == <<-STDOUT
- !    HEROKU_POSTGRESQL_OTHER will become writable and no longer
+ !    HEROKU_POSTGRESQL_FOLLOW_URL will become writable and no longer
  !    follow Database on roninhost:5432/database. This cannot be undone.
-Unfollowing HEROKU_POSTGRESQL_OTHER... done
+Unfollowing HEROKU_POSTGRESQL_FOLLOW_URL... done
 STDOUT
       end
     end