cf 4.1.5.rc6 → 4.1.5.rc7

data/lib/cf.rb

@@ -1,5 +1,7 @@
 require "cf/version"
 
+require "cf/object_extensions"
+
 require "cf/cli"
 
 command_files = "../cf/cli/{app,route,domain,organization,space,service,start,user}/*.rb"

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

@@ -24,11 +24,6 @@ module CF
       end
 
       def display_target
-        if client.nil?
-          fail "No target has been specified."
-          return
-        end
-
         if quiet?
           line client.target
         else

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

@@ -12,10 +12,8 @@ module CF::Start
           :from_given => by_name(:space)
 
     def target
-      unless input.has?(:url) || input.has?(:organization) || \
-              input.has?(:space)
-        display_target
-        display_org_and_space unless quiet?
+      unless input.has?(:url) || input.has?(:organization) || input.has?(:space)
+        TargetPrettifier.prettify(client, self)
         return
       end
 
@@ -23,7 +21,7 @@ module CF::Start
         target = sane_target_url(input[:url])
         with_progress("Setting target to #{c(target, :name)}") do
           begin
-            CFoundry::Client.new(target) # check that it's valid before setting
+            CFoundry::Client.get(target) # check that it's valid before setting
           rescue CFoundry::TargetRefused
             fail "Target refused connection."
           rescue CFoundry::InvalidTarget
@@ -35,7 +33,6 @@ module CF::Start
       end
 
       return unless client.logged_in?
-
       if input.has?(:organization) || input.has?(:space)
         CF::Populators::Target.new(input).populate_and_save!
       end
@@ -45,21 +42,9 @@ module CF::Start
       invalidate_client
 
       line
-      display_target
-      display_org_and_space
+      TargetPrettifier.prettify(client, self)
     end
 
-    private
-
-    def display_org_and_space
-      if (org = client.current_organization)
-        line "organization: #{c(org.name, :name)}"
-      end
-
-      if (space = client.current_space)
-        line "space: #{c(space.name, :name)}"
-      end
-    rescue CFoundry::APIError
-    end
+    public :c
   end
 end

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

@@ -0,0 +1,16 @@
+class TargetPrettifier
+  def self.prettify(client, outputter)
+    outputter.line("Target Information (where will apps be pushed):")
+    outputter.line("  CF instance: #{print_var(client.try(:target), outputter)} (API version: #{print_var(client.try(:version), outputter)})")
+    outputter.line("  user: #{print_var(client.try(:current_user).try(:email), outputter)}")
+    outputter.line("  target app space: #{print_var(client.try(:current_space).try(:name), outputter)} (org: #{print_var(client.try(:current_organization).try(:name), outputter)})")
+  end
+
+  def self.print_var(object_name, outputter)
+    if object_name
+      outputter.c(object_name, :good)
+    else
+      outputter.c('N/A', :bad)
+    end
+  end
+end

data/lib/cf/object_extensions.rb

@@ -0,0 +1,11 @@
+class Object
+  def try(*args)
+    send(*args)
+  end
+end
+
+class NilClass
+  def try(*args)
+    nil
+  end
+end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "4.1.5.rc6".freeze
+  VERSION = "4.1.5.rc7".freeze
 end

data/spec/cf/cli/start/target_prettifier_spec.rb

@@ -0,0 +1,60 @@
+require "spec_helper"
+
+module CF::Start
+  describe TargetPrettifier do
+    let(:user) do
+      build(:user).tap { |u| u.stub(:email => 'user@example.com') }
+    end
+    let(:space) { build(:space) }
+    let(:organization) { build(:organization) }
+    let(:target) { "http://example.com" }
+    let(:client) do
+      double(:client,
+             target: target,
+             current_user: user,
+             current_organization: organization,
+             current_space: space,
+             version: 2
+      )
+    end
+    let(:outputter) { double(:outputter, line: nil, fail: nil) }
+
+    before do
+      outputter.stub(:c) { |to_colorize| to_colorize }
+    end
+
+    describe "displaying the target (no args)" do
+      it "prints things nicely" do
+        TargetPrettifier.prettify(client, outputter)
+        desired_result = <<-STR
+Target Information (where will apps be pushed):
+  CF instance: #{client.target} (API version: 2)
+  user: #{user.email}
+  target app space: #{space.name} (org: #{organization.name})
+        STR
+        desired_result.each_line do |line|
+          outputter.should have_received(:line).with(line.chomp)
+        end
+      end
+
+      context "when nothing is specified" do
+        let(:user) { nil }
+        let(:space) { nil }
+        let(:organization) { nil }
+
+        it "prints things nicely" do
+          TargetPrettifier.prettify(client, outputter)
+          desired_result = <<-STR
+Target Information (where will apps be pushed):
+  CF instance: http://example.com (API version: 2)
+  user: N/A
+  target app space: N/A (org: N/A)
+          STR
+          desired_result.each_line do |line|
+            outputter.should have_received(:line).with(line.chomp)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/cf/cli/start/target_spec.rb

@@ -41,7 +41,7 @@ module CF
         stub_home_dir_with { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
 
         context "when the user is authenticated and has an organization" do
-          let(:user) { build(:user) }
+          let(:user) { build(:user).tap{ |u| u.stub(:email => "user@example.com") } }
           let(:organization) { build(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user], :spaces => [space]) }
           let(:space) { build(:space, :name => "Staging", :guid => "space-id-2", :developers => [user]) }
 
