vmc 0.4.0.beta.29 → 0.4.0.beta.30

data/vmc-ng/lib/vmc/cli.rb

@@ -34,6 +34,9 @@ module VMC
     option :version, :alias => "-v", :type => :boolean,
       :desc => "Print version number"
 
+    option :verbose, :alias => "-V", :type => :boolean,
+      :desc => "Print extra information"
+
     option(:force, :alias => "-f", :type => :boolean,
            :desc => "Skip interaction when possible") {
       option(:script)
@@ -156,6 +159,10 @@ module VMC
       option(:color)
     end
 
+    def verbose?
+      option(:verbose)
+    end
+
     def err(msg, status = 1)
       if quiet?
         $stderr.puts(msg)
@@ -175,7 +182,7 @@ module VMC
         begin
           TCPSocket.new(url, Net::HTTP.https_default_port)
           url = "https://#{url}"
-        rescue SocketError, Timeout::Error
+        rescue Errno::ECONNREFUSED, SocketError, Timeout::Error
           url = "http://#{url}"
         end
       end
@@ -324,6 +331,29 @@ module VMC
       def client=(c)
         @@client = c
       end
+
+      private
+
+      def find_by_name(what)
+        proc { |name, choices, *_|
+          choices.find { |c| c.name == name } ||
+            fail("Unknown #{what} '#{name}'")
+        }
+      end
+
+      def by_name(what, obj = what)
+        proc { |name, *_|
+          client.send(:"#{obj}_by_name", name) ||
+            fail("Unknown #{what} '#{name}'")
+        }
+      end
+
+      def find_by_name_insensitive(what)
+        proc { |name, choices|
+          choices.find { |c| c.name.upcase == name.upcase } ||
+            fail("Unknown #{what} '#{name}'")
+        }
+      end
     end
   end
 end

data/vmc-ng/lib/vmc/cli/app.rb

@@ -35,21 +35,6 @@ module VMC
     }
 
 
-    def self.find_by_name(what)
-      proc { |name, choices|
-        choices.find { |c| c.name == name } ||
-          fail("Unknown #{what} '#{name}'")
-      }
-    end
-
-    def self.by_name(what)
-      proc { |name|
-        client.send(:"#{what}_by_name", name) ||
-          fail("Unknown #{what} '#{name}'")
-      }
-    end
-
-
     desc "List your applications"
     group :apps
     input :space, :desc => "Show apps in given space",
@@ -73,6 +58,7 @@ module VMC
       end
 
       if apps.empty? and !quiet?
+        line
         line "No applications."
         return
       end
@@ -83,7 +69,7 @@ module VMC
         !app_matches(a, input)
       end
 
-      spaced(apps) do |a|
+      spaced(apps.sort_by(&:name)) do |a|
         display_app(a)
       end
     end
@@ -901,7 +887,7 @@ module VMC
     end
 
     def display_instance(i)
-      start_print "instance #{c("\##{i.index}", :instance)}: "
+      start_line "instance #{c("\##{i.index}", :instance)}: "
       puts "#{b(c(i.state.downcase, state_color(i.state)))} "
 
       indented do

data/vmc-ng/lib/vmc/cli/service.rb

@@ -2,27 +2,6 @@ require "vmc/cli"
 
 module VMC
   class Service < CLI
-    def self.find_by_name(what)
-      proc { |name, choices|
-        choices.find { |c| c.name == name } ||
-          fail("Unknown #{what} '#{name}'")
-      }
-    end
-
-    def self.find_by_name_insensitive(what)
-      proc { |name, choices|
-        choices.find { |c| c.name.upcase == name.upcase } ||
-          fail("Unknown #{what} '#{name}'")
-      }
-    end
-
-    def self.by_name(what, obj = what)
-      proc { |name, *_|
-        client.send(:"#{obj}_by_name", name) ||
-          fail("Unknown #{what} '#{name}'")
-      }
-    end
-
     desc "List your service instances"
     group :services
     input :name, :desc => "Filter by name"

data/vmc-ng/lib/vmc/cli/space.rb

@@ -149,6 +149,18 @@ module VMC
     end
 
 
