pogo 2.32.14 → 2.39.2

data/spec/heroku/command/drains_spec.rb

@@ -5,7 +5,7 @@ describe Heroku::Command::Drains do
 
   describe "drains" do
     it "can list drains" do
-      stub_core.list_drains("myapp").returns("drains")
+      stub_core.list_drains("example").returns("drains")
       stderr, stdout = execute("drains")
       stderr.should == ""
       stdout.should == <<-STDOUT
@@ -14,7 +14,7 @@ STDOUT
     end
 
     it "can add drains" do
-      stub_core.add_drain("myapp", "syslog://localhost/add").returns("added")
+      stub_core.add_drain("example", "syslog://localhost/add").returns("added")
       stderr, stdout = execute("drains:add syslog://localhost/add")
       stderr.should == ""
       stdout.should == <<-STDOUT
@@ -23,7 +23,7 @@ STDOUT
     end
 
     it "can remove drains" do
-      stub_core.remove_drain("myapp", "syslog://localhost/remove").returns("removed")
+      stub_core.remove_drain("example", "syslog://localhost/remove").returns("removed")
       stderr, stdout = execute("drains:remove syslog://localhost/remove")
       stderr.should == ""
       stdout.should == <<-STDOUT

data/spec/heroku/command/fork_spec.rb

@@ -0,0 +1,56 @@
+require "spec_helper"
+require "heroku/command/fork"
+require "heroku/client/cisaurus"
+
+module Heroku::Command
+
+  describe Fork do
+
+    before(:each) do
+      stub_core
+      api.post_app("name" => "example", "stack" => "cedar")
+    end
+
+    after(:each) do
+      api.delete_app("example")
+      api.delete_app("example-fork")
+    end
+
+    context "successfully" do
+
+      before(:each) do
+        stub_cisaurus.copy_slug.returns("/v1/jobs/4099d263-bf67-4c0b-80f5-64a5d25598fd")
+        stub_cisaurus.job_done?.returns(true)
+      end
+
+      it "forks an app" do
+        stderr, stdout = execute("fork example-fork")
+        stderr.should == ""
+        stdout.should == <<-STDOUT
+Creating fork example-fork... done
+Copying slug... done
+Copying config vars... done
+Fork complete, view it at http://example-fork.herokuapp.com/
+STDOUT
+      end
+
+      it "copies config vars" do
+        config_vars = {
+            "SECRET"     => "imasecret",
+            "FOO"        => "bar",
+            "LANG_ENV"   => "production"
+        }
+        api.put_config_vars("example", config_vars)
+        execute("fork example-fork")
+        api.get_config_vars("example-fork").body.should == config_vars
+      end
+
+      it "re-provisions add-ons" do
+        addons = ["pgbackups:basic", "deployhooks:http"].sort
+        addons.each { |a| api.post_addon("example", a) }
+        execute("fork example-fork")
+        api.get_addons("example-fork").body.collect { |info| info["name"] }.sort.should == addons
+      end
+    end
+  end
+end

data/spec/heroku/command/git_spec.rb

@@ -11,52 +11,80 @@ module Heroku::Command
     context("clone") do
 
       before(:each) do
-        api.post_app("name" => "myapp", "stack" => "cedar")
-        FileUtils.mkdir('myapp')
-        FileUtils.chdir('myapp') { `git init` }
+        api.post_app("name" => "example", "stack" => "cedar")
       end
 
       after(:each) do
-        api.delete_app("myapp")
-        FileUtils.rm_rf('myapp')
+        api.delete_app("example")
       end
 
       it "clones and adds remote" do
         any_instance_of(Heroku::Command::Git) do |git|
-          stub(git).git('clone git@heroku.com:myapp.git ').returns("Cloning into 'myapp'...")
-          stub(git).git('remote').returns("origin")
-          stub(git).git('remote add heroku git@heroku.com:myapp.git')
+          mock(git).system("git clone -o heroku git@heroku.com:example.git") do
+            puts "Cloning into 'example'..."
+          end
         end
