cf 0.6.1.rc8 → 0.6.1.rc9

data/lib/cf/cli.rb

@@ -379,23 +379,10 @@ module CF
       info = target_info(target)
       token = info[:token] && CFoundry::AuthToken.from_hash(info)
 
-      @@client =
-        case info[:version]
-        when 2
-          fail "User switching not implemented." if input[:proxy]
-          CFoundry::V2::Client.new(target, token)
-        when 1
-          CFoundry::V1::Client.new(target, token)
-        else
-          CFoundry::Client.new(target, token)
-        end
-
-      unless @@client.is_a?(CFoundry::V2::Client)
-        # TODO
-        fail "V1 targets are no longer supported."
-      end
+      fail "V1 targets are no longer supported." if info[:version] == 1
+      fail "User switching not implemented." if input[:proxy]
 
-      @@client.proxy = input[:proxy]
+      @@client = CFoundry::V2::Client.new(target, token)
       @@client.trace = input[:trace]
 
       uri = URI.parse(target)
@@ -406,11 +393,11 @@ module CF
         save_target_info(info, target)
       end
 
-      if org = info[:organization]
+      if (org = info[:organization])
         @@client.current_organization = @@client.organization(org)
       end
 
-      if space = info[:space]
+      if (space = info[:space])
         @@client.current_space = @@client.space(space)
       end
 

data/lib/cf/cli/app/start.rb

@@ -94,21 +94,26 @@ module CF::App
       line "Checking #{c(app.name, :name)}..."
 
       seconds = 0
-      while instances = app.instances
-        indented { print_instances_summary(instances) }
 
-        if all_instances_running?(instances)
-          line "#{c("OK", :good)}"
-          return
-        end
+      begin
+        while instances = app.instances
+          indented { print_instances_summary(instances) }
 
-        if any_instance_flapping?(instances) || seconds == APP_CHECK_LIMIT
-          err "Application failed to start."
-          return
-        end
+          if all_instances_running?(instances)
+            line "#{c("OK", :good)}"
+            return
+          end
 
-        sleep 1
-        seconds += 1
+          if any_instance_flapping?(instances) || seconds == APP_CHECK_LIMIT
+            err "Application failed to start."
+            return
+          end
+
+          sleep 1
+          seconds += 1
+        end
+      rescue CFoundry::StagingError
+        err "Application failed to stage"
       end
     end
 

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "0.6.1.rc8".freeze
+  VERSION = "0.6.1.rc9".freeze
 end

data/spec/cf/cli/app/start_spec.rb

@@ -84,6 +84,19 @@ describe CF::App::Start do
           end
         end
 
