cf 0.6.1.rc12 → 0.6.1.rc13

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

@@ -17,37 +17,26 @@ module CF::Organization
       org = input[:organization]
       return unless input[:really, org]
 
-      spaces = org.spaces
-      unless spaces.empty?
-        unless force?
-          line "This organization is not empty!"
-          line
-          line "spaces: #{name_list(spaces)}"
-          line
-
-          return unless input[:recursive]
-        end
-
-        spaces.each do |s|
-          invoke :delete_space, :space => s, :really => true,
-                 :recursive => true, :warn => false
-        end
-      end
-
       is_current = org == client.current_organization
 
-      with_progress("Deleting organization #{c(org.name, :name)}") do
-        org.delete!
+      begin
+        with_progress("Deleting organization #{c(org.name, :name)}") do
+          org.delete!
+        end
+      rescue CFoundry::AssociationNotEmpty => boom
+        line
+        line c(boom.description, :bad)
+        line c("If you want to delete the organization along with all dependent objects, rerun the command with the #{b("'--recursive'")} flag.", :bad)
       end
 
-      if orgs.size == 1
+      if client.organizations.size == 1
         return unless input[:warn]
 
         line
         line c("There are no longer any organizations.", :warning)
         line "You may want to create one with #{c("create-org", :good)}."
       elsif is_current
-        invalidate_target
+        invalidate_client
         invoke :target
       end
     end

data/lib/cf/version.rb

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

data/lib/tunnel/helper-app/Gemfile

@@ -8,4 +8,3 @@ gem 'async_sinatra'
 gem 'thin'
 gem 'json'
 gem 'uuidtools'
-raise "NONONONONONONO"

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

@@ -0,0 +1,80 @@
+require 'spec_helper'
+require "cf/cli/organization/delete"
+
+describe CF::Organization::Delete do
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:delete_org] }
+
+    describe 'command' do
+      subject { command }
+      it { expect(Mothership::Help.group(:organizations)).to include(subject) }
+    end
+
+    include_examples 'inputs must have descriptions'
+  end
+
+  describe "running the command" do
+    let(:organization) { fake(:organization, :name => "MyOrg") }
+    let(:organizations) { [organization] }
+
+    let(:client) { fake_client(:current_organization => organization, :organizations => organizations) }
+
+    subject { capture_output { cf %W[delete-org MyOrg --quiet --force] } }
+
+    before do
+      any_instance_of described_class do |cli|
+        stub(cli).client { client }
+
+        stub(cli).check_logged_in
+        stub(cli).check_target
+        any_instance_of(CF::Populators::Organization, :populate_and_save! => organization)
+      end
+      stub(organization).delete!
+    end
+
+    context "without the force parameter" do
+      subject { cf %W[delete-org MyOrg --quiet] }
+      it "confirms deletion of the organization and deletes it" do
+        mock(organization).delete!
+        mock_ask("Really delete #{organization.name}?", {:default => false}) { true }
+
+        subject
+      end
+    end
+
+    context "when deleting the last organization" do
+      it "warns the user what they've done" do
+        subject
+        expect(output).to say("There are no longer any organizations.")
+      end
+    end
+
+    context "when deleting the current organization" do
+      let(:organizations) { [organization, fake(:organization)] }
+      it "invalidates the old target / client" do
+        any_instance_of(described_class) { |cli| mock(cli).invalidate_client }
+        subject
+      end
+
+      it "invokes the target command" do
+        mock_invoke :target
+        subject
+      end
+    end
+
+    context "when an org fails to delete" do
+      before do
+        stub(organization).delete! { raise CFoundry::AssociationNotEmpty.new("We don't delete children.", 10006) }
+        subject
+      end
+
+      it "shows the error message" do
+        expect(output).to say "We don't delete children."
+      end
+
+      it "informs the user of how to recursively 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
+  end
+end

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