+    desc "Switch to a space, creating it if it doesn't exist"
+    group :spaces, :hidden => true
+    input :name, :argument => true, :desc => "Space name"
+    def take_space(input)
+      if space = client.space_by_name(input[:name])
+        invoke :target, :space => space
+      else
+        invoke :create_space, :name => input[:name], :target => true
+      end
+    end
+
+
     desc "Delete a space and its contents"
     group :spaces
     input(:space, :argument => :optional, :from_given => space_by_name,

data/vmc-ng/lib/vmc/cli/start.rb

@@ -342,7 +342,7 @@ module VMC
 
     def display_target
       if quiet?
-        puts client.target
+        line client.target
       else
         line "target: #{c(client.target, :name)}"
       end
@@ -363,7 +363,7 @@ module VMC
 
     def display_runtime(r)
       if quiet?
-        puts r.name
+        line r.name
       else
         line "#{c(r.name, :name)}:"
 
@@ -380,7 +380,7 @@ module VMC
 
     def display_service(s)
       if quiet?
-        puts s.label
+        line s.label
       else
         line "#{c(s.label, :name)}:"
 
@@ -403,7 +403,7 @@ module VMC
 
     def display_framework(f)
       if quiet?
-        puts f.name
+        line f.name
       else
         line "#{c(f.name, :name)}:"
 

data/vmc-ng/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.29"
+  VERSION = "0.4.0.beta.30"
 end

data/vmc-ng/spec/app/apps_spec.rb

@@ -3,73 +3,67 @@ require "./helpers"
 describe "App#apps" do
   it "lists app names" do
     with_random_apps do |apps|
-      shell("apps").split("\n").should =~
-        apps.collect(&:name)
+      running(:apps) do
+        apps.sort_by(&:name).each do |a|
+          outputs(a.name)
+        end
+      end
     end
   end
 
   it "filters by name with --name" do
     with_random_apps do |apps|
-      app = apps[rand(apps.size)]
+      name = sample(apps).name
 
-      result = shell("apps", "--name", app.name).split("\n")
-      result.should =~ [app.name]
+      running(:apps, :name => name) do
+        apps.sort_by(&:name).each do |a|
+          if a.name == name
+            outputs(a.name)
+          end
+        end
+      end
     end
   end
 
   it "filters by runtime with --runtime" do
     with_random_apps do |apps|
-      app = apps[rand(apps.size)]
+      runtime = sample(apps).runtime
 
-      result = shell("apps", "--runtime", app.runtime.name).split("\n")
-      actual =
-        apps.select { |a|
-          /#{app.runtime.name}/ =~ a.runtime.name
-        }.collect(&:name)
-
-      result.should =~ actual
+      running(:apps, :runtime => runtime.name) do
+        apps.sort_by(&:name).each do |a|
+          if a.runtime =~ /#{runtime}/
+            outputs(a.name)
+          end
+        end
+      end
     end
   end
 
   it "filters by framework with --framework" do
     with_random_apps do |apps|
-      app = apps[rand(apps.size)]
-
-      result = shell("apps", "--framework", app.framework.name).split("\n")
-      actual =
-        apps.select { |a|
-          /#{app.framework.name}/ =~ a.framework.name
-        }.collect(&:name)
+      framework = sample(apps).framework
 
-      result.should =~ actual
+      running(:apps, :framework => framework.name) do
+        apps.sort_by(&:name).each do |a|
+          if a.framework == framework
+            outputs(a.name)
+          end
+        end
+      end
     end
   end
 
-  # TODO: use space other than current
   it "can be told which space with --space" do
-    with_random_apps do |apps|
-      app = apps[rand(apps.size)]
-
-      result = shell("apps", "--space", client.current_space.name).split("\n")
-      actual = client.current_space.apps.collect(&:name)
-
-      result.should =~ actual
+    with_new_space do |space|
+      with_random_apps do |other_apps|
+        with_random_apps(space) do |apps|
+          running(:apps, :space => space) do
+            apps.sort_by(&:name).each do |a|
+              outputs(a.name)
+            end
+          end
+        end
+      end
     end
   end
-
-  # TODO: v2
-  #it "filters by url with --url" do
-    #with_random_apps do |apps|
-      #app = apps[rand(apps.size)]
-      #url = app.urls[rand(app.urls.size)]
-
-      #result = shell("apps", "--url", url).split("\n")
-      #actual =
-        #apps.select { |a|
-          #a.urls.include? url
-        #}.collect(&:name)
-
-      #result.should =~ actual
-    #end
-  #end
 end

data/vmc-ng/spec/app/push_spec.rb

@@ -0,0 +1,68 @@
+require "./helpers"
+
+describe "App#push" do
+  it "pushes interactively" do
+    name = "app-#{random_str}"
+    instances = rand(3) + 1
+    framework = sample(client.frameworks)
+    runtime = sample(client.runtimes)
+    url = "#{name}.fakecloud.com"
+    memory = sample([64, 128, 256, 512])
+
+    client.app_by_name(name).should_not be
+
+    begin
+      running(:push) do
+        asks("Name")
+        given(name)
+        has_input(:name, name)
+
+        asks("Instances")
+        given(instances)
+        has_input(:instance, instances)
+
+        asks("Framework")
+        given(framework.name)
+        has_input(:framework, framework)
+
+        asks("Runtime")
+        given(runtime.name)
+        has_input(:runtime, runtime)
+
+        asks("URL")
+        given(url)
+        has_input(:url, url)
+
+        asks("Memory Limit")
+        given("#{memory}M")
+        has_input(:memory, "#{memory}M")
+
+        asks("Create services for application?")
+        given("n")
+        has_input(:create_instances, false)
+
+        asks("Bind other services to application?")
+        given("n")
+        has_input(:bind_instances, false)
+      end
+    rescue VMC::UserError => e
+      unless e.to_s == "V2 API currently does not support uploading or starting apps."
+        raise
+      end
+    end
+
+    app = client.app_by_name(name)
+
+    begin
+      app.should be
+      app.name.should == name
+      app.instances.should == instances
+      app.framework.should == framework
+      app.runtime.should == runtime
+      #app.url.should == url # TODO v2
+      app.memory.should == memory
+    ensure
+      app.delete!
+    end
+  end
+end

data/vmc-ng/spec/eventlog.rb

@@ -0,0 +1,157 @@
+require "thread"
+
+class FakeTTY
+  attr_accessor :event
+
+  def initialize
+    @input = Queue.new
+  end
+
+  def getc
+    @input.pop
+  end
+
+  def fake(input)
+    return if @input.nil?
+
+    input.each_char do |c|
+      @input << c
+    end
+  end
+
+  def close
+    @input = nil
+  end
+
+  def tty?
+    true
+  end
+end
+
+class EventLog
+  attr_accessor :process
+  attr_reader :events, :interaction, :inputs
+
+  def initialize(input)
+    @input = input
+
+    @queue = Queue.new
+    @events = []
+    @inputs = {}
+  end
+
+  def finish_input
+    @input.close
+  end
+
+  def next_event
+    if @queue.empty?
+      if @process.status == false
+        raise "Expected more events, but the process has finished."
+      elsif @process.status == nil
+        begin
+          @process.join
+        rescue => e
+          raise "Expected more events, but process has thrown an exception: #{e}."
+        end
+      end
+    end
+
+    val = @queue.pop
+    @events << val
+    val
+  end
+
+  def pending_events
+    events = []
+
+    until @queue.empty?
+      events << @queue.pop
+    end
+
+    events
+  end
+
+  def wait_for_event(type)
+    val = next_event
+
+    until val.is_a?(type)
+      val = next_event
+    end
+
+    val
+  end
+
+
+  def pick_random_option
+    options = @interaction.options
+    choices = options[:choices]
+    chosen = choices[rand(choices.size)]
+
+    if display = options[:display]
+      provide("#{display.call(chosen)}\n")
+    else
+      provide("#{chosen}\n")
+    end
+
+    chosen
+  end
+
+  def provide(input)
+    @input.fake(input)
+  end
+
+
+  def printed(line)
+    @queue << Printed.new(line)
+  end
+
+  def asking(message, options = {})
+    @interaction = Asked.new(message, options)
+    @queue << @interaction
+  end
+
+  def got_input(name, val)
+    @inputs[name] = val
+    @queue << GotInput.new(name, val)
+  end
+
+
+  class Printed
+    attr_reader :line
+
+    def initialize(line)
+      @line = line
+    end
+
+    def to_s
+      "<Printed '#@line'>"
+    end
+  end
+
+  class Asked
+    attr_reader :message, :options
+
+    def initialize(message, options = {})
+      @message = message
+      @options = options
+    end
+
+    def to_s
+      "<Asked '#@message'>"
+    end
+  end
+
+  class GotInput
+    attr_reader :name, :value
+
+    def initialize(name, value)
+      @name = name
+      @value = value
+    end
+
+    def to_s
+      "<GotInput #@name '#@value'>"
+    end
+  end
+end

data/vmc-ng/spec/helpers.rb

@@ -1,6 +1,10 @@
 require "cfoundry"
 require "vmc"
 
+require "./eventlog"
+require "./patches"
+
+
 TARGET = ENV["VMC_TEST_TARGET"] || "http://localhost:8181"
 USER = ENV["VMC_TEST_USER"] || "sre@vmware.com"
 PASSWORD = ENV["VMC_TEST_PASSWORD"] || "test"
@@ -45,13 +49,13 @@ module VMCHelpers
   end
 
   # create 2-5 random apps, call the block, and then delete them
-  def with_random_apps(num = rand(3) + 2)
+  def with_random_apps(space = client.current_space, num = rand(3) + 2)
     apps = []
 
     num.times do |n|
       app = client.app
       app.name = "app-#{n + 1}-#{random_str}"
-      app.space = client.current_space
+      app.space = space
       app.instances = rand(2)
 
       app.framework = sample(frameworks)
@@ -67,31 +71,223 @@ module VMCHelpers
     apps.each(&:delete!)
   end
 
-  # invoke a command with a given arglist
-  def shell(*argv)
+  def with_new_space(org = client.current_organization)
+    space = client.space
+    space.name = "space-#{random_str}"
+    space.organization = org
+    space.create!
+
+    yield space
+  ensure
+    space.delete!
+  end
+
+  def running(command, inputs = {})
+    VMC::CLI.new.exit_status 0
+
+    before_in = $stdin
     before_out = $stdout
     before_err = $stderr
+    before_event = $vmc_event
+
+    tty = FakeTTY.new
+
+    $vmc_event = EventLog.new(tty)
 
+    $stdin = tty
     $stdout = StringIO.new
     $stderr = StringIO.new
 
-    begin
-      VMC::CLI.start(argv)
-    rescue SystemExit => e
-      unless e.status == 0
-        raise "execution failed! output:\n#{$stderr.string}"
+    main = Thread.current
+
+    thd = Thread.new do
+      begin
+        VMC::CLI.new.invoke(command, inputs)
+      rescue SystemExit => e
+        unless e.status == 0
+          raise <<EOF
+execution failed with status #{e.status}!
+
+stdout:
+#{$stdout.string.inspect}
+
+stderr:
+#{$stderr.string}
+EOF
+        end
+      rescue => e
+        main.raise(e)
       end
     end
 
-    $stdout.string
+    begin
+      $vmc_event.process = thd
+
+      yield $vmc_event
+
+      $vmc_event.should complete
+    ensure
+      thd.kill
+    end
   ensure
+    $stdin = before_in
     $stdout = before_out
     $stderr = before_err
+    $vmc_event = before_event
+  end
+end
+
+module VMCMatchers
+  class Contain
+    def initialize(content)
+      @content = content
+    end
+
+    def matches?(actual)
+      @actual = actual
+      true
+    end
+
+    def failure_message
+      "expected '#@content' to be in the output"
+    end
+
+    def negative_failure_message
+      "expected '#@content' to NOT be in the output"
+    end
+  end
+
+  def contain(content)
+    Contain.new(content)
+  end
+
+  class Ask
+    def initialize(message)
+      @message = message
+    end
+
+    def matches?(log)
+      ev = log.wait_for_event(EventLog::Asked)
+
+      @actual = ev.message
+      @actual == @message
+    end
+
+    def failure_message
+      "expected to be asked '#@message', got '#@actual'"
+    end
+
+    def negative_failure_message
+      "expected to NOT be asked for #@message"
+    end
+  end
+
+  def ask(message)
+    Ask.new(message)
+  end
+
+  class HaveInput
+    def initialize(name, value = nil)
+      @name = name
+      @expected = value
+    end
+
+    def matches?(log)
+      @actual = log.wait_for_event(EventLog::GotInput).value
+      @actual == @expected
+    end
+
+    def failure_message
+      "expected to have input '#@name' as '#@expected', but got '#@actual'"
+    end
+
+    def negative_failure_message
+      "expected not to have input '#@name', but had it as '#@actual'"
+    end
+  end
+
+  def have_input(name, value = nil)
+    HaveInput.new(name, value)
+  end
+
+  class Output
+    def initialize(line)
+      @expected = line
+    end
+
+    def matches?(log)
+      @actual = log.wait_for_event(EventLog::Printed).line
+      @actual == @expected
+    end
+
+    def failure_message
+      "expected '#@expected' to be in the output, but got '#@actual'"
+    end
+
+    def negative_failure_message
+      "expected '#@expected' NOT to be in the output, but it was"
+    end
+  end
+
+  def output(line)
+    Output.new(line)
+  end
+
+  class Complete
+    def matches?(log)
+      @log = log
+
+      log.process.join(1)
+
+      log.process.status == false
+    end
+
+    def failure_message
+      pending = @log.pending_events
+
+      if @exception
+        "process existed with an exception: #@exception"
+      elsif !pending.empty?
+        "expected process to complete, but it's pending events #{pending}"
+      else
+        "process is blocked; status: #{@log.process.status}"
+      end
+    end
+
+    def negative_failure_message
+      "expected process to still be running, but it's completed"
+    end
+  end
+
+  def complete
+    Complete.new
+  end
+
+
+  def asks(what)
+    $vmc_event.should ask(what)
+  end
+
+  def given(what)
+    $vmc_event.provide("#{what}\n")
+  end
+
+  def has_input(name, value = nil)
+    $vmc_event.should have_input(name, value)
+  end
+
+  def finish
+    $vmc_event.should complete
+  end
+
+  def outputs(what)
+    $vmc_event.should output(what)
   end
 end
 
 RSpec.configure do |c|
   c.include VMCHelpers
+  c.include VMCMatchers
 
   c.before(:all) do
     VMC::CLI.client = CFoundry::Client.new(TARGET)

data/vmc-ng/spec/patches.rb

@@ -0,0 +1,36 @@
+# [EventLog]
+$vmc_event = nil
+
+class VMC::CLI
+  def ask(*args)
+    $vmc_event.asking(*args) if $vmc_event
+    super
+  end
+
+  def line(*args)
+    $vmc_event.printed(*args) if $vmc_event
+    super
+  end
+
+  def force?
+    false
+  end
+end
+
+class Mothership::Inputs
+  alias_method :vmc_spec_get, :[]
+
+  def [](name, *args)
+    val = vmc_spec_get(name, *args)
+    $vmc_event.got_input(name, val) if $vmc_event
+    val
+  end
+end
+
+module Interactive
+  def set_input_state(input)
+  end
+
+  def restore_input_state(input, before)
+  end
+end

data/vmc-ng/spec/start/target_spec.rb

@@ -2,7 +2,9 @@ require "./helpers"
 
 describe "Start#target" do
   it "shows target url with no arguments" do
-    shell("target").rstrip.should == client.target
+    running(:target) do
+      outputs(client.target)
+    end
   end
 
   describe "switching target url" do
@@ -25,20 +27,27 @@ describe "Start#target" do
     end
 
     it "switches target url if given one argument" do
-      shell("target", "http://api.cloudfoundry.com")
-      client.target.should == "http://api.cloudfoundry.com"
+      running(:target, :url => "http://api.cloudfoundry.com") do
+        finish
+        client.target.should == "http://api.cloudfoundry.com"
+      end
     end
 
     it "defaults to https if supported by remote" do
-      shell("target", "api.cloudfoundry.com")
-      client.target.should == "https://api.cloudfoundry.com"
+      running(:target, :url => "api.cloudfoundry.com") do
+        finish
+        client.target.should == "https://api.cloudfoundry.com"
+      end
     end
 
     # TODO: this assumes locally running cc without https support
     it "defaults to http if not supported by remote" do
       base_target = client.target.sub(/^https?:\/\//, "")
-      shell("target", base_target)
-      client.target.should == "http://#{base_target}"
+
+      running(:target, :url => base_target) do
+        finish
+        client.target.should == "http://#{base_target}"
+      end
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196441
+  hash: 62196447
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 29
-  version: 0.4.0.beta.29
+  - 30
+  version: 0.4.0.beta.30
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-30 00:00:00 Z
+date: 2012-08-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 53
         segments: 
         - 0
         - 3
-        - 17
-        version: 0.3.17
+        - 19
+        version: 0.3.19
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -387,7 +387,10 @@ files:
 - vmc-ng/lib/vmc/version.rb
 - vmc-ng/lib/vmc.rb
 - vmc-ng/spec/app/apps_spec.rb
+- vmc-ng/spec/app/push_spec.rb
+- vmc-ng/spec/eventlog.rb
 - vmc-ng/spec/helpers.rb
+- vmc-ng/spec/patches.rb
 - vmc-ng/spec/Rakefile
 - vmc-ng/spec/start/target_spec.rb
 - vmc-ng/bin/vmc