cf 1.1.3.rc1 → 1.1.4

data/lib/cf/cli.rb

@@ -398,13 +398,8 @@ module CF
         save_target_info(info, target)
       end
 
-      if (org = info[:organization])
-        @@client.current_organization = @@client.organization(org)
-      end
-
-      if (space = info[:space])
-        @@client.current_space = @@client.space(space)
-      end
+      @@client.current_organization = @@client.organization(info[:organization]) if info[:organization]
+      @@client.current_space = @@client.space(info[:space]) if info[:space]
 
       @@client
     rescue CFoundry::InvalidTarget

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

@@ -18,16 +18,14 @@ module CF::Organization
       return unless input[:really, org]
 
       is_current = org == client.current_organization
+      remote_organizations = client.organizations(:depth => 0)
 
       with_progress("Deleting organization #{c(org.name, :name)}") do
-        if input[:recursive]
-          org.delete!(:recursive => true)
-        else
-          org.delete!
-        end
+        deleted = org.delete!(:recursive => !!input[:recursive])
+        remote_organizations.delete(org) if deleted
       end
 
-      if client.organizations(:depth => 0).size == 1
+      if remote_organizations.empty?
         return unless input[:warn]
 
         line

data/lib/cf/cli/service/create.rb

@@ -9,17 +9,18 @@ module CF::Service
     desc "Create a service"
     group :services, :manage
     input :offering, :desc => "What kind of service (e.g. redis, mysql)",
-          :argument => :optional, :from_given => offerings_from_label
+      :argument => :optional, :from_given => offerings_from_label
     input :name, :desc => "Name for your service", :argument => :optional
     input :plan, :desc => "Service plan",
-          :from_given => find_by_name_insensitive("plan"),
-          :default => proc {
-              interact
-          }
+      :from_given => find_by_name_insensitive("plan"),
+      :default => proc {
+        interact
+      }
     input :provider, :desc => "Service provider"
     input :version, :desc => "Service version"
     input :app, :desc => "Application to immediately bind to",
-          :alias => "--bind", :from_given => by_name(:app)
+      :alias => "--bind", :from_given => by_name(:app)
+
     def create_service
       offerings = client.services
 
@@ -37,9 +38,9 @@ module CF::Service
       if plan = input.direct(:plan)
         offerings.reject! do |s|
           if plan.is_a?(String)
-            s.service_plans.none? { |p| p.name == plan.upcase }
+            s.service_plans.none? { |p| p.name.casecmp(plan) == 0 }
           else
-            s.service_plans.include? plan
+            !s.service_plans.include? plan
           end
         end
       end
@@ -55,7 +56,12 @@ module CF::Service
       service = client.service_instance
       service.name = input[:name, offering]
 
-      service.service_plan = input[:plan, offering.service_plans]
+      plan = input[:plan, offering.service_plans]
+      service.service_plan = if plan.is_a?(String)
+                               offering.service_plans.find { |p| p.name.casecmp(plan) == 0 }
+                             else
+                               plan
+                             end
       service.space = client.current_space
 
       with_progress("Creating service #{c(service.name, :name)}") do
@@ -73,14 +79,14 @@ module CF::Service
 
     def ask_offering(offerings)
       [ask("What kind?", :choices => offerings.sort_by(&:label),
-           :display => proc { |s|
-              str = "#{c(s.label, :name)} #{s.version}"
-              if s.provider != "core"
-                str << ", via #{s.provider}"
-              end
-              str
-           },
-           :complete => proc { |s| "#{s.label} #{s.version}" })]
+        :display => proc { |s|
+          str = "#{c(s.label, :name)} #{s.version}"
+          if s.provider != "core"
+            str << ", via #{s.provider}"
+          end
+          str
+        },
+        :complete => proc { |s| "#{s.label} #{s.version}" })]
     end
 
     def ask_name(offering)

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

@@ -1,50 +1,52 @@
 require "cf/cli/space/base"
 
