cf 0.6.0.rc2 → 0.6.0.rc3

data/lib/cf/cli.rb

@@ -107,6 +107,8 @@ module CF
       err e.message
     rescue SystemExit
       raise
+    rescue UserFriendlyError => e
+      err e.message
     rescue CFoundry::Forbidden, CFoundry::InvalidAuthToken => e
       if !$cf_asked_auth
         $cf_asked_auth = true

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

@@ -30,8 +30,6 @@ module CF::Service
 
       if input[:version]
         offerings.reject! { |s| s.version != input[:version] }
-      else
-        offerings.reject!(&:deprecated?)
       end
 
       # filter the offerings based on a given plan value, which will be a

data/lib/cf/errors.rb

@@ -1,5 +1,5 @@
 module CF
-  class UserError < RuntimeError
+  class UserFriendlyError < RuntimeError
     def initialize(msg)
       @message = msg
     end
@@ -9,6 +9,8 @@ module CF
     end
   end
 
+  class UserError < UserFriendlyError; end
+
   class NotAuthorized < UserError
     def initialize
       @message = "Not authorized."

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "0.6.0.rc2".freeze
+  VERSION = "0.6.0.rc3".freeze
 end

data/spec/cf/cli_spec.rb

@@ -36,6 +36,13 @@ describe CF::CLI do
       end
     end
 
+    context "with a UserFriendlyError" do
+      let(:action) { proc { raise CF::UserFriendlyError.new("user friendly") } }
+
+      it_behaves_like "an error that's obvious to the user",
+        :with_message => "user friendly"
+    end
+
     context "with a SystemExit" do
       let(:action) { proc { exit 1 } }
 

data/spec/features/account_lifecycle_spec.rb

@@ -39,13 +39,23 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
       end
 
       run("#{cf_bin} login #{username} --password #{password}") do |runner|
-        expect(runner).to say "Organization>"
-        runner.send_keys "1"
-        expect(runner).to say "Space>"
-        runner.send_keys "1"
+        expect(runner).to say(
+          "Organization>" => proc {
+            runner.send_keys "pivotal-integration"
+            expect(runner).to say /Switching to organization .*\.\.\. OK/
+          },
+          "Switching to organization" => proc {}
+        )
+
+        expect(runner).to say(
+          "Space>" => proc {
+            runner.send_keys "1"
+            expect(runner).to say /Switching to space .*\.\.\. OK/
+          },
+          "Switching to space" => proc {}
+        )
       end
 
-      puts "registering #{email}"
       run("#{cf_bin} register #{email} --password p") do |runner|
         expect(runner).to say "Confirm Password>"
         runner.send_keys 'p'
@@ -71,7 +81,6 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
         # expect(runner).to say "Deleting #{email}... OK"
       # end
 
-      puts "deleting #{email}"
       client.login(email, "p")
       user = client.current_user
       guid = user.guid

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cf
 version: !ruby/object:Gem::Version 
-  hash: -3773193672
+  hash: -3819338190
   prerelease: 6
   segments: 
   - 0
   - 6
   - 0
   - rc
-  - 2
-  version: 0.6.0.rc2
+  - 3
+  version: 0.6.0.rc3
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -21,7 +21,9 @@ cert_chain: []
 date: 2013-03-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: json_pure
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +33,12 @@ dependencies:
         - 1
         - 6
         version: "1.6"
-  prerelease: false
   type: :runtime
-  name: json_pure
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: multi_json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +48,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  prerelease: false
   type: :runtime
-  name: multi_json
-  requirement: *id002
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: interact
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,17 +63,17 @@ dependencies:
         - 0
         - 5
         version: "0.5"
-  prerelease: false
   type: :runtime
-  name: interact
-  requirement: *id003
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: cfoundry
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -3773193672
+        hash: -3819338192
         segments: 
         - 0
         - 6
@@ -86,12 +88,12 @@ dependencies:
         - 0
         - 7
         version: "0.7"
-  prerelease: false
   type: :runtime
-  name: cfoundry
-  requirement: *id004
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: clouseau
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -101,12 +103,12 @@ dependencies:
         - 0
         - 0
         version: "0.0"
-  prerelease: false
   type: :runtime
-  name: clouseau
-  requirement: *id005
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: mothership
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,24 +126,24 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  prerelease: false
   type: :runtime
-  name: mothership
-  requirement: *id006
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: manifests-cf-plugin
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -3773193682
+        hash: -3819338208
         segments: 
         - 0
         - 7
         - 0
         - rc
-        - 1
-        version: 0.7.0.rc1
+        - 2
+        version: 0.7.0.rc2
     - - <
       - !ruby/object:Gem::Version 
         hash: 27
@@ -149,24 +151,24 @@ dependencies:
         - 0
         - 8
         version: "0.8"
-  prerelease: false
   type: :runtime
-  name: manifests-cf-plugin
-  requirement: *id007
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: tunnel-cf-plugin
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -3773193618
+        hash: -3819338144
         segments: 
         - 0
         - 3
         - 0
         - rc
-        - 1
-        version: 0.3.0.rc1
+        - 2
+        version: 0.3.0.rc2
     - - <
       - !ruby/object:Gem::Version 
         hash: 3
@@ -174,12 +176,12 @@ dependencies:
         - 0
         - 4
         version: "0.4"
-  prerelease: false
   type: :runtime
-  name: tunnel-cf-plugin
-  requirement: *id008
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -189,12 +191,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  prerelease: false
   type: :development
-  name: rake
-  requirement: *id009
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -204,12 +206,12 @@ dependencies:
         - 2
         - 11
         version: "2.11"
-  prerelease: false
   type: :development
-  name: rspec
-  requirement: *id010
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  name: webmock
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -219,12 +221,12 @@ dependencies:
         - 1
         - 9
         version: "1.9"
-  prerelease: false
   type: :development
-  name: webmock
-  requirement: *id011
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  name: rr
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -234,10 +236,8 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  prerelease: false
   type: :development
-  name: rr
-  requirement: *id012
+  version_requirements: *id012
 description: 
 email: 
 - vcap-dev@googlegroups.com