pogo 2.32.14 → 2.39.2

data/spec/heroku/command/ps_spec.rb

@@ -10,11 +10,11 @@ describe Heroku::Command::Ps do
   context("cedar") do
 
     before(:each) do
-      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 "ps:dynos errors out on cedar apps" do
@@ -29,11 +29,11 @@ describe Heroku::Command::Ps do
 
       it "displays processes" do
         Heroku::Command::Ps.any_instance.should_receive(:time_ago).exactly(10).times.and_return("2012/09/11 12:34:56 (~ 0s ago)")
-        api.post_ps_scale('myapp', 'web', 10)
+        api.post_ps_scale('example', 'web', 10)
         stderr, stdout = execute("ps")
         stderr.should == ""
         stdout.should == <<-STDOUT
-=== web: `bundle exec thin start -p $PORT`
+=== web (1X): `bundle exec thin start -p $PORT`
 web.1: created 2012/09/11 12:34:56 (~ 0s ago)
 web.2: created 2012/09/11 12:34:56 (~ 0s ago)
 web.3: created 2012/09/11 12:34:56 (~ 0s ago)
@@ -50,15 +50,15 @@ STDOUT
 
       it "displays one-off processes" do
         Heroku::Command::Ps.any_instance.should_receive(:time_ago).and_return('2012/09/11 12:34:56 (~ 0s ago)', '2012/09/11 12:34:56 (~ 0s ago)')
-        api.post_ps "myapp", "bash"
+        api.post_ps "example", "bash"
 
         stderr, stdout = execute("ps")
         stderr.should == ""
         stdout.should == <<-STDOUT
 === run: one-off processes
-run.1: created 2012/09/11 12:34:56 (~ 0s ago): `bash`
+run.1 (1X): created 2012/09/11 12:34:56 (~ 0s ago): `bash`
 
-=== web: `bundle exec thin start -p $PORT`
+=== web (1X): `bundle exec thin start -p $PORT`
 web.1: created 2012/09/11 12:34:56 (~ 0s ago)
 
 STDOUT
@@ -68,27 +68,27 @@ STDOUT
 
     describe "ps:restart" do
 
-      it "restarts all processes with no args" do
+      it "restarts all dynos with no args" do
         stderr, stdout = execute("ps:restart")
         stderr.should == ""
         stdout.should == <<-STDOUT
-Restarting processes... done
+Restarting dynos... done
 STDOUT
       end
 
-      it "restarts one process" do
+      it "restarts one dyno" do
         stderr, stdout = execute("ps:restart web.1")
         stderr.should == ""
         stdout.should == <<-STDOUT
-Restarting web.1 process... done
+Restarting web.1 dyno... done
 STDOUT
       end
 
-      it "restarts a type of process" do
+      it "restarts a type of dyno" do
         stderr, stdout = execute("ps:restart web")
         stderr.should == ""
         stdout.should == <<-STDOUT
-Restarting web processes... done
+Restarting web dynos... done
 STDOUT
       end
 
@@ -100,7 +100,7 @@ STDOUT
         stderr, stdout = execute("ps:scale web=5")
         stderr.should == ""
         stdout.should == <<-STDOUT
-Scaling web processes... done, now running 5
+Scaling web dynos... done, now running 5
 STDOUT
       end
 
@@ -108,7 +108,7 @@ STDOUT
         stderr, stdout = execute("ps:scale web+2")
         stderr.should == ""
         stdout.should == <<-STDOUT
-Scaling web processes... done, now running 3
+Scaling web dynos... done, now running 3
 STDOUT
       end
 
@@ -116,19 +116,19 @@ STDOUT
 
     describe "ps:stop" do
 
-      it "restarts one process" do
+      it "restarts one dyno" do
         stderr, stdout = execute("ps:restart ps.1")
         stderr.should == ""
         stdout.should == <<-STDOUT
-Restarting ps.1 process... done
+Restarting ps.1 dyno... done
 STDOUT
       end
 
-      it "restarts a type of process" do
+      it "restarts a type of dyno" do
         stderr, stdout = execute("ps:restart ps")
         stderr.should == ""
         stdout.should == <<-STDOUT
-Restarting ps processes... done
+Restarting ps dynos... done
 STDOUT
       end
 
@@ -139,11 +139,11 @@ STDOUT
   context("non-cedar") do
 
     before(:each) do
-      api.post_app("name" => "myapp")
+      api.post_app("name" => "example")
     end
 
     after(:each) do
-      api.delete_app("myapp")
+      api.delete_app("example")
     end
 
     describe "ps:dynos" do
@@ -153,7 +153,7 @@ STDOUT
         stderr.should == ""
         stdout.should == <<-STDOUT
 ~ `heroku ps:dynos QTY` has been deprecated and replaced with `heroku ps:scale dynos=QTY`
-myapp is running 0 dynos
+example is running 0 dynos
 STDOUT
       end
 
@@ -175,7 +175,7 @@ STDOUT
         stderr.should == ""
         stdout.should == <<-STDOUT
 ~ `heroku ps:workers QTY` has been deprecated and replaced with `heroku ps:scale workers=QTY`
-myapp is running 0 workers
+example is running 0 workers
 STDOUT
       end
 

data/spec/heroku/command/releases_spec.rb

@@ -10,24 +10,24 @@ describe Heroku::Command::Releases do
   describe "releases" do
 
     before(:each) do
-      api.post_app("name" => "myapp", "stack" => "cedar")
-      api.put_config_vars("myapp", { 'FOO_BAR'  => 'BAZ' })
-      api.put_config_vars("myapp", { 'BAR_BAZ'  => 'QUX' })
-      api.put_config_vars("myapp", { 'BAZ_QUX'  => 'QUUX' })
-      api.put_config_vars("myapp", { 'QUX_QUUX' => 'XYZZY' })
-      api.put_config_vars("myapp", { 'SUPER_LONG_CONFIG_VAR_TO_GET_PAST_THE_TRUNCATION_LIMIT' => 'VALUE' })
+      api.post_app("name" => "example", "stack" => "cedar")
+      api.put_config_vars("example", { 'FOO_BAR'  => 'BAZ' })
+      api.put_config_vars("example", { 'BAR_BAZ'  => 'QUX' })
+      api.put_config_vars("example", { 'BAZ_QUX'  => 'QUUX' })
+      api.put_config_vars("example", { 'QUX_QUUX' => 'XYZZY' })
+      api.put_config_vars("example", { 'SUPER_LONG_CONFIG_VAR_TO_GET_PAST_THE_TRUNCATION_LIMIT' => 'VALUE' })
       Heroku::Command::Releases.any_instance.should_receive(:time_ago).exactly(5).times.and_return('2012/09/10 11:36:44 (~ 0s ago)', '2012/09/10 11:36:43 (~ 1s ago)', '2012/09/10 11:35:44 (~ 1m ago)', '2012/09/10 10:36:44 (~ 1h ago)', '2012/01/02 12:34:56')
     end
 
     after(:each) do
-      api.delete_app("myapp")
+      api.delete_app("example")
     end
 
     it "should list releases" do
       @stderr, @stdout = execute("releases")
       @stderr.should == ""
       @stdout.should == <<-STDOUT
-=== myapp Releases
+=== example Releases
 v5  Config add SUPER_LONG_CONFIG_VAR_TO_GE..  email@example.com  2012/09/10 11:36:44 (~ 0s ago)
 v4  Config add QUX_QUUX                       email@example.com  2012/09/10 11:36:43 (~ 1s ago)
 v3  Config add BAZ_QUX                        email@example.com  2012/09/10 11:35:44 (~ 1m ago)
@@ -41,12 +41,12 @@ STDOUT
 
   describe "releases:info" do
     before(:each) do
-      api.post_app("name" => "myapp", "stack" => "cedar")
-      api.put_config_vars("myapp", { 'FOO_BAR' => 'BAZ' })
+      api.post_app("name" => "example", "stack" => "cedar")
+      api.put_config_vars("example", { 'FOO_BAR' => 'BAZ' })
     end
 
     after(:each) do
-      api.delete_app("myapp")
+      api.delete_app("example")
     end
 
     it "requires a release to be specified" do
@@ -68,11 +68,10 @@ Change: Config add FOO_BAR
 When:   2012/09/11 12:34:56 (~ 0s ago)
 
 === v1 Config Vars
-BUNDLE_WITHOUT:      development:test
-DATABASE_URL:        postgres://username:password@ec2-123-123-123-123.compute-1.amazonaws.com/username
-LANG:                en_US.UTF-8
-RACK_ENV:            production
-SHARED_DATABASE_URL: postgres://username:password@ec2-123-123-123-123.compute-1.amazonaws.com/username
+BUNDLE_WITHOUT: development:test
+DATABASE_URL:   postgres://username:password@ec2-123-123-123-123.compute-1.amazonaws.com/username
+LANG:           en_US.UTF-8
+RACK_ENV:       production
 STDOUT
     end
 
