vmc 0.5.0.beta.7 → 0.5.0.beta.10

data/lib/vmc/cli/route/unmap.rb

@@ -0,0 +1,94 @@
+require "vmc/cli/route/base"
+
+module VMC::Route
+  class Unmap < Base
+    desc "Remove a URL mapping"
+    group :apps, :info, :hidden => true
+    input :url, :desc => "URL to unmap", :argument => :optional,
+          :from_given => find_by_name("route") { client.routes }
+    input :app, :desc => "Application to remove the URL from",
+          :argument => :optional, :from_given => by_name(:app)
+    input :delete, :desc => "Delete route", :type => :boolean
+    input :all, :desc => "Act on all routes", :type => :boolean
+    input :really, :type => :boolean, :forget => true, :hidden => true,
+          :default => proc { force? || interact }
+    def unmap
+      return invoke :v1_unmap, input.inputs, input.given unless v2?
+
+      if input[:all]
+        if input.has?(:app)
+          app = target = input[:app]
+          return unless !input[:delete] || input[:really, "ALL URLS bound to #{target.name}", :bad]
+        else
+          target = client
+          return unless !input[:delete] || input[:really, "ALL URLS", :bad]
+        end
+
+        target.routes.each do |r|
+          begin
+            invoke :unmap, :delete => input[:delete], :url => r, :really => true, :app => app
+          rescue CFoundry::APIError => e
+            err "#{e.class}: #{e.message}"
+          end
+        end
+
+        return
+      end
+
+      app = input[:app]
+      url = input[:url, app ? app.routes : client.routes]
+
+      if input[:delete]
+        with_progress("Deleting route #{c(url.name, :name)}") do
+          url.delete!
+        end
+      elsif app
+        with_progress("Unbinding #{c(url.name, :name)} from #{c(app.name, :name)}") do
+          app.remove_route(url)
+        end
+      else
+        fail "Missing either --delete or --app."
+      end
+    end
+
+
+    desc "V1 ONLY UNMAP YOU SHOULD NOT SEE THIS"
+    input :url, :desc => "URL to unmap", :argument => :optional,
+          :interact => :v1_ask_url
+    input :app, :desc => "Application to remove the URL from",
+          :argument => :optional, :from_given => by_name(:app)
+    input :all, :desc => "Act on all routes", :type => :boolean
+    def v1_unmap
+      app = input[:app]
+      url = input[:url, app.urls] unless input[:all]
+
+      with_progress("Updating #{c(app.name, :name)}") do |s|
+        if input[:all]
+          app.urls = []
+        else
+          simple = url.sub(/^https?:\/\/(.*)\/?/i, '\1')
+
+          unless app.urls.delete(simple)
+            fail "URL #{url} is not mapped to this application."
+          end
+        end
+
+        app.update!
+      end
+    end
+
+    private
+
+    def ask_url(choices)
+      ask("Which URL?", :choices => choices.sort_by(&:name), :display => proc(&:name))
+    end
+
+    def v1_ask_url(choices)
+      ask("Which URL?", :choices => choices.sort)
+    end
+
+    def ask_really(name, color)
+      ask("Really delete #{c(name, color)}?", :default => false)
+    end
+  end
+end

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

@@ -34,7 +34,10 @@ module VMC::Service
         offerings.reject!(&:deprecated?)
       end
 
-      if v2? && plan = input.given(:plan)
+      # filter the offerings based on a given plan value, which will be a
+      # string if the user provided it with a flag, or a ServicePlan if
+      # something invoked this command with a particular plan
+      if v2? && plan = input.direct(:plan)
         offerings.reject! do |s|
           if plan.is_a?(String)
             s.service_plans.none? { |p| p.name == plan.upcase }

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

@@ -37,7 +37,7 @@ module VMC
       def select_org_and_space(input, info)
         changed_org = false
 
-        if input.given?(:organization) || !org_valid?(info[:organization])
+        if input.has?(:organization) || !org_valid?(info[:organization])
           org = input[:organization]
           return unless org
 
@@ -50,7 +50,7 @@ module VMC
         end
 
         # switching org means switching space
-        if changed_org || input.given?(:space) || !space_valid?(info[:space])
+        if changed_org || input.has?(:space) || !space_valid?(info[:space])
           line if changed_org && !quiet?
 
           space = input[:space, org]

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

