cf 1.1.3.rc1 → 1.1.4

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require "cfoundry/test_support"
 require "cf"
 require "cf/test_support"
 require "webmock"
+require "webmock/rspec"
 require "ostruct"
 require "fakefs/safe"
 require "blue-shell"
@@ -38,8 +39,6 @@ RSpec.configure do |c|
   c.include Fake::FakeMethods
   c.include BlueShell::Matchers
 
-  c.mock_with :rr
-
   if RUBY_VERSION =~ /^1\.8\.\d/
     c.filter_run_excluding :ruby19 => true
   end

data/spec/support/cli_helper.rb

@@ -5,15 +5,11 @@ module CliHelper
   end
 
   def stub_client
-    any_instance_of described_class do |cli|
-      stub(cli).client { client }
-    end
+    described_class.any_instance.stub(:client).and_return(client)
   end
 
   def stub_precondition
-    any_instance_of described_class do |cli|
-      stub(cli).precondition
-    end
+    described_class.any_instance.stub(:precondition)
   end
 
   def wrap_errors
@@ -24,7 +20,7 @@ module CliHelper
 
   def cf(argv)
     Mothership.new.exit_status 0
-    stub(CF::CLI).exit { |code| code }
+    CF::CLI.stub(:exit) { |code| code }
     capture_output { CF::CLI.start(argv + ["--debug", "--no-script"]) }
   end
 
@@ -60,15 +56,10 @@ module CliHelper
   end
 
   def mock_invoke(*args)
-    any_instance_of described_class do |cli|
-      mock(cli).invoke *args
-    end
+    described_class.any_instance.should_receive(:invoke).with(*args)
   end
 
   def dont_allow_invoke(*args)
-    any_instance_of described_class do |cli|
-      dont_allow(cli).invoke *args
-    end
+    described_class.any_instance.should_not_receive(:invoke).with(*args)
   end
-
 end

data/spec/support/factory_girl.rb

@@ -0,0 +1,6 @@
+require "factory_girl"
+
+RSpec.configure do |config|
+  FactoryGirl.find_definitions
+  config.include FactoryGirl::Syntax::Methods
+end

data/spec/support/interact_helper.rb

@@ -1,29 +1,19 @@
 module InteractHelper
   def stub_ask(*args, &block)
-    a_stub = nil
-    any_instance_of CF::CLI do |interactive|
-      a_stub = stub(interactive).ask(*args, &block)
-    end
-    a_stub
+    CF::CLI.any_instance.stub(:ask).with(*args, &block)
   end
 
   def mock_ask(*args, &block)
-    a_mock = nil
-    any_instance_of CF::CLI do |interactive|
-      a_mock = mock(interactive).ask(*args, &block)
-    end
-    a_mock
+    CF::CLI.any_instance.should_receive(:ask).with(*args, &block)
   end
 
   def dont_allow_ask(*args)
-    any_instance_of CF::CLI do |interactive|
-      dont_allow(interactive).ask(*args)
-    end
+    CF::CLI.any_instance.should_not_receive(:ask).with(*args)
   end
 
   def mock_with_progress(message)
-    any_instance_of CF::CLI do |interactive|
-      mock(interactive).with_progress(message) { |_, block| block.call }
+    CF::CLI.any_instance.should_receive(:with_progress).with(message) do |_, &block|
+      block.call
     end
   end
 end

data/spec/support/shared_examples/errors.rb

@@ -7,7 +7,7 @@ shared_examples_for "an error that's obvious to the user" do |options|
   end
 
   it "sets the exit code to 1" do
-    mock(context).exit_status(1)
+    context.should_receive(:exit_status).with(1)
     subject
   end
 

data/spec/tunnel/plugin_spec.rb

@@ -4,7 +4,7 @@ describe CFTunnelPlugin::Tunnel do
   describe "#tunnel_clients" do
     context "when the user has a custom clients.yml in their cf directory" do
       it "overrides the default client config with the user's customizations" do
