pogo 2.31.2 → 2.32.14

data/spec/heroku/command/pgbackups_spec.rb

@@ -16,8 +16,19 @@ module Heroku::Command
           "PGBACKUPS_URL"           => "https://ip:password@pgbackups.heroku.com/client"
         }
       )
+      @pgbackups.stub :app_attachments => mock_attachments
     end
 
+    let(:mock_attachments) {
+      [
+        Heroku::Helpers::HerokuPostgresql::Attachment.new({
+          'config_var' => 'HEROKU_POSTGRESQL_IVORY',
+          'resource' => {'name'  => 'softly-mocking-123',
+                         'value' => 'postgres://database',
+                         'type'  => 'heroku-postgresql:baku' }})
+      ]
+    }
+
     after do
       api.delete_app("myapp")
     end
@@ -42,6 +53,13 @@ STDOUT
     end
 
     describe "single backup" do
+      let(:from_name)  { "FROM_NAME" }
+      let(:from_url)   { "postgres://from/bar" }
+      let(:attachment) { double('attachment', :display_name => from_name, :url => from_url ) }
+      before do
+        @pgbackups.stub!(:hpg_resolve).and_return(attachment)
+      end
+
       it "gets the url for the latest backup if nothing is specified" do
         stub_core
         stub_pgbackups.get_latest_backup.returns({"public_url" => "http://latest/backup.dump"})
@@ -70,11 +88,9 @@ STDOUT
       end
 
       it "should capture a backup when requested" do
-        from_name, from_url = "FROM_NAME", "postgres://from/bar"
         backup_obj = {'to_url' => "s3://bucket/userid/b001.dump"}
 
         @pgbackups.stub!(:args).and_return([])
-        @pgbackups.stub!(:hpg_resolve).and_return([from_name, from_url])
         @pgbackups.stub!(:transfer!).with(from_url, from_name, nil, "BACKUP", {:expire => nil}).and_return(backup_obj)
         @pgbackups.stub!(:poll_transfer!).with(backup_obj).and_return(backup_obj)
 
@@ -82,11 +98,9 @@ STDOUT
       end
 
       it "should send expiration flag to client if specified on args" do
-        from_name, from_url = "FROM_NAME", "postgres://from/bar"
         backup_obj = {'to_url' => "s3://bucket/userid/b001.dump"}
 
         @pgbackups.stub!(:options).and_return({:expire => true})
-        @pgbackups.stub!(:hpg_resolve).and_return([from_name, from_url])
         @pgbackups.stub!(:transfer!).with(from_url, from_name, nil, "BACKUP", {:expire => true}).and_return(backup_obj)
         @pgbackups.stub!(:poll_transfer!).with(backup_obj).and_return(backup_obj)
 
@@ -136,6 +150,12 @@ STDERR
           stub_core
           stub_pgbackups.create_transfer.returns(@backup_obj)
           stub_pgbackups.get_transfer.returns(@backup_obj)
+
+          any_instance_of(Heroku::Command::Pgbackups) do |pgbackups|
+            stub(pgbackups).app_attachments.returns(
+              mock_attachments
+            )
+          end
         end
 
         it 'aborts on a generic error' do
@@ -185,6 +205,7 @@ STDOUT
     end
 
     context "restore" do
+      let(:attachment) { double('attachment', :display_name => 'someconfigvar', :url => 'postgres://fromhost/database') }
       before do
         from_name, from_url = "FROM_NAME", "postgres://fromhost/database"
 
@@ -226,12 +247,13 @@ STDOUT
           @pgbackups.restore
         end
 
+
         it "should restore the named backup" do
           name = "backupname"
           args = ['DATABASE', name]
           @pgbackups.stub(:args).and_return(args)
           @pgbackups.stub(:shift_argument).and_return(*args)
-          @pgbackups.stub(:hpg_resolve).and_return([name])
+          @pgbackups.stub(:hpg_resolve).and_return(attachment)
           @pgbackups_client.should_receive(:get_backup).with(name).and_return(@backup_obj)
           @pgbackups.restore
         end
@@ -240,7 +262,7 @@ STDOUT
           args = ['db_name_gets_shifted_out_in_resolve_db', 'http://external/file.dump']
           @pgbackups.stub(:args).and_return(args)
           @pgbackups.stub(:shift_argument).and_return(*args)
-          @pgbackups.stub(:hpg_resolve).and_return(["name", "url"])
+          @pgbackups.stub(:hpg_resolve).and_return(attachment)
           @pgbackups_client.should_not_receive(:get_backup)
           @pgbackups_client.should_not_receive(:get_latest_backup)
           @pgbackups.restore