-module CF::Space
-  class Create < Base
-    desc "Create a space in an organization"
-    group :spaces
-    input :name, :desc => "Space name", :argument => :optional
-    input :organization, :desc => "Parent organization",
-          :argument => :optional, :aliases => ["--org", "-o"],
-          :from_given => by_name(:organization),
-          :default => proc { client.current_organization }
-    input :target, :desc => "Switch to the space after creation",
-          :alias => "-t", :default => false
-    input :manager, :desc => "Add yourself as manager", :default => true
-    input :developer, :desc => "Add yourself as developer", :default => true
-    input :auditor, :desc => "Add yourself as auditor", :default => false
-
-    def create_space
-      space = client.space
-      space.organization = org
-      space.name = input[:name]
-
-      with_progress("Creating space #{c(space.name, :name)}") { space.create! }
-
-      if input[:manager]
-        with_progress("Adding you as a manager") { space.add_manager client.current_user }
+module CF
+  module Space
+    class Create < Base
+      desc "Create a space in an organization"
+      group :spaces
+      input :name, :desc => "Space name", :argument => :optional
+      input :organization, :desc => "Parent organization",
+        :argument => :optional, :aliases => ["--org", "-o"],
+        :from_given => by_name(:organization),
+        :default => proc { client.current_organization }
+      input :target, :desc => "Switch to the space after creation",
+        :alias => "-t", :default => false
+      input :manager, :desc => "Add yourself as manager", :default => true
+      input :developer, :desc => "Add yourself as developer", :default => true
+      input :auditor, :desc => "Add yourself as auditor", :default => false
+
+      def create_space
+        space = client.space
+        space.organization = org
+        space.name = input[:name]
+
+        with_progress("Creating space #{c(space.name, :name)}") { space.create! }
+
+        if input[:manager]
+          with_progress("Adding you as a manager") { space.add_manager client.current_user }
+        end
+
+        if input[:developer]
+          with_progress("Adding you as a developer") { space.add_developer client.current_user }
+        end
+
+        if input[:auditor]
+          with_progress("Adding you as an auditor") { space.add_auditor client.current_user }
+        end
+
+        if input[:target]
+          invoke :target, :organization => space.organization, :space => space
+        else
+          line c("Space created! Use #{b("`cf switch-space #{space.name}`")} to target it.", :good)
+        end
       end
 
-      if input[:developer]
-        with_progress("Adding you as a developer") { space.add_developer client.current_user }
-      end
-
-      if input[:auditor]
-        with_progress("Adding you as an auditor") { space.add_auditor client.current_user }
-      end
+      private
 
-      if input[:target]
-        invoke :target, :organization => space.organization, :space => space
-      else
-        line c("Space created! Use #{b("`cf switch-space #{space.name}`")} to target it.", :good)
+      def ask_name
+        ask("Name")
       end
     end
-
-    private
-
-    def ask_name
-      ask("Name")
-    end
   end
 end

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

@@ -1,62 +1,65 @@
 require "cf/cli/space/base"
 
-module CF::Space
-  class Space < Base
-    desc "Show space information"
-    group :spaces
-    input :organization, :desc => "Space's organization",
-          :aliases => %w{--org -o},
-          :default => proc { client.current_organization },
-          :from_given => by_name(:organization)
-    input :space, :desc => "Space to show", :argument => :optional,
-          :default => proc { client.current_space },
-          :from_given => space_by_name
-    input :full, :desc => "Show full information for apps, services, etc.",
-          :default => false
-    def space
-      space = CF::Populators::Space.new(input, org).populate_and_save!
-
-      unless space
-        return if quiet?
-        fail "No current space."
-      end
+module CF
+  module Space
+    class Space < Base
+      desc "Show space information"
+      group :spaces
+      input :organization, :desc => "Space's organization",
+        :aliases => %w{--org -o},
+        :default => proc { client.current_organization },
+        :from_given => by_name(:organization)
+      input :space, :desc => "Space to show", :argument => :optional,
+        :default => proc { client.current_space },
+        :from_given => space_by_name
+      input :full, :desc => "Show full information for apps, services, etc.",
+        :default => false
 
-      if quiet?
-        puts space.name
-        return
-      end
+      def space
+        space = CF::Populators::Space.new(input, org).populate_and_save!
 
-      line "#{c(space.name, :name)}:"
+        unless space
+          return if quiet?
+          fail "No current space."
+        end
+
+        if quiet?
+          puts space.name
+          return
+        end
 
-      indented do
-        line "organization: #{c(space.organization.name, :name)}"
+        line "#{c(space.name, :name)}:"
 
-        if input[:full]
-          line
-          line "apps:"
+        indented do
+          line "organization: #{c(space.organization.name, :name)}"
 
-          spaced(space.apps(:depth => 2)) do |a|
-            indented do
-              invoke :app, :app => a
+          if input[:full]
+            line
+            line "apps:"
+
+            spaced(space.apps(:depth => 2)) do |a|
+              indented do
+                invoke :app, :app => a
+              end
             end
+          else
+            line "apps: #{name_list(space.apps)}"
           end
-        else
-          line "apps: #{name_list(space.apps)}"
-        end
 
-        if input[:full]
-          line
-          line "services:"
-          spaced(space.service_instances(:depth => 2)) do |s|
-            indented do
-              invoke :service, :service => s
+          if input[:full]
+            line
+            line "services:"
+            spaced(space.service_instances(:depth => 2)) do |s|
+              indented do
+                invoke :service, :service => s
+              end
             end
+          else
+            line "services: #{name_list(space.service_instances)}"
           end
-        else
-          line "services: #{name_list(space.service_instances)}"
-        end
 
-        line "domains: #{name_list(space.domains)}"
+          line "domains: #{name_list(space.domains)}"
+        end
       end
     end
   end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "1.1.3.rc1".freeze
