vmc 0.5.0.rc1 → 0.5.0.rc2

data/lib/vmc/cli.rb

@@ -26,7 +26,7 @@ module VMC
     option :help, :desc => "Show command usage", :alias => "-h",
       :default => false
 
-    option :proxy, :desc => "Act as another user (admin)", :alias => "-u",
+    option :proxy, :desc => "Run this command as another user (admin)", :alias => "-u",
       :value => :email
 
     option :version, :desc => "Print version number", :alias => "-v",
@@ -398,6 +398,7 @@ module VMC
       @@client =
         case info[:version]
         when 2
+          fail "User switching not implemented for v2." if input[:proxy]
           CFoundry::V2::Client.new(target, token)
         when 1
           CFoundry::V1::Client.new(target, token)

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

@@ -19,16 +19,13 @@ module VMC::App
 
         switch_mode(app, input[:debug_mode])
 
-        with_progress("Starting #{c(app.name, :name)}") do |s|
-          if app.started?
-            s.skip do
-              err "Already started."
-            end
-          end
-
-          app.start!
+        if app.started?
+          err "Application #{b(app.name)} is already started."
+          next
         end
 
+        log = start_app(app)
+        stream_start_log(log) if log
         check_application(app)
 
         if app.debug_mode && !quiet?
@@ -38,6 +35,33 @@ module VMC::App
       end
     end
 
+    private
+
+    def start_app(app)
+      log = nil
+      with_progress("Starting #{c(app.name, :name)}") do
+        app.start!(true) do |url|
+          log = url
+        end
+      end
+      log
+    end
+
+    def stream_start_log(log)
+      offset = 0
+
+      while true
+        begin
+          client.stream_url(log + "&tail&tail_offset=#{offset}") do |out|
+            offset += out.size
+            print out
+          end
+        rescue Timeout::Error
+        end
+      end
+    rescue CFoundry::APIError
+    end
+
     # set app debug mode, ensuring it's valid, and shutting it down
     def switch_mode(app, mode)
       mode = nil if mode == "none"
@@ -68,26 +92,59 @@ module VMC::App
     end
 
     def check_application(app)
-      with_progress("Checking #{c(app.name, :name)}") do |s|
-        if app.debug_mode == "suspend"
-          s.skip do
-            line "Application is in suspended debugging mode."
-            line "It will wait for you to attach to it before starting."
-          end
+      if app.debug_mode == "suspend"
+        line "Application is in suspended debugging mode."
+        line "It will wait for you to attach to it before starting."
+        return
+      end
+
+      line "Checking #{c(app.name, :name)}..."
+
+      seconds = 0
+      while instances = app.instances
+        indented { print_instances_summary(instances) }
+
+        if all_instances_running?(instances)
+          line "#{c("OK", :good)}"
+          return
         end
 
-        seconds = 0
-        until app.healthy?
-          sleep 1
-          seconds += 1
-          if seconds == APP_CHECK_LIMIT
-            s.give_up do
-              err "Application failed to start."
-              # TODO: print logs
-            end
-          end
+        if any_instance_flapping?(instances) || seconds == APP_CHECK_LIMIT
+          err "Application failed to start."
+          return
+        end
+
+        sleep 1
+        seconds += 1
+      end
+    end
+
+    def all_instances_running?(instances)
+      instances.all? { |i| i.state == "RUNNING" }
+    end
+
+    def any_instance_flapping?(instances)
+      instances.any? { |i| i.state == "FLAPPING" }
+    end
+
+    def print_instances_summary(instances)
+      counts = Hash.new { 0 }
+      instances.each do |i|
+        counts[i.state] += 1
+      end
+
+      states = []
+      %w{RUNNING STARTING DOWN FLAPPING}.each do |state|
+        if (num = counts[state]) > 0
+          states << "#{b(num)} #{c(state.downcase, state_color(state))}"
         end
       end
+
+      total = instances.count
+      running = counts["RUNNING"].to_s.rjust(total.to_s.size)
+
+      ratio = "#{running}#{d("/")}#{total} instances:"
+      line "#{ratio} #{states.join(", ")}"
     end
   end
 end

data/lib/vmc/cli/space/create.rb

@@ -14,7 +14,11 @@ module VMC::Space
     input :manager, :desc => "Add yourself as manager", :default => true
     input :developer, :desc => "Add yourself as developer", :default => true
     input :auditor, :desc => "Add yourself as auditor", :default => false