@@ -31,6 +31,7 @@ module VMC::Start
 
       info = target_info
 
+      auth_token = nil
       authenticated = false
       failed = false
       remaining_attempts = 3
@@ -42,7 +43,7 @@ module VMC::Start
 
         with_progress("Authenticating") do |s|
           begin
-            info[:token] = client.login(credentials)
+            auth_token = client.login(credentials[:username], credentials[:password])
             authenticated = true
           rescue CFoundry::Denied
             return if force?
@@ -55,14 +56,16 @@ module VMC::Start
         end
       end
 
+      info.merge!(auth_token.to_hash)
       save_target_info(info)
       invalidate_client
 
       if v2?
         line if input.interactive?(:organization) || input.interactive?(:space)
         select_org_and_space(input, info)
-        save_target_info(info)
       end
+
+      save_target_info(info)
     ensure
       exit_status 1 if not authenticated
     end

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

@@ -12,13 +12,14 @@ module VMC::Start
           :from_given => by_name(:space)
     interactions TargetInteractions
     def target
-      if !input.given?(:url) && !input.given?(:organization) && !input.given?(:space)
+      unless input.has?(:url) || input.has?(:organization) || \
+              input.has?(:space)
         display_target
         display_org_and_space unless quiet?
         return
       end
 
-      if input.given?(:url)
+      if input.has?(:url)
         target = sane_target_url(input[:url])
         with_progress("Setting target to #{c(target, :name)}") do
           client(target).info # check that it's valid before setting
@@ -28,7 +29,7 @@ module VMC::Start
 
       return unless v2? && client.logged_in?
 
-      if input.given?(:organization) || input.given?(:space)
+      if input.has?(:organization) || input.has?(:space)
         info = target_info
 
         select_org_and_space(input, info)

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

@@ -4,6 +4,25 @@ module VMC
   module User
     class Base < CLI
       def precondition
+        check_logged_in
+      end
+
+      private
+
+      def validate_password!(password)
+        validate_password_verified!(password)
+        validate_password_strength!(password)
+      end
+
+      def validate_password_verified!(password)
+        fail "Passwords do not match." unless force? || password == input[:verify]
+      end
+
+      def validate_password_strength!(password)
+        strength = client.base.uaa.password_score(password)
+        msg = "Your password strength is: #{strength}"
+        fail msg if strength == :weak
+        line msg
       end
     end
   end

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

@@ -20,27 +20,15 @@ module VMC::User
       user = input[:user]
       password = input[:password] if v2?
       new_password = input[:new_password]
-      verify = input[:verify]
 
-      if new_password != verify
-        fail "Passwords do not match."
-      end
-
-      pw_strength = client.base.uaa.password_score(new_password)
-      msg = "Your password strength is: #{pw_strength}"
-
-      if pw_strength == :weak
-        fail msg
-      else
-        line msg
+      validate_password! new_password
 
-        with_progress("Changing password") do
-          if v2?
-            user.change_password!(new_password, password)
-          else
-            user.password = new_password
-            user.update!
-          end
+      with_progress("Changing password") do
+        if v2?
+          user.change_password!(new_password, password)
+        else
+          user.password = new_password
+          user.update!
         end
       end
     end

data/lib/vmc/cli/{start → user}/register.rb

@@ -1,38 +1,27 @@
-require "vmc/cli/start/base"
+require "vmc/cli/user/base"
 
-module VMC::Start
+module VMC::User
   class Register < Base
+    def precondition; end
+
     desc "Create a user and log in"
-    group :start, :hidden => true
+    group :admin, :user, :hidden => true
     input :email, :desc => "Desired email", :argument => :optional
     input :password, :desc => "Desired password"
     input :verify, :desc => "Repeat password"
     input :login, :desc => "Automatically log in?", :default => true
     def register
-      show_context
-
       email = input[:email]
       password = input[:password]
 
-      if !force? && password != input[:verify]
-        fail "Passwords do not match."
-      end
-
-      pw_strength = client.base.uaa.password_score(password)
-      msg = "Your password strength is: #{pw_strength}"
-
-      if pw_strength == :weak
-        fail msg
-      else
-        line msg
+      validate_password!(password)
 
