vmc 0.5.0.beta.6 → 0.5.0.beta.7

data/lib/vmc/cli.rb

@@ -158,6 +158,17 @@ module VMC
         f.puts msg
         f.puts ""
 
+        if e.respond_to?(:request_trace)
+          f.puts "<<<"
+          f.puts e.request_trace
+        end
+
+        if e.respond_to?(:response_trace)
+          f.puts e.response_trace
+          f.puts ">>>"
+          f.puts ""
+        end
+
         vmc_dir = File.expand_path("../../../..", __FILE__) + "/"
         e.backtrace.each do |loc|
           if loc =~ /\/gems\//

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

@@ -52,10 +52,10 @@ module VMC
       end
 
       def human_size(num, precision = 1)
-        sizes = ["G", "M", "K"]
+        sizes = %w(G M K)
         sizes.each.with_index do |suf, i|
           pow = sizes.size - i
-          unit = 1024 ** pow
+          unit = 1024.0 ** pow
           if num >= unit
             return format("%.#{precision}f%s", num / unit, suf)
           end

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

@@ -19,7 +19,7 @@ module VMC::App
 
         line unless quiet?
 
-        spaced(instances) do |i|
+        spaced(instances.sort { |a, b| a.id.to_i <=> b.id.to_i }) do |i|
           if quiet?
             line i.id
           else
@@ -29,9 +29,11 @@ module VMC::App
       end
     end
 
+    private
+
     def display_instance(i)
       start_line "instance #{c("\##{i.id}", :instance)}: "
-      puts "#{b(c(i.state.downcase, state_color(i.state)))} "
+      puts "#{b(c(i.state.downcase, state_color(i.state)))}"
 
       indented do
         if s = i.since

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

@@ -17,7 +17,7 @@ module VMC::App
     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 :command,   :desc => "Startup command for standalone app"
+    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
@@ -26,6 +26,7 @@ module VMC::App
     input :bind_services, :desc => "Interactively bind services?",
           :type => :boolean, :default => proc { force? ? false : interact }
     interactions PushInteractions
+
     def push
       name = input[:name]
       path = File.expand_path(input[:path])

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

@@ -12,7 +12,7 @@ module VMC::App
       inputs[:space] = client.current_space if client.current_space
       inputs[:production] = !!(input[:plan] =~ /^p/i) if v2?
       inputs[:framework] = framework = determine_framework
-      inputs[:command] = input[:command] if framework.name == "standalone"
+      inputs[:command] = input[:command] if can_have_custom_start_command?(framework)
       inputs[:runtime] = determine_runtime(framework)
 
       human_mb = human_mb(detector.suggested_memory(framework) || 64)
@@ -114,6 +114,10 @@ module VMC::App
 
     private
 
+    def can_have_custom_start_command?(framework)
+      %w(standalone buildpack).include?(framework.name)
+    end
+
     def all_instances
       @all_instances ||= client.service_instances
     end

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

@@ -37,7 +37,9 @@ module VMC::App
     end
 
     def ask_command
-      ask("Startup command")
+      if ask("Use custom startup command?", :default => false)
+        ask("Startup command")
+      end
     end
 
     def ask_create_services

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

@@ -37,7 +37,7 @@ module VMC::App
             if usage
               [ idx,
                 "#{percentage(usage[:cpu])} of #{b(stats[:cores])} cores",
-                "#{usage(usage[:mem] * 1024, stats[:mem_quota])}",
+                "#{usage(usage[:mem], stats[:mem_quota])}",
                 "#{usage(usage[:disk], stats[:disk_quota])}"
               ]
             else

data/lib/vmc/cli/start/info.rb

@@ -36,11 +36,11 @@ module VMC::Start
             end
       end
 
-      info = client.info
-
       showing_any = runtimes || services || frameworks
 
       unless !all && showing_any
+        info = client.info
+
         line if showing_any
         line info[:description]
         line

data/lib/vmc/plugin.rb

@@ -21,8 +21,9 @@ module VMC
 
       enabled = Set.new(matching.collect(&:name))
 
-      Gem.loaded_specs["vmc"].dependencies.each do |dep|
-        if dep.name =~ /vmc-plugin/ && dep.type == :runtime
+      vmc_gems = Gem.loaded_specs["vmc"]
+      ((vmc_gems && vmc_gems.dependencies) || Gem.loaded_specs.values).each do |dep|
+        if dep.name =~ /vmc-plugin/
           require "#{dep.name}/plugin"
           enabled.delete dep.name
         end

data/lib/vmc/version.rb

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

data/spec/support/feature_helpers.rb

@@ -1,5 +1,6 @@
 def vmc_ok(argv)
   with_output_to do |out|
+    Mothership.new.exit_status 0
     code = VMC::CLI.start(argv + ["--no-script"])
     yield out.string.strip_progress_dots if block_given?
     expect(code).to eq 0

data/spec/vmc/cli/app/base_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require "vmc/cli/app/base"
+
+describe VMC::App::Base do
+  describe '#human_size' do
+    let(:base) { VMC::App::Base.new }
+
+    it { base.human_size(1_023).should == "1023.0B" }
+    it { base.human_size(1_024).should == "1.0K" }
+    it { base.human_size(1_024 * 1_024).should == "1.0M" }
+    it { base.human_size(1_024 * 1_024 * 1.5).should == "1.5M" }
+    it { base.human_size(1_024 * 1_024 * 1_024).should == "1.0G" }
+    it { base.human_size(1_024 * 1_024 * 1_024 * 1.5).should == "1.5G" }
+    it { base.human_size(1_024 * 1_024 * 1_024 * 1.234, 3).should == "1.234G" }
+    it { base.human_size(31395840).should == "29.9M" } # tests against floating point errors
+  end
+end

data/spec/vmc/cli/app/delete_spec.rb

@@ -5,7 +5,7 @@ describe VMC::App::Delete do
   let(:global) { { :color => false, :quiet => true } }
   let(:inputs) { {} }
   let(:given) { {} }
-  let(:client) { FactoryGirl.build(:client) }
+  let(:client) { fake_client }
   let(:app) {}
   let(:new_name) { "some-new-name" }
 
@@ -49,28 +49,25 @@ describe VMC::App::Delete do
   end
 
   context 'when there are apps' do
-    let(:client) { FactoryGirl.build(:client, :apps => apps) }
+    let(:client) { fake_client(:apps => apps) }
     let(:apps) { [basic_app, app_with_orphans, app_without_orphans] }
-    let(:service_1) { FactoryGirl.build(:service_instance) }
-    let(:service_2) { FactoryGirl.build(:service_instance) }
-    let(:basic_app) { FactoryGirl.build(:app, :name => "basic_app") }
+    let(:service_1) { fake :service_instance }
+    let(:service_2) { fake :service_instance }
+    let(:basic_app) { fake(:app, :name => "basic_app") }
     let(:app_with_orphans) {
-      FactoryGirl.build(:app,
+      fake :app,
         :name => "app_with_orphans",
         :service_bindings => [
-          FactoryGirl.build(:service_binding,
-            :service_instance => service_1),
-          FactoryGirl.build(:service_binding,
-            :service_instance => service_2)
-        ])
+          fake(:service_binding, :service_instance => service_1),
+          fake(:service_binding, :service_instance => service_2)
+        ]
     }
     let(:app_without_orphans) {
-      FactoryGirl.build(:app,
+      fake :app,
         :name => "app_without_orphans",
         :service_bindings => [
-          FactoryGirl.build(:service_binding,
-            :service_instance => service_1)
-        ])
+          fake(:service_binding, :service_instance => service_1)
+        ]
     }
 
     context 'and no app is given' do
@@ -125,6 +122,8 @@ describe VMC::App::Delete do
             stub_ask("Really delete #{deleted_app.name}?", anything) { true }
             stub(deleted_app).delete!
 
+            stub(service_2).invalidate!
+
             mock_ask("Delete orphaned service #{service_2.name}?", anything) { true }
 
             any_instance_of(VMC::App::Delete) do |del|
