cf 0.6.1.rc4 → 0.6.1.rc5

data/spec/features/login_spec.rb

@@ -2,7 +2,6 @@ require "spec_helper"
 
 if ENV['CF_V2_RUN_INTEGRATION']
   describe 'A user logs in and switches spaces, after a different user has logged in', :ruby19 => true do
-    include ConsoleAppSpeckerMatchers
 
     let(:target) { ENV['CF_V2_TEST_TARGET'] }
     let(:username) { ENV['CF_V2_TEST_USER'] }
@@ -16,13 +15,13 @@ if ENV['CF_V2_RUN_INTEGRATION']
     before do
       Interact::Progress::Dots.start!
 
-      run("#{cf_bin} target #{target}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} target #{target}") do |runner|
         expect(runner).to say "Setting target"
         expect(runner).to say target
         runner.wait_for_exit
       end
 
-      run("#{cf_bin} logout") do |runner|
+      BlueShell::Runner.run("#{cf_bin} logout") do |runner|
         runner.wait_for_exit
       end
     end
@@ -33,7 +32,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
     context "when a different user is already logged in" do
       before do
-        run("#{cf_bin} login #{username} --password #{password}") do |runner|
+        BlueShell::Runner.run("#{cf_bin} login #{username} --password #{password}") do |runner|
           expect(runner).to say "Authenticating... OK"
 
           expect(runner).to say(
@@ -57,7 +56,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
       end
 
       it "can switch spaces on login" do
-        run("#{cf_bin} login #{second_username} --password #{second_password} --organization #{second_organization} --space #{second_space}") do |runner|
+        BlueShell::Runner.run("#{cf_bin} login #{second_username} --password #{second_password} --organization #{second_organization} --space #{second_space}") do |runner|
           expect(runner).to say "Authenticating... OK"
           expect(runner).to say "Switching to organization #{second_organization}... OK"
           expect(runner).to say "Switching to space #{second_space}... OK"

data/spec/features/push_flow_spec.rb

@@ -3,7 +3,6 @@ require "webmock/rspec"
 
 if ENV['CF_V2_RUN_INTEGRATION']
   describe 'A new user tries to use CF against v2', :ruby19 => true do
-    include ConsoleAppSpeckerMatchers
     include CF::Interactive
 
     let(:target) { ENV['CF_V2_TEST_TARGET'] }
@@ -28,15 +27,15 @@ if ENV['CF_V2_RUN_INTEGRATION']
     end
 
     it 'pushes a simple sinatra app using defaults as much as possible' do
-      run("#{cf_bin} logout") do |runner|
+      BlueShell::Runner.run("#{cf_bin} logout") do |runner|
         runner.wait_for_exit
       end
 
-      run("#{cf_bin} target http://#{target}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} target http://#{target}") do |runner|
         expect(runner).to say %r{Setting target to http://#{target}... OK}
       end
 
-      run("#{cf_bin} login") do |runner|
+      BlueShell::Runner.run("#{cf_bin} login") do |runner|
         expect(runner).to say %r{target: https?://#{target}}
 
         expect(runner).to say "Email>"
@@ -64,12 +63,12 @@ if ENV['CF_V2_RUN_INTEGRATION']
         )
       end
 
-      run("#{cf_bin} app #{app}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} app #{app}") do |runner|
         expect(runner).to say "Unknown app '#{app}'."
       end
 
       Dir.chdir("#{SPEC_ROOT}/assets/hello-sinatra") do
-        run("#{cf_bin} push") do |runner|
+        BlueShell::Runner.run("#{cf_bin} push") do |runner|
           expect(runner).to say "Name>"
           runner.send_keys app
 
@@ -129,7 +128,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
         end
       end
 
-      run("#{cf_bin} services") do |runner|
+      BlueShell::Runner.run("#{cf_bin} services") do |runner|
         expect(runner).to say /name\s+service\s+provider\s+version\s+plan\s+bound apps/
         expect(runner).to say /mysql-.+?\s+   # name
             mysql\s+                          # service
@@ -140,7 +139,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
           /x
       end
 
-      run("#{cf_bin} delete #{app}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} delete #{app}") do |runner|
         expect(runner).to say "Really delete #{app}?>"
         runner.send_keys "y"
         expect(runner).to say "Deleting #{app}... OK"

data/spec/features/switching_targets_spec.rb

@@ -2,7 +2,6 @@ require "spec_helper"
 
 if ENV['CF_V2_RUN_INTEGRATION']
   describe 'A new user tries to use CF against v2 production', :ruby19 => true do
-    include ConsoleAppSpeckerMatchers
 
     let(:target) { ENV['CF_V2_TEST_TARGET'] }
     let(:username) { ENV['CF_V2_TEST_USER'] }
@@ -20,12 +19,12 @@ if ENV['CF_V2_RUN_INTEGRATION']
     end
 
     it "can switch targets, even if a target is invalid" do
-      run("#{cf_bin} target invalid-target") do |runner|
+      BlueShell::Runner.run("#{cf_bin} target invalid-target") do |runner|
         expect(runner).to say "Target refused"
         runner.wait_for_exit
       end
 
-      run("#{cf_bin} target #{target}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} target #{target}") do |runner|
         expect(runner).to say "Setting target"
         expect(runner).to say target
         runner.wait_for_exit
@@ -33,11 +32,10 @@ if ENV['CF_V2_RUN_INTEGRATION']
     end
 
     it "can switch organizations and spaces" do
-      run("#{cf_bin} logout") do |runner|
-        runner.wait_for_exit
-      end
+      BlueShell::Runner.run("#{cf_bin} target #{target}")
+      BlueShell::Runner.run("#{cf_bin} logout")
 
-      run("#{cf_bin} login") do |runner|
+      BlueShell::Runner.run("#{cf_bin} login") do |runner|
         expect(runner).to say "Email>"
         runner.send_keys username
 
@@ -47,7 +45,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
         expect(runner).to say "Authenticating... OK"
       end
 
-      run("#{cf_bin} target -o #{organization}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} target -o #{organization}") do |runner|
         expect(runner).to say("Switching to organization #{organization}")
 
         expect(runner).to say("Space>")
@@ -56,12 +54,12 @@ if ENV['CF_V2_RUN_INTEGRATION']
         runner.wait_for_exit
       end
 
-      run("#{cf_bin} target -s #{space}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} target -s #{space}") do |runner|
         expect(runner).to say("Switching to space #{space}")
         runner.wait_for_exit
       end
 
-      run("#{cf_bin} target -s #{space2}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} target -s #{space2}") do |runner|
         expect(runner).to say("Switching to space #{space2}")
         runner.wait_for_exit
       end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require "cf/test_support"
 require "webmock"
 require "ostruct"
 require "fakefs/safe"
+require "blue-shell"
 
 INTEGRATE_WITH = ENV["INTEGRATE_WITH"] || "default"
 TRAVIS_BUILD_ID = ENV["TRAVIS_BUILD_ID"]
@@ -35,7 +36,7 @@ end
 
 RSpec.configure do |c|
   c.include Fake::FakeMethods
-  c.include ConsoleAppSpeckerMatchers
+  c.include BlueShell::Matchers
 
   c.mock_with :rr
 
@@ -64,9 +65,3 @@ def name_list(xs)
     xs.collect(&:name).join(", ")
   end
 end
-
-def run(command)
-  SpeckerRunner.new(command) do |runner|
-    yield runner
-  end
-end

data/spec/support/cli_helper.rb

@@ -52,11 +52,11 @@ module CliHelper
   end
 
   def output
-    @output ||= TrackingExpector.new(stdout)
+    @output ||= BlueShell::BufferedReaderExpector.new(stdout)
   end
 
   def error_output
-    @error_output ||= TrackingExpector.new(stderr)
+    @error_output ||= BlueShell::BufferedReaderExpector.new(stderr)
   end
 
   def mock_invoke(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 0.6.1.rc4
+  version: 0.6.1.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -168,6 +168,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: blue-shell
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -293,8 +309,6 @@ files:
 - spec/assets/hello-sinatra/Gemfile
 - spec/assets/hello-sinatra/Gemfile.lock
 - spec/assets/hello-sinatra/main.rb
-- spec/assets/specker_runner/specker_runner_input.rb
-- spec/assets/specker_runner/specker_runner_pause.rb
 - spec/cf/cli/app/base_spec.rb
 - spec/cf/cli/app/delete_spec.rb
 - spec/cf/cli/app/instances_spec.rb
@@ -319,8 +333,10 @@ files:
 - spec/cf/cli/service/service_spec.rb
 - spec/cf/cli/service/services_spec.rb
 - spec/cf/cli/service/unbind_spec.rb
+- spec/cf/cli/space/base_spec.rb
 - spec/cf/cli/space/create_spec.rb
 - spec/cf/cli/space/rename_spec.rb
+- spec/cf/cli/space/space_spec.rb
 - spec/cf/cli/space/spaces_spec.rb
 - spec/cf/cli/space/switch_space_spec.rb
 - spec/cf/cli/start/info_spec.rb
@@ -331,8 +347,6 @@ files:
 - spec/cf/cli/user/passwd_spec.rb
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
-- spec/console_app_specker/console_app_specker_matchers_spec.rb
-- spec/console_app_specker/specker_runner_spec.rb
 - spec/features/account_lifecycle_spec.rb
 - spec/features/login_spec.rb
 - spec/features/push_flow_spec.rb
@@ -340,14 +354,10 @@ files:
 - spec/spec_helper.rb
 - spec/support/cli_helper.rb
 - spec/support/config_helper.rb
-- spec/support/console_app_specker_matchers.rb
 - spec/support/fake_home_dir.rb
 - spec/support/interact_helper.rb
 - spec/support/shared_examples/errors.rb
 - spec/support/shared_examples/input.rb
-- spec/support/shared_examples/populate_organization.rb
-- spec/support/specker_runner.rb
-- spec/support/tracking_expector.rb
 - bin/cf
 homepage: http://github.com/cloudfoundry/cf
 licenses: []
@@ -363,7 +373,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2266107112903724844
+      hash: 544715593409945959
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -382,8 +392,6 @@ test_files:
 - spec/assets/hello-sinatra/Gemfile
 - spec/assets/hello-sinatra/Gemfile.lock
 - spec/assets/hello-sinatra/main.rb
-- spec/assets/specker_runner/specker_runner_input.rb
-- spec/assets/specker_runner/specker_runner_pause.rb
 - spec/cf/cli/app/base_spec.rb
 - spec/cf/cli/app/delete_spec.rb
 - spec/cf/cli/app/instances_spec.rb
@@ -408,8 +416,10 @@ test_files:
 - spec/cf/cli/service/service_spec.rb
 - spec/cf/cli/service/services_spec.rb
 - spec/cf/cli/service/unbind_spec.rb
+- spec/cf/cli/space/base_spec.rb
 - spec/cf/cli/space/create_spec.rb
 - spec/cf/cli/space/rename_spec.rb
+- spec/cf/cli/space/space_spec.rb
 - spec/cf/cli/space/spaces_spec.rb
 - spec/cf/cli/space/switch_space_spec.rb
 - spec/cf/cli/start/info_spec.rb
@@ -420,8 +430,6 @@ test_files:
 - spec/cf/cli/user/passwd_spec.rb
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
-- spec/console_app_specker/console_app_specker_matchers_spec.rb
-- spec/console_app_specker/specker_runner_spec.rb
 - spec/features/account_lifecycle_spec.rb
 - spec/features/login_spec.rb
 - spec/features/push_flow_spec.rb
@@ -429,11 +437,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/cli_helper.rb
 - spec/support/config_helper.rb
-- spec/support/console_app_specker_matchers.rb
 - spec/support/fake_home_dir.rb
 - spec/support/interact_helper.rb
 - spec/support/shared_examples/errors.rb
 - spec/support/shared_examples/input.rb
-- spec/support/shared_examples/populate_organization.rb
-- spec/support/specker_runner.rb
-- spec/support/tracking_expector.rb

data/spec/assets/specker_runner/specker_runner_input.rb

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-$stdout.sync = true
-print "started"
-typed = gets
-print "received #{typed}"

data/spec/assets/specker_runner/specker_runner_pause.rb

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-print "started"
-sleep 0.5
-print " finished"

data/spec/console_app_specker/console_app_specker_matchers_spec.rb

@@ -1,173 +0,0 @@
-require 'spec_helper'
-include ConsoleAppSpeckerMatchers
-
-describe ConsoleAppSpeckerMatchers, :ruby19 => true do
-  describe "#say" do
-    it "returns an ExpectOutputMatcher" do
-      say("").should be_a(ExpectOutputMatcher)
-    end
-
-    context "with an explicit timeout" do
-      it "returns an ExpectOutputMatcher" do
-        matcher = say("", 30)
-        matcher.should be_a(ExpectOutputMatcher)
-        matcher.timeout.should == 30
-      end
-    end
-  end
-
-  describe "#have_exited_with" do
-    it "returns an ExitCodeMatcher" do
-      have_exited_with(1).should be_a(ExitCodeMatcher)
-    end
-
-    it "has synonyms" do
-      exit_with(1).should be_a(ExitCodeMatcher)
-    end
-  end
-end
-
-describe ExpectOutputMatcher, :ruby19 => true do
-  let(:expected_output) { "expected_output" }
-  let(:timeout) { 1 }
-
-  subject { ExpectOutputMatcher.new(expected_output, timeout) }
-
-  describe "#matches?" do
-    context "with something that isn't a runner" do
-      it "raises an exception" do
-        expect {
-          subject.matches?("c'est ne pas une specker runner")
-        }.to raise_exception(InvalidInputError)
-      end
-    end
-
-    context "with a valid runner" do
-      context "when the expected output is in the process output" do
-        it "finds the expected output" do
-          run("echo -n expected_output") do |runner|
-            subject.matches?(runner).should be_true
-          end
-        end
-      end
-
-      context "when the expected output is not in the process output" do
-        let(:runner) { SpeckerRunner.new('echo -n not_what_we_were_expecting') }
-
-        it "does not find the expected output" do
-          run("echo -n not_what_we_were_expecting") do |runner|
-            subject.matches?(runner).should be_false
-          end
-        end
-      end
-    end
-  end
-
-  context "failure messages" do
-    it "has a correct failure message" do
-      run("echo -n actual_output") do |runner|
-        subject.matches?(runner)
-        subject.failure_message.should == "expected 'expected_output' to be printed, but it wasn't. full output:\nactual_output"
-      end
-    end
-
-    it "has a correct negative failure message" do
-      run("echo -n actual_output") do |runner|
-        subject.matches?(runner)
-        subject.negative_failure_message.should == "expected 'expected_output' to not be printed, but it was. full output:\nactual_output"
-      end
-    end
-
-    context "when expecting branching output" do
-      let(:expected_output) { {
-        "expected_output" => proc {},
-        "other_expected_output" => proc {}
-      } }
-
-      it "has a correct failure message" do
-        run("echo -n actual_output") do |runner|
-          subject.matches?(runner)
-          subject.failure_message.should == "expected one of 'expected_output', 'other_expected_output' to be printed, but it wasn't. full output:\nactual_output"
-        end
-      end
-
-      it "has a correct negative failure message" do
-        run("echo -n expected_output") do |runner|
-          subject.matches?(runner)
-          subject.negative_failure_message.should == "expected 'expected_output' to not be printed, but it was. full output:\nexpected_output"
-        end
-      end
-    end
-  end
-end
-
-describe ExitCodeMatcher, :ruby19 => true do
-  let(:expected_code) { 0 }
-
-  subject { ExitCodeMatcher.new(expected_code) }
-
-  describe "#matches?" do
-    context "with something that isn't a runner" do
-      it "raises an exception" do
-        expect {
-          subject.matches?("c'est ne pas une specker runner")
-        }.to raise_exception(InvalidInputError)
-      end
-    end
-
-    context "with a valid runner" do
-      context "and the command exited with the expected exit code" do
-        it "returns true" do
-          run("true") do |runner|
-            subject.matches?(runner).should be_true
-          end
-        end
-      end
-
-      context "and the command exits with a different exit code" do
-        it "returns false" do
-          run("false") do |runner|
-            subject.matches?(runner).should be_false
-          end
-        end
-      end
-
-      context "and the command runs for a while" do
-        it "waits for it to exit" do
-          run("sleep 0.5") do |runner|
-            subject.matches?(runner).should be_true
-          end
-        end
-      end
-    end
-  end
-
-  context "failure messages" do
-    context "with a command that's exited" do
-      it "has a correct failure message" do
-        run("false") do |runner|
-          subject.matches?(runner)
-          runner.wait_for_exit
-          subject.failure_message.should == "expected process to exit with status 0, but it exited with status 1"
-        end
-      end
-
-      it "has a correct negative failure message" do
-        run("false") do |runner|
-          subject.matches?(runner)
-          runner.wait_for_exit
-          subject.negative_failure_message.should == "expected process to not exit with status 0, but it did"
-        end
-      end
-    end
-
-    context "with a command that's still running" do
-      it "waits for it to exit" do
-        run("ruby -e 'sleep 1; exit 1'") do |runner|
-          subject.matches?(runner)
-          subject.failure_message.should == "expected process to exit with status 0, but it exited with status 1"
-        end
-      end
-    end
-  end
-end