cf 0.6.1.rc13 → 0.6.1.rc14

data/lib/cf/cli/organization/delete.rb

@@ -21,7 +21,11 @@ module CF::Organization
 
       begin
         with_progress("Deleting organization #{c(org.name, :name)}") do
-          org.delete!
+          if input[:recursive]
+            org.delete!(:recursive => true)
+          else
+            org.delete!
+          end
         end
       rescue CFoundry::AssociationNotEmpty => boom
         line

data/lib/cf/cli/space/delete.rb

@@ -28,12 +28,17 @@ module CF::Space
 
         begin
           with_progress("Deleting space #{c(space.name, :name)}") do
-            space.delete!
+            if input[:recursive]
+              space.delete!(:recursive => true)
+            else
+              space.delete!
+            end
           end
         rescue CFoundry::APIError => boom
           line
           line c(boom.description, :bad)
           line c("If you want to delete the space along with all dependent objects, rerun the command with the #{b("'--recursive'")} flag.", :bad)
+          exit_status(1)
         end
       end
 

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "0.6.1.rc13".freeze
+  VERSION = "0.6.1.rc14".freeze
 end

data/spec/cf/cli/organization/delete_spec.rb

@@ -76,5 +76,14 @@ describe CF::Organization::Delete do
         expect(output).to say "If you want to delete the organization along with all dependent objects, rerun the command with the '--recursive' flag."
       end
     end
+
+    context "when deleting with --recursive" do
+      subject { cf %W[delete-org MyOrg --recursive --force] }
+
+      it "sends recursive true in its delete request" do
+        mock(organization).delete!(:recursive => true)
+        subject
+      end
+    end
   end
 end

data/spec/cf/cli/space/delete_spec.rb

@@ -86,6 +86,19 @@ describe CF::Space::Delete do
       it "informs the user of how to recursively delete" do
         expect(output).to say "If you want to delete the space along with all dependent objects, rerun the command with the '--recursive' flag."
       end
+
+      it "returns a non-zero exit code" do
+        @status.should_not == 0
+      end
+    end
+
+    context "when deleting with --recursive" do
+      subject { cf %W[delete-space some_space_name --recursive --force] }
+
+      it "sends recursive true in its delete request" do
+        mock(space).delete!(:recursive => true)
+        subject
+      end
     end
   end
 end

data/spec/features/org_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+
+if ENV['CF_V2_RUN_INTEGRATION']
+  describe "creating and deleting orgs", :ruby19 => true do
+    before(:all) do
+      WebMock.allow_net_connect!
+    end
+
+    after(:all) do
+      WebMock.disable_net_connect!
+    end
+
+    let(:target) { ENV['CF_V2_TEST_TARGET'] }
+    let(:organization) { ENV['CF_V2_TEST_ORGANIZATION'] }
+    let(:space) { ENV['CF_V2_TEST_SPACE'] }
+    let(:admin_username) { ENV['CF_V2_ADMIN_USERNAME'] }
+    let(:admin_password) { ENV['CF_V2_ADMIN_PW'] }
+
+    let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
+    let(:new_org_name) { "new-org-#{run_id}" }
+
+    let(:client) do
+      client = CFoundry::V2::Client.new("https://#{target}")
+      client.login(admin_username, admin_password)
+      client
+    end
+
+    before do
+      Interact::Progress::Dots.start!
+      "cf login #{admin_username} --password #{admin_password} -o #{organization} -s #{space}"
+      BlueShell::Runner.run("cf login #{admin_username} --password #{admin_password} -o #{organization} -s #{space}") do |runner|
+        runner.wait_for_exit(60)
+      end
+    end
+
+    after do
+      logout
+      Interact::Progress::Dots.stop!
+    end
+
+    it "can create and recursively delete an org" do
+      BlueShell::Runner.run("cf create-org #{new_org_name}") do |runner|
+        runner.should say "Creating organization #{new_org_name}... OK"
+        runner.should say "Switching to organization #{new_org_name}... OK"
+        runner.should say "There are no spaces. You may want to create one with create-space."
+      end
+
+      BlueShell::Runner.run("cf create-space new-space") do |runner|
+        runner.should say "Creating space new-space... OK"
+      end
+
+      BlueShell::Runner.run("cf delete-org #{new_org_name} --force") do |runner|
+        runner.should say "If you want to delete the organization along with all dependent objects, rerun the command with the '--recursive' flag."
+      end
+
+      BlueShell::Runner.run("cf delete-org #{new_org_name} --force --recursive") do |runner|
+        runner.should say("Deleting organization #{new_org_name}... OK")
+      end
+
+      BlueShell::Runner.run("cf orgs") do |runner|
+        runner.should_not say("#{new_org_name}")
+      end
+    end
+  end
+end

data/spec/features/push_flow_spec.rb

@@ -39,10 +39,10 @@ if ENV['CF_V2_RUN_INTEGRATION']
           runner.send_keys app
 
           expect(runner).to say "Instances> 1"
-          runner.send_keys ""
+          runner.send_return
 
           expect(runner).to say "Custom startup command> "
-          runner.send_keys ""
+          runner.send_return
 
           expect(runner).to say "Memory Limit>"
           runner.send_keys "128M"
