vmc 0.5.0.beta.2 → 0.5.0.beta.3

data/lib/vmc/cli/app/delete.rb

@@ -9,8 +9,9 @@ module VMC::App
     input :apps, :desc => "Applications to delete", :argument => :splat,
           :singular => :app, :from_given => by_name(:app)
     input :routes, :desc => "Delete associated routes", :default => false
-    input :orphaned, :desc => "Delete orphaned services", :aliases => "-o",
-          :default => false
+    input :delete_orphaned, :desc => "Delete orphaned services",
+          :aliases => "-o", :default => proc { force? ? false : interact },
+          :forget => true
     input :all, :desc => "Delete all applications", :default => false
     input :really, :type => :boolean, :forget => true, :hidden => true,
           :default => proc { force? || interact }
@@ -27,14 +28,14 @@ module VMC::App
         others = apps - to_delete
       end
 
-      orphaned = find_orphaned_services(to_delete, others)
+      all_services = apps.collect(&:services).flatten
+      deleted_app_services = []
 
-      deleted = []
       spaced(to_delete) do |app|
         really = input[:all] || input[:really, app.name, :name]
         next unless really
 
-        deleted << app
+        deleted_app_services += app.services
 
         with_progress("Deleting #{c(app.name, :name)}") do
           app.routes.collect(&:delete!) if input[:routes]
@@ -42,35 +43,31 @@ module VMC::App
         end
       end
 
-      delete_orphaned_services(orphaned, input[:orphaned])
+      delete_orphaned_services(
+        find_orphaned_services(deleted_app_services, all_services))
 
       to_delete
     end
 
-    def find_orphaned_services(apps, others = [])
-      orphaned = Set.new
+    def find_orphaned_services(deleted, all)
+      orphaned = []
 
-      apps.each do |a|
-        a.services.each do |i|
-          if others.none? { |x| x.binds?(i) }
-            orphaned << i
-          end
-        end
+      leftover = all.dup
+      deleted.each do |svc|
+        leftover.slice!(leftover.index(svc))
+        orphaned << svc unless leftover.include?(svc)
       end
 
+      # clear out the relationships as the apps are now deleted
       orphaned.each(&:invalidate!)
     end
 
-    def delete_orphaned_services(service, orphaned)
-      return if service.empty?
+    def delete_orphaned_services(orphans)
+      return if orphans.empty?
 
       line unless quiet? || force?
 
-      service.select { |i|
-        orphaned ||
-          ask("Delete orphaned service #{c(i.name, :name)}?",
-              :default => false)
-      }.each do |service|
+      orphans.select { |o| input[:delete_orphaned, o] }.each do |service|
         # TODO: splat
         invoke :delete_service, :service => service, :really => true
       end
@@ -78,7 +75,7 @@ module VMC::App
 
     private
 
-    def ask_app
+    def ask_apps
       apps = client.apps
       fail "No applications." if apps.empty?
 
@@ -89,5 +86,10 @@ module VMC::App
     def ask_really(name, color)
       ask("Really delete #{c(name, color)}?", :default => false)
     end
+
+    def ask_delete_orphaned(service)
+      ask("Delete orphaned service #{c(service.name, :name)}?",
+          :default => false)
+    end
   end
 end

data/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.5.0.beta.2".freeze
+  VERSION = "0.5.0.beta.3".freeze
 end

data/spec/vmc/cli/app/delete_spec.rb