-        stub(subject).config_file_path { "#{SPEC_ROOT}/fixtures/fake_home_dirs/with_custom_clients/.cf/#{CFTunnelPlugin::Tunnel::CLIENTS_FILE}" }
+        subject.stub(:config_file_path) { "#{SPEC_ROOT}/fixtures/fake_home_dirs/with_custom_clients/.cf/#{CFTunnelPlugin::Tunnel::CLIENTS_FILE}" }
 
         expect(subject.tunnel_clients["postgresql"]).to eq({
           "psql" => {
@@ -17,7 +17,7 @@ describe CFTunnelPlugin::Tunnel do
 
     context "when the user does not have a custom clients.yml" do
       it "returns the default client config" do
-        stub(subject).config_file_path { File.expand_path("./.cf/#{CFTunnelPlugin::Tunnel::CLIENTS_FILE}") }
+        subject.stub(:config_file_path) { File.expand_path("./.cf/#{CFTunnelPlugin::Tunnel::CLIENTS_FILE}") }
 
         expect(subject.tunnel_clients["postgresql"]).to eq({
           "psql" => {

data/spec/tunnel/tunnel_spec.rb

@@ -38,14 +38,14 @@ describe CFTunnel do
       let(:host) { "caldecott" }
 
       before do
-        stub(subject).random_helper_url { "caldecott" }
-        stub(client).app { app }
-        stub(client).current_space { space }
-        stub(client).domains { [fake(:domain, :owning_organization => fake(:organization)), domain] }
+       subject.stub(:random_helper_url) { "caldecott" }
+       client.stub(:app) { app }
+       client.stub(:current_space) { space }
+       client.stub(:domains) { [fake(:domain, :owning_organization => fake(:organization)), domain] }
       end
 
       it "adds a new route to caldecott app" do
-        mock(app).create_route(:domain => domain, :host => host, :space => space)
+        app.should_receive(:create_route).with(:domain => domain, :host => host, :space => space)
 
         subject.send("push_helper", "this is a token")
       end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 1.1.3.rc1
-  prerelease: 6
+  version: 1.1.4
+  prerelease: 
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -178,6 +178,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  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: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -226,22 +242,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -259,13 +259,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 0.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -273,15 +273,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
-  name: rspec-instafail
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -289,7 +289,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '1.9'
 description: 
 email:
 - vcap-dev@googlegroups.com
@@ -493,6 +493,9 @@ files:
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
 - spec/console/console_spec.rb
+- spec/factories/cfoundry/v2/domain_factory.rb
+- spec/factories/cfoundry/v2/route_factory.rb
+- spec/factories/cfoundry/v2/user_factory.rb
 - spec/features/account_lifecycle_spec.rb
 - spec/features/create_user_spec.rb
 - spec/features/login_spec.rb
@@ -508,6 +511,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/cli_helper.rb
 - spec/support/config_helper.rb
+- spec/support/factory_girl.rb
 - spec/support/fake_home_dir.rb
 - spec/support/features_helper.rb
 - spec/support/interact_helper.rb
@@ -530,13 +534,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2659135865467122406
+      hash: -864933876994937869
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: cf
 rubygems_version: 1.8.25
@@ -640,6 +644,9 @@ test_files:
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
 - spec/console/console_spec.rb
+- spec/factories/cfoundry/v2/domain_factory.rb
+- spec/factories/cfoundry/v2/route_factory.rb
+- spec/factories/cfoundry/v2/user_factory.rb
 - spec/features/account_lifecycle_spec.rb
 - spec/features/create_user_spec.rb
 - spec/features/login_spec.rb
@@ -655,6 +662,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/cli_helper.rb
 - spec/support/config_helper.rb
+- spec/support/factory_girl.rb
 - spec/support/fake_home_dir.rb
 - spec/support/features_helper.rb
 - spec/support/interact_helper.rb