vmc 0.5.0.beta.4 → 0.5.0.beta.5

data/lib/vmc/cli.rb

@@ -101,6 +101,8 @@ module VMC
         precondition
         super
       end
+    rescue CFoundry::Timeout => e
+      err(e.message)
     rescue Interrupt
       exit_status 130
     rescue Mothership::Error

data/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.5.0.beta.4".freeze
+  VERSION = "0.5.0.beta.5".freeze
 end

data/spec/vmc/cli_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe VMC::CLI do
+  let(:cmd) { Class.new(VMC::CLI).new }
+
+  describe '#execute' do
+    subject do
+      stub(cmd).input { {} }
+      cmd.execute(nil, [])
+    end
+
+    it 'wraps Timeout::Error with a more friendly message' do
+      stub(cmd).precondition { raise CFoundry::Timeout.new(Net::HTTP::Get, "/foo") }
+
+      mock(cmd).err "GET /foo timed out"
+      subject
+    end
+  end
+end
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1816304663
+  hash: 244434823
   prerelease: 6
   segments: 
   - 0
   - 5
   - 0
   - beta
-  - 4
-  version: 0.5.0.beta.4
+  - 5
+  version: 0.5.0.beta.5
 platform: ruby
 authors: 
 - Alex Suraci
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-15 00:00:00 -08:00
-default_executable: 
+date: 2012-12-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -74,12 +73,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 4
-        - 14
-        version: 0.4.14
+        - 15
+        version: 0.4.15
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -233,110 +232,109 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - Rakefile
-- lib/vmc/version.rb
-- lib/vmc/detect.rb
-- lib/vmc/errors.rb
-- lib/vmc/spacing.rb
-- lib/vmc/spec_helper.rb
-- lib/vmc/plugin.rb
-- lib/vmc/constants.rb
-- lib/vmc/cli.rb
-- lib/vmc/cli/organization/create.rb
-- lib/vmc/cli/organization/rename.rb
-- lib/vmc/cli/organization/orgs.rb
-- lib/vmc/cli/organization/base.rb
-- lib/vmc/cli/organization/delete.rb
-- lib/vmc/cli/organization/org.rb
-- lib/vmc/cli/start/target_interactions.rb
-- lib/vmc/cli/start/targets.rb
-- lib/vmc/cli/start/register.rb
-- lib/vmc/cli/start/colors.rb
-- lib/vmc/cli/start/target.rb
-- lib/vmc/cli/start/logout.rb
-- lib/vmc/cli/start/base.rb
-- lib/vmc/cli/start/info.rb
-- lib/vmc/cli/start/login.rb
-- lib/vmc/cli/route/create_route.rb
-- lib/vmc/cli/route/routes.rb
-- lib/vmc/cli/route/base.rb
-- lib/vmc/cli/route/delete.rb
-- lib/vmc/cli/app/scale.rb
-- lib/vmc/cli/app/health.rb
+- lib/vmc/cli/app/app.rb
+- lib/vmc/cli/app/apps.rb
+- lib/vmc/cli/app/base.rb
+- lib/vmc/cli/app/crashes.rb
+- lib/vmc/cli/app/delete.rb
+- lib/vmc/cli/app/deprecated.rb
+- lib/vmc/cli/app/env.rb
 - lib/vmc/cli/app/files.rb
+- lib/vmc/cli/app/health.rb
+- lib/vmc/cli/app/instances.rb
+- lib/vmc/cli/app/logs.rb
 - lib/vmc/cli/app/push/create.rb
 - lib/vmc/cli/app/push/interactions.rb
 - lib/vmc/cli/app/push/sync.rb
+- lib/vmc/cli/app/push.rb
 - lib/vmc/cli/app/rename.rb
+- lib/vmc/cli/app/restart.rb
 - lib/vmc/cli/app/routes.rb
-- lib/vmc/cli/app/deprecated.rb
-- lib/vmc/cli/app/logs.rb
-- lib/vmc/cli/app/instances.rb
+- lib/vmc/cli/app/scale.rb
 - lib/vmc/cli/app/start.rb
-- lib/vmc/cli/app/app.rb
-- lib/vmc/cli/app/stop.rb
-- lib/vmc/cli/app/env.rb
-- lib/vmc/cli/app/base.rb
 - lib/vmc/cli/app/stats.rb
