cf 4.2.9.rc5 → 4.2.10.rc1

data/lib/cf/cli.rb

@@ -88,7 +88,6 @@ module CF
 
     desc "Help!"
     input :command, :argument => :optional
-    input :all, :type => :boolean
     def help
       if name = input[:command]
         if cmd = @@commands[name.gsub("-", "_").to_sym]
@@ -97,11 +96,9 @@ module CF
           unknown_command(name)
         end
       elsif Help.has_groups?
-        unless input[:all]
-          puts "#{help_header}"
-        end
+        puts "#{help_header}"
 
-        Mothership::Help.print_help_groups(@@global, input[:all])
+        Mothership::Help.print_help_groups(@@global, true)
       else
         Mothership::Help.basic_help(@@commands, @@global)
       end
@@ -110,7 +107,7 @@ module CF
     def help_header
     <<EOS
 Cloud Foundry Command Line Interface, version [#{CF::VERSION}]
-  Use 'cf help' for basic help, 'cf help --all' for all commands, 'cf help [command]' for command details.
+  Use 'cf help [command]' for command details.
   For docs and support visit http://support.cloudfoundry.com
 
 USAGE EXAMPLES

data/lib/cf/cli/app/env.rb

@@ -5,7 +5,7 @@ module CF::App
     VALID_ENV_VAR = /^[a-zA-Za-z_][[:alnum:]_]*$/
 
     desc "Show all environment variables set for an app"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to inspect the environment of",
           :argument => true, :from_given => by_name(:app)
     def env
@@ -24,7 +24,7 @@ module CF::App
     end
 
     desc "Set an environment variable"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to set the variable for",
           :argument => true, :from_given => by_name(:app)
     input :name, :desc => "Variable name", :argument => true
@@ -56,7 +56,7 @@ module CF::App
 
 
     desc "Remove an environment variable"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to set the variable for",
           :argument => true, :from_given => by_name(:app)
     input :name, :desc => "Variable name", :argument => true

data/lib/cf/cli/app/events.rb

@@ -3,7 +3,7 @@ require "cf/cli/app/base"
 module CF::App
   class Events < Base
     desc "Display application events"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to get the events for",
           :argument => true, :from_given => by_name(:app)
     def events

data/lib/cf/cli/app/files.rb

@@ -4,7 +4,7 @@ require "cf/cli/app/base"
 module CF::App
   class Files < Base
     desc "Print out an app's file contents"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to inspect the files of",
           :argument => true, :from_given => by_name(:app)
     input :path, :desc => "Path of file to read", :argument => :optional,
@@ -34,7 +34,7 @@ module CF::App
     end
 
     desc "Examine an app's files"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to inspect the files of",
           :argument => true, :from_given => by_name(:app)
     input :path, :desc => "Path of directory to list", :argument => :optional,
@@ -62,7 +62,7 @@ module CF::App
     end
 
     desc "Stream an app's file contents"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to inspect the files of",
           :argument => true, :from_given => by_name(:app)
     input :path, :desc => "Path of file to stream", :argument => :optional

data/lib/cf/cli/app/health.rb

@@ -3,7 +3,7 @@ require "cf/cli/app/base"
 module CF::App
   class Health < Base
     desc "Get application health"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :apps, :desc => "Show the health information for one or more applications", :argument => :splat,
           :singular => :app, :from_given => by_name(:app)
     def health

data/lib/cf/cli/app/instances.rb

@@ -3,7 +3,7 @@ require "cf/cli/app/base"
 module CF::App
   class Instances < Base
     desc "List an app's instances"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :apps, :desc => "Applications whose instances to list",
           :argument => :splat, :singular => :app,
           :from_given => by_name(:app)

data/lib/cf/cli/app/logs.rb

@@ -3,7 +3,7 @@ require "cf/cli/app/base"
 module CF::App
   class Logs < Base
     desc "Print out an app's logs"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to get the logs of", :argument => true,
           :from_given => by_name(:app)
     input :instance, :desc => "Instance of application to get the logs of",
@@ -33,7 +33,7 @@ module CF::App
     end
 
     desc "Print out the logs for an app's crashed instances"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to get the logs of", :argument => true,
           :from_given => by_name(:app)
     def crashlogs

data/lib/cf/cli/app/rename.rb

@@ -3,7 +3,7 @@ require "cf/cli/app/base"
 module CF::App
   class Rename < Base
     desc "Rename an application"
-    group :apps, :manage, :hidden => true
+    group :apps, :manage
     input :app, :desc => "Application to rename", :argument => :optional,
           :from_given => by_name(:app)
     input :name, :desc => "New application name", :argument => :optional

data/lib/cf/cli/app/scale.rb

@@ -3,7 +3,7 @@ require "cf/cli/app/base"
 module CF::App
   class Scale < Base
     desc "Update the instances/memory limit for an application"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to update", :argument => true,
           :from_given => by_name(:app)
     input :instances, :desc => "Number of instances to run",

data/lib/cf/cli/app/stats.rb

@@ -3,7 +3,7 @@ require "cf/cli/app/base"
 module CF::App
   class Stats < Base
     desc "Display application instance status"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to get the stats for",
           :argument => true, :from_given => by_name(:app)
     def stats

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

@@ -3,7 +3,7 @@ require "cf/cli/organization/base"
 module CF::Organization
   class Rename < Base
     desc "Rename an organization"
-    group :organizations, :hidden => true
+    group :organizations
     input :organization, :desc => "Organization to rename",
           :aliases => ["--org", "-o"], :argument => :optional,
           :from_given => by_name(:organization)

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

@@ -3,7 +3,7 @@ require "cf/cli/route/base"
 module CF::Route
   class Map < Base
     desc "Add a URL mapping"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :app, :desc => "Application to add the URL to",
           :argument => :optional, :from_given => by_name(:app)
     input :host, :desc => "Host name for the route",

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

@@ -3,7 +3,7 @@ require "cf/cli/route/base"
 module CF::Route
   class Unmap < Base
     desc "Remove a URL mapping"
-    group :apps, :info, :hidden => true
+    group :apps, :info
     input :url, :desc => "URL to unmap", :argument => :optional,
           :from_given => find_by_name("route") { client.routes }
     input :app, :desc => "Application to remove the URL from",

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

@@ -1,16 +1,6 @@
 require "cf/cli/service/base"
 
 module CF::Service
-  USER_PROVIDED_OFFERING = "user-provided" # I'd rather move this to CFoundry
-
-  class UPDummy
-    def label
-      "user-provided"
-    end
-
-    attr_reader :version, :provider
-  end
-
   class Create < Base
     offerings_from_label = proc { |label, offerings|
       offerings.select { |s| s.label == label }
@@ -56,8 +46,6 @@ module CF::Service
       end
       finalize
 
-      offerings << UPDummy.new
-
       selected_offerings = offerings.any? ? Array(input[:offering, offerings.sort_by(&:label)]) : []
       finalize
 
@@ -67,85 +55,48 @@ module CF::Service
 
       offering = selected_offerings.first
 
-      if offering.label == CF::Service::USER_PROVIDED_OFFERING
-        service_instance = client.user_provided_service_instance
-        service_instance.name = input[:name, offering]
-        finalize
-
-        # at this point there's no way input[:credentials] can work interactively...
-        service_instance.credentials = input[:credentials, nil] || ask_credentials
-      else
-        service_instance = client.managed_service_instance
-        service_instance.name = input[:name, offering]
-        finalize
-
-        plan = input[:plan, offering.service_plans]
-        finalize
-        service_instance.service_plan = if plan.is_a?(String)
-                                          offering.service_plans.find { |p| p.name.casecmp(plan) == 0 }
-                                        else
-                                          plan
-                                        end
-      end
-
-      service_instance.space = client.current_space
-
-      with_progress("Creating service #{c(service_instance.name, :name)}") do
-        service_instance.create!
+      service = client.service_instance
+      service.name = input[:name, offering]
+      finalize
+      plan = input[:plan, offering.service_plans]
+      finalize
+      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
+        service.create!
       end
 
       app = input[:app]
       finalize
 
       if app
-        invoke :bind_service, :service => service_instance, :app => app
+        invoke :bind_service, :service => service, :app => app
       end
-      service_instance
+      service
     end
 
     private
 
-    def ask_credentials
-      credentials = {}
-      line("What credential parameters should applications use to connect to this service instance? (e.g. hostname, port, password)")
-
-      while keys = ask("Keys").split(/\s*,\s*/).map(&:strip)
-        if bad_key = keys.detect { |key| key !~ /^[-\w]+$/ }
-          line("'#{bad_key}' is not a valid key")
-        else
-          break
-        end
-      end
-      finalize
-      keys.each do |key|
-        value = ask(key)
-        finalize
-        credentials[key] = value
-      end
-
-      credentials
-    end
-
     def ask_offering(offerings)
       [ask("What kind?", :choices => offerings.sort_by(&:label),
-        :display => proc do |s|
+        :display => proc { |s|
           str = "#{c(s.label, :name)} #{s.version}"
           if s.provider != "core"
             str << ", via #{s.provider}"
           end
           str
-        end,
+        },
         :complete => proc { |s| "#{s.label} #{s.version}" })]
     end
 
     def ask_name(offering)
-      default = nil
-      unless offering == CF::Service::USER_PROVIDED_OFFERING
-        random = sprintf("%x", rand(1000000))
-        default = "#{offering.label}-#{random}"
-      end
-
-      ask "Name?", :default => default
+      random = sprintf("%x", rand(1000000))
+      ask "Name?", :default => "#{offering.label}-#{random}"
     end
 
     def ask_plan(plans)

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

@@ -4,7 +4,7 @@ module CF::Service
   class Delete < Base
     desc "Delete a service"
     group :services, :manage
-    input :service, :desc => "Service to delete", :argument => :optional,
+    input :service, :desc => "Service to bind", :argument => :optional,
           :from_given => by_name(:service_instance, :service)
     input :unbind, :desc => "Unbind from applications before deleting?",
           :type => :boolean, :default => proc { force? || interact }

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

@@ -3,7 +3,7 @@ require "cf/cli/service/base"
 module CF::Service
   class Rename < Base
     desc "Rename a service"
-    group :services, :manage, :hidden => true
+    group :services, :manage
     input :service, :desc => "Service to rename", :argument => :optional,
           :from_given => by_name(:service_instance, :service)
     input :name, :desc => "New service name", :argument => :optional

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

@@ -71,16 +71,19 @@ module CF::Service
     def show_services_table
       table(
         ["name", "service", "provider", "version", "plan", "bound apps"],
-        @services.collect { |instance|
-          presenter = ServiceInstanceHelper.new(instance)
-          apps     = name_list(presenter.service_bindings.collect(&:app))
-
-          label = presenter.service_label
-          provider = presenter.service_provider
-          version = presenter.version
-          plan_name = presenter.plan_name
-
-          [ c(presenter.name, :name), label, provider, version, plan_name, apps]
+        @services.collect { |i|
+          apps     = name_list(i.service_bindings.collect(&:app))
+          plan = i.service_plan
+
+          unless plan
+            [ c(i.name, :name), "none", "none", "none", "none", apps]
+          else
+            service = plan.service
+            label    = service.label
+            version  = service.version
+            provider = service.provider
+            [ c(i.name, :name), label, provider, version, plan.name, apps]
+          end
         })
 
     end
@@ -102,8 +105,25 @@ module CF::Service
         return false unless File.fnmatch(name, i.name)
       end
 
-      helper = ServiceInstanceHelper.new(i)
-      return helper.matches(options)
+      plan = i.service_plan
+
+      if service = options[:service]
+        return false unless File.fnmatch(service, plan.service.label)
+      end
+
+      if plan = options[:plan]
+        return false unless File.fnmatch(plan.upcase, plan.name.upcase)
+      end
+
+      if provider = options[:provider]
+        return false unless File.fnmatch(provider, plan.service.provider)
+      end
+
+      if version = options[:version]
+        return false unless File.fnmatch(version, plan.service.version)
+      end
+
+      true
     end
   end
 end

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

@@ -3,7 +3,7 @@ require "cf/cli/space/base"
 module CF::Space
   class Rename < Base
     desc "Rename a space"
-    group :spaces, :hidden => true
+    group :spaces
     input :organization, :desc => "Space's organization",
           :aliases => ["--org", "-o"], :from_given => by_name(:organization),
           :default => proc { client.current_organization }

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

@@ -3,7 +3,7 @@ require "cf/cli/space/base"
 module CF::Space
   class Switch < Base
     desc "Switch to a space"
-    group :spaces, :hidden => true
+    group :spaces
     input :name, :desc => "Space name", :argument => true
     def switch_space
       space = client.space_by_name(input[:name])

data/lib/cf/cli/start/colors.rb

@@ -3,7 +3,7 @@ require "cf/cli/start/base"
 module CF::Start
   class Colors < Base
     desc "Show color configuration"
-    group :start, :hidden => true
+    group :start
     def colors
       user_colors.each do |n, c|
         line "#{n}: #{c(c.to_s, n)}"

data/lib/cf/cli/start/targets.rb

@@ -3,7 +3,7 @@ require "cf/cli/start/base"
 module CF::Start
   class Targets < Base
     desc "List known targets."
-    group :start, :hidden => true
+    group :start
     def targets
       targets_info.each do |target, _|
         line target

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

@@ -3,7 +3,7 @@ require "cf/cli/user/base"
 module CF::User
   class Create < Base
     desc "Create a user"
-    group :admin, :user, :hidden => true
+    group :admin, :user
     input :email, :desc => "User email", :argument => :optional
     input :password, :desc => "User password"
     input :verify, :desc => "Repeat password"