@@ -141,6 +140,8 @@ describe VMC::App::Delete do
             stub_ask("Really delete #{deleted_app.name}?", anything) { false }
             dont_allow(deleted_app).delete!
 
+            stub(service_2).invalidate!
+
             dont_allow_ask("Delete orphaned service #{service_2.name}?")
 
             any_instance_of(VMC::App::Delete) do |del|

data/spec/vmc/cli/app/instances_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+require 'stringio'
+
+describe VMC::App::Stats do
+  let(:global) { { :color => false } }
+  let(:inputs) { {:app => apps[0]} }
+  let(:given) { {} }
+  let(:output) { StringIO.new }
+  let(:client) { fake_client(:apps => apps) }
+  let(:apps) { [fake(:app, :name => "basic_app")] }
+  let(:time) { Time.local(2012,11,1,2,30)}
+
+  before do
+    any_instance_of(VMC::CLI) do |cli|
+      stub(cli).client { client }
+      stub(cli).precondition { nil }
+    end
+    stub(client).base.stub!.instances(anything) do
+      {
+        "12" => {:state => "STOPPED", :since => time.to_i, :debug_ip => "foo", :debug_port => "bar", :console_ip => "baz", :console_port => "qux"},
+        "1" => {:state => "STOPPED", :since => time.to_i, :debug_ip => "foo", :debug_port => "bar", :console_ip => "baz", :console_port => "qux"},
+        "2" => {:state => "STARTED", :since => time.to_i, :debug_ip => "foo", :debug_port => "bar", :console_ip => "baz", :console_port => "qux"}
+      }
+    end
+  end
+
+  subject do
+    with_output_to output do
+      Mothership.new.invoke(:instances, inputs, given, global)
+    end
+  end
+
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:instances] }
+
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "List an app's instances" }
+      it { expect(Mothership::Help.group(:apps, :info)).to include(subject) }
+    end
+
+    include_examples 'inputs must have descriptions'
+
+    describe 'arguments' do
+      subject { command.arguments }
+      it 'has no arguments' do
+        should eq([{:type=>:splat, :value=>nil, :name=>:apps}])
+      end
+    end
+  end
+
+  it 'prints out the instances in the correct order' do
+    subject
+
+    output.rewind
+    expect(output.string).to match /.*instance \#1.*instance \#2.*instance \#12.*/m
+  end
+
+  it 'prints out one of the instances correctly' do
+    subject
+
+    output.rewind
+    expect(output.string).to include <<-OUT.strip_heredoc
+      instance #2: started
+        started: #{time.strftime("%F %r")}
+        debugger: port bar at foo
+        console: port qux at baz
+    OUT
+  end
+end

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

@@ -5,19 +5,20 @@ describe VMC::App::Create do
   let(:given) { {} }
   let(:global) { { :color => false, :quiet => true } }
 
-  let(:frameworks) { FactoryGirl.build_list(:framework, 3) }
-  let(:framework) { frameworks.first }
-  let(:standalone) { FactoryGirl.build(:framework, :name => "standalone") }
+  let(:frameworks) { fake_list(:framework, 3) }
+  let(:framework) { buildpack }
+  let(:buildpack) { fake(:framework, :name => "buildpack") }
+  let(:standalone) { fake(:framework, :name => "standalone") }
 
-  let(:runtimes) { FactoryGirl.build_list(:runtime, 3) }
+  let(:runtimes) { fake_list(:runtime, 3) }
   let(:runtime) { runtimes.first }
 
-  let(:service_instances) { FactoryGirl.build_list(:service_instance, 5) }
+  let(:service_instances) { fake_list(:service_instance, 5) }
 
   let(:client) do
-    FactoryGirl.build(
-      :client,
-      :frameworks => frameworks, :runtimes => runtimes,
+    fake_client(
+      :frameworks => frameworks,
+      :runtimes => runtimes,
       :service_instances => service_instances)
   end
 
@@ -44,7 +45,8 @@ describe VMC::App::Create do
         :plan => "p100",
         :framework => framework,
         :runtime => runtime,
-        :memory => "1G"
+        :memory => "1G",
+        :command => "ruby main.rb"
       }
     end
 