@@ -50,7 +50,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
           expect(runner).to say "Creating #{app}... OK"
 
           expect(runner).to say "Subdomain> #{app}"
-          runner.send_keys ""
+          runner.send_return
 
           expect(runner).to say "1:"
           expect(runner).to say "Domain>"
@@ -76,15 +76,15 @@ if ENV['CF_V2_RUN_INTEGRATION']
           expect(runner).to say /Binding .+ to .+ OK/
 
           expect(runner).to say "Create another service?> n"
-          runner.send_keys ""
+          runner.send_return
 
           # skip this
           if runner.expect "Bind other services to application?> n", 15
-            runner.send_keys ""
+            runner.send_return
           end
 
           expect(runner).to say "Save configuration?> n", 20
-          runner.send_keys ""
+          runner.send_return
 
           expect(runner).to say "Uploading #{app}... OK", 180
           expect(runner).to say "Starting #{app}... OK", 180

data/spec/features/space_spec.rb

@@ -69,5 +69,35 @@ if ENV['CF_V2_RUN_INTEGRATION']
         expect(runner).to say(space)
       end
     end
+
+    let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
+    let(:app) { "hello-sinatra-recursive-#{run_id}" }
+
+    it "can create an app in a space, then delete it recursively" do
+      new_space = "test-space-#{rand(10000)}"
+      BlueShell::Runner.run("#{cf_bin} create-space #{new_space}") { |runner| runner.wait_for_exit(30) }
+      BlueShell::Runner.run("#{cf_bin} switch-space #{new_space}") { |runner| runner.wait_for_exit(30) }
+
+      push_app("hello-sinatra", app)
+
+      BlueShell::Runner.run("#{cf_bin} delete-space #{new_space} --force") do |runner|
+        expect(runner).to say("If you want to delete the space along with all dependent objects, rerun the command with the '--recursive' flag.")
+        runner.wait_for_exit(30)
+      end.should_not be_successful
+
+      BlueShell::Runner.run("#{cf_bin} spaces") do |runner|
+        expect(runner).to say(new_space)
+        expect(runner).to say(app)
+      end
+
+      BlueShell::Runner.run("#{cf_bin} delete-space #{new_space} --recursive --force") do |runner|
+        expect(runner).to say("Deleting space #{new_space}... OK")
+      end
+
+      BlueShell::Runner.run("#{cf_bin} spaces") do |runner|
+        expect(runner).to_not say(new_space)
+        expect(runner).to_not say(app)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -57,6 +57,13 @@ RSpec.configure do |c|
   c.before do
     CF::CLI.send(:class_variable_set, :@@client, nil)
   end
+
+  c.after do
+    if example.exception != nil && example.exception.message.include?("~/.cf/crash")
+      puts '~/.cf/crash output for failed spec:'
+      puts `cat ~/.cf/crash`
+    end
+  end
 end
 
 def name_list(xs)

data/spec/support/features_helper.rb

@@ -21,4 +21,43 @@ module FeaturesHelper
       runner.wait_for_exit(20)
     end
   end
+
+  def push_app(app_folder, deployed_app_name)
+    Dir.chdir("#{SPEC_ROOT}/assets/#{app_folder}") do
+      BlueShell::Runner.run("#{cf_bin} push --no-manifest") do |runner|
+        expect(runner).to say "Name>"
+        runner.send_keys deployed_app_name
+
+        expect(runner).to say "Instances> 1", 15
+        runner.send_return
+
+        expect(runner).to say "Custom startup command> "
+        runner.send_return
+
+        expect(runner).to say "Memory Limit>"
+        runner.send_keys "128M"
+
+        expect(runner).to say "Creating #{deployed_app_name}... OK"
+
+        expect(runner).to say "Subdomain> #{deployed_app_name}"
+        runner.send_return
+
+        expect(runner).to say "1:"
+        expect(runner).to say "Domain>"
+        runner.send_keys "1"
+
+        expect(runner).to say(/Creating route #{deployed_app_name}\..*\.\.\. OK/)
+        expect(runner).to say(/Binding #{deployed_app_name}\..* to #{deployed_app_name}\.\.\. OK/)
+
+        expect(runner).to say "Create services for application?> n"
+        runner.send_return
+
+        if runner.expect "Bind other services to application?> n", 15
+          runner.send_return
+        end
+
+        runner.wait_for_exit
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 0.6.1.rc13
+  version: 0.6.1.rc14
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0.rc5
+        version: 0.7.0.rc8
     - - <
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0.rc5
+        version: 0.7.0.rc8
     - - <
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -280,6 +280,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rspec-instafail
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 description: 
 email:
 - vcap-dev@googlegroups.com
@@ -482,6 +498,7 @@ files:
 - spec/features/account_lifecycle_spec.rb
 - spec/features/create_user_spec.rb
 - spec/features/login_spec.rb
+- spec/features/org_spec.rb
 - spec/features/push_flow_spec.rb
 - spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb
@@ -514,7 +531,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3085176752358037272
+      hash: 255382247514781003
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -625,6 +642,7 @@ test_files:
 - spec/features/account_lifecycle_spec.rb
 - spec/features/create_user_spec.rb
 - spec/features/login_spec.rb
+- spec/features/org_spec.rb
 - spec/features/push_flow_spec.rb
 - spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb