cf 0.6.1.rc17 → 0.6.1.rc18

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

@@ -19,20 +19,12 @@ module CF::Organization
 
       is_current = org == client.current_organization
 
-      begin
-        with_progress("Deleting organization #{c(org.name, :name)}") do
-          if input[:recursive]
-            org.delete!(:recursive => true)
-          else
-            org.delete!
-          end
+      with_progress("Deleting organization #{c(org.name, :name)}") do
+        if input[:recursive]
+          org.delete!(:recursive => true)
+        else
+          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)
-        exit_status(1)
-        return
       end
 
       if client.organizations.size == 1
@@ -45,6 +37,11 @@ module CF::Organization
         invalidate_client
         invoke :target
       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)
+      exit_status(1)
     end
 
     private

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

@@ -0,0 +1,28 @@
+require "cf/cli/route/base"
+
+module CF::Route
+  class Delete < Base
+    desc "Delete a route"
+    group :routes
+    input :route, :desc => "Route to unmap", :argument => true,
+      :from_given => find_by_name("route") { client.routes }
+    input :really, :type => :boolean, :forget => true, :hidden => true,
+      :default => proc { force? || interact }
+
+    def delete_route
+      route = input[:route, client.routes]
+
+      return unless input[:really, route]
+
+      with_progress("Deleting route #{c(route.name, :name)}") do
+        route.delete!
+      end
+    end
+
+    private
+
+    def ask_really(route)
+      ask("Really delete #{c(route.name, :name)}?", :default => false)
+    end
+  end
+end

data/lib/cf/cli/route/unmap.rb

@@ -8,23 +8,21 @@ module CF::Route
           :from_given => find_by_name("route") { client.routes }
     input :app, :desc => "Application to remove the URL from",
           :argument => :optional, :from_given => by_name(:app)
-    input :delete, :desc => "Delete route", :type => :boolean
     input :all, :desc => "Act on all routes", :type => :boolean
     input :really, :type => :boolean, :forget => true, :hidden => true,
           :default => proc { force? || interact }
+
     def unmap
       if input[:all]
         if input.has?(:app)
           app = target = input[:app]
-          return unless !input[:delete] || input[:really, "ALL URLS bound to #{target.name}", :bad]
         else
           target = client
-          return unless !input[:delete] || input[:really, "ALL URLS", :bad]
         end
 
         target.routes.each do |r|
           begin
-            invoke :unmap, :delete => input[:delete], :url => r, :really => true, :app => app
+            invoke :unmap, :url => r, :really => true, :app => app
           rescue CFoundry::APIError => e
             err "#{e.class}: #{e.message}"
           end
@@ -36,16 +34,12 @@ module CF::Route
       app = input[:app]
       url = input[:url, app ? app.routes : client.routes]
 
-      if input[:delete]
-        with_progress("Deleting route #{c(url.name, :name)}") do
-          url.delete!
-        end
-      elsif app
+      if app
         with_progress("Unbinding #{c(url.name, :name)} from #{c(app.name, :name)}") do
           app.remove_route(url)
         end
       else
-        fail "Missing either --delete or --app."
+        fail "Missing --app."
       end
     end
 

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

@@ -7,8 +7,8 @@ module CF::Space
     input :organization, :desc => "Space's organization",
       :aliases => ["--org", "-o"], :from_given => by_name(:organization),
       :default => proc { client.current_organization }
-    input :spaces, :desc => "Spaces to delete", :argument => :splat,
-      :singular => :space, :from_given => space_by_name
+    input :space, :desc => "Space to delete", :argument => true,
+      :from_given => space_by_name
     input :recursive, :desc => "Delete recursively", :alias => "-r",
       :default => false, :forget => true
     input :warn, :desc => "Show warning if it was the last space",
@@ -17,35 +17,29 @@ module CF::Space
       :default => proc { force? || interact }
 
     def delete_space
-      spaces = input[:spaces, org]
-
-      deleted_current = false
-
-      spaces.each do |space|
-        next unless input[:really, space]
-
-        deleted_current ||= (space == client.current_space)
-
-        begin
-          with_progress("Deleting space #{c(space.name, :name)}") do
-            if input[:recursive]
-              space.delete!(:recursive => true)
-            else
-              space.delete!
-            end
-          end
-        rescue CFoundry::AssociationNotEmpty => 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)
+      space = input[:space, org]
+
+      return unless input[:really, space]
+
+      deleting_current_space = (space == client.current_space)
+
+      with_progress("Deleting space #{c(space.name, :name)}") do
+        if input[:recursive]
+          space.delete!(:recursive => true)
+        else
+          space.delete!
         end
       end
 
