vmc 0.5.1.rc4 → 0.5.1.rc5

data/lib/vmc/cli.rb

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

data/lib/vmc/cli/app/push/create.rb

@@ -14,8 +14,6 @@ module VMC::App
       if v2?
         inputs[:production] = !!(input[:plan] =~ /^p/i)
         inputs[:command] = input[:command] if input.has?(:command) || !has_procfile?
-
-        framework = detector.detect_framework
       else
         framework = inputs[:framework] = determine_framework
         inputs[:runtime] = determine_runtime(framework)
@@ -24,7 +22,13 @@ module VMC::App
 
       inputs[:buildpack] = input[:buildpack] if v2?
 
-      human_mb = human_mb(detector.suggested_memory(framework) || 64)
+      if v2?
+        detected = detector.detected
+        human_mb = human_mb((detected && detected.memory_suggestion) || 64)
+      else
+        human_mb = human_mb(detector.suggested_memory(framework) || 64)
+      end
+
       inputs[:memory] = megabytes(input[:memory, human_mb])
 
       inputs[:stack] = input[:stack] if v2?

data/lib/vmc/detect.rb

@@ -76,12 +76,12 @@ module VMC
       @all_frameworks ||= @client.frameworks
     end
 
-    private
-
     def detected
       @detected ||= Clouseau.detect(@path)
     end
 
+    private
+
     def map_detectors!
       @framework_detectors = {}
       @detector_frameworks = {}

data/lib/vmc/errors.rb

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

data/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.5.1.rc4".freeze
+  VERSION = "0.5.1.rc5".freeze
 end

data/spec/features/v2/account_lifecycle_spec.rb

@@ -39,10 +39,21 @@ if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TA
       end
 
       run("#{vmc_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 "1"
+            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}"

data/spec/features/v2/login_spec.rb

@@ -35,6 +35,8 @@ if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TA
       before do
         run("#{vmc_bin} login #{username} --password #{password}") do |runner|
           expect(runner).to say "Authenticating... OK"
+          expect(runner).to say "Organization>"
+          runner.send_keys("pivotal")
 
           expect(runner).to say "Switching to organization"
           expect(runner).to say "OK"

data/spec/spec_helper.rb

@@ -7,10 +7,19 @@ require "vmc"
 require "vmc/test_support"
 require "webmock"
 require "ostruct"
+require "fakefs/safe"
 
 INTEGRATE_WITH = ENV["INTEGRATE_WITH"] || "default"
 TRAVIS_BUILD_ID = ENV["TRAVIS_BUILD_ID"]
 
+OriginalFile = File
+
+class FakeFS::File
+  def self.fnmatch(*args, &blk)
+    OriginalFile.fnmatch(*args, &blk)
+  end
+end
+
 def vmc_bin
   vmc = File.expand_path("#{SPEC_ROOT}/../bin/vmc.dev")
   if INTEGRATE_WITH != 'default'

data/spec/vmc/cli/app/push/create_spec.rb

@@ -76,8 +76,6 @@ describe VMC::App::Create do
           FakeFS.activate!
           Dir.mkdir(path)
 
-          # fakefs removes fnmatch :'(
-          stub(create.send(:detector)).detect_framework
           File.open("#{path}/Procfile", "w") do |file|
             file.write("this is a procfile")
           end
@@ -152,9 +150,6 @@ describe VMC::App::Create do
           before do
             FakeFS.activate!
             Dir.mkdir(path)
-
-            # fakefs removes fnmatch :'(
-            stub(create.send(:detector)).detect_framework
           end
 
           after do
@@ -192,14 +187,29 @@ describe VMC::App::Create do
         subject
       end
 
+      # this is hacky, but will get better once we remove all the v1-specific
+      # logic, as we won't have to worry about this anyway as the code will be gone
+      #
+      # we wanted to spec for this because frameworks/runtimes will be gone on
+      # v2, and if we don't fix it now, vmc push will blow up
       it 'asks for the memory' do
         given.delete(:memory)
 
         memory_choices = %w(64M 128M 256M 512M 1G)
         stub(create).memory_choices { memory_choices }
 
+        detector = mock
+        detected = mock
+        dont_allow(detector).detect_framework
+
+        stub(detected).memory_suggestion { 128 }
+
+        stub(create).detector { detector }
+        stub(detector).detected { detected }
+
         mock_ask('Memory Limit', anything) do |_, options|
           expect(options[:choices]).to eq memory_choices
+          expect(options[:default]).to eq "128M"
           "1G"
         end
 

data/spec/vmc/cli_spec.rb

@@ -36,6 +36,13 @@ describe VMC::CLI do
       end
     end
 
+    context "with a UserFriendlyError" do
+      let(:action) { proc { raise VMC::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 } }
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1784256881
+  hash: -1558593090
   prerelease: 6
   segments: 
   - 0
   - 5
   - 1
   - rc
-  - 4
-  version: 0.5.1.rc4
+  - 5
+  version: 0.5.1.rc5
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,10 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-14 00:00:00 Z
+date: 2013-03-21 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,24 +63,24 @@ 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: 1784256867
+        hash: -1558593112
         segments: 
         - 0
         - 5
         - 3
         - rc
-        - 5
-        version: 0.5.3.rc5
+        - 6
+        version: 0.5.3.rc6
     - - <
       - !ruby/object:Gem::Version 
         hash: 7
@@ -86,12 +88,12 @@ dependencies:
         - 0
         - 6
         version: "0.6"
-  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,17 +126,17 @@ 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-vmc-plugin
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1784256861
+        hash: -1558593136
         segments: 
         - 0
         - 6
@@ -149,12 +151,12 @@ dependencies:
         - 0
         - 7
         version: "0.7"
-  prerelease: false
   type: :runtime
-  name: manifests-vmc-plugin
-  requirement: *id007
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: tunnel-vmc-plugin
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -165,12 +167,12 @@ dependencies:
         - 2
         - 2
         version: 0.2.2
-  prerelease: false
   type: :runtime
-  name: tunnel-vmc-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: 
     - - ~>
@@ -180,12 +182,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: 
     - - ~>
@@ -195,12 +197,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: 
     - - ~>
@@ -210,12 +212,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: 
     - - ~>
@@ -225,10 +227,8 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  prerelease: false
   type: :development
-  name: rr
-  requirement: *id012
+  version_requirements: *id012
 description: 
 email: 
 - vcap-dev@googlegroups.com