+        context "staging fails" do
+          before do
+            stub(app).instances { raise CFoundry::StagingError.new("Failed to stage", 170001, nil, nil) }
+          end
+
+          it "says the app failed to stage" do
+            subject
+            expect(output).to say("Checking #{app.name}...")
+            expect(error_output).to say("Application failed to stage")
+            expect(output).to_not say(/\d (running|down|flapping)/)
+          end
+        end
+
         context "when any instance becomes flapping" do
           let(:final_instances) do
             [ CFoundry::V2::App::Instance.new(nil, nil, nil, :state => "FLAPPING"),

data/spec/cf/cli/start/target_spec.rb

@@ -68,7 +68,7 @@ describe CF::Start::Target do
 
         context "when the target is valid but the connection is refused" do
           it "shows a pretty error message" do
-            any_instance_of(CFoundry::Client) do |cli|
+            any_instance_of(CFoundry::V2::Client) do |cli|
               stub(cli).info { raise CFoundry::TargetRefused, "foo" }
             end
 
@@ -79,7 +79,7 @@ describe CF::Start::Target do
 
         context "when the uri is malformed" do
           it "shows a pretty error message" do
-            any_instance_of(CFoundry::Client) do |cli|
+            any_instance_of(CFoundry::V2::Client) do |cli|
               stub(cli).info { raise CFoundry::InvalidTarget.new(target) }
             end
 

data/spec/cf/cli_spec.rb

@@ -405,19 +405,7 @@ describe CF::CLI do
       end
     end
 
-    context "with a v1 cloud controller" do
-      before do
-        stub(context).target_info { { :version => 1 } }
-      end
-
-      it "fails" do
-        expect {
-          context.client
-        }.to raise_error(CF::UserError, /no longer supported/)
-      end
-    end
-
-    context "with a v2 cloud controller" do
+    context "with a cloud controller" do
       before do
         stub(context).target_info { { :version => 2} }
       end

data/spec/features/login_spec.rb

@@ -6,6 +6,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
     let(:target) { ENV['CF_V2_TEST_TARGET'] }
     let(:username) { ENV['CF_V2_TEST_USER'] }
     let(:password) { ENV['CF_V2_TEST_PASSWORD'] }
+    let(:organization) { ENV['CF_V2_TEST_ORGANIZATION'] }
 
     let(:second_username) { ENV['CF_V2_OTHER_TEST_USER'] }
     let(:second_organization) { ENV['CF_V2_OTHER_TEST_ORGANIZATION'] }
@@ -36,7 +37,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
           expect(runner).to say(
             "Organization>" => proc {
-              runner.send_keys "1"
+              runner.send_keys organization
               expect(runner).to say /Switching to organization .*\.\.\. OK/
             },
             "Switching to organization" => proc {}

data/spec/features/push_flow_spec.rb

@@ -10,10 +10,9 @@ if ENV['CF_V2_RUN_INTEGRATION']
     let(:password) { ENV['CF_V2_TEST_PASSWORD'] }
     let(:organization) { ENV['CF_V2_TEST_ORGANIZATION_TWO'] }
 
-    let(:app) do
-      fuzz = TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_")
-      "hello-sinatra-#{fuzz}"
-    end
+    let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
+    let(:app) { "hello-sinatra-#{run_id}" }
+    let(:service_name) { "mysql-#{run_id}" }
 
     before do
       FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
@@ -23,7 +22,8 @@ if ENV['CF_V2_RUN_INTEGRATION']
     end
 
     after do
-      `#{cf_bin} delete #{app} -f -o --no-script`
+      `#{cf_bin} unbind-service -f --no-script #{service_name} #{app}`
+      `#{cf_bin} delete #{app} -f --routes --no-script`
       logout
       Interact::Progress::Dots.stop!
     end
@@ -67,23 +67,23 @@ if ENV['CF_V2_RUN_INTEGRATION']
           runner.send_keys "mysql"
 
           expect(runner).to say "Name?>"
-          runner.send_keys ""
+          runner.send_keys service_name
 
           expect(runner).to say "Which plan?>"
           runner.send_keys "200"
 
-          expect(runner).to say /Creating service .+ OK/
+          expect(runner).to say /Creating service #{service_name}.*OK/
           expect(runner).to say /Binding .+ to .+ OK/
 
           expect(runner).to say "Create another service?> n"
           runner.send_keys ""
 
           # skip this
-          if runner.expect "Bind other services to application?> n", 1
+          if runner.expect "Bind other services to application?> n", 15
             runner.send_keys ""
           end
 
-          expect(runner).to say "Save configuration?> n", 10
+          expect(runner).to say "Save configuration?> n", 20
           runner.send_keys ""
 
           expect(runner).to say "Uploading #{app}... OK", 180
@@ -105,14 +105,14 @@ if ENV['CF_V2_RUN_INTEGRATION']
           /x
       end
 
+      BlueShell::Runner.run("#{cf_bin} unbind-service #{service_name} #{app}") do |runner|
+        runner.wait_for_exit(20)
+      end
+
       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"
-
-        expect(runner).to say "Delete orphaned service"
-        runner.send_keys "y"
-        expect(runner).to say /Deleting .* OK/
       end
     end
   end

data/spec/support/features_helper.rb

@@ -15,6 +15,8 @@ module FeaturesHelper
   end
 
   def set_target
-    BlueShell::Runner.run("#{cf_bin} target #{target}")
+    BlueShell::Runner.run("#{cf_bin} target #{target}") do |runner|
+      runner.wait_for_exit(20)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 0.6.1.rc8
+  version: 0.6.1.rc9
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -67,10 +67,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.1.rc3
+        version: 0.7.0.rc3
     - - <
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -78,10 +78,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.1.rc3
+        version: 0.7.0.rc3
     - - <
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: mothership
   requirement: !ruby/object:Gem::Requirement
@@ -377,7 +377,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2077676923754035420
+      hash: 3627403370497925760
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: