vmc 0.5.1.rc2 → 0.5.1.rc3

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

@@ -24,13 +24,17 @@ module VMC::App
                       }
     input :memory,    :desc => "Memory limit"
     input :instances, :desc => "Number of instances to run", :type => :integer
-    input :framework, :desc => "Framework to use", :from_given => by_name(:framework)
-    input :runtime,   :desc => "Runtime to use", :from_given => by_name(:runtime)
+    input :framework, :desc => "Framework to use",
+                      :from_given => by_name(:framework)
+    input :runtime,   :desc => "Runtime to use",
+                      :from_given => by_name(:runtime)
     input :command,   :desc => "Startup command"
     input :plan,      :desc => "Application plan", :default => "D100"
     input :start,     :desc => "Start app after pushing?", :default => true
     input :restart,   :desc => "Restart app after updating?", :default => true
     input :buildpack, :desc => "Custom buildpack URL", :default => nil
+    input :stack,     :desc => "Stack to use", :default => nil,
+                      :from_given => by_name(:stack)
     input :create_services, :desc => "Interactively create services?",
           :type => :boolean, :default => proc { force? ? false : interact }
     input :bind_services, :desc => "Interactively bind services?",

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

@@ -13,7 +13,7 @@ module VMC::App
 
       if v2?
         inputs[:production] = !!(input[:plan] =~ /^p/i)
-        inputs[:command] = input[:command] unless has_procfile?
+        inputs[:command] = input[:command] if input.has?(:command) || !has_procfile?
 
         framework = detector.detect_framework
       else
@@ -27,6 +27,8 @@ module VMC::App
       human_mb = human_mb(detector.suggested_memory(framework) || 64)
       inputs[:memory] = megabytes(input[:memory, human_mb])
 
+      inputs[:stack] = input[:stack] if v2?
+
       inputs
     end
 

data/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.5.1.rc2".freeze
+  VERSION = "0.5.1.rc3".freeze
 end

data/spec/features/v1/new_user_flow_spec.rb

@@ -11,7 +11,7 @@ if ENV['VMC_TEST_USER'] && ENV['VMC_TEST_PASSWORD'] && ENV['VMC_TEST_TARGET']
     let(:password) { ENV['VMC_TEST_PASSWORD'] }
 
     let(:app) do
-      fuzz = TRAVIS_BUILD_ID || Time.new.to_f.to_s.gsub(".", "_")
+      fuzz = TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_")
       "hello-sinatra-#{fuzz}"
     end
 

data/spec/features/v2/push_flow_spec.rb

@@ -11,7 +11,7 @@ if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TA
     let(:password) { ENV['VMC_V2_TEST_PASSWORD'] }
 
     let(:app) do
-      fuzz = TRAVIS_BUILD_ID || Time.new.to_f.to_s.gsub(".", "_")
+      fuzz = TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_")
       "hello-sinatra-#{fuzz}"
     end
 

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

@@ -16,11 +16,14 @@ describe VMC::App::Create do
 
   let(:service_instances) { fake_list(:service_instance, 5) }
 
+  let(:lucid64) { fake :stack, :name => "lucid64" }
+
   let(:client) do
     fake_client(
       :frameworks => frameworks,
       :runtimes => runtimes,
-      :service_instances => service_instances)
+      :service_instances => service_instances,
+      :stacks => [lucid64])
   end
 
   before do
@@ -43,13 +46,14 @@ describe VMC::App::Create do
   describe '#get_inputs' do
     subject { create.get_inputs }
 
-    let(:inputs) do
+    let(:given) do
       { :name => "some-name",
-        :instances => 1,
+        :instances => "1",
         :plan => "p100",
         :memory => "1G",
         :command => "ruby main.rb",
-        :buildpack => "git://example.com"
+        :buildpack => "git://example.com",
+        :stack => "lucid64"
       }
     end
 
@@ -63,17 +67,40 @@ describe VMC::App::Create do
       its([:command]) { should eq "ruby main.rb" }
       its([:memory]) { should eq 1024 }
       its([:buildpack]) { should eq "git://example.com" }
+      its([:stack]) { should eq lucid64 }
+    end
+
+    context 'when the command is given' do
+      context "and there is a Procfile in the application's root" do
+        before 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
+        end
+
+        after do
+          FakeFS.deactivate!
+          FakeFS::FileSystem.clear
+        end
+
+        its([:command]) { should eq "ruby main.rb" }
+      end
     end
 
     context 'when certain inputs are not given' do
       it 'asks for the name' do
-        inputs.delete(:name)
+        given.delete(:name)
         mock_ask("Name") { "some-name" }
         subject
       end
 
       it 'asks for the total instances' do
-        inputs.delete(:instances)
+        given.delete(:instances)
         mock_ask("Instances", anything) { 1 }
         subject
       end
@@ -87,7 +114,7 @@ describe VMC::App::Create do
       end
 
       context 'when the command is not given' do
-        before { inputs.delete(:command) }
+        before { given.delete(:command) }
 
         shared_examples 'an app that can have a custom start command' do
           it "asks for a start command with a default as 'none'" do
@@ -166,7 +193,7 @@ describe VMC::App::Create do
       end
 
       it 'asks for the memory' do
-        inputs.delete(:memory)
+        given.delete(:memory)
 
         memory_choices = %w(64M 128M 256M 512M 1G)
         stub(create).memory_choices { memory_choices }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -656826288
+  hash: 3495541125
   prerelease: 6
   segments: 
   - 0
   - 5
   - 1
   - rc
-  - 2
-  version: 0.5.1.rc2
+  - 3
+  version: 0.5.1.rc3
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-07 00:00:00 Z
+date: 2013-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -71,14 +71,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -656826304
+        hash: 3495541147
         segments: 
         - 0
         - 5
         - 3
         - rc
-        - 2
-        version: 0.5.3.rc2
+        - 4
+        version: 0.5.3.rc4
     - - <
       - !ruby/object:Gem::Version 
         hash: 7
@@ -132,14 +132,23 @@ dependencies:
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 3495541159
         segments: 
         - 0
         - 6
+        - 3
+        - rc
         - 2
-        version: 0.6.2
+        version: 0.6.3.rc2
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
   prerelease: false
   type: :runtime
   name: manifests-vmc-plugin