-        stderr, stdout = execute("git:clone")
+        stderr, stdout = execute("git:clone example")
         stderr.should == ""
         stdout.should == <<-STDOUT
-Cloning into 'myapp'...
-Git remote heroku added
+Cloning from app 'example'...
+Cloning into 'example'...
         STDOUT
       end
 
-      it "clones and sets -r remote" do
+      it "clones into another dir" do
         any_instance_of(Heroku::Command::Git) do |git|
-          stub(git).git('clone git@heroku.com:myapp.git ').returns("Cloning into 'myapp'...")
-          stub(git).git('remote').returns("origin")
-          stub(git).git('remote add other git@heroku.com:myapp.git')
+          mock(git).system("git clone -o heroku git@heroku.com:example.git somedir") do
+            puts "Cloning into 'somedir'..."
+          end
         end
-        stderr, stdout = execute("git:clone -r other")
+        stderr, stdout = execute("git:clone example somedir")
         stderr.should == ""
         stdout.should == <<-STDOUT
-Cloning into 'myapp'...
-Git remote other added
+Cloning from app 'example'...
+Cloning into 'somedir'...
+        STDOUT
+      end
+
+      it "can specify app with -a" do
+        any_instance_of(Heroku::Command::Git) do |git|
+          mock(git).system("git clone -o heroku git@heroku.com:example.git") do
+            puts "Cloning into 'example'..."
+          end
+        end
+        stderr, stdout = execute("git:clone -a example")
+        stderr.should == ""
+        stdout.should == <<-STDOUT
+Cloning from app 'example'...
+Cloning into 'example'...
+        STDOUT
+      end
+
+      it "can specify app with -a and a dir" do
+        any_instance_of(Heroku::Command::Git) do |git|
+          mock(git).system("git clone -o heroku git@heroku.com:example.git somedir") do
+            puts "Cloning into 'somedir'..."
+          end
+        end
+        stderr, stdout = execute("git:clone -a example somedir")
+        stderr.should == ""
+        stdout.should == <<-STDOUT
+Cloning from app 'example'...
+Cloning into 'somedir'...
         STDOUT
       end
 
-      it "clones and skips remote with no-remote" do
+      it "clones and sets -r remote" do
         any_instance_of(Heroku::Command::Git) do |git|
-          stub(git).git('clone git@heroku.com:myapp.git ').returns("Cloning into 'myapp'...")
+          mock(git).system("git clone -o other git@heroku.com:example.git") do
+            puts "Cloning into 'example'..."
+          end
         end
-        stderr, stdout = execute("git:clone --no-remote")
+        stderr, stdout = execute("git:clone example -r other")
         stderr.should == ""
         stdout.should == <<-STDOUT
-Cloning into 'myapp'...
+Cloning from app 'example'...
+Cloning into 'example'...
         STDOUT
       end
 
@@ -65,20 +93,20 @@ Cloning into 'myapp'...
     context("remote") do
 
       before(:each) do
-        api.post_app("name" => "myapp", "stack" => "cedar")
-        FileUtils.mkdir('myapp')
-        FileUtils.chdir('myapp') { `git init` }
+        api.post_app("name" => "example", "stack" => "cedar")
+        FileUtils.mkdir('example')
+        FileUtils.chdir('example') { `git init` }
       end
 
       after(:each) do
-        api.delete_app("myapp")
-        FileUtils.rm_rf('myapp')
+        api.delete_app("example")
+        FileUtils.rm_rf('example')
       end
 
       it "adds remote" do
         any_instance_of(Heroku::Command::Git) do |git|
           stub(git).git('remote').returns("origin")
-          stub(git).git('remote add heroku git@heroku.com:myapp.git')
+          stub(git).git('remote add heroku git@heroku.com:example.git')
         end
         stderr, stdout = execute("git:remote")
         stderr.should == ""