-        with_progress("Creating user") do
-          client.register(email, password)
-        end
+      with_progress("Creating user") do
+        client.register(email, password)
+      end
 
-        if input[:login]
-          invoke :login, :username => email, :password => password
-        end
+      if input[:login]
+        invoke :login, :username => email, :password => password
       end
     end
 
@@ -42,7 +31,7 @@ module VMC::Start
       ask("Email")
     end
 
-    def ask_passsword
+    def ask_password
       ask("Password", :echo => "*", :forget => true)
     end
 

data/lib/vmc/constants.rb

@@ -2,7 +2,7 @@ module VMC
   OLD_TARGET_FILE = "~/.vmc_target".freeze
   OLD_TOKENS_FILE = "~/.vmc_token".freeze
 
-  CONFIG_DIR = (defined?(SPEC_ROOT) ? "#{SPEC_ROOT}/tmp/.vmc" : "~/.vmc").freeze
+  CONFIG_DIR = "~/.vmc".freeze
 
   LOGS_DIR = "#{CONFIG_DIR}/logs".freeze
   PLUGINS_FILE = "#{CONFIG_DIR}/plugins.yml".freeze

data/lib/vmc/test_support.rb

@@ -0,0 +1,4 @@
+module VMC::TestSupport
+end
+
+Dir.glob(File.expand_path("../test_support/*", __FILE__)).each { |file| require file }

data/lib/vmc/test_support/command_helper.rb

@@ -0,0 +1,38 @@
+module VMC::TestSupport::CommandHelper
+  def vmc(argv)
+    stub(VMC::CLI).exit { |code| code }
+    capture_output { VMC::CLI.start(argv + ["--debug"]) }
+  end
+
+  def expect_success
+    print_debug_output if status != 0
+    expect(status).to eq 0
+  end
+
+  def expect_failure
+    print_debug_output if status == 0
+    expect(status).to eq 1
+  end
+
+  def bool_flag(flag)
+    "#{'no-' unless send(flag)}#{flag.to_s.gsub('_', '-')}"
+  end
+
+  def print_debug_output
+    puts stdout.string.strip_progress_dots
+    puts stderr.string
+  end
+
+  attr_reader :stdout, :stderr, :status
+
+  def capture_output
+    real_stdout = $stdout
+    real_stderr = $stderr
+    $stdout = @stdout = StringIO.new
+    $stderr = @stderr = StringIO.new
+    @status = yield
+  ensure
+    $stdout = real_stdout
+    $stderr = real_stderr
+  end
+end

data/lib/vmc/test_support/fake_home_dir.rb

@@ -0,0 +1,16 @@
+module VMC::TestSupport::FakeHomeDir
+  def self.included(klass)
+    def klass.use_fake_home_dir(&block)
+      around do |example|
+        dir = instance_exec(&block)
+        original_home_dir = ENV['HOME']
+        ENV['HOME'] = dir
+        begin
+          example.call
+        ensure
+          ENV['HOME'] = original_home_dir
+        end
+      end
+    end
+  end
+end

data/lib/vmc/test_support/interact_helper.rb

@@ -0,0 +1,29 @@
+module VMC::TestSupport::InteractHelper
+  def stub_ask(*args, &block)
+    a_stub = nil
+    any_instance_of VMC::CLI do |interactive|
+      a_stub = stub(interactive).ask(*args, &block)
+    end
+    a_stub
+  end
+
+  def mock_ask(*args, &block)
+    a_mock = nil
+    any_instance_of VMC::CLI do |interactive|
+      a_mock = mock(interactive).ask(*args, &block)
+    end
+    a_mock
+  end
+
+  def dont_allow_ask(*args)
+    any_instance_of VMC::CLI do |interactive|
+      dont_allow(interactive).ask(*args)
+    end
+  end
+
+  def mock_with_progress(message)
+    any_instance_of VMC::CLI do |interactive|
+      mock(interactive).with_progress(message) { |_, block| block.call }
+    end
+  end
+end

data/lib/vmc/version.rb

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

data/spec/features/new_user_flow_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require "webmock/rspec"
 
 if ENV['VMC_TEST_USER'] && ENV['VMC_TEST_PASSWORD'] && ENV['VMC_TEST_TARGET']
   describe 'A new user tries to use VMC against v1 production' do
