cf 0.6.1.rc3 → 0.6.1.rc4

data/lib/cf/cli.rb

@@ -86,11 +86,11 @@ module CF
       check_logged_in
 
       unless client.current_organization
-        fail "Please select an organization with 'cf target --ask-org'."
+        fail "Please select an organization with 'cf target --organization ORGANIZATION_NAME'. (Get organization names from 'cf orgs'.)"
       end
 
       unless client.current_space
-        fail "Please select a space with 'cf target --ask-space'."
+        fail "Please select a space with 'cf target --space SPACE_NAME'. (Get space names from 'cf spaces'.)"
       end
     end
 
@@ -109,7 +109,10 @@ module CF
       raise
     rescue UserFriendlyError => e
       err e.message
-    rescue CFoundry::Forbidden, CFoundry::InvalidAuthToken => e
+    rescue CFoundry::InvalidAuthToken => e
+      line
+      line c("Invalid authentication token. Try logging in again with 'cf login'", :warning)
+    rescue CFoundry::Forbidden => e
       if !$cf_asked_auth
         $cf_asked_auth = true
 

data/lib/cf/cli/populators/base.rb

@@ -0,0 +1,14 @@
+require "cf/cli"
+
+module CF
+  module Populators
+    class Base < CF::CLI
+      attr_reader :input, :info
+
+      def initialize(input)
+        @input = input
+        @info = target_info
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require "cf/cli/populators/base"
+require "cf/cli/populators/populator_methods"
+
+module CF
+  module Populators
+    class Organization < Base
+      include PopulatorMethods
+
+      private
+
+      def choices
+        client.organizations(:depth => 0)
+      end
+
+      def valid?(organization)
+        return false unless organization.guid
+        organization.users.include? client.current_user
+      rescue CFoundry::APIError
+        false
+      end
+    end
+  end
+end

data/lib/cf/cli/populators/populator_methods.rb

@@ -0,0 +1,52 @@
+module CF
+  module Populators
+    module PopulatorMethods
+      def self.included(klass)
+        klass.class_eval do
+          define_method(:type) do
+            klass.name.split("::").last.downcase.to_sym
+          end
+        end
+      end
+
+      def populate_and_save!
+        obj = get_object
+        info[type] = obj.guid
+        save_target_info(info)
+        invalidate_client
+
+        obj
+      end
+
+      private
+
+      def get_object
+        if input.has?(type)
+          object = input[type]
+          with_progress("Switching to #{type} #{c(object.name, :name)}") {}
+        elsif info[type]
+          previous_object = client.send(type, (info[type]))
+          object = previous_object if valid?(previous_object)
+        end
+
+        object || prompt_user
+      end
+
+      def prompt_user
+        object_choices = choices
+
+        if object_choices.empty?
+          raise CF::UserFriendlyError.new(
+            "There are no #{type}s. You may want to create one with #{c("create-#{type}", :good)}."
+          )
+        elsif object_choices.size == 1 && !input.interactive?(type)
+          object_choices.first
+        else
+          ask(type.to_s.capitalize, :choices => object_choices.sort_by(&:name), :display => proc(&:name)).tap do |object|
+            with_progress("Switching to #{type} #{c(object.name, :name)}") {}
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+require "cf/cli/populators/base"
+require "cf/cli/populators/populator_methods"
+
+module CF
+  module Populators
+    class Space < Base
+      attr_reader :organization
+      include PopulatorMethods
+
+      def initialize(input, organization)
+        super(input)
+        @organization = organization
+      end
+
+      private
+
+      def valid?(space)
+        return false unless space.guid
+        space.developers.include? client.current_user
+      rescue CFoundry::APIError
+        false
+      end
+
+      def choices
+        organization.spaces(:depth => 0)
+      end
+    end
+  end
+end

data/lib/cf/cli/populators/target.rb

@@ -0,0 +1,13 @@
+require "cf/cli/populators/organization"
+require "cf/cli/populators/space"
+
+module CF
+  module Populators
+    class Target < Base
+      def populate_and_save!
+        organization = CF::Populators::Organization.new(input).populate_and_save!
+        CF::Populators::Space.new(input, organization).populate_and_save!
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ require "cf/cli/service/base"
 
 module CF::Service
   class Services < Base