+  VERSION = "1.1.4".freeze
 end

data/lib/console/console.rb

@@ -122,7 +122,7 @@ class CFConsole < CFTunnel
 
     return if line == nil || line == 'quit' || line == 'exit'
 
-    if line !~ /^\s*$/ && Readline::HISTORY.to_a[-1] != line
+    if line !~ /^\s*$/ && Readline::HISTORY.to_a.last != line
       Readline::HISTORY.push(line)
     end
 

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

@@ -10,10 +10,8 @@ describe CF::App::Delete do
   let(:new_name) { "some-new-name" }
 
   before do
-    any_instance_of(CF::CLI) do |cli|
-      stub(cli).client { client }
-      stub(cli).precondition { nil }
-    end
+    CF::CLI.any_instance.stub(:client).and_return(client)
+    CF::CLI.any_instance.stub(:precondition).and_return(nil)
   end
 
   subject { Mothership.new.invoke(:delete, inputs, given, global) }
@@ -74,7 +72,7 @@ describe CF::App::Delete do
       it 'asks for the app' do
         mock_ask("Delete which application?", anything) { basic_app }
         stub_ask { true }
-        stub(basic_app).delete!
+        basic_app.stub(:delete!)
         subject
       end
     end
@@ -87,7 +85,7 @@ describe CF::App::Delete 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!
+            deleted_app.should_not_receive(:delete!)
             subject
           end
         end
@@ -95,7 +93,7 @@ describe CF::App::Delete do
         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!
+            deleted_app.should_receive(:delete!)
             subject
           end
         end
@@ -106,7 +104,7 @@ describe CF::App::Delete do
 
         it 'deletes the application without asking to confirm' do
           dont_allow_ask
-          mock(deleted_app).delete!
+          deleted_app.should_receive(:delete!)
           subject
         end
       end
@@ -120,16 +118,13 @@ describe CF::App::Delete 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!
+            deleted_app.stub(:delete!)
 
-            stub(service_2).invalidate!
+            service_2.stub(:invalidate!)
 
             mock_ask("Delete orphaned service #{service_2.name}?", anything) { true }
 
-            any_instance_of(CF::App::Delete) do |del|
-              mock(del).invoke :delete_service, :service => service_2,
-                :really => true
-            end
+            CF::App::Delete.any_instance.should_receive(:invoke).with(:delete_service, :service => service_2, :really => true)
 
             subject
           end
@@ -138,15 +133,13 @@ describe CF::App::Delete do
         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!
+            deleted_app.should_not_receive(:delete!)
 
-            stub(service_2).invalidate!
+            service_2.stub(:invalidate!)
 
             dont_allow_ask("Delete orphaned service #{service_2.name}?")
 
-            any_instance_of(CF::App::Delete) do |del|
-              dont_allow(del).invoke(:delete_service, anything)
-            end
+            CF::App::Delete.any_instance.should_not_receive(:invoke).with(:delete_service, anything)
 
             subject
           end
@@ -158,11 +151,9 @@ describe CF::App::Delete do
 
         it 'does not delete orphaned services' do
           dont_allow_ask
-          stub(deleted_app).delete!
+          deleted_app.stub(:delete!)
 
-          any_instance_of(CF::App::Delete) do |del|
-            dont_allow(del).invoke(:delete_service, anything)
-          end
+          CF::App::Delete.any_instance.should_not_receive(:invoke).with(:delete_service, anything)
 
           subject
         end
@@ -173,12 +164,9 @@ describe CF::App::Delete do
 
         it 'deletes the orphaned services' do
           stub_ask("Really delete #{deleted_app.name}?", anything) { true }
-          stub(deleted_app).delete!
+          deleted_app.stub(:delete!)
 
-          any_instance_of(CF::App::Delete) do |del|
-            mock(del).invoke :delete_service, :service => service_2,
-              :really => true
-          end
+          CF::App::Delete.any_instance.should_receive(:invoke).with(:delete_service, :service => service_2, :really => true)
 
           subject
         end

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

@@ -10,11 +10,10 @@ describe CF::App::Stats do
   let(:time) { Time.local(2012, 11, 1, 2, 30) }
 
   before do
-    any_instance_of(CF::CLI) do |cli|
-      stub(cli).client { client }
-      stub(cli).precondition { nil }
-    end
-    stub(client.base).instances(anything) do
+    CF::CLI.any_instance.stub(:client).and_return(client)
+    CF::CLI.any_instance.stub(:precondition).and_return(nil)
+
+    client.base.stub(:instances).with(anything) do
       {
         "12" => {:state => "STOPPED", :since => time.to_i, :debug_ip => "foo", :debug_port => "bar", :console_ip => "baz", :console_port => "qux"},
         "1" => {:state => "STOPPED", :since => time.to_i, :debug_ip => "foo", :debug_port => "bar", :console_ip => "baz", :console_port => "qux"},