data/spec/heroku/command_spec.rb

@@ -117,12 +117,12 @@ describe Heroku::Command do
     end
 
     it "shows Internal Server Error when the response doesn't contain a XML or JSON" do
-      Heroku::Command.extract_error('<h1>HTTP 500</h1>').should == "Internal server error.\nRun 'heroku status' to check for known platform issues."
+      Heroku::Command.extract_error('<h1>HTTP 500</h1>').should == "Internal server error.\nRun `heroku status` to check for known platform issues."
     end
 
     it "shows Internal Server Error when the response is not plain text" do
       response = FakeResponse.new(:body => "Foobar", :headers => { :content_type => "application/xml" })
-      Heroku::Command.extract_error(response).should == "Internal server error.\nRun 'heroku status' to check for known platform issues."
+      Heroku::Command.extract_error(response).should == "Internal server error.\nRun `heroku status` to check for known platform issues."
     end
 
     it "allows a block to redefine the default error" do

data/spec/heroku/helpers/heroku_postgresql_spec.rb

@@ -6,7 +6,9 @@ include Heroku::Helpers::HerokuPostgresql
 describe Heroku::Helpers::HerokuPostgresql do
 
   before do
+    subject.forget_config!
     subject.stub(:app_config_vars) { app_config_vars }
+    subject.stub(:app_attachments) { app_attachments }
   end
 
   let(:app_config_vars) do
@@ -18,92 +20,108 @@ describe Heroku::Helpers::HerokuPostgresql do
     }
   end
 
+    let(:app_attachments) {
+      [ Attachment.new({ 'config_var' => 'HEROKU_POSTGRESQL_IVORY_URL',
+          'resource' => {'name'  => 'softly-mocking-123',
+                         'value' => 'postgres://default',
+                         'type'  => 'heroku-postgresql:baku' }}),
+        Attachment.new({ 'config_var' => 'HEROKU_POSTGRESQL_BLACK_URL',
+          'resource' => {'name'  => 'quickly-yelling-2421',
+                         'value' => 'postgres://black',
+                         'type'  => 'heroku-postgresql:zilla' }})
+      ]
+    }
+
   it "resolves DATABASE" do
-    subject.hpg_resolve('DATABASE').should == [
-      "HEROKU_POSTGRESQL_IVORY (DATABASE_URL)",
-      "postgres://default"
-    ]
+    att = subject.hpg_resolve('DATABASE')
+    att.display_name.should == "HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)"
+    att.url.should == "postgres://default"
   end
 
   it "resolves SHARED_DATABASE" do
-    subject.hpg_resolve('SHARED_DATABASE').should == [
-      "SHARED_DATABASE",
-      "postgres://shared"
-    ]
+    att = subject.hpg_resolve('SHARED_DATABASE')
+    att.display_name.should == "SHARED_DATABASE"
+    att.url.should == "postgres://shared"
   end
 
   it "resolves default using NAME" do
-    subject.hpg_resolve("IVORY").should == [
-      "HEROKU_POSTGRESQL_IVORY (DATABASE_URL)",
-      "postgres://default"
-    ]
+    att = subject.hpg_resolve('IVORY')
+    att.display_name.should == "HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)"
+    att.url.should == "postgres://default"
   end
 
   it "resolves non-default using NAME" do
-    subject.hpg_resolve("BLACK").should == [
-      "HEROKU_POSTGRESQL_BLACK",
-      "postgres://black"
-    ]
+    att = subject.hpg_resolve('BLACK')
+    att.display_name.should == "HEROKU_POSTGRESQL_BLACK_URL"
+    att.url.should == "postgres://black"
   end
 
   it "resolves default using NAME_URL" do
-    subject.hpg_resolve("IVORY_URL").should == [
-      "HEROKU_POSTGRESQL_IVORY (DATABASE_URL)",
-      "postgres://default"
-    ]
+    att = subject.hpg_resolve('IVORY_URL')
+    att.display_name.should == "HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)"
+    att.url.should == "postgres://default"
   end
 
   it "resolves non-default using NAME_URL" do
-    subject.hpg_resolve("BLACK_URL").should == [
-      "HEROKU_POSTGRESQL_BLACK",
-      "postgres://black"
-    ]
+    att = subject.hpg_resolve('BLACK_URL')
+    att.display_name.should == "HEROKU_POSTGRESQL_BLACK_URL"
+    att.url.should == "postgres://black"
   end
 
   it "resolves default using lowercase" do
-    subject.hpg_resolve("ivory").should == [
-      "HEROKU_POSTGRESQL_IVORY (DATABASE_URL)",
-      "postgres://default"
-    ]
+    att = subject.hpg_resolve('ivory')
+    att.display_name.should == "HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)"
+    att.url.should == "postgres://default"
   end
 
   it "resolves non-default using lowercase" do
-    subject.hpg_resolve("black").should == [
-      "HEROKU_POSTGRESQL_BLACK",
-      "postgres://black"
-    ]
+    att = subject.hpg_resolve('black')
+    att.display_name.should == "HEROKU_POSTGRESQL_BLACK_URL"
+    att.url.should == "postgres://black"
+  end
+
+  it "resolves non-default using part of name" do
+    att = subject.hpg_resolve('bla')
+    att.display_name.should == "HEROKU_POSTGRESQL_BLACK_URL"
+    att.url.should == "postgres://black"
   end
 
   it "throws an error if it doesnt exist" do
-    subject.should_receive(:error).with("Unknown database: VIOLET. Valid options are: DATABASE, HEROKU_POSTGRESQL_BLACK, HEROKU_POSTGRESQL_IVORY, SHARED_DATABASE")
+    subject.should_receive(:error).with("Unknown database: violet. Valid options are: DATABASE_URL, HEROKU_POSTGRESQL_BLACK_URL, HEROKU_POSTGRESQL_IVORY_URL, SHARED_DATABASE")
     subject.hpg_resolve("violet")
   end
 
   context "default" do
 
     it "errors if there is no default" do
-      subject.should_receive(:error).with("Unknown database. Valid options are: DATABASE, HEROKU_POSTGRESQL_BLACK, HEROKU_POSTGRESQL_IVORY, SHARED_DATABASE")
+      subject.should_receive(:error).with("Unknown database. Valid options are: DATABASE_URL, HEROKU_POSTGRESQL_BLACK_URL, HEROKU_POSTGRESQL_IVORY_URL, SHARED_DATABASE")
       subject.hpg_resolve(nil)
     end
 
-    it "uses the default if nothing specified" do
-      subject.hpg_resolve(nil, "DATABASE_URL").should == [
-        "HEROKU_POSTGRESQL_IVORY (DATABASE_URL)",
-        "postgres://default"
-      ]
+    it "uses the default if nothing(nil) specified" do
+      att = subject.hpg_resolve(nil, "DATABASE_URL")
+      att.display_name.should == "HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)"
+      att.url.should == "postgres://default"
     end
 
-  end
+    it "uses the default if nothing(empty) specified" do
+      att = subject.hpg_resolve('', "DATABASE_URL")
+      att.display_name.should == "HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)"
+      att.url.should == "postgres://default"
+    end
 
-  context "uri" do
+    it 'throws an error if given an empty string and asked for the default and there is no default' do
+      app_config_vars.delete 'DATABASE_URL'
+      subject.should_receive(:error).with("Unknown database. Valid options are: HEROKU_POSTGRESQL_BLACK_URL, HEROKU_POSTGRESQL_IVORY_URL, SHARED_DATABASE")
+      att = subject.hpg_resolve('', "DATABASE_URL")
+    end
 
-    it "returns the uri directly" do
-      subject.hpg_resolve('postgres://uri', nil).should == [
-        nil,
-        'postgres://uri'
-      ]
+    it 'throws an error if given an empty string and asked for the default and the default doesnt match' do
+      app_config_vars['DATABASE_URL'] = 'something different'
+      subject.should_receive(:error).with("Unknown database. Valid options are: HEROKU_POSTGRESQL_BLACK_URL, HEROKU_POSTGRESQL_IVORY_URL, SHARED_DATABASE")
+      att = subject.hpg_resolve('', "DATABASE_URL")
     end
 
-  end
 
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pogo
 version: !ruby/object:Gem::Version
-  version: 2.31.2
+  version: 2.32.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -142,6 +142,7 @@ files:
 - lib/heroku/deprecated.rb
 - lib/heroku/deprecated/help.rb
 - lib/heroku/distribution.rb
+- lib/heroku/excon.rb
 - lib/heroku/helpers.rb
 - lib/heroku/helpers/heroku_postgresql.rb
 - lib/heroku/plugin.rb
@@ -193,9 +194,9 @@ files:
 homepage: http://pogoapp.com/
 licenses:
 - MIT
-post_install_message: ! ' !    Thanks for trying the Pogoapp beta!
-
-'
+post_install_message: ! " !    The `heroku` gem has been deprecated and replaced with
+  the Heroku Toolbelt.\n !    Download and install from: https://toolbelt.heroku.com\n
+  !    For API access, see: https://github.com/heroku/heroku.rb\n"
 rdoc_options: []
 require_paths:
 - lib