-    desc "List your service"
+    desc "List your services"
     group :services
     input :space, :desc => "Show services in given space",
           :from_given => by_name(:space),
@@ -15,6 +15,7 @@ module CF::Service
     input :app, :desc => "Limit to application's service bindings",
           :from_given => by_name(:app)
     input :full, :desc => "Verbose output format", :default => false
+
     def services
       msg =
         if space = input[:space]
@@ -45,7 +46,7 @@ module CF::Service
         end
       else
         table(
-          ["name", "service", "version", "plan", "bound apps"],
+          ["name", "service", "provider", "version", "plan", "bound apps"],
           services.collect { |i|
             plan = i.service_plan
             service = plan.service
@@ -53,9 +54,11 @@ module CF::Service
             label = service.label
             version = service.version
             apps = name_list(i.service_bindings.collect(&:app))
+            provider = service.provider
 
             [ c(i.name, :name),
               label,
+              provider,
               version,
               plan.name,
               apps

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

@@ -1,4 +1,5 @@
 require "cf/cli"
+require "cf/cli/populators/organization"
 
 module CF
   module Space
@@ -6,6 +7,11 @@ module CF
       def precondition
         check_target
         check_logged_in
+        check_organization
+      end
+
+      def check_organization
+        CF::Populators::Organization.new(input).populate_and_save!
       end
 
       def self.space_by_name

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

@@ -1,55 +1,57 @@
 require "cf/cli/space/base"
 
-module CF::Space
-  class Spaces < Base
-    desc "List spaces in an organization"
-    group :spaces
-    input :organization, :desc => "Organization to list spaces from",
-          :aliases => %w{--org -o}, :argument => :optional,
-          :from_given => by_name(:organization),
-          :default => proc { client.current_organization }
-    input :name, :desc => "Filter by name"
-    input :full, :desc => "Show full information for apps, services, etc.",
-          :default => false
-    def spaces
-      org = input[:organization]
-      spaces =
-        with_progress("Getting spaces in #{c(org.name, :name)}") do
-          org.spaces(:depth => quiet? ? 0 : 1).sort_by(&:name)
+module CF
+  module Space
+    class Spaces < Base
+      desc "List spaces in an organization"
+      group :spaces
+      input :organization, :desc => "Organization to list spaces from",
+        :aliases => %w{--org -o}, :argument => :optional,
+        :from_given => by_name(:organization),
+        :default => proc { client.current_organization }
+      input :name, :desc => "Filter by name"
+      input :full, :desc => "Show full information for apps, services, etc.",
+        :default => false
+      def spaces
+        org = input[:organization]
+        spaces =
+          with_progress("Getting spaces in #{c(org.name, :name)}") do
+            org.spaces(:depth => quiet? ? 0 : 1).sort_by(&:name)
+          end
+
+        return if spaces.empty?
+
+        line unless quiet?
+
+        spaces.reject! do |s|
+          !space_matches?(s, input)
         end
 
-      return if spaces.empty?
-
-      line unless quiet?
-
-      spaces.reject! do |s|
-        !space_matches?(s, input)
-      end
-
-      if input[:full]
-        spaced(spaces) do |s|
-          invoke :space, :space => s, :full => input[:full]
+        if input[:full]
+          spaced(spaces) do |s|
+            invoke :space, :space => s, :full => input[:full]
+          end
+        else
+          table(
+            %w{name apps services},
+            spaces.collect { |s|
+              [c(s.name, :name),
+                name_list(s.apps),
+                name_list(s.service_instances)
+              ]
+            })
         end
-      else
-        table(
-          %w{name apps services},
-          spaces.collect { |s|
-            [ c(s.name, :name),
-              name_list(s.apps),
-              name_list(s.service_instances)
-            ]
-          })
       end
-    end
 
-    private
+      private
 
-    def space_matches?(s, options)
-      if name = options[:name]
-        return false if s.name !~ /#{name}/
-      end
+      def space_matches?(s, options)
+        if name = options[:name]
+          return false if s.name !~ /#{name}/
+        end
 
-      true
+        true
+      end
     end
   end
-end
+end

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

@@ -12,7 +12,8 @@ module CF
 
 
       # These commands don't require authentication.
-      def precondition; end
+      def precondition;
+      end
 
       private
 
@@ -27,67 +28,17 @@ module CF
       end
 
       def display_target
+        if client.nil?
+          fail "No target has been specified."
+          return
+        end
+
         if quiet?
           line client.target
         else
           line "target: #{c(client.target, :name)}"
         end
       end
-
-      def select_org(input, info)
-        if input.has?(:organization) || !org_valid?(info[:organization])
-          org = input[:organization]
-          if org
-            with_progress("Switching to organization #{c(org.name, :name)}") {}
-            client.current_organization = org
-          end
-          info[:organization] = org ? org.guid : nil
-          !!org
-        else
-          info[:organization] = nil
-          client.current_organization = nil
-          false
-        end
-      end
-
-      def select_space(input, info, changed_org)
-        if input.has?(:space) || !space_valid?(info[:space])
-          line if changed_org && !quiet?
-          space = input[:space, client.current_organization]
-          if space
-            with_progress("Switching to space #{c(space.name, :name)}") {}
-            client.current_space = space
-          end
-          info[:space] = space ? space.guid : nil
-        else
-          info[:space] = nil
-          client.current_space = nil
-        end
-      end
-
-      def select_org_and_space(input, info)
-        changed_org = select_org(input, info)
-        if client.current_organization
-          select_space(input, info, changed_org)
-        else
-          info[:space] = nil
-          client.current_space = nil
-        end
-      end
-
-      def org_valid?(guid, user = client.current_user)
-        return false unless guid
-        client.organization(guid).users.include? user
-      rescue CFoundry::APIError
-        false
-      end
-
-      def space_valid?(guid, user = client.current_user)
-        return false unless guid
-        client.space(guid).developers.include? user
-      rescue CFoundry::APIError
-        false
-      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 require "cf/cli/start/base"
-require "cf/cli/start/target_interactions"
+require "cf/cli/populators/target"
 
 module CF::Start
   class Login < Base
@@ -16,14 +16,10 @@ module CF::Start
           :from_given => by_name(:organization)
     input :space, :desc => "Space", :alias => "-s",
           :from_given => by_name(:space)
-    interactions TargetInteractions
     def login
       show_context
 
-      credentials =
-        { :username => input[:username],
-          :password => input[:password]
-        }
+      credentials = { :username => input[:username], :password => input[:password] }
 
       prompts = client.login_prompts
 
@@ -67,9 +63,8 @@ module CF::Start
       invalidate_client
 
       line if input.interactive?(:organization) || input.interactive?(:space)
-      select_org_and_space(input, info)
 
-      save_target_info(info)
+      CF::Populators::Target.new(input).populate_and_save!
     ensure
       exit_status 1 if not authenticated
     end

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

@@ -1,5 +1,5 @@
 require "cf/cli/start/base"
-require "cf/cli/start/target_interactions"
+require "cf/cli/populators/target"
 
 module CF::Start
   class Target < Base
@@ -10,7 +10,7 @@ module CF::Start
           :from_given => by_name(:organization)
     input :space, :desc => "Space", :alias => "-s",
           :from_given => by_name(:space)
-    interactions TargetInteractions
+
     def target
       unless input.has?(:url) || input.has?(:organization) || \
               input.has?(:space)
@@ -37,11 +37,7 @@ module CF::Start
       return unless client.logged_in?
 
       if input.has?(:organization) || input.has?(:space)
-        info = target_info
-
-        select_org_and_space(input, info)
-
-        save_target_info(info)
+        CF::Populators::Target.new(input).populate_and_save!
       end
 
       return if quiet?
@@ -56,11 +52,11 @@ module CF::Start
     private
 
     def display_org_and_space
-      if org = client.current_organization
+      if (org = client.current_organization)
         line "organization: #{c(org.name, :name)}"
       end
 
-      if space = client.current_space
+      if (space = client.current_space)
         line "space: #{c(space.name, :name)}"
       end
     rescue CFoundry::APIError