@@ -91,28 +90,27 @@ BUNDLE_WITHOUT=development:test
 DATABASE_URL=postgres://username:password@ec2-123-123-123-123.compute-1.amazonaws.com/username
 LANG=en_US.UTF-8
 RACK_ENV=production
-SHARED_DATABASE_URL=postgres://username:password@ec2-123-123-123-123.compute-1.amazonaws.com/username
 STDOUT
     end
   end
 
   describe "rollback" do
     before(:each) do
-      api.post_app("name" => "myapp", "stack" => "cedar")
-      api.put_config_vars("myapp", { 'FOO_BAR' => 'BAZ' })
-      api.put_config_vars("myapp", { 'BAR_BAZ' => 'QUX' })
-      api.put_config_vars("myapp", { 'BAZ_QUX' => 'QUUX' })
+      api.post_app("name" => "example", "stack" => "cedar")
+      api.put_config_vars("example", { 'FOO_BAR' => 'BAZ' })
+      api.put_config_vars("example", { 'BAR_BAZ' => 'QUX' })
+      api.put_config_vars("example", { 'BAZ_QUX' => 'QUUX' })
     end
 
     after(:each) do
-      api.delete_app("myapp")
+      api.delete_app("example")
     end
 
     it "rolls back to the latest release with no argument" do
       stderr, stdout = execute("releases:rollback")
       stderr.should == ""
       stdout.should == <<-STDOUT
-Rolling back myapp... done, v2
+Rolling back example... done, v2
 STDOUT
     end
 
@@ -120,7 +118,7 @@ STDOUT
       stderr, stdout = execute("releases:rollback v1")
       stderr.should == ""
       stdout.should == <<-STDOUT
-Rolling back myapp... done, v1
+Rolling back example... done, v1
 STDOUT
     end
   end

data/spec/heroku/command/run_spec.rb

@@ -8,11 +8,11 @@ describe Heroku::Command::Run do
 
   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
 
   describe "run" do
@@ -37,6 +37,14 @@ Running `bin/foo` detached... up, run.1
 Use `heroku logs -p run.1` to view the output.
 STDOUT
     end
+
+    it "runs with options" do
+      stub_core.read_logs("example", [
+        "tail=1",
+        "ps=run.1"
+      ])
+      execute "run:detached bin/foo --tail"
+    end
   end
 
   describe "run:rake" do
@@ -66,21 +74,10 @@ STDOUT
   end
 
   describe "run:console" do
-    it "runs a console session" do
-      console = stub(Heroku::Client::ConsoleSession)
-      stub_core.console.returns(console)
+    it "has been removed" do
       stderr, stdout = execute("run:console")
       stderr.should == ""
-      stdout.should == ""
-    end
-
-    it "runs a console command" do
-      stub_core.console("myapp", "bash foo").returns("foo_output")
-      stderr, stdout = execute("run:console bash foo")
-      stderr.should == ""
-      stdout.should == <<-STDOUT
-foo_output
-STDOUT
+      stdout.should =~ /has been removed/
     end
   end
 end

data/spec/heroku/command/sharing_spec.rb

@@ -6,21 +6,21 @@ module Heroku::Command
 
     before(:each) do
       stub_core
-      api.post_app("name" => "myapp")
+      api.post_app("name" => "example")
     end
 
     after(:each) do
-      api.delete_app("myapp")
+      api.delete_app("example")
     end
 
     context("list") do
 
       it "lists collaborators" do
-        api.post_collaborator("myapp", "collaborator@example.com")
+        api.post_collaborator("example", "collaborator@example.com")
         stderr, stdout = execute("sharing")
         stderr.should == ""
         stdout.should == <<-STDOUT
-=== myapp Collaborators
+=== example Collaborators
 collaborator@example.com
 email@example.com
 
@@ -33,25 +33,25 @@ STDOUT
       stderr, stdout = execute("sharing:add collaborator@example.com")
       stderr.should == ""
       stdout.should == <<-STDOUT
-Adding collaborator@example.com to myapp collaborators... done
+Adding collaborator@example.com to example collaborators... done
 STDOUT
     end
 
     it "removes collaborators" do
-      api.post_collaborator("myapp", "collaborator@example.com")
+      api.post_collaborator("example", "collaborator@example.com")
       stderr, stdout = execute("sharing:remove collaborator@example.com")
       stderr.should == ""
       stdout.should == <<-STDOUT
-Removing collaborator@example.com from myapp collaborators... done
+Removing collaborator@example.com from example collaborators... done
 STDOUT
     end
 
     it "transfers ownership" do