@@ -103,15 +103,18 @@ module CF
               expect(output).to say("space: #{space.name}")
             end
           end
-        end
-
-        context "when client is nil" do
-          let(:client) { nil }
-          subject { cf ["target"] }
 
-          it 'prints an error' do
-            subject
-            expect(error_output).to say("No target has been specified.")
+          describe "displaying the target (no args)" do
+            it "prints things nicely" do
+              client.stub(:current_space) { space }
+              cf %W{target}
+              expect(output).to say(<<-STR)
+Target Information (where will apps be pushed):
+  CF instance: #{client.target} (API version: 2)
+  user: #{user.email}
+  target app space: #{space.name} (org: #{organization.name})
+              STR
+            end
           end
         end
       end

data/spec/cf/object_extensions_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe "try" do
+  it "calls through with arguments on non-nil objects" do
+    "hi".try(:sub, 'i', 'o').should == "ho"
+  end
+
+  it "it throws a no method found error if the method does not exist" do
+    expect {
+      "hi".try(:fake_method)
+    }.to raise_error(NoMethodError)
+  end
+
+  it "returns nil for nil" do
+    nil.try(:sub, 'i', 'o').should == nil
+  end
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.1.5.rc6
+  version: 4.1.5.rc7
+  prerelease: 6
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -14,6 +15,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: caldecott-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -52,6 +58,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +69,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +77,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +85,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +93,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +101,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mothership
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -100,6 +112,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,6 +123,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -117,6 +131,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -124,6 +139,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -131,6 +147,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -138,6 +155,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -145,6 +163,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -152,6 +171,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: anchorman
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -159,6 +179,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,6 +187,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: blue-shell
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -173,6 +195,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -180,6 +203,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -187,6 +211,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -194,6 +219,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -201,6 +227,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -208,6 +235,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -215,6 +243,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -222,6 +251,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -229,6 +259,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -236,6 +267,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -243,6 +275,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -250,6 +283,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -257,6 +291,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -264,6 +299,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -271,6 +307,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -278,6 +315,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -285,6 +323,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -370,6 +409,7 @@ files:
 - lib/cf/cli/start/login.rb
 - lib/cf/cli/start/logout.rb
 - lib/cf/cli/start/target.rb
+- lib/cf/cli/start/target_prettifier.rb
 - lib/cf/cli/start/targets.rb
 - lib/cf/cli/user/base.rb
 - lib/cf/cli/user/create.rb
@@ -379,6 +419,7 @@ files:
 - lib/cf/cli.rb
 - lib/cf/constants.rb
 - lib/cf/errors.rb
+- lib/cf/object_extensions.rb
 - lib/cf/plugin.rb
 - lib/cf/spacing.rb
 - lib/cf/spec_helper.rb
@@ -518,12 +559,14 @@ files:
 - spec/cf/cli/start/info_spec.rb
 - spec/cf/cli/start/login_spec.rb
 - spec/cf/cli/start/logout_spec.rb
+- spec/cf/cli/start/target_prettifier_spec.rb
 - spec/cf/cli/start/target_spec.rb
 - spec/cf/cli/user/create_spec.rb
 - spec/cf/cli/user/help_spec.rb
 - spec/cf/cli/user/passwd_spec.rb
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
+- spec/cf/object_extensions_spec.rb
 - spec/console/console_spec.rb
 - spec/factories/cfoundry/v2/apps_factory.rb
 - spec/factories/cfoundry/v2/clients_factory.rb
@@ -566,26 +609,30 @@ files:
 - bin/cf
 homepage: http://github.com/cloudfoundry/cf
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2597973038898250794
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: cf
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
 test_files:
 - spec/admin/curl_spec.rb
@@ -692,12 +739,14 @@ test_files:
 - spec/cf/cli/start/info_spec.rb
 - spec/cf/cli/start/login_spec.rb
 - spec/cf/cli/start/logout_spec.rb
+- spec/cf/cli/start/target_prettifier_spec.rb
 - spec/cf/cli/start/target_spec.rb
 - spec/cf/cli/user/create_spec.rb
 - spec/cf/cli/user/help_spec.rb
 - spec/cf/cli/user/passwd_spec.rb
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
+- spec/cf/object_extensions_spec.rb
 - spec/console/console_spec.rb
 - spec/factories/cfoundry/v2/apps_factory.rb
 - spec/factories/cfoundry/v2/clients_factory.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e8807a41f79e55ef1f7374cc6e5c0a5c14c57004
-  data.tar.gz: 6daff8418840423d98aa28ff883567661e4bc92a
-SHA512:
-  metadata.gz: 1db10b928373eb25b9a9372ae70142295cd896d253e361f97fbf5fb6b52d45b09a480ab3fdd291afa57e9e53196d02c4759cec302a181e92b0c99de1cd900acf
-  data.tar.gz: fd679453636c15f57b02c96631593bc6a017e8586c135325dbe9d442cf55d09de78bb2fae7b56eb1207108e5fad49a1c94759a4a8c07b8c83940879237f92021