@@ -75,7 +75,7 @@ describe CF::Space::Delete do
 
     context "when a space fails to delete" do
       before do
-        stub(space).delete! { raise CFoundry::APIError.new("We don't delete children.", 40005) }
+        stub(space).delete! { raise CFoundry::AssociationNotEmpty.new("We don't delete children.", 10006) }
         subject
       end
 

data/spec/features/account_lifecycle_spec.rb

@@ -16,6 +16,8 @@ if ENV['CF_V2_RUN_INTEGRATION']
     let(:username) { ENV['CF_V2_TEST_USER'] }
     let(:password) { ENV['CF_V2_TEST_PASSWORD'] }
     let(:organization) { ENV['CF_V2_TEST_ORGANIZATION'] }
+    let(:space) { ENV['CF_V2_TEST_SPACE'] }
+
 
     let(:client) do
       client = CFoundry::V2::Client.new("https://#{target}")

data/spec/features/push_flow_spec.rb

@@ -64,13 +64,13 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
           # create a service here
           expect(runner).to say "What kind?>"
-          runner.send_keys "mysql 5.5"
+          runner.send_keys "mysql n/a"
 
           expect(runner).to say "Name?>"
           runner.send_keys service_name
 
           expect(runner).to say "Which plan?>"
-          runner.send_keys "200"
+          runner.send_keys "cfinternal"
 
           expect(runner).to say /Creating service #{service_name}.*OK/
           expect(runner).to say /Binding .+ to .+ OK/
@@ -98,9 +98,9 @@ if ENV['CF_V2_RUN_INTEGRATION']
         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
-            core\s+                           # provider
-            [\d.]+\s+                         # version
-            200\s+                            # plan
+            aws\s+                            # provider
+            n\/a\s+                           # version
+            cfinternal\s+                     # plan
             #{app}                            # bound apps
           /x
       end

data/spec/support/features_helper.rb

@@ -3,10 +3,12 @@ module FeaturesHelper
     set_target
     logout
 
-    cmd = "yes 1 | #{cf_bin} login #{username} --password #{password} -o #{organization}"
-    cmd += " -s #{space}" if respond_to?(:space)
+    to_space = respond_to?(:space) ? space : ENV['CF_V2_TEST_SPACE']
+
+    cmd = "#{cf_bin} login #{username} --password #{password} -o #{organization}"
+    cmd += " -s #{to_space}"
     BlueShell::Runner.run(cmd) do |runner|
-      runner.wait_for_exit 30
+      runner.wait_for_exit 60
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 0.6.1.rc12
+  version: 0.6.1.rc13
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-22 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.rc4
+        version: 0.7.0.rc5
     - - <
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0.rc4
+        version: 0.7.0.rc5
     - - <
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -169,29 +169,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: blue-shell
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -199,31 +199,31 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
-  name: blue-shell
+  name: ffaker
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -231,7 +231,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
 description: 
 email:
 - vcap-dev@googlegroups.com
@@ -417,6 +449,7 @@ files:
 - spec/cf/cli/app/stats_spec.rb
 - spec/cf/cli/domain/map_spec.rb
 - spec/cf/cli/domain/unmap_spec.rb
+- spec/cf/cli/organization/delete_spec.rb
 - spec/cf/cli/organization/orgs_spec.rb
 - spec/cf/cli/organization/rename_spec.rb
 - spec/cf/cli/populators/organization_spec.rb
@@ -481,7 +514,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3167793142364284283
+      hash: -3085176752358037272
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -559,6 +592,7 @@ test_files:
 - spec/cf/cli/app/stats_spec.rb
 - spec/cf/cli/domain/map_spec.rb
 - spec/cf/cli/domain/unmap_spec.rb
+- spec/cf/cli/organization/delete_spec.rb
 - spec/cf/cli/organization/orgs_spec.rb
 - spec/cf/cli/organization/rename_spec.rb
 - spec/cf/cli/populators/organization_spec.rb