@@ -90,7 +118,7 @@ Git remote heroku added
       it "adds -r remote" do
         any_instance_of(Heroku::Command::Git) do |git|
           stub(git).git('remote').returns("origin")
-          stub(git).git('remote add other git@heroku.com:myapp.git')
+          stub(git).git('remote add other git@heroku.com:example.git')
         end
         stderr, stdout = execute("git:remote -r other")
         stderr.should == ""

data/spec/heroku/command/labs_spec.rb

@@ -7,11 +7,11 @@ module Heroku::Command
 
     before(:each) do
       stub_core
-      api.post_app("name" => "myapp", "stack" => "cedar")
+      api.post_app("name" => "example", "stack" => "cedar")
     end
 
     after(:each) do
-      api.delete_app("myapp")
+      api.delete_app("example")
     end
 
     it "lists available features" do
@@ -21,21 +21,21 @@ module Heroku::Command
 === 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)
+=== App Features (example)
 [+] 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
 
     it "lists enabled features" do
-      stub_core.list_features("myapp").returns([])
+      stub_core.list_features("example").returns([])
       stderr, stdout = execute("labs")
       stderr.should == ""
       stdout.should == <<-STDOUT
 === 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)
+=== App Features (example)
 [+] 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
@@ -64,7 +64,7 @@ STDERR
       stderr, stdout = execute("labs:enable user_env_compile")
       stderr.should == ""
       stdout.should == <<-STDOUT
-Enabling user_env_compile for myapp... done
+Enabling user_env_compile for example... done
 WARNING: This feature is experimental and may change or be removed without notice.
 For more information see: http://devcenter.heroku.com/articles/labs-user-env-compile
 STDOUT
@@ -80,11 +80,11 @@ STDERR
     end
 
     it "disables a feature" do
-      api.post_feature('user_env_compile', 'myapp')
+      api.post_feature('user_env_compile', 'example')
       stderr, stdout = execute("labs:disable user_env_compile")
       stderr.should == ""
       stdout.should == <<-STDOUT
-Disabling user_env_compile for myapp... done
+Disabling user_env_compile for example... done
 STDOUT
     end
 

data/spec/heroku/command/logs_spec.rb

@@ -4,12 +4,12 @@ require "heroku/command/logs"
 describe Heroku::Command::Logs do
   describe "logs" do
     it "runs with no options" do
-      stub_core.read_logs("myapp", [])
+      stub_core.read_logs("example", [])
       execute "logs"
     end
 
     it "runs with options" do
-      stub_core.read_logs("myapp", [
+      stub_core.read_logs("example", [
         "tail=1",
         "num=2",
         "ps=ps.3",
@@ -20,7 +20,7 @@ describe Heroku::Command::Logs do
 
     describe "with log output" do
       before(:each) do
-        stub_core.read_logs("myapp", []).yields("2011-01-01T00:00:00+00:00 app[web.1]: test")
+        stub_core.read_logs("example", []).yields("2011-01-01T00:00:00+00:00 app[web.1]: test")
       end
 
       it "prettifies tty output" do

data/spec/heroku/command/maintenance_spec.rb

@@ -6,11 +6,11 @@ module Heroku::Command
 
     before(:each) do
       stub_core
-      api.post_app("name" => "myapp", "stack" => "cedar")
+      api.post_app("name" => "example", "stack" => "cedar")
     end
 
     after(:each) do
-      api.delete_app("myapp")
+      api.delete_app("example")
     end
 
     it "displays off for maintenance mode of an app" do
@@ -22,7 +22,7 @@ STDOUT
     end
 
     it "displays on for maintenance mode of an app" do
-      api.post_app_maintenance('myapp', '1')
+      api.post_app_maintenance('example', '1')
 
       stderr, stdout = execute("maintenance")
       stderr.should == ""
@@ -35,7 +35,7 @@ STDOUT
       stderr, stdout = execute("maintenance:on")
       stderr.should == ""
       stdout.should == <<-STDOUT
-Enabling maintenance mode for myapp... done
+Enabling maintenance mode for example... done
 STDOUT
     end
 
@@ -43,7 +43,7 @@ STDOUT
       stderr, stdout = execute("maintenance:off")
       stderr.should == ""
       stdout.should == <<-STDOUT
-Disabling maintenance mode for myapp... done
+Disabling maintenance mode for example... done
 STDOUT
     end
 

data/spec/heroku/command/pg_spec.rb

@@ -6,10 +6,9 @@ module Heroku::Command
     before do
       stub_core
 
-      api.post_app "name" => "myapp"
-      api.put_config_vars "myapp", {
+      api.post_app "name" => "example"
+      api.put_config_vars "example", {
         "DATABASE_URL" => "postgres://database_url",
-        "SHARED_DATABASE_URL" => "postgres://shared_database_url",
         "HEROKU_POSTGRESQL_IVORY_URL" => "postgres://database_url",
         "HEROKU_POSTGRESQL_RONIN_URL" => "postgres://ronin_database_url"
       }
@@ -36,40 +35,30 @@ module Heroku::Command
     end
 
     after do
-      api.delete_app "myapp"
+      api.delete_app "example"
     end
 
     it "resets the app's database if user confirms" do
       stub_pg.reset
 
-      stderr, stdout = execute("pg:reset RONIN --confirm myapp")
+      stderr, stdout = execute("pg:reset RONIN --confirm example")
       stderr.should == ""
       stdout.should == <<-STDOUT
 Resetting HEROKU_POSTGRESQL_RONIN_URL... done
 STDOUT
     end
 
-    it "resets shared databases" do
-      Heroku::Client.any_instance.should_receive(:database_reset).with('myapp')
-
-      stderr, stdout = execute("pg:reset SHARED_DATABASE --confirm myapp")
-      stderr.should == ''
-      stdout.should == <<-STDOUT
-Resetting SHARED_DATABASE... done
-STDOUT
-    end
-
     it "doesn't reset the app's database if the user doesn't confirm" do
       stub_pg.reset
 
       stderr, stdout = execute("pg:reset RONIN")
       stderr.should == <<-STDERR
- !    Confirmation did not match myapp. Aborted.
+ !    Confirmation did not match example. Aborted.
 STDERR
       stdout.should == "
  !    WARNING: Destructive Action
- !    This command will affect the app: myapp
- !    To proceed, type \"myapp\" or re-run this command with --confirm myapp
+ !    This command will affect the app: example
+ !    To proceed, type \"example\" or re-run this command with --confirm example
 
 > "
     end
@@ -120,9 +109,6 @@ Fork/Follow: Available
 Created:     2011-12-13 00:00 UTC
 Maintenance: not required
 
-=== SHARED_DATABASE
-Data Size: (empty)
-
 STDOUT
       end
     end
@@ -161,12 +147,12 @@ STDOUT
 
     context "promotion" do
       it "promotes the specified database" do
-        stderr, stdout = execute("pg:promote RONIN --confirm myapp")
+        stderr, stdout = execute("pg:promote RONIN --confirm example")
         stderr.should == ""
         stdout.should == <<-STDOUT
 Promoting HEROKU_POSTGRESQL_RONIN_URL to DATABASE_URL... done
 STDOUT
-        api.get_config_vars("myapp").body["DATABASE_URL"].should == "postgres://ronin_database_url"
+        api.get_config_vars("example").body["DATABASE_URL"].should == "postgres://ronin_database_url"
       end
 
       it "fails if no database is specified" do
@@ -192,7 +178,7 @@ STDOUT
 
       it "does not update DATABASE_URL if it's not the main db" do
         stub_pg.rotate_credentials
-        api.put_config_vars "myapp", {
+        api.put_config_vars "example", {
           "DATABASE_URL" => "postgres://to_reset_credentials",
           "HEROKU_POSTGRESQL_RESETME_URL" => "postgres://something_else"
         }
@@ -222,7 +208,7 @@ STDOUT
             {"name"=>"Maintenance", "values"=>["not required"]}
           ]
         )
-        stderr, stdout = execute("pg:unfollow HEROKU_POSTGRESQL_FOLLOW_URL --confirm myapp")
+        stderr, stdout = execute("pg:unfollow HEROKU_POSTGRESQL_FOLLOW_URL --confirm example")
         stderr.should == ""
         stdout.should == <<-STDOUT
  !    HEROKU_POSTGRESQL_FOLLOW_URL will become writable and no longer

data/spec/heroku/command/pgbackups_spec.rb

@@ -7,9 +7,9 @@ module Heroku::Command
       @pgbackups = prepare_command(Pgbackups)
       @pgbackups.heroku.stub!(:info).and_return({})
 
-      api.post_app("name" => "myapp")
+      api.post_app("name" => "example")
       api.put_config_vars(
-        "myapp",
+        "example",
         {
           "DATABASE_URL"            => "postgres://database",
           "HEROKU_POSTGRESQL_IVORY" => "postgres://database",
@@ -30,15 +30,17 @@ module Heroku::Command
     }
 
     after do
-      api.delete_app("myapp")
+      api.delete_app("example")
     end
 
     it "requests a pgbackups transfer list for the index command" do
       stub_core
       stub_pgbackups.get_transfers.returns([{
         "created_at"  => "2012-01-01 12:00:00 +0000",
+        "started_at"  => "2012-01-01 12:00:01 +0000",
         "from_name"   => "DATABASE",
         "size"        => "1024",
+        "progress"    => "dump 2048",
         "to_name"     => "BACKUP",
         "to_url"      => "s3://bucket/userid/b001.dump"
       }])
@@ -46,9 +48,9 @@ module Heroku::Command
       stderr, stdout = execute("pgbackups")
       stderr.should == ""
       stdout.should == <<-STDOUT
-ID    Backup Time                Size  Database
-----  -------------------------  ----  --------
-b001  2012-01-01 12:00:00 +0000  1024  DATABASE
+ID    Backup Time                Status     Size  Database
+----  -------------------------  ---------  ----  --------
+b001  2012-01-01 12:00:00 +0000  Capturing  1024  DATABASE
 STDOUT
     end
 
@@ -130,7 +132,7 @@ STDOUT
       end
 
       it "aborts if no database addon is present" do
-        api.delete_config_var("myapp", "DATABASE_URL")
+        api.delete_config_var("example", "DATABASE_URL")
         stub_core
         stderr, stdout = execute("pgbackups:capture")
         stderr.should == <<-STDERR
@@ -163,6 +165,7 @@ STDERR
           stderr, stdout = execute("pgbackups:capture")
           stderr.should == <<-STDERR
  !    An error occurred and your backup did not finish.
+ !    Please run `heroku logs --ps pgbackups` for details.
 STDERR
           stdout.should == <<-STDOUT
 
@@ -177,6 +180,7 @@ STDOUT
           stderr, stdout = execute("pgbackups:capture")
           stderr.should == <<-STDERR
  !    An error occurred and your backup did not finish.
+ !    Please run `heroku logs --ps pgbackups` for details.
  !    The database is not yet online. Please try again.
 STDERR
           stdout.should == <<-STDOUT
@@ -192,6 +196,7 @@ STDOUT
           stderr, stdout = execute("pgbackups:capture")
           stderr.should == <<-STDERR
  !    An error occurred and your backup did not finish.
+ !    Please run `heroku logs --ps pgbackups` for details.
  !    The database credentials are incorrect.
 STDERR
           stdout.should == <<-STDOUT
@@ -287,7 +292,7 @@ STDOUT
 
         it 'aborts for a generic error' do
           stub_error_backup_with_log 'something generic'
-          @pgbackups.should_receive(:error).with("An error occurred and your restore did not finish.")
+          @pgbackups.should_receive(:error).with("An error occurred and your restore did not finish.\nPlease run `heroku logs --ps pgbackups` for details.")
           @pgbackups.restore
         end