-      if deleted_current
+      if deleting_current_space
         line
         line c("The space that you were targeting has now been deleted. Please use #{b("`cf target -s SPACE_NAME`")} to target a different one.", :warning)
       end
+    rescue CFoundry::AssociationNotEmpty => 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
 
     private

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "0.6.1.rc17".freeze
+  VERSION = "0.6.1.rc18".freeze
 end

data/lib/tunnel/config/clients.yml

@@ -0,0 +1,17 @@
+redis:
+  redis-cli: -h ${host} -p ${port} -a ${password}
+
+mysql:
+  mysql: --protocol=TCP --host=${host} --port=${port} --user=${user} --password=${password} ${name}
+  mysqldump: --protocol=TCP --host=${host} --port=${port} --user=${user} --password=${password} ${name} > ${ask Output file}
+
+mongodb:
+  mongo: --host ${host} --port ${port} -u ${user} -p ${password} ${name}
+  mongodump: --host ${host} --port ${port} -u ${user} -p ${password} --db ${name}
+  mongorestore: --host ${host} --port ${port} -u ${user} -p ${password} --db ${name} ${ask Directory or filename to restore from}
+
+postgresql:
+  psql:
+    command: -h ${host} -p ${port} -d ${name} -U ${user} -w
+    environment:
+      - PGPASSWORD='${password}'

data/lib/tunnel/plugin.rb

@@ -4,7 +4,7 @@ require "tunnel/tunnel"
 module CFTunnelPlugin
   class Tunnel < CF::CLI
     CLIENTS_FILE = "tunnel-clients.yml"