-- lib/vmc/cli/app/apps.rb
-- lib/vmc/cli/app/restart.rb
-- lib/vmc/cli/app/delete.rb
-- lib/vmc/cli/app/push.rb
-- lib/vmc/cli/app/crashes.rb
-- lib/vmc/cli/interactive.rb
+- lib/vmc/cli/app/stop.rb
+- lib/vmc/cli/domain/add_domain.rb
+- lib/vmc/cli/domain/base.rb
 - lib/vmc/cli/domain/create_domain.rb
-- lib/vmc/cli/domain/domains.rb
 - lib/vmc/cli/domain/delete_domain.rb
-- lib/vmc/cli/domain/base.rb
+- lib/vmc/cli/domain/domains.rb
 - lib/vmc/cli/domain/remove_domain.rb
-- lib/vmc/cli/domain/add_domain.rb
-- lib/vmc/cli/space/spaces.rb
-- lib/vmc/cli/space/create.rb
-- lib/vmc/cli/space/rename.rb
-- lib/vmc/cli/space/space.rb
-- lib/vmc/cli/space/take.rb
-- lib/vmc/cli/space/base.rb
-- lib/vmc/cli/space/delete.rb
-- lib/vmc/cli/service/service.rb
+- lib/vmc/cli/help.rb
+- lib/vmc/cli/interactive.rb
+- lib/vmc/cli/organization/base.rb
+- lib/vmc/cli/organization/create.rb
+- lib/vmc/cli/organization/delete.rb
+- lib/vmc/cli/organization/org.rb
+- lib/vmc/cli/organization/orgs.rb
+- lib/vmc/cli/organization/rename.rb
+- lib/vmc/cli/route/base.rb
+- lib/vmc/cli/route/create_route.rb
+- lib/vmc/cli/route/delete.rb
+- lib/vmc/cli/route/routes.rb
+- lib/vmc/cli/service/base.rb
 - lib/vmc/cli/service/bind.rb
 - lib/vmc/cli/service/create.rb
+- lib/vmc/cli/service/delete.rb
 - lib/vmc/cli/service/rename.rb
+- lib/vmc/cli/service/service.rb
 - lib/vmc/cli/service/services.rb
 - lib/vmc/cli/service/unbind.rb
-- lib/vmc/cli/service/base.rb
-- lib/vmc/cli/service/delete.rb
-- lib/vmc/cli/user/passwd.rb
-- lib/vmc/cli/user/create.rb
+- lib/vmc/cli/space/base.rb
+- lib/vmc/cli/space/create.rb
+- lib/vmc/cli/space/delete.rb
+- lib/vmc/cli/space/rename.rb
+- lib/vmc/cli/space/space.rb
+- lib/vmc/cli/space/spaces.rb
+- lib/vmc/cli/space/take.rb
+- lib/vmc/cli/start/base.rb
+- lib/vmc/cli/start/colors.rb
+- lib/vmc/cli/start/info.rb
+- lib/vmc/cli/start/login.rb
+- lib/vmc/cli/start/logout.rb
+- lib/vmc/cli/start/register.rb
+- lib/vmc/cli/start/target.rb
+- lib/vmc/cli/start/target_interactions.rb
+- lib/vmc/cli/start/targets.rb
 - lib/vmc/cli/user/base.rb
+- lib/vmc/cli/user/create.rb
 - lib/vmc/cli/user/delete.rb
+- lib/vmc/cli/user/passwd.rb
 - lib/vmc/cli/user/users.rb
-- lib/vmc/cli/help.rb
+- lib/vmc/cli.rb
+- lib/vmc/constants.rb
+- lib/vmc/detect.rb
+- lib/vmc/errors.rb
+- lib/vmc/plugin.rb
+- lib/vmc/spacing.rb
+- lib/vmc/spec_helper.rb
+- lib/vmc/version.rb
 - lib/vmc.rb
-- spec/support/interact_helpers.rb
-- spec/support/feature_helpers.rb
+- spec/assets/hello-sinatra/Gemfile
+- spec/assets/hello-sinatra/main.rb
+- spec/features/new_user_flow_spec.rb
 - spec/spec_helper.rb