+
     def create_space
+      return invoke :help,
+        :command => "create-space" if input[:organization].nil?
+
       space = client.space
       space.organization = input[:organization]
       space.name = input[:name]

data/lib/vmc/cli/space/switch.rb

@@ -0,0 +1,16 @@
+require "vmc/cli/space/base"
+
+module VMC::Space
+  class Switch < Base
+    desc "Switch to a space"
+    group :spaces, :hidden => true
+    input :name, :desc => "Space name", :argument => true
+    def switch_space
+      if (space = client.space_by_name(input[:name]))
+        invoke :target, :space => space
+      else
+        raise VMC::UserError, "The space #{input[:name]} does not exist, please create the space first."
+      end
+    end
+  end
+end

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

@@ -34,34 +34,37 @@ module VMC
         end
       end
 
-      def select_org_and_space(input, info)
-        changed_org = false
-
+      def select_org(input, info)
         if input.has?(:organization) || !org_valid?(info[:organization])
           org = input[:organization]
-          return unless org
-
-          with_progress("Switching to organization #{c(org.name, :name)}") do
-            info[:organization] = org.guid
-            changed_org = true
-          end
+          with_progress("Switching to organization #{c(org.name, :name)}") {} if org
+          org
         else
-          org = client.current_organization
+          client.current_organization
         end
+      end
 
-        # switching org means switching space
-        if changed_org || input.has?(:space) || !space_valid?(info[:space])
+      def select_space(org, input, info, changed_org)
+        if input.has?(:space) || !space_valid?(info[:space])
           line if changed_org && !quiet?
-
           space = input[:space, org]
-          return unless space
-
-          with_progress("Switching to space #{c(space.name, :name)}") do
-            info[:space] = space.guid
-          end
+          with_progress("Switching to space #{c(space.name, :name)}") {} if space
+          space
+        else
+          client.current_space
         end
       end
 
+      def select_org_and_space(input, info)
+        org = select_org(input, info)
+        changed_org = client.current_organization != org
+        space = select_space(org, input, info, changed_org) if org
+        info.merge!(
+          :organization => (org ? org.guid : nil),
+          :space        => (space ? space.guid : nil)
+        )
+      end
+
       def org_valid?(guid, user = client.current_user)
         return false unless guid
         client.organization(guid).users.include? user

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

@@ -19,7 +19,7 @@ module VMC
       end
 
       def validate_password_strength!(password)
-        strength = client.password_score(password)
+        strength = client.base.password_score(password)
         msg = "Your password strength is: #{strength}"
         fail msg if strength == :weak
         line msg

data/lib/vmc/cli/user/delete.rb

@@ -8,6 +8,8 @@ module VMC::User
     input :really, :type => :boolean, :forget => true, :hidden => true,
           :default => proc { force? || interact }
     def delete_user
+      no_v2
+
       email = input[:email]
       return unless input[:really, email]
 

data/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.5.0.rc1".freeze
+  VERSION = "0.5.0.rc2".freeze
 end

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