-    STOCK_CLIENTS = File.expand_path("../../../config/clients.yml", __FILE__)
+    STOCK_CLIENTS = File.expand_path("../config/clients.yml", __FILE__)
 
     desc "Create a local tunnel to a service."
     group :services, :manage

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

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe CF::Route::Delete do
+  before do
+    stub_client_and_precondition
+    stub(route).delete!
+  end
+
+  let(:route) { fake(:route, :host => host_name, :domain => domain) }
+  let(:client) { fake_client :routes => [route] }
+  let(:domain) { fake(:domain, :name => domain_name) }
+  let(:domain_name) { "some-domain.com" }
+  let(:host_name) { "some-host" }
+  let(:url) { "#{host_name}.#{domain_name}" }
+
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:delete_route] }
+
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "Delete a route" }
+      it { expect(Mothership::Help.group(:routes)).to include(subject) }
+    end
+
+    include_examples 'inputs must have descriptions'
+
+    describe 'arguments' do
+      subject { command.arguments }
+      it 'has the correct argument order' do
+        should eq([{:type => :normal, :value => nil, :name => :route}])
+      end
+    end
+  end
+
+  context "without the force parameter" do
+    let(:command) { cf %W[delete-route #{url}] }
+
+    it "prompts the user are they sure?" do
+      mock_ask("Really delete #{url}?", {:default => false}) { true }
+
+      command
+    end
+
+    context "when the user responds 'y'" do
+      before do
+        stub_ask("Really delete #{url}?", {:default => false}) { true }
+      end
+
+      it "deletes the route" do
+        mock(route).delete!
+        command
+      end
+
+      it "exits cleanly" do
+        command
+        @status.should == 0
+      end
+    end
+
+    context "when the user responds 'n'" do
+      before do
+        stub_ask("Really delete #{url}?", {:default => false}) { false }
+      end
+
+      it "does not delete the route" do
+        dont_allow(route).delete!
+        command
+      end
+
+      it "exits cleanly" do
+        command
+        @status.should == 0
+      end
+    end
+  end
+
+  context "with the force parameter" do
+    let(:command) { cf %W[delete-route #{url} --force] }
+
+    it "deletes the route" do
+      mock(route).delete!
+      command
+    end
+
+    it "exits cleanly" do
+      command
+      @status.should == 0
+    end
+  end
+end

data/spec/cf/cli/route/unmap_spec.rb

@@ -94,57 +94,6 @@ describe CF::Route::Unmap do
     end
   end
 
-  context "when a url is specified and the --delete option is given" do
-    let(:route) { fake(:route, :host => host_name, :domain => domain) }
-    let(:client) { fake_client :routes => [route] }
-
-    subject { cf %W[unmap #{url} --delete] }
-
-    it "deletes the route" do
-      mock(route).delete!
-      subject
-    end
-  end
-
-  context "when the --delete and --all options are both passed" do
-    let(:other_route) { fake(:route, :host => "abcd", :domain => domain) }
-    let(:route) { fake(:route, :host => "efgh", :domain => domain) }
-    let(:client) { fake_client :routes => [route, other_route] }
-
-    subject { cf %W[unmap --delete --all] }
-
-    before do
-      any_instance_of(route.class) do |route|
-        stub(route).delete!
-      end
-    end
-
-    it "asks if the user really wants to unmap all urls" do
-      mock_ask("Really delete ALL URLS?", :default => false) { false }
-      subject
-    end
-
-    context "when the user responds with a yes" do
-      before { stub_ask("Really delete ALL URLS?", anything) { true } }
-
-      it "deletes all the user's routes" do
-        client.routes.each { |r| mock(r).delete! }
-        subject
-      end
-    end
-
-    context "when the user responds with a no" do
-      before { stub_ask("Really delete ALL URLS?", anything) { false } }
-
-      it "does not delete any routes" do
-        any_instance_of(route.class) do |route|
-          dont_allow(route).delete!
-        end
-        subject
-      end
-    end
-  end
-
   context "when only a url is passed" do
     let(:route) { fake(:route, :host => host_name, :domain => domain) }
     let(:client) { fake_client :routes => [route] }
@@ -153,7 +102,7 @@ describe CF::Route::Unmap do
 
     it "displays an error message" do
       subject
-      expect(error_output).to say("Missing either --delete or --app.")
+      expect(error_output).to say("Missing --app.")
     end
   end
 end

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

@@ -12,26 +12,14 @@ describe CF::Space::Delete do
     end
 
     include_examples 'inputs must have descriptions'
-
-    describe 'arguments' do
-      subject { command.arguments }
-      it 'has the correct argument order' do
-        should eq([
-          {:type => :splat, :value => nil, :name => :spaces}
-        ])
-      end
-    end
   end
 
   describe "running the command" do
     let(:space) { fake :space, :name => "some_space_name" }
-    let(:space_2) { fake :space, :name => "some_other_space_name" }
-    let(:spaces) { [space, space_2] }
-    let(:organization) { fake(:organization, :spaces => spaces, :name => "MyOrg") }
-
-    let(:client) { fake_client(:current_organization => organization, :spaces => spaces) }
+    let(:organization) { fake(:organization, :spaces => [space], :name => "MyOrg") }
+    let(:client) { fake_client(:current_organization => organization, :spaces => [space]) }
 
-    subject { capture_output { cf %W[delete-space some_space_name some_other_space_name --quiet --force] } }
+    subject { capture_output { cf %W[delete-space some_space_name --quiet --force] } }
 
     before do
       any_instance_of described_class do |cli|
@@ -42,35 +30,52 @@ describe CF::Space::Delete do
         any_instance_of(CF::Populators::Organization, :populate_and_save! => organization)
       end
       stub(space).delete!
-      stub(space_2).delete!
     end
 
-    it "deletes all named spaces" do
-      mock(space).delete!
-      mock(space_2).delete!
 
-      subject
-    end
+    context "without the force parameter when prompting" do
+      subject { cf %W[delete-space some_space_name --quiet] }
+      context "when the user responds 'y'" do
+        it "deletes the space, exits cleanly" do
+          mock(space).delete!
+          mock_ask("Really delete #{space.name}?", {:default => false}) { true }
+
+          subject
+          @status.should == 0
+        end
+      end
 
-    context "without the force parameter" do
-      subject { cf %W[delete-space some_space_name some_other_space_name --quiet] }
-      it "confirms deletion of each space and deletes them" do
-        mock(space).delete!
-        dont_allow(space_2).delete!
-        mock_ask("Really delete #{space.name}?", {:default => false}) { true }
-        mock_ask("Really delete #{space_2.name}?", {:default => false}) { false }
+      context "when the user responds 'n'" do
+        it "exits cleanly without deleting the space" do
+          dont_allow(space).delete!
+          mock_ask("Really delete #{space.name}?", {:default => false}) { false }
 
-        subject
+          subject
+          @status.should == 0
+        end
       end
     end
 
     context "when deleting the current space" do
-      it "warns the user what they've done" do
+      before do
         stub(client).current_space { space }
+      end
 
+      it "warns the user what they've done" do
         subject
         expect(output).to say("The space that you were targeting has now been deleted. Please use `cf target -s SPACE_NAME` to target a different one.")
       end
+
+      context "when the current space has dependent objects" do
+        before do
+          stub(space).delete! { raise CFoundry::AssociationNotEmpty.new("We don't delete children.", 10006) }
+        end
+
+        it "does not print a success message" do
+          subject
+          expect(output).to_not say("The space that you were targeting has now been deleted")
+        end
+      end
     end
 
     context "when a space fails to delete" do

data/spec/features/push_flow_spec.rb

@@ -12,7 +12,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
     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}" }
+    let(:service_name) { "redistogo-dev-#{run_id}" }
 
     before do
       FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
@@ -65,13 +65,13 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
           # create a service here
           expect(runner).to say "What kind?>"
-          runner.send_keys "mysql n/a"
+          runner.send_keys "redistogo-dev n/a"
 
           expect(runner).to say "Name?>"
           runner.send_keys service_name
 
           expect(runner).to say "Which plan?>"
-          runner.send_keys "cfinternal"
+          runner.send_keys "1"
 
           expect(runner).to say /Creating service #{service_name}.*OK/
           expect(runner).to say /Binding .+ to .+ OK/
@@ -97,11 +97,11 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
       BlueShell::Runner.run("#{cf_bin} services") do |runner|
         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
-            aws\s+                            # provider
+        expect(runner).to say /redistogo-dev-.+?\s+   # name
+            redistogo-dev\s+                          # service
+            redistogo\s+                            # provider
             n\/a\s+                           # version
-            cfinternal\s+                     # plan
+            100\s+                     # plan
             #{app}                            # bound apps
           /x
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 0.6.1.rc17
+  version: 0.6.1.rc18
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-02 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.rc9
+        version: 0.7.0.rc12
     - - <
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0.rc9
+        version: 0.7.0.rc12
     - - <
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -205,7 +205,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
@@ -213,7 +213,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
@@ -345,6 +345,7 @@ files:
 - lib/cf/cli/populators/space.rb
 - lib/cf/cli/populators/target.rb
 - lib/cf/cli/route/base.rb
+- lib/cf/cli/route/delete.rb
 - lib/cf/cli/route/map.rb
 - lib/cf/cli/route/routes.rb
 - lib/cf/cli/route/unmap.rb
@@ -395,6 +396,7 @@ files:
 - lib/manifests/manifests.rb
 - lib/manifests/plugin.rb
 - lib/manifests/README.md
+- lib/tunnel/config/clients.yml
 - lib/tunnel/helper-app/Gemfile
 - lib/tunnel/helper-app/Gemfile.lock
 - lib/tunnel/helper-app/server.rb
@@ -471,6 +473,7 @@ files:
 - spec/cf/cli/populators/organization_spec.rb
 - spec/cf/cli/populators/space_spec.rb
 - spec/cf/cli/populators/target_spec.rb
+- spec/cf/cli/route/delete_spec.rb
 - spec/cf/cli/route/map_spec.rb
 - spec/cf/cli/route/unmap_spec.rb
 - spec/cf/cli/service/bind_spec.rb
@@ -531,7 +534,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1676711361169297204
+      hash: 3221305947383105149
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -615,6 +618,7 @@ test_files:
 - spec/cf/cli/populators/organization_spec.rb
 - spec/cf/cli/populators/space_spec.rb
 - spec/cf/cli/populators/target_spec.rb
+- spec/cf/cli/route/delete_spec.rb
 - spec/cf/cli/route/map_spec.rb
 - spec/cf/cli/route/unmap_spec.rb
 - spec/cf/cli/service/bind_spec.rb