@@ -54,7 +56,7 @@ describe VMC::App::Create do
       its([:space]) { should eq client.current_space }
       its([:production]) { should eq true }
       its([:framework]) { should eq framework }
-      its([:command]) { should eq nil }
+      its([:command]) { should eq "ruby main.rb" }
       its([:runtime]) { should eq runtime }
       its([:memory]) { should eq 1024 }
     end
@@ -81,10 +83,54 @@ describe VMC::App::Create do
         subject
       end
 
-      it 'should ask for the command if the framework is standalone' do
-        inputs[:framework] = standalone
-        mock_ask("Startup command") { "ruby main.rb" }
-        subject
+      context 'when the command is not given' do
+        before { inputs.delete(:command) }
+
+        shared_examples 'an app that can have a custom start command' do
+          it 'should ask if there is a custom start command' do
+            mock_ask("Use custom startup command?", :default => false) { false }
+            subject
+          end
+
+          context 'when the user answers "yes" to the custom start command' do
+            before { stub_ask("Use custom startup command?", :default => false) { true } }
+
+            it 'should ask for the startup command' do
+              mock_ask("Startup command") { "foo bar.com" }
+              subject[:command].should eq "foo bar.com"
+            end
+          end
+
+          context 'when the user answers "no" to the custom start command' do
+            before { stub_ask("Use custom startup command?", :default => false) { false } }
+
+            it 'should not ask for the startup command' do
+              dont_allow_ask("Startup command")
+              subject
+            end
+          end
+        end
+
+        context 'when the framework is "buildpack"' do
+          let(:framework) { buildpack }
+
+          include_examples 'an app that can have a custom start command'
+        end
+
+        context 'when the framework is "standalone"' do
+          let(:framework) { standalone }
+
+          include_examples 'an app that can have a custom start command'
+        end
+
+        context 'when the framework is neither "buildpack" nor "standalone"' do
+          let(:framework) { fake(:framework, :name => "java") }
+
+          it 'does not ask if there is a custom start command' do
+            dont_allow_ask("Startup command")
+            subject
+          end
+        end
       end
 
       it 'should ask for the runtime' do
@@ -225,7 +271,7 @@ describe VMC::App::Create do
   describe '#create_app' do
     before { dont_allow_ask }
 
-    let(:app) { FactoryGirl.build(:app, :guid => nil) }
+    let(:app) { fake(:app, :guid => nil) }
 
     let(:attributes) do
       { :name => "some-app",
@@ -255,7 +301,7 @@ describe VMC::App::Create do
   end
 
   describe '#map_url' do
-    let(:app) { FactoryGirl.build(:app) }
+    let(:app) { fake(:app) }
     let(:url_choices) { %W(#{app.name}.foo-cloud.com) }
 
     before do
@@ -291,7 +337,7 @@ describe VMC::App::Create do
         mock_ask('URL', anything) { url_choices.first }
 
         mock(create).invoke(:map, :app => app, :url => url_choices.first) do
-          raise CFoundry::RouteHostTaken.new(1234, "foo")
+          raise CFoundry::RouteHostTaken.new(nil, nil, "foo", 1234)
         end
       end
 
@@ -319,7 +365,7 @@ describe VMC::App::Create do
   end
 
   describe '#create_services' do
-    let(:app) { FactoryGirl.build(:app) }
+    let(:app) { fake(:app) }
     subject { create.create_services(app) }
 
     context 'when forcing' do
@@ -365,7 +411,7 @@ describe VMC::App::Create do
   end
 
   describe '#bind_services' do
-    let(:app) { FactoryGirl.build(:app) }
+    let(:app) { fake(:app) }
 
     subject { create.bind_services(app) }
 
@@ -437,7 +483,7 @@ describe VMC::App::Create do
   end
 
   describe '#start_app' do
-    let(:app) { FactoryGirl.build(:app) }
+    let(:app) { fake(:app) }
     subject { create.start_app(app) }
 
     context 'when the start flag is provided' do