@@ -0,0 +1,17 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rack (1.5.2)
+    rack-protection (1.3.2)
+      rack
+    sinatra (1.3.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  sinatra

data/spec/features/{new_user_flow_spec.rb → v1/new_user_flow_spec.rb}

@@ -1,18 +1,18 @@
 require 'spec_helper'
-require "webmock/rspec"
-
-INTEGRATE_WITH = ENV["INTEGRATE_WITH"] || "default"
+require 'webmock/rspec'
+require 'ffaker'
 
 if ENV['VMC_TEST_USER'] && ENV['VMC_TEST_PASSWORD'] && ENV['VMC_TEST_TARGET']
-  describe 'A new user tries to use VMC against v1 production', :ruby19 => true do
+  describe 'A new user tries to use VMC against v1 production', :ruby19 => true do 
     include ConsoleAppSpeckerMatchers
     include VMC::Interactive
 
+    let(:output) { StringIO.new }
+    let(:out) { output.string.strip_progress_dots }
+    
     let(:target) { ENV['VMC_TEST_TARGET'] }
     let(:username) { ENV['VMC_TEST_USER'] }
     let(:password) { ENV['VMC_TEST_PASSWORD'] }
-    let(:output) { StringIO.new }
-    let(:out) { output.string.strip_progress_dots }
 
     let(:app) do
       fuzz = defined?(TRAVIS_BUILD_ID) ? TRAVIS_BUILD_ID : Time.new.to_f.to_s.gsub(".", "_")
@@ -30,15 +30,6 @@ if ENV['VMC_TEST_USER'] && ENV['VMC_TEST_PASSWORD'] && ENV['VMC_TEST_TARGET']
       Interact::Progress::Dots.stop!
     end
 
-    let(:vmc_bin) do
-      vmc = File.expand_path("#{SPEC_ROOT}/../bin/vmc.dev")
-      if INTEGRATE_WITH != 'default'
-        "rvm #{INTEGRATE_WITH}@vmc do #{vmc}"
-      else
-        vmc
-      end
-    end
-
     it 'pushes a simple sinatra app using defaults as much as possible' do
       run("#{vmc_bin} target http://#{target}") do |runner|
         expect(runner).to say %r{Setting target to http://#{target}... OK}
@@ -98,7 +89,10 @@ if ENV['VMC_TEST_USER'] && ENV['VMC_TEST_PASSWORD'] && ENV['VMC_TEST_TARGET']
 
           expect(runner).to say "Uploading #{app}... OK"
           expect(runner).to say "Starting #{app}... OK"
-          expect(runner).to say "Checking #{app}... OK", 30
+
+          expect(runner).to say "Checking #{app}..."
+          expect(runner).to say "1/1 instances"
+          expect(runner).to say "OK", 30
         end
       end
 
@@ -111,5 +105,5 @@ if ENV['VMC_TEST_USER'] && ENV['VMC_TEST_PASSWORD'] && ENV['VMC_TEST_TARGET']
     end
   end
 else
-  $stderr.puts 'Skipping integration specs; please provide $VMC_TEST_TARGET, $VMC_TEST_USER, and $VMC_TEST_PASSWORD'
-end
+  $stderr.puts 'Skipping v1 integration specs; please provide $VMC_TEST_TARGET, $VMC_TEST_USER, and $VMC_TEST_PASSWORD'
+end

data/spec/features/v2/account_lifecycle_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+require "webmock/rspec"
+
+if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TARGET']
+  describe 'A new user tries to use VMC against v2 production', :ruby19 => true do
+    include ConsoleAppSpeckerMatchers
+
+    let(:target) { ENV['VMC_V2_TEST_TARGET'] }
+    let(:username) { ENV['VMC_V2_TEST_USER'] }
+    let(:password) { ENV['VMC_V2_TEST_PASSWORD'] }
+
+    before do
+      Interact::Progress::Dots.start!
+    end
+
+    after do
+      Interact::Progress::Dots.stop!
+    end
+
+    it "registers a new account and deletes it" do
+      pending "until we get some v2 admin credentials somewhere to actually run this with"
+
+      email = Faker::Internet.email
+      run("#{vmc_bin} target #{target}") do |runner|
+        runner.wait_for_exit
+      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"
+      end
+
+      puts "registering #{email}"
+      run("#{vmc_bin} register #{email} --password p") do |runner|
+        expect(runner).to say "Confirm Password>"
+        runner.send_keys 'p'
+        expect(runner).to say "Your password strength is: good"
+        expect(runner).to say "Creating user... OK"
+        expect(runner).to say "Authenticating... OK"
+      end
+
+      run("#{vmc_bin} logout") do |runner|
+        runner.wait_for_exit
+      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"
+      end
+
+      run("#{vmc_bin} delete-user #{email}") do |runner|
+        expect(runner).to say "Really delete user #{email}?>"
+        runner.send_keys "y"
+        expect(runner).to say "Deleting #{email}... OK"
+      end
+    end
+  end
+else
+  $stderr.puts 'Skipping v2 integration specs; please provide $VMC_V2_TEST_TARGET, $VMC_V2_TEST_USER, and $VMC_V2_TEST_PASSWORD'
+end

data/spec/features/v2/push_flow_spec.rb

@@ -0,0 +1,126 @@
+require "spec_helper"
+require "webmock/rspec"
+
+if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TARGET']
+  describe 'A new user tries to use VMC against v2', :ruby19 => true do
+    include ConsoleAppSpeckerMatchers
+    include VMC::Interactive
+
+    let(:target) { ENV['VMC_V2_TEST_TARGET'] }
+    let(:username) { ENV['VMC_V2_TEST_USER'] }
+    let(:password) { ENV['VMC_V2_TEST_PASSWORD'] }
+
+    let(:app) do
+      fuzz = defined?(TRAVIS_BUILD_ID) ? TRAVIS_BUILD_ID : Time.new.to_f.to_s.gsub(".", "_")
+      "hello-sinatra-#{fuzz}"
+    end
+
+    before do
+      FileUtils.rm_rf File.expand_path(VMC::CONFIG_DIR)
+      WebMock.allow_net_connect!
+      Interact::Progress::Dots.start!
+    end
+
+    after do
+      vmc %W(delete #{app} -f --no-script)
+      Interact::Progress::Dots.stop!
+    end
+
+    it 'pushes a simple sinatra app using defaults as much as possible' do
+      run("#{vmc_bin} target http://#{target}") do |runner|
+        expect(runner).to say %r{Setting target to http://#{target}... OK}
+      end
+
+      run("#{vmc_bin} login") do |runner|
+        expect(runner).to say %r{target: https?://#{target}}
+
+        expect(runner).to say "Email>"
+        runner.send_keys username
+
+        expect(runner).to say "Password>"
+        runner.send_keys password
+
+        expect(runner).to say "Authenticating... OK"
+
+        expect(runner).to say "1:"
+        expect(runner).to say "Organization>"
+        runner.send_keys "1"
+
+        expect(runner).to say /Switching to organization .*\.\.\. OK/
+        expect(runner).to say /Switching to space .*\.\.\. OK/
+      end
+
+      run("#{vmc_bin} app #{app}") do |runner|
+        expect(runner).to say "Unknown app '#{app}'."
+      end
+
+      Dir.chdir("#{SPEC_ROOT}/assets/hello-sinatra") do
+        run("#{vmc_bin} push") do |runner|
+          expect(runner).to say "Name>"
+          runner.send_keys app
+
+          expect(runner).to say "Instances> 1"
+          runner.send_keys ""
+
+          expect(runner).to say ": other"
+          expect(runner).to say "Framework>"
+          runner.send_keys "other"
+
+          expect(runner).to say ": buildpack"
+          expect(runner).to say "Framework>"
+          runner.send_keys "buildpack"
+
+          expect(runner).to say "Use custom startup command?> "
+          runner.send_keys "y"
+
+          expect(runner).to say "Startup command> "
+          runner.send_keys "bundle exec ruby main.rb -p $PORT"
+
+          expect(runner).to say ": ruby19"
+          expect(runner).to say "Runtime>"
+          runner.send_keys "ruby19"
+
+          expect(runner).to say "Memory Limit>"
+          runner.send_keys "64M"
+
+          expect(runner).to say "Creating #{app}... OK"
+
+          expect(runner).to say "Subdomain> #{app}"
+          runner.send_keys ""
+
+          expect(runner).to say "1:"
+          expect(runner).to say "Domain>"
+          runner.send_keys "1"
+
+          expect(runner).to say(/Creating route #{app}\..*\.\.\. OK/)
+          expect(runner).to say(/Binding #{app}\..* to #{app}\.\.\. OK/)
+
+          expect(runner).to say "Create services for application?> n"
+          runner.send_keys ""
+
+          expect(runner).to say "Save configuration?> n"
+          runner.send_keys ""
+
+          expect(runner).to say "Uploading #{app}... OK"
+          expect(runner).to say "Starting #{app}... OK"
+
+          expect(runner).to say "Using Ruby", 10
+          expect(runner).to say "Your bundle is complete!", 30
+
+          expect(runner).to say "Checking #{app}..."
+          expect(runner).to say "1/1 instances"
+          expect(runner).to say "OK", 30
+        end
+      end
+
+      run("#{vmc_bin} delete #{app}") do |runner|
+        expect(runner).to say "Really delete #{app}?>"
+        runner.send_keys "y"
+
+        expect(runner).to say "Deleting #{app}... OK"
+      end
+    end
+  end
+else
+  $stderr.puts 'Skipping integration specs; please provide $VMC_TEST_TARGET, $VMC_TEST_USER, and $VMC_TEST_PASSWORD'
+end