@@ -0,0 +1,198 @@
+require 'spec_helper'
+require "vmc/cli/app/delete"
+
+describe VMC::App::Delete do
+  let(:global) { { :color => false, :quiet => true } }
+  let(:inputs) { {} }
+  let(:given) { {} }
+  let(:client) { FactoryGirl.build(:client) }
+  let(:app) {}
+  let(:new_name) { "some-new-name" }
+
+  before do
+    any_instance_of(VMC::CLI) do |cli|
+      stub(cli).client { client }
+      stub(cli).precondition { nil }
+    end
+  end
+
+  subject { Mothership.new.invoke(:delete, inputs, given, global) }
+
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:delete] }
+
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "Delete an application" }
+      it { expect(Mothership::Help.group(:apps, :manage)).to include(subject) }
+    end
+
+    describe 'inputs' do
+      subject { command.inputs }
+
+      it "is not missing any descriptions" do
+        subject.each do |input, attrs|
+          next if attrs[:hidden]
+
+          expect(attrs[:description]).to be
+          expect(attrs[:description].strip).to_not be_empty
+        end
+      end
+    end
+
+    describe 'arguments' do
+      subject { command.arguments }
+      it 'has the correct argument order' do
+        should eq([{ :type => :splat, :value => nil, :name => :apps }])
+      end
+    end
+  end
+
+  context 'when there are no apps' do
+    context 'and an app is given' do
+      let(:given) { { :app => "some-app" } }
+      it { expect { subject }.to raise_error(VMC::UserError, "Unknown app 'some-app'.") }
+    end
+
+    context 'and an app is not given' do
+      it { expect { subject }.to raise_error(VMC::UserError, "No applications.") }
+    end
+  end
+
+  context 'when there are apps' do
+    let(:client) { FactoryGirl.build(:client, :apps => apps) }
+    let(:apps) { [basic_app, app_with_orphans, app_without_orphans] }
+    let(:service_1) { FactoryGirl.build(:service_instance) }
+    let(:service_2) { FactoryGirl.build(:service_instance) }
+    let(:basic_app) { FactoryGirl.build(:app, :name => "basic_app") }
+    let(:app_with_orphans) {
+      FactoryGirl.build(:app,
+        :name => "app_with_orphans",
+        :service_bindings => [
+          FactoryGirl.build(:service_binding,
+            :service_instance => service_1),
+          FactoryGirl.build(:service_binding,
+            :service_instance => service_2)
+        ])
+    }
+    let(:app_without_orphans) {
+      FactoryGirl.build(:app,
+        :name => "app_without_orphans",
+        :service_bindings => [
+          FactoryGirl.build(:service_binding,
+            :service_instance => service_1)
+        ])
+    }
+
+    context 'and no app is given' do
+      it 'asks for the app' do
+        mock_ask("Delete which application?", anything) { basic_app }
+        stub_ask { true }
+        stub(basic_app).delete!
+        subject
+      end
+    end
+
+    context 'and a basic app is given' do
+      let(:deleted_app) { basic_app }
+      let(:given) { { :app => deleted_app.name } }
+
+      context 'and it asks for confirmation' do
+        context 'and the user answers no' do
+          it 'does not delete the application' do
+            mock_ask("Really delete #{deleted_app.name}?", anything) { false }
+            dont_allow(deleted_app).delete!
+            subject
+          end
+        end
+
+        context 'and the user answers yes' do
+          it 'deletes the application' do
+            mock_ask("Really delete #{deleted_app.name}?", anything) { true }
+            mock(deleted_app).delete!
+            subject
+          end
+        end
+      end
+
+      context 'and --force is given' do
+        let(:global) { { :force => true, :color => false, :quiet => true } }
+
+        it 'deletes the application without asking to confirm' do
+          dont_allow_ask
+          mock(deleted_app).delete!
+          subject
+        end
+      end
+    end
+
+    context 'and an app with orphaned services is given' do
+      let(:deleted_app) { app_with_orphans }
+      let(:inputs) { { :app => deleted_app } }
+
+      context 'and it asks for confirmation' do
+        context 'and the user answers yes' do
+          it 'asks to delete orphaned services' do
+            stub_ask("Really delete #{deleted_app.name}?", anything) { true }
+            stub(deleted_app).delete!
+
+            mock_ask("Delete orphaned service #{service_2.name}?", anything) { true }
+
+            any_instance_of(VMC::App::Delete) do |del|
+              mock(del).invoke :delete_service, :service => service_2,
+                :really => true
+            end
+
+            subject
+          end
+        end
+
+        context 'and the user answers no' do
+          it 'does not ask to delete orphaned serivces, or delete them' do
+            stub_ask("Really delete #{deleted_app.name}?", anything) { false }
+            dont_allow(deleted_app).delete!
+
+            dont_allow_ask("Delete orphaned service #{service_2.name}?")
+
+            any_instance_of(VMC::App::Delete) do |del|
+              dont_allow(del).invoke(:delete_service, anything)
+            end
+
+            subject
+          end
+        end
+      end
+
+      context 'and --force is given' do
+        let(:global) { { :force => true, :color => false, :quiet => true } }
+
+        it 'does not delete orphaned services' do
+          dont_allow_ask
+          stub(deleted_app).delete!
+
+          any_instance_of(VMC::App::Delete) do |del|
+            dont_allow(del).invoke(:delete_service, anything)
+          end
+
+          subject
+        end
+      end
+
+      context 'and --delete-orphaned is given' do
+        let(:inputs) { { :app => deleted_app, :delete_orphaned => true } }
+
+        it 'deletes the orphaned services' do
+          stub_ask("Really delete #{deleted_app.name}?", anything) { true }
+          stub(deleted_app).delete!
+
+          any_instance_of(VMC::App::Delete) do |del|
+            mock(del).invoke :delete_service, :service => service_2,
+              :really => true
+          end
+
+          subject
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -2770117636
+  hash: 2384138659
   prerelease: 6
   segments: 
   - 0
   - 5
   - 0
   - beta
-  - 2
-  version: 0.5.0.beta.2
+  - 3
+  version: 0.5.0.beta.3
 platform: ruby
 authors: 
 - Alex Suraci
@@ -74,12 +74,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 21
         segments: 
         - 0
         - 4
-        - 11
-        version: 0.4.11
+        - 13
+        version: 0.4.13
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -322,6 +322,7 @@ files:
 - spec/vmc/cli/route/delete_route_spec.rb
 - spec/vmc/cli/app/push_spec.rb
 - spec/vmc/cli/app/push/create_spec.rb
+- spec/vmc/cli/app/delete_spec.rb
 - spec/vmc/cli/app/rename_spec.rb
 - spec/vmc/cli/space/spaces_spec.rb
 - spec/vmc/cli/space/rename_spec.rb
@@ -383,6 +384,7 @@ test_files:
 - spec/vmc/cli/route/delete_route_spec.rb
 - spec/vmc/cli/app/push_spec.rb
 - spec/vmc/cli/app/push/create_spec.rb
+- spec/vmc/cli/app/delete_spec.rb
 - spec/vmc/cli/app/rename_spec.rb
 - spec/vmc/cli/space/spaces_spec.rb
 - spec/vmc/cli/space/rename_spec.rb