pogo 2.32.14 → 2.39.2

data/spec/heroku/helpers/heroku_postgresql_spec.rb

@@ -15,8 +15,7 @@ describe Heroku::Helpers::HerokuPostgresql do
     {
       "DATABASE_URL"                => "postgres://default",
       "HEROKU_POSTGRESQL_BLACK_URL" => "postgres://black",
-      "HEROKU_POSTGRESQL_IVORY_URL" => "postgres://default",
-      "SHARED_DATABASE_URL"         => "postgres://shared"
+      "HEROKU_POSTGRESQL_IVORY_URL" => "postgres://default"
     }
   end
 
@@ -32,16 +31,38 @@ describe Heroku::Helpers::HerokuPostgresql do
       ]
     }
 
-  it "resolves DATABASE" do
-    att = subject.hpg_resolve('DATABASE')
-    att.display_name.should == "HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)"
-    att.url.should == "postgres://default"
+  context "when the DATABASE_URL has query options" do
+    let(:app_config_vars) do
+      {
+        "DATABASE_URL"                => "postgres://default?pool=15",
+        "HEROKU_POSTGRESQL_BLACK_URL" => "postgres://black",
+        "HEROKU_POSTGRESQL_IVORY_URL" => "postgres://default",
+        "SHARED_DATABASE_URL"         => "postgres://shared"
+      }
+    end
+
+    it "resolves DATABASE" do
+      att = subject.hpg_resolve('DATABASE')
+      att.display_name.should == "HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)"
+      att.url.should == "postgres://default"
+    end
   end
 
-  it "resolves SHARED_DATABASE" do
-    att = subject.hpg_resolve('SHARED_DATABASE')
-    att.display_name.should == "SHARED_DATABASE"
-    att.url.should == "postgres://shared"
+  context "when the DATABASE_URL has no query options" do
+    let(:app_config_vars) do
+      {
+        "DATABASE_URL"                => "postgres://default",
+        "HEROKU_POSTGRESQL_BLACK_URL" => "postgres://black",
+        "HEROKU_POSTGRESQL_IVORY_URL" => "postgres://default",
+        "SHARED_DATABASE_URL"         => "postgres://shared"
+      }
+    end
+
+    it "resolves DATABASE" do
+      att = subject.hpg_resolve('DATABASE')
+      att.display_name.should == "HEROKU_POSTGRESQL_IVORY_URL (DATABASE_URL)"
+      att.url.should == "postgres://default"
+    end
   end
 
   it "resolves default using NAME" do
@@ -87,14 +108,14 @@ describe Heroku::Helpers::HerokuPostgresql do
   end
 
   it "throws an error if it doesnt exist" do
-    subject.should_receive(:error).with("Unknown database: violet. Valid options are: DATABASE_URL, HEROKU_POSTGRESQL_BLACK_URL, HEROKU_POSTGRESQL_IVORY_URL, SHARED_DATABASE")
+    subject.should_receive(:error).with("Unknown database: violet. Valid options are: DATABASE_URL, HEROKU_POSTGRESQL_BLACK_URL, HEROKU_POSTGRESQL_IVORY_URL")
     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_URL, HEROKU_POSTGRESQL_BLACK_URL, HEROKU_POSTGRESQL_IVORY_URL, SHARED_DATABASE")
+      subject.should_receive(:error).with("Unknown database. Valid options are: DATABASE_URL, HEROKU_POSTGRESQL_BLACK_URL, HEROKU_POSTGRESQL_IVORY_URL")
       subject.hpg_resolve(nil)
     end
 
@@ -112,13 +133,13 @@ describe Heroku::Helpers::HerokuPostgresql 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")
+      subject.should_receive(:error).with("Unknown database. Valid options are: HEROKU_POSTGRESQL_BLACK_URL, HEROKU_POSTGRESQL_IVORY_URL")
       att = subject.hpg_resolve('', "DATABASE_URL")
     end
 
     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")
+      subject.should_receive(:error).with("Unknown database. Valid options are: HEROKU_POSTGRESQL_BLACK_URL, HEROKU_POSTGRESQL_IVORY_URL")
       att = subject.hpg_resolve('', "DATABASE_URL")
     end
 

data/spec/spec_helper.rb

@@ -31,7 +31,7 @@ end
 
 def prepare_command(klass)
   command = klass.new
-  command.stub!(:app).and_return("myapp")
+  command.stub!(:app).and_return("example")
   command.stub!(:ask).and_return("")
   command.stub!(:display)
   command.stub!(:hputs)
@@ -50,7 +50,7 @@ def execute(command_line)
   object, method = Heroku::Command.prepare_run(command, args)
 
   any_instance_of(Heroku::Command::Base) do |base|
-    stub(base).app.returns("myapp")
+    stub(base).app.returns("example")
   end
 
   stub(Heroku::Auth).get_credentials.returns(['email@example.com', 'apikey01'])
@@ -61,6 +61,11 @@ def execute(command_line)
   $stdin  = captured_stdin  = StringIO.new
   $stderr = captured_stderr = StringIO.new
   $stdout = captured_stdout = StringIO.new
+  class << captured_stdout
+    def tty?
+      true
+    end
+  end
 
   begin
     object.send(method)
@@ -158,6 +163,16 @@ def stub_rendezvous
   end
 end
 
+def stub_cisaurus
+  @stub_cisaurus ||= begin
+    stub_cisaurus = nil
+    any_instance_of(Heroku::Client::Cisaurus) do |cisaurus|
+      stub_cisaurus = stub(cisaurus)
+    end
+    stub_cisaurus
+  end
+end
+
 def with_blank_git_repository(&block)
   sandbox = File.join(Dir.tmpdir, "heroku", Process.pid.to_s)
   FileUtils.mkdir_p(sandbox)

data/spec/support/openssl_mock_helper.rb

@@ -1,5 +1,5 @@
 def mock_openssl
-  @ctx_mock        = mock "SSLContext", :key= => nil, :cert= => nil
+  @ctx_mock        = mock "SSLContext", :key= => nil, :cert= => nil, :ssl_version= => nil
   @tcp_socket_mock = mock "TCPSocket", :close => true
   @ssl_socket_mock = mock "SSLSocket", :sync= => true, :connect => true, :close => true, :to_io => $stdin
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pogo
 version: !ruby/object:Gem::Version
-  version: 2.32.14
+  version: 2.39.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: heroku-api
+  name: pogoapp-api
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,7 @@ files:
 - lib/heroku/auth.rb
 - lib/heroku/cli.rb
 - lib/heroku/client.rb
+- lib/heroku/client/cisaurus.rb
 - lib/heroku/client/heroku_postgresql.rb
 - lib/heroku/client/pgbackups.rb
 - lib/heroku/client/rendezvous.rb
@@ -121,6 +122,7 @@ files:
 - lib/heroku/command/db.rb
 - lib/heroku/command/domains.rb
 - lib/heroku/command/drains.rb
+- lib/heroku/command/fork.rb
 - lib/heroku/command/git.rb
 - lib/heroku/command/help.rb
 - lib/heroku/command/keys.rb
@@ -131,6 +133,7 @@ files:
 - lib/heroku/command/pgbackups.rb
 - lib/heroku/command/plugins.rb
 - lib/heroku/command/ps.rb
+- lib/heroku/command/regions.rb
 - lib/heroku/command/releases.rb
 - lib/heroku/command/run.rb
 - lib/heroku/command/sharing.rb
@@ -145,6 +148,7 @@ files:
 - lib/heroku/excon.rb
 - lib/heroku/helpers.rb
 - lib/heroku/helpers/heroku_postgresql.rb
+- lib/heroku/helpers/log_displayer.rb
 - lib/heroku/plugin.rb
 - lib/heroku/updater.rb
 - lib/heroku/version.rb
@@ -165,6 +169,7 @@ files:
 - spec/heroku/command/db_spec.rb
 - spec/heroku/command/domains_spec.rb
 - spec/heroku/command/drains_spec.rb
+- spec/heroku/command/fork_spec.rb
 - spec/heroku/command/git_spec.rb
 - spec/heroku/command/help_spec.rb
 - spec/heroku/command/keys_spec.rb
@@ -178,7 +183,6 @@ files:
 - spec/heroku/command/releases_spec.rb
 - spec/heroku/command/run_spec.rb
 - spec/heroku/command/sharing_spec.rb
-- spec/heroku/command/ssl_spec.rb
 - spec/heroku/command/stack_spec.rb
 - spec/heroku/command/status_spec.rb
 - spec/heroku/command/version_spec.rb
@@ -219,3 +223,4 @@ signing_key:
 specification_version: 3
 summary: Client library and CLI to deploy apps on Pogoapp.
 test_files: []
+has_rdoc: 

data/spec/heroku/command/ssl_spec.rb

@@ -1,32 +0,0 @@
-require "spec_helper"
-require "heroku/command/ssl"
-
-module Heroku::Command
-  describe Ssl do
-
-    it "adds ssl certificates to domains" do
-      File.should_receive(:exists?).with('.git').and_return(false)
-      File.should_receive(:exists?).with('my.crt').and_return(true)
-      File.should_receive(:read).with('my.crt').and_return('crt contents')
-      File.should_receive(:exists?).with('my.key').and_return(true)
-      File.should_receive(:read).with('my.key').and_return('key contents')
-      expires_at = Time.now + 60 * 60 * 24 * 365
-      stub_core.add_ssl('myapp', 'crt contents', 'key contents').returns({"domain" => "example.com", "expires_at" => expires_at})
-      stderr, stdout = execute("ssl:add my.crt my.key")
-      stderr.should == ""
-      stdout.should == <<-STDOUT
-Added certificate to example.com, expiring at #{expires_at}
-STDOUT
-    end
-
-    it "removes certificates" do
-      stub_core.remove_ssl('myapp', 'example.com')
-      stderr, stdout = execute("ssl:remove example.com")
-      stderr.should == ""
-      stdout.should == <<-STDOUT
-Removed certificate from example.com
-STDOUT
-    end
-
-  end
-end