-      api.post_collaborator("myapp", "collaborator@example.com")
+      api.post_collaborator("example", "collaborator@example.com")
       stderr, stdout = execute("sharing:transfer collaborator@example.com")
       stderr.should == ""
       stdout.should == <<-STDOUT
-Transferring myapp to collaborator@example.com... done
+Transferring example to collaborator@example.com... done
 STDOUT
     end
   end

data/spec/heroku/command/stack_spec.rb

@@ -6,18 +6,18 @@ module Heroku::Command
     describe "index" do
       before(:each) do
         stub_core
-        api.post_app("name" => "myapp", "stack" => "bamboo-mri-1.9.2")
+        api.post_app("name" => "example", "stack" => "bamboo-mri-1.9.2")
       end
 
       after(:each) do
-        api.delete_app("myapp")
+        api.delete_app("example")
       end
 
       it "index should provide list" do
         stderr, stdout = execute("stack")
         stderr.should == ""
         stdout.should == <<-STDOUT
-=== myapp Available Stacks
+=== example Available Stacks
   aspen-mri-1.8.6
   bamboo-ree-1.8.7
   cedar (beta)
@@ -30,7 +30,7 @@ STDOUT
         stderr, stdout = execute("stack:migrate bamboo-ree-1.8.7")
         stderr.should == ""
         stdout.should == <<-STDOUT
------> Preparing to migrate myapp
+-----> Preparing to migrate example
        bamboo-mri-1.9.2 -> bamboo-ree-1.8.7
 
        NOTE: Additional details here

data/spec/heroku/command_spec.rb

@@ -51,13 +51,13 @@ describe Heroku::Command do
     context "and the app is known" do
       before do
         any_instance_of(Heroku::Command::Base) do |base|
-          stub(base).app.returns("myapp")
+          stub(base).app.returns("example")
         end
       end
 
       context "and the user includes --confirm WRONGAPP" do
         it "should not allow include the option" do
-          stub_request(:post, %r{apps/myapp/addons/my_addon$}).
+          stub_request(:post, %r{apps/example/addons/my_addon$}).
             with(:body => "")
           run "addons:add my_addon --confirm XXX"
         end
@@ -65,17 +65,17 @@ describe Heroku::Command do
 
       context "and the user includes --confirm APP" do
         it "should set --app to APP and not ask for confirmation" do
-          stub_request(:post, %r{apps/myapp/addons/my_addon$}).
-            with(:body => {:confirm => 'myapp'})
+          stub_request(:post, %r{apps/example/addons/my_addon$}).
+            with(:body => {:confirm => 'example'})
 
-          run "addons:add my_addon --confirm myapp"
+          run "addons:add my_addon --confirm example"
         end
       end
 
       context "and the user didn't include a confirm flag" do
         it "should ask the user for confirmation" do
           stub(Heroku::Command).confirm_command.returns(true)
-          stub_request(:post, %r{apps/myapp/addons/my_addon$}).
+          stub_request(:post, %r{apps/example/addons/my_addon$}).
             to_return(response_that_requires_confirmation).then.
             to_return({:status => 200})
 
@@ -83,16 +83,16 @@ describe Heroku::Command do
         end
 
         it "should not continue if the confirmation does not match" do
-          Heroku::Command.stub(:current_options).and_return(:confirm => 'not_myapp')
+          Heroku::Command.stub(:current_options).and_return(:confirm => 'not_example')
 
           lambda do
-            Heroku::Command.confirm_command('myapp')
+            Heroku::Command.confirm_command('example')
           end.should raise_error(Heroku::Command::CommandFailed)
         end
 
         it "should not continue if the user doesn't confirm" do
           stub(Heroku::Command).confirm_command.returns(false)
-          stub_request(:post, %r{apps/myapp/addons/my_addon$}).
+          stub_request(:post, %r{apps/example/addons/my_addon$}).
             to_return(response_that_requires_confirmation).then.
             to_raise(Heroku::Command::CommandFailed)
 
@@ -157,12 +157,12 @@ describe Heroku::Command do
 
   context "help" do
     it "works as a prefix" do
-      heroku("help ps:scale").should =~ /scale processes by/
+      heroku("help ps:scale").should =~ /scale dynos by/
     end
 
     it "works as an option" do
-      heroku("ps:scale -h").should =~ /scale processes by/
-      heroku("ps:scale --help").should =~ /scale processes by/
+      heroku("ps:scale -h").should =~ /scale dynos by/
+      heroku("ps:scale --help").should =~ /scale dynos by/
     end
   end