@@ -8,76 +9,67 @@ if ENV['VMC_TEST_USER'] && ENV['VMC_TEST_PASSWORD'] && ENV['VMC_TEST_TARGET']
     let(:output) { StringIO.new }
     let(:out) { output.string.strip_progress_dots }
 
-    let(:app) {
-      fuzz =
-        if defined? TRAVIS_BUILD_ID
-          TRAVIS_BUILD_ID
-        else
-          Time.new.to_f.to_s.gsub(".", "_")
-        end
-
+    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 VMC::CONFIG_DIR
-      stub(VMC::CLI).exit { |code| code }
       WebMock.allow_net_connect!
     end
 
-    after do
-      with_output_to { VMC::CLI.start %W(delete #{app} -f) }
-    end
+    after { vmc %W(delete #{app} -f --no-script) }
 
     it 'and pushes a simple sinatra app using defaults as much as possible' do
-      vmc_ok %W(target #{target}) do |out|
-        expect(out).to eq <<-OUT.strip_heredoc
-          Setting target to https://#{target}... OK
-        OUT
-      end
+      vmc %W[target #{target} --no-script]
+      expect_success
+      expect(stdout.string.strip_progress_dots).to eq <<-OUT.strip_heredoc
+        Setting target to https://#{target}... OK
+      OUT
 
-      vmc_ok %W(login #{username} --password #{password}) do |out|
-        expect(out).to eq <<-OUT.strip_heredoc
-          target: https://#{target}
+      vmc %W[login #{username} --password #{password} --no-script]
+      expect_success
+      expect(stdout.string.strip_progress_dots).to eq <<-OUT.strip_heredoc
+        target: https://#{target}
 
-          Authenticating... OK
-        OUT
-      end
+        Authenticating... OK
+      OUT
 
-      vmc_fail %W(app #{app}) do |out|
-        expect(out).to eq <<-OUT.strip_heredoc
-          Unknown app '#{app}'.
-        OUT
-      end
+      vmc %W[app #{app} --no-script]
+      expect_failure
+      expect(stderr.string).to eq <<-OUT.strip_heredoc
+        Unknown app '#{app}'.
+      OUT
 
       Dir.chdir("#{SPEC_ROOT}/assets/hello-sinatra") do
-        vmc_ok %W(push #{app} --runtime ruby19 --url #{app}-vmc-test.cloudfoundry.com -f) do |out|
-          expect(out).to eq <<-OUT.strip_heredoc
-            Creating #{app}... OK
-
-            Updating #{app}... OK
-            Uploading #{app}... OK
-            Starting #{app}... OK
-            Checking #{app}... OK
-          OUT
-        end
+        vmc %W[push #{app} --runtime ruby19 --url #{app}-vmc-test.cloudfoundry.com -f --no-script]
+        expect_success
+        expect(stdout.string.strip_progress_dots).to eq <<-OUT.strip_heredoc
+          Creating #{app}... OK
 
-        vmc_ok %W(push #{app}) do |out|
-          expect(out).to eq <<-OUT.strip_heredoc
-            Uploading #{app}... OK
-            Stopping #{app}... OK
+          Updating #{app}... OK
+          Uploading #{app}... OK
+          Starting #{app}... OK
+          Checking #{app}... OK
+        OUT
 
-            Starting #{app}... OK
-            Checking #{app}... OK
-          OUT
-        end
-      end
+        vmc %W[push #{app} --no-script]
+        expect_success
+        expect(stdout.string.strip_progress_dots).to eq <<-OUT.strip_heredoc
+          Uploading #{app}... OK
+          Stopping #{app}... OK
 
-      vmc_ok %W(delete #{app} -f) do |out|
-        expect(out).to eq <<-OUT.strip_heredoc
-          Deleting #{app}... OK
+          Starting #{app}... OK
+          Checking #{app}... OK
         OUT
       end
+
+      vmc %W[delete #{app} -f --no-script]
+      expect_success
+      expect(stdout.string.strip_progress_dots).to eq <<-OUT.strip_heredoc
+        Deleting #{app}... OK
+      OUT
     end
   end
 else