-- spec/vmc/detect_spec.rb
+- spec/support/feature_helpers.rb
+- spec/support/interact_helpers.rb
+- spec/vmc/cli/app/delete_spec.rb
+- spec/vmc/cli/app/push/create_spec.rb
+- spec/vmc/cli/app/push_spec.rb
+- spec/vmc/cli/app/rename_spec.rb
 - spec/vmc/cli/organization/orgs_spec.rb
 - spec/vmc/cli/organization/rename_spec.rb
-- spec/vmc/cli/start/login_spec.rb
-- spec/vmc/cli/start/info_spec.rb
 - spec/vmc/cli/route/delete_route_spec.rb
-- spec/vmc/cli/app/push_spec.rb
-- spec/vmc/cli/app/push/create_spec.rb
-- spec/vmc/cli/app/delete_spec.rb
-- spec/vmc/cli/app/rename_spec.rb
-- spec/vmc/cli/space/spaces_spec.rb
-- spec/vmc/cli/space/rename_spec.rb
-- spec/vmc/cli/service/unbind_spec.rb
 - spec/vmc/cli/service/bind_spec.rb
 - spec/vmc/cli/service/delete_spec.rb
-- spec/vmc/cli/service/service_spec.rb
 - spec/vmc/cli/service/rename_spec.rb
-- spec/assets/hello-sinatra/Gemfile
-- spec/assets/hello-sinatra/main.rb
-- spec/assets/hello-sinatra/Gemfile.lock
-- spec/features/new_user_flow_spec.rb
+- spec/vmc/cli/service/service_spec.rb
+- spec/vmc/cli/service/unbind_spec.rb
+- spec/vmc/cli/space/rename_spec.rb
+- spec/vmc/cli/space/spaces_spec.rb
+- spec/vmc/cli/start/info_spec.rb
+- spec/vmc/cli/start/login_spec.rb
+- spec/vmc/cli_spec.rb
+- spec/vmc/detect_spec.rb
 - bin/vmc
-has_rdoc: true
 homepage: http://cloudfoundry.com/
 licenses: []
 
@@ -368,32 +366,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vmc
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
 test_files: 
-- spec/support/interact_helpers.rb
-- spec/support/feature_helpers.rb
+- spec/assets/hello-sinatra/Gemfile
+- spec/assets/hello-sinatra/main.rb
+- spec/features/new_user_flow_spec.rb
 - spec/spec_helper.rb
-- spec/vmc/detect_spec.rb
+- spec/support/feature_helpers.rb
+- spec/support/interact_helpers.rb
+- spec/vmc/cli/app/delete_spec.rb
+- spec/vmc/cli/app/push/create_spec.rb
+- spec/vmc/cli/app/push_spec.rb
+- spec/vmc/cli/app/rename_spec.rb
 - spec/vmc/cli/organization/orgs_spec.rb
 - spec/vmc/cli/organization/rename_spec.rb
-- spec/vmc/cli/start/login_spec.rb
-- spec/vmc/cli/start/info_spec.rb
 - spec/vmc/cli/route/delete_route_spec.rb
-- spec/vmc/cli/app/push_spec.rb
-- spec/vmc/cli/app/push/create_spec.rb
-- spec/vmc/cli/app/delete_spec.rb
-- spec/vmc/cli/app/rename_spec.rb
-- spec/vmc/cli/space/spaces_spec.rb
-- spec/vmc/cli/space/rename_spec.rb
-- spec/vmc/cli/service/unbind_spec.rb
 - spec/vmc/cli/service/bind_spec.rb
 - spec/vmc/cli/service/delete_spec.rb
-- spec/vmc/cli/service/service_spec.rb
 - spec/vmc/cli/service/rename_spec.rb
-- spec/assets/hello-sinatra/Gemfile
-- spec/assets/hello-sinatra/main.rb
-- spec/assets/hello-sinatra/Gemfile.lock
-- spec/features/new_user_flow_spec.rb
+- spec/vmc/cli/service/service_spec.rb
+- spec/vmc/cli/service/unbind_spec.rb
+- spec/vmc/cli/space/rename_spec.rb
+- spec/vmc/cli/space/spaces_spec.rb
+- spec/vmc/cli/start/info_spec.rb
+- spec/vmc/cli/start/login_spec.rb
+- spec/vmc/cli_spec.rb
+- spec/vmc/detect_spec.rb

data/spec/assets/hello-sinatra/Gemfile.lock

@@ -1,17 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  sinatra