vmc 0.5.0.beta.12 → 0.5.0.rc1

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require "cfoundry"
 require "cfoundry/test_support"
 require "vmc"
 require "vmc/test_support"
+require "webmock"
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|
   require file
@@ -12,12 +13,21 @@ end
 
 RSpec.configure do |c|
   c.include Fake::FakeMethods
+  c.include V1Fake::FakeMethods
   c.mock_with :rr
 
+  if RUBY_VERSION =~ /^1\.8\.\d/
+    c.filter_run_excluding :ruby19 => true
+  end
+
   c.include VMC::TestSupport::FakeHomeDir
   c.include VMC::TestSupport::CommandHelper
   c.include VMC::TestSupport::InteractHelper
 
+  c.before(:all) do
+    WebMock.disable_net_connect!
+  end
+
   c.before do
     VMC::CLI.send(:class_variable_set, :@@client, nil)
   end
@@ -55,3 +65,9 @@ def stub_output(cli)
   stub(Interact::Progress::Dots).start!
   stub(Interact::Progress::Dots).stop!
 end
+
+def run(command)
+  SpeckerRunner.new(command) do |runner|
+    yield runner
+  end
+end

data/spec/support/console_app_specker_matchers.rb

@@ -0,0 +1,75 @@
+module ConsoleAppSpeckerMatchers
+  class InvalidInputError < StandardError; end
+
+  class ExpectOutputMatcher
+    attr_reader :timeout
+
+    def initialize(expected_output, timeout = 30)
+      @expected_output = expected_output
+      @timeout = timeout
+    end
+
+    def matches?(runner)
+      raise InvalidInputError unless runner.is_a?(SpeckerRunner)
+      expected = runner.expect(@expected_output, @timeout)
+      @full_output = runner.output
+      !!expected
+    end
+
+    def failure_message
+      "expected '#{@expected_output}' to be printed, but it wasn't. full output:\n#@full_output"
+    end
+
+    def negative_failure_message
+      "expected '#{@expected_output}' to not be printed, but it was. full output:\n#@full_output"
+    end
+  end
+
+
+  class ExitCodeMatcher
+    def initialize(expected_code)
+      @expected_code = expected_code
+    end
+
+    def matches?(runner)
+      raise InvalidInputError unless runner.is_a?(SpeckerRunner)
+
+      begin
+        Timeout.timeout(5) do
+          @actual_code = runner.exit_code
+        end
+
+        @actual_code == @expected_code
+      rescue Timeout::Error
+        @timed_out = true
+        false
+      end
+    end
+
+    def failure_message
+      if @timed_out
+        "expected process to exit with status #@expected_code, but it did not exit within 5 seconds"
+      else
+        "expected process to exit with status #{@expected_code}, but it exited with status #{@actual_code}"
+      end
+    end
+
+    def negative_failure_message
+      if @timed_out
+        "expected process to exit with status #@expected_code, but it did not exit within 5 seconds"
+      else
+        "expected process to not exit with status #{@expected_code}, but it did"
+      end
+    end
+  end
+
+  def say(expected_output, timeout = 30)
+    ExpectOutputMatcher.new(expected_output, timeout)
+  end
+
+  def have_exited_with(expected_code)
+    ExitCodeMatcher.new(expected_code)
+  end
+
+  alias :exit_with :have_exited_with
+end

data/spec/support/specker_runner.rb

@@ -0,0 +1,123 @@
+require "expect"
+require "pty"
+
+class SpeckerRunner
+  attr_reader :output
+
+  def initialize(*args)
+    @output = ""
+
+    @stdout, slave = PTY.open
+    system("stty raw", :in => slave)
+    read, @stdin = IO.pipe
+
+    @pid = spawn(*(args.push(:in => read, :out => slave, :err => slave)))
+
+    yield self
+  end
+
+  def expect(matcher, timeout = 30)
+    case matcher
+    when Hash
+      expect_branches(matcher, timeout)
+    else
+      tracking_expect(matcher, timeout)
+    end
+  end
+
+  def send_keys(text_to_send)
+    @stdin.puts(text_to_send)
+  end
+
+  def exit_code
+    return @status if @status
+
+    status = nil
+    Timeout.timeout(5) do
+      _, status = Process.waitpid2(@pid)
+    end
+
+    @status = numeric_exit_code(status)
+  end
+
+  alias_method :wait_for_exit, :exit_code
+
+  def exited?
+    !running?
+  end
+
+  def running?
+    !!Process.getpgid(@pid)
+  end
+
+  private
+
+  def expect_branches(branches, timeout)
+    branch_names = /#{branches.keys.collect { |k| Regexp.quote(k) }.join("|")}/
+    expected = @stdout.expect(branch_names, timeout)
+    return unless expected
+
+    data = expected.first.match(/(#{branch_names})$/)
+    matched = data[1]
+    branches[matched].call
+  end
+
+  def numeric_exit_code(status)
+    status.exitstatus
+  rescue NoMethodError
+    status
+  end
+
+  def tracking_expect(pattern, timeout)
+    buffer = ''
+
+    case pattern
+    when String
+      pattern = Regexp.new(Regexp.quote(pattern))
+    when Regexp
+    else
+      raise TypeError, "unsupported pattern class: #{pattern.class}"
+    end
+
+    result = nil
+    position = 0
+    @unused ||= ""
+
+    while true
+      if !@unused.empty?
+        c = @unused.slice!(0).chr
+      elsif !IO.select([@stdout], nil, nil, timeout) || @stdout.eof?
+        @unused = buffer
+        break
+      else
+        c = @stdout.getc.chr
+      end
+
+      # wear your flip flops
+      unless (c == "\e") .. (c == "m")
+        if c == "\b"
+          if position > 0 && buffer[position - 1] && buffer[position - 1].chr != "\n"
+            position -= 1
+          end
+        else
+          if buffer.size > position
+            buffer[position] = c
+          else
+            buffer << c
+          end
+
+          position += 1
+        end
+      end
+
+      if matches = pattern.match(buffer)
+        result = [buffer, *matches.to_a[1..-1]]
+        break
+      end
+    end
+
+    @output << buffer
+
+    result
+  end
+end

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

@@ -29,9 +29,10 @@ describe VMC::App::Create do
   end
 
   let(:create) do
-    create = VMC::App::Push.new
+    command = Mothership.commands[:push]
+    create = VMC::App::Push.new(command)
     create.path = "some-path"
-    create.input = Mothership::Inputs.new(Mothership.commands[:push], create, inputs, given, global)
+    create.input = Mothership::Inputs.new(command, create, inputs, given, global)
     create.extend VMC::App::PushInteractions
     create
   end
@@ -301,33 +302,89 @@ describe VMC::App::Create do
         expect(app.send(key)).to eq val
       end
     end
+
+    context "with an invalid buildpack" do
+      before do
+        stub(app).create! do
+          raise CFoundry::MessageParseError.new(
+            "Request invalid due to parse error: Field: buildpack, Error: Value git@github.com:cloudfoundry/heroku-buildpack-ruby.git doesn't match regexp String /GIT_URL_REGEX/",
+            1001)
+        end
+      end
+
+      it "fails and prints a pretty message" do
+        stub(create).line(anything)
+        expect { subject }.to raise_error(
+          VMC::UserError, "Buildpack must be a public git repository URI.")
+      end
+    end
   end
 
   describe '#map_url' do
-    let(:app) { fake(:app) }
-    let(:url_choices) { %W(#{app.name}.foo-cloud.com) }
+    let(:app) { fake(:app, :space => space) }
+    let(:space) { fake(:space, :domains => domains) }
+    let(:domains) { [fake(:domain, :name => "foo.com")] }
+    let(:hosts) { [app.name] }
+
+    subject { create.map_route(app) }
+
+    it "asks for a subdomain with 'none' as an option" do
+      mock_ask('Subdomain', anything) do |_, options|
+        expect(options[:choices]).to eq(hosts + %w(none))
+        expect(options[:default]).to eq hosts.first
+        hosts.first
+      end
 
-    before do
-      stub(create).url_choices { url_choices }
+      stub_ask("Domain", anything) { domains.first }
+
+      stub(create).invoke
+
+      subject
     end
 
-    subject { create.map_url(app) }
+    it "asks for a domain with 'none' as an option" do
+      stub_ask("Subdomain", anything) { hosts.first }
 
-    it "maps a url" do
-      mock_ask('URL', anything) do |_, options|
-        expect(options[:choices]).to eq(url_choices + %w(none))
-        expect(options[:default]).to eq url_choices.first
-        url_choices.first
+      mock_ask('Domain', anything) do |_, options|
+        expect(options[:choices]).to eq(domains + %w(none))
+        expect(options[:default]).to eq domains.first
+        domains.first
       end
 
-      mock(create).invoke(:map, :app => app, :url => url_choices.first)
+      stub(create).invoke
 
       subject
     end
 
-    context "when 'none' is given" do
+    it "maps the host and domain after both are given" do
+      stub_ask('Subdomain', anything) { hosts.first }
+      stub_ask('Domain', anything) { domains.first }
+
+      mock(create).invoke(:map,
+        :app => app, :host => hosts.first,
+        :domain => domains.first)
+
+      subject
+    end
+
+    context "when 'none' is given as the host" do
+      context "and a domain is provided afterwards" do
+        it "invokes 'map' with an empty host" do
+          mock_ask('Subdomain', anything) { "none" }
+          stub_ask('Domain', anything) { domains.first }
+
+          mock(create).invoke(:map,
+            :host => "", :domain => domains.first, :app => app)
+
+          subject
+        end
+      end
+    end
+
+    context "when 'none' is given as the domain" do
       it "does not perform any mapping" do
-        mock_ask('URL', anything) { "none" }
+        stub_ask('Subdomain', anything) { "foo" }
+        mock_ask('Domain', anything) { "none" }
 
         dont_allow(create).invoke(:map, anything)
 
@@ -337,9 +394,11 @@ describe VMC::App::Create do
 
     context "when mapping fails" do
       before do
-        mock_ask('URL', anything) { url_choices.first }
+        mock_ask('Subdomain', anything) { "foo" }
+        mock_ask('Domain', anything) { domains.first }
 
-        mock(create).invoke(:map, :app => app, :url => url_choices.first) do
+        mock(create).invoke(:map,
+            :host => "foo", :domain => domains.first, :app => app) do
           raise CFoundry::RouteHostTaken.new("foo", 1234)
         end
       end
@@ -347,9 +406,10 @@ describe VMC::App::Create do
       it "asks again" do
         stub(create).line
 
-        mock_ask('URL', anything) { url_choices.first }
+        mock_ask('Subdomain', anything) { hosts.first }
+        mock_ask('Domain', anything) { domains.first }
 
-        stub(create).invoke(:map, :app => app, :url => url_choices.first)
+        stub(create).invoke
 
         subject
       end
@@ -358,9 +418,10 @@ describe VMC::App::Create do
         mock(create).line "foo"
         mock(create).line
 
-        stub_ask('URL', anything) { url_choices.first }
+        stub_ask('Subdomain', anything) { hosts.first }
+        stub_ask('Domain', anything) { domains.first }
 
-        stub(create).invoke(:map, :app => app, :url => url_choices.first)
+        stub(create).invoke
 
         subject
       end

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

@@ -284,20 +284,65 @@ describe VMC::App::Push do
         end
       end
     end
+
+    context "when buildpack is given" do
+      let(:old) { nil }
+      let(:app) { fake(:app, :buildpack => old) }
+      let(:inputs) { { :buildpack => new } }
+
+      context "and it's an invalid URL" do
+        let(:new) { "git@github.com:foo/bar.git" }
+
+        before do
+          stub(app).update! do
+            raise CFoundry::MessageParseError.new(
+              "Request invalid due to parse error: Field: buildpack, Error: Value git@github.com:cloudfoundry/heroku-buildpack-ruby.git doesn't match regexp String /GIT_URL_REGEX/",
+              1001)
+          end
+        end
+
+        it "fails and prints a pretty message" do
+          stub(push).line(anything)
+          expect { subject }.to raise_error(
+            VMC::UserError, "Buildpack must be a public git repository URI.")
+        end
+      end
+
+      context "and it's a valid URL" do
+        let(:new) { "git://github.com/foo/bar.git" }
+
+        it "updates the app's buildpack" do
+          stub(push).line(anything)
+          mock(app).update!
+          expect { subject }.to change { app.buildpack }.from(old).to(new)
+        end
+
+        it "outputs the changed buildpack with single quotes" do
+          mock(push).line("Changes:")
+          mock(push).line("buildpack: '' -> '#{new}'")
+          stub(app).update!
+          subject
+        end
+
+        include_examples 'common tests for inputs', :buildpack
+      end
+    end
   end
 
   describe '#setup_new_app (integration spec!!)' do
     let(:app) { fake(:app, :guid => nil) }
     let(:framework) { fake(:framework) }
     let(:runtime) { fake(:runtime) }
-    let(:url) { "https://www.foobar.com" }
+    let(:host) { "" }
+    let(:domain) { fake(:domain, :name => "example.com") }
     let(:inputs) do
       { :name => "some-app",
         :instances => 2,
         :framework => framework,
         :runtime => runtime,
         :memory => 1024,
-        :url => url
+        :host => host,
+        :domain => domain
       }
     end
     let(:global) { {:quiet => true, :color => false, :force => true} }
@@ -316,9 +361,9 @@ describe VMC::App::Push do
       mock(app).upload(path)
       mock(push).filter(:create_app, app) { app }
       mock(push).filter(:push_app, app) { app }
-      mock(push).invoke :map, :app => app, :url => url
+      mock(push).invoke :map, :app => app, :host => host, :domain => domain
       mock(push).invoke :start, :app => app
       subject
     end
   end
-end
+end