cf 1.1.4 → 2.0.0

data/spec/manifests/plugin_spec.rb

@@ -10,7 +10,7 @@ describe ManifestsPlugin do
   let(:inputs) { Mothership::Inputs.new(Mothership.commands[:push], nil, inputs_hash, given_hash, global_hash) }
   let(:plugin) { ManifestsPlugin.new(command, inputs) }
 
-  let(:client) { fake_client }
+  let(:client) { build(:client) }
 
   before do
     plugin.stub(:manifest) { manifest }
@@ -199,10 +199,14 @@ describe ManifestsPlugin do
       context "and a name is given" do
         context "and the name is present in the manifest" do
           let(:given_hash) { { :name => "a" } }
+          let(:app) { build :app, :name => "a" }
+
+          before do
+            client.stub(:apps => [app])
+            client.stub(:app_by_name).with("a").and_return(app)
+          end
 
           context "and the app exists" do
-            let(:app) { fake :app, :name => "a" }
-            let(:client) { fake_client :apps => [app] }
 
             context "and --reset was given" do
               let(:inputs_hash) { { :reset => true } }
@@ -220,6 +224,8 @@ describe ManifestsPlugin do
           end
 
           context "and the app does NOT exist" do
+            let(:app) { nil }
+
             it "pushes a new app with the inputs from the manifest" do
               wrapped.should_receive(:call).with(anything) do |inputs|
                 expect(inputs.given).to eq(
@@ -243,6 +249,11 @@ describe ManifestsPlugin do
       # cf push ./abc
       context "and a path is given" do
         context "and there are apps matching that path in the manifest" do
+          before do
+            client.stub(:apps => [build(:app), build(:app)])
+            client.stub(:app_by_name)
+          end
+
           let(:manifest) do
             { :applications => [
               { :name => "a",
@@ -288,7 +299,7 @@ describe ManifestsPlugin do
       let(:manifest) { nil }
 
       it "asks to save the manifest when uploading the application" do
-        mock_ask("Save configuration?", :default => false)
+        should_ask("Save configuration?", :default => false)
         wrapped.stub(:call) { plugin.filter(:push_app, app) }
         subject
       end
@@ -300,11 +311,11 @@ describe ManifestsPlugin do
       before do
         plugin.stub(:from_manifest) { "PATH" }
         app.changes.clear
+        client.stub(:apps => [app])
       end
 
-      let(:client) { fake_client(:apps => [app]) }
       let(:manifest_memory) { "256M" }
-      let(:app) { fake :app, :name => "a", :memory => 256 }
+      let(:app) { build(:app, :name => "a", :memory => 256) }
       let(:manifest) { { :name => "a", :memory => manifest_memory } }
 
       subject { plugin.send(:push_input_for, manifest, inputs) }

data/spec/spec_helper.rb

@@ -36,7 +36,6 @@ Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|
 end
 
 RSpec.configure do |c|
-  c.include Fake::FakeMethods
   c.include BlueShell::Matchers
 
   if RUBY_VERSION =~ /^1\.8\.\d/

data/spec/support/interact_helper.rb

@@ -3,7 +3,7 @@ module InteractHelper
     CF::CLI.any_instance.stub(:ask).with(*args, &block)
   end
 
-  def mock_ask(*args, &block)
+  def should_ask(*args, &block)
     CF::CLI.any_instance.should_receive(:ask).with(*args, &block)
   end
 

data/spec/tunnel/tunnel_spec.rb

@@ -24,7 +24,7 @@ describe CFTunnel do
     end
   end
 
-  let(:client) { fake_client }
+  let(:client) { build(:client) }
   let(:service) { NullObject.new }
 
   subject { CFTunnel.new(client, service) }
@@ -32,16 +32,16 @@ describe CFTunnel do
   describe "#open!" do
     describe "creating a route for caldecott" do
       let!(:app) { NullObject.new("app") }
-      let!(:domain) { fake(:domain, :owning_organization => nil) }
-      let!(:route) { fake(:route) }
-      let!(:space) { fake(:space) }
+      let!(:domain) { build(:domain, :owning_organization => nil) }
+      let!(:route) { build(:route) }
+      let!(:space) { build(:space) }
       let(:host) { "caldecott" }
 
       before do
        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] }
+       client.stub(:domains) { [build(:domain, :owning_organization => build(:organization)), domain] }
       end
 
       it "adds a new route to caldecott app" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -49,17 +49,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.0.1.rc1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.0.1.rc1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
@@ -493,9 +499,18 @@ 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/factories/cfoundry/v2/apps_factory.rb
+- spec/factories/cfoundry/v2/clients_factory.rb
+- spec/factories/cfoundry/v2/domains_factory.rb
+- spec/factories/cfoundry/v2/organizations_factory.rb
+- spec/factories/cfoundry/v2/routes_factory.rb
+- spec/factories/cfoundry/v2/service_bindings_factory.rb
+- spec/factories/cfoundry/v2/service_instances_factory.rb
+- spec/factories/cfoundry/v2/service_plans_factory.rb
+- spec/factories/cfoundry/v2/services_factory.rb
+- spec/factories/cfoundry/v2/spaces_factory.rb
+- spec/factories/cfoundry/v2/stacks_factory.rb
+- spec/factories/cfoundry/v2/users_factory.rb
 - spec/features/account_lifecycle_spec.rb
 - spec/features/create_user_spec.rb
 - spec/features/login_spec.rb
@@ -534,7 +549,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -864933876994937869
+      hash: -3456553480456892639
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -644,9 +659,18 @@ 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/factories/cfoundry/v2/apps_factory.rb
+- spec/factories/cfoundry/v2/clients_factory.rb
+- spec/factories/cfoundry/v2/domains_factory.rb
+- spec/factories/cfoundry/v2/organizations_factory.rb
+- spec/factories/cfoundry/v2/routes_factory.rb
+- spec/factories/cfoundry/v2/service_bindings_factory.rb
+- spec/factories/cfoundry/v2/service_instances_factory.rb
+- spec/factories/cfoundry/v2/service_plans_factory.rb
+- spec/factories/cfoundry/v2/services_factory.rb
+- spec/factories/cfoundry/v2/spaces_factory.rb
+- spec/factories/cfoundry/v2/stacks_factory.rb
+- spec/factories/cfoundry/v2/users_factory.rb
 - spec/features/account_lifecycle_spec.rb
 - spec/features/create_user_spec.rb
 - spec/features/login_spec.rb