vmc 0.4.0.beta.20 → 0.4.0.beta.21

data/vmc-ng/Rakefile

@@ -1,11 +1,47 @@
-require "bundler"
+require "rake"
 
-if Gem::Version.new(Bundler::VERSION) > Gem::Version.new("1.0.12")
-  require "bundler/gem_tasks"
-end
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "vmc/version"
 
 task :default => :spec
 
-task :spec do
+desc "Run specs"
+task :spec => ["bundler:install", "test:spec"]
+
+desc "Run integration tests"
+task :test => ["bundler:install", "test:integration"]
+
+task :build do
+  sh "gem build vmc.gemspec"
+end
+
+task :install => :build do
+  sh "gem install --local vmc-#{VMC::VERSION}"
+end
+
+task :uninstall do
+  sh "gem uninstall vmc"
+end
+
+task :reinstall => [:uninstall, :install]
+
+task :release => :build do
+  sh "gem push vmc-#{VMC::VERSION}.gem"
+end
+
+namespace "bundler" do
+  desc "Install gems"
+  task "install" do
+    sh("bundle install")
+  end
+end
+
+namespace "test" do
+  task "spec" do |t|
+    # nothing
+  end
 
+  task "integration" do |t|
+    sh("cd spec && bundle exec rake spec")
+  end
 end

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

@@ -43,13 +43,17 @@ module VMC
 
     desc "List your applications"
     group :apps
+    input :space, :desc => "Show apps in given space",
+      :from_given => proc { |name|
+        client.space_by_name(name) || \
+          fail("Unknown space '#{name}'")
+      }
     input :name, :desc => "Filter by name regexp"
     input :runtime, :desc => "Filter by runtime regexp"
     input :framework, :desc => "Filter by framework regexp"
     input :url, :desc => "Filter by url regexp"
     def apps(input)
-      if v2?
-        space = client.current_space
+      if space = input[:space] || client.current_space
         apps =
           with_progress("Getting applications in #{c(space.name, :name)}") do
             space.apps
@@ -146,7 +150,7 @@ module VMC
 
       app = client.app
       app.name = name
-      app.space = client.current_space if v2?
+      app.space = client.current_space if client.current_space
       app.total_instances = input[:instances]
 
       detector = Detector.new(client, path)

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

@@ -9,6 +9,19 @@ module VMC
       @@displayed_target
     end
 
+
+    # These commands don't require authentication.
+    def precondition; end
+
+
+    def self.find_by_name(what)
+      proc { |name, choices|
+        choices.find { |c| c.name == name } ||
+          fail("Unknown #{what} '#{name}'")
+      }
+    end
+
+
     desc "Display information on the current target, user, etc."
     group :start
     input :runtimes, :type => :boolean,
@@ -57,7 +70,7 @@ module VMC
 
         if user = client.current_user
           puts ""
-          puts "user: #{b(user.email || user.id)}"
+          puts "user: #{b(user.email || user.guid)}"
         end
       end
 
@@ -104,21 +117,25 @@ module VMC
       end
     end
 
-
     desc "Set or display the current target cloud"
     group :start
     input :url, :argument => :optional,
       :desc => "Target URL to switch to"
+    input(:interactive, :alias => "-i", :type => :boolean,
+          :desc => "Interactively select organization/space")
     input(:organization, :aliases => ["--org", "-o"],
-          :desc => "Organization") { |choices|
-      ask("Organization", :choices => choices)
+          :from_given => find_by_name("organization"),
+          :desc => "Organization") { |orgs|
+      ask("Organization", :choices => orgs, :display => proc(&:name))
     }
-    input(:space, :alias => "-s", :desc => "Space") { |choices|
-      ask("Space", :choices => choices)
+    input(:space, :alias => "-s",
+          :from_given => find_by_name("space"),
+          :desc => "Space") { |spaces|
+      ask("Space", :choices => spaces, :display => proc(&:name))
     }
     def target(input)
-      if !input.given?(:url) && !input.given?(:organization) &&
-          !input.given?(:space)
+      if !input[:interactive] && !input.given?(:url) &&
+          !input.given?(:organization) && !input.given?(:space)
         display_target
         return
       end
@@ -130,22 +147,22 @@ module VMC
           set_target(target)
         end
 
-        return if force?
+        unless quiet?
+          puts ""
+          display_org_and_space
+        end
       end
 
-      return unless v2?
-
-      unless client.logged_in?
-        puts "" unless quiet?
-        invoke :login
-        @client = nil
-      end
+      return unless v2? && client.logged_in?
 
-      info = target_info
+      if input[:interactive] || input.given?(:organization) ||
+          input.given?(:space)
+        info = target_info
 
-      select_org_and_space(input, info)
+        select_org_and_space(input, info)
 
-      save_target_info(info)
+        save_target_info(info)
+      end
     end
 
 
@@ -159,34 +176,22 @@ module VMC
     end
 
 
-    def ask_prompt(type, label)
-      if type == "password"
-        options = { :echo => "*", :forget => true }
-      else
-        options = {}
-      end
-
-      ask(label, options)
-    end
-
-    def ask_prompts(credentials, prompts)
-      prompts.each do |name, meta|
-        type, label = meta
-        credentials[name] ||= ask_prompt(type, label)
-      end
-    end
-
     desc "Authenticate with the target"
     group :start
     input :username, :alias => "--email", :argument => :optional,
       :desc => "Account email"
     input :password, :desc => "Account password"
+    input(:interactive, :alias => "-i", :type => :boolean,
+          :desc => "Interactively select organization/space")
     input(:organization, :aliases => ["--org", "-o"],
-          :desc => "Organization") { |choices|
-      ask("Organization", :choices => choices)
+          :from_given => find_by_name("organization"),
+          :desc => "Organization") { |orgs|
+      ask("Organization", :choices => orgs, :display => proc(&:name))
     }
-    input(:space, :alias => "-s", :desc => "Space") { |choices|
-      ask("Space", :choices => choices)
+    input(:space, :alias => "-s",
+          :from_given => find_by_name("space"),
+          :desc => "Space") { |spaces|
+      ask("Space", :choices => spaces, :display => proc(&:name))
     }
     def login(input)
       display_target unless quiet?
@@ -228,9 +233,14 @@ module VMC
         end
       end
 
-      select_org_and_space(input, info) if v2?
-
       save_target_info(info)
+      invalidate_client
+
+      if v2?
+        puts "" if input[:interactive]
+        select_org_and_space(input, info)
+        save_target_info(info)
+      end
     ensure
       exit_status 1 if not authenticated
     end
@@ -288,18 +298,31 @@ module VMC
 
     private
 
+    def ask_prompt(type, label)
+      if type == "password"
+        options = { :echo => "*", :forget => true }
+      else
+        options = {}
+      end
+
+      ask(label, options)
+    end
+
+    def ask_prompts(credentials, prompts)
+      prompts.each do |name, meta|
+        type, label = meta
+        credentials[name] ||= ask_prompt(type, label)
+      end
+    end
+
     def display_target
-      return if @@displayed_target
+      return if displayed_target?
 
       if quiet?
         puts client.target
       else
-        puts "Target: #{c(client.target, :name)}"
-
-        if v2? && client.current_organization && client.current_space
-          puts "Organization: #{c(client.current_organization.name, :name)}"
-          puts "Space: #{c(client.current_space.name, :name)}"
-        end
+        puts "target: #{c(client.target, :name)}"
+        display_org_and_space
       end
 
       puts ""
@@ -307,6 +330,19 @@ module VMC
       @@displayed_target = true
     end
 
+    def display_org_and_space
+      return unless v2?
+
+      if org = client.current_organization
+        puts "organization: #{c(org.name, :name)}"
+      end
+
+      if space = client.current_space
+        puts "space: #{c(space.name, :name)}"
+      end
+    rescue CFoundry::APIError
+    end
+
     def display_runtime(r)
       if quiet?
         puts r.name
@@ -346,56 +382,59 @@ module VMC
       end
     end
 
-    def org_valid?(id, user = client.current_user)
-      return false unless id
-      client.organization(id).users.include? user
+    def org_valid?(guid, user = client.current_user)
+      return false unless guid
+      client.organization(guid).users.include? user
     rescue CFoundry::APIError
       false
     end
 
-    def space_valid?(id, user = client.current_user)
-      return false unless id
-      client.space(id).developers.include? user
+    def space_valid?(guid, user = client.current_user)
+      return false unless guid
+      client.space(guid).developers.include? user
     rescue CFoundry::APIError
       false
     end
 
     def select_org_and_space(input, info)
-      if input.given?(:organization) || !org_valid?(info[:organization])
+      changed_org = false
+
+      if input[:interactive] || input.given?(:organization) || \
+          !org_valid?(info[:organization])
         orgs = client.organizations
         fail "No organizations!" if orgs.empty?
 
-        if orgs.size == 1 && !input.given?(:organization)
+        if !input[:interactive] && orgs.size == 1 && !input.given?(:organization)
           org = orgs.first
         else
-          org_name = input[:organization, orgs.collect(&:name).sort]
-          org = orgs.find { |o| o.name == org_name }
-          fail "Unknown organization '#{org_name}'" unless org
+          org = input[:organization, orgs.sort_by(&:name)]
         end
 
-        info[:organization] = org.id
+        with_progress("Switching to organization #{c(org.name, :name)}") do
+          info[:organization] = org.guid
+          changed_org = true
+        end
       else
         org = client.current_organization
       end
 
-      # switching org probably means switching space
-      if input.given?(:organization) || input.given?(:space) || \
-            !space_valid?(info[:space])
-        spaces = client.spaces.select do |s|
-          s.organization.id == org.id
-        end
+      # switching org means switching space
+      if input[:interactive] || changed_org || input.given?(:space) || \
+          !space_valid?(info[:space])
+        spaces = org.spaces
 
         fail "No spaces!" if spaces.empty?
 
-        if spaces.size == 1 && !input.given?(:space)
+        if !input[:interactive] && spaces.size == 1 && !input.given?(:space)
           space = spaces.first
         else
-          space_name = input[:space, spaces.collect(&:name).sort]
-          space = spaces.find { |s| s.name == space_name }
-          fail "Unknown space '#{space_name}'" unless space
+          puts "" if changed_org
+          space = input[:space, spaces.sort_by(&:name)]
         end
 
-        info[:space] = space.id
+        with_progress("Switching to space #{c(space.name, :name)}") do
+          info[:space] = space.guid
+        end
       end
     end
   end

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

@@ -1,4 +1,6 @@
 require "yaml"
+require "socket"
+require "net/http"
 
 require "mothership"
 require "mothership/pretty"
@@ -62,10 +64,27 @@ module VMC
       end
     end
 
+    def precondition
+      unless client.logged_in?
+        fail "Please log in with 'vmc login'."
+      end
+
+      return unless v2?
+
+      unless client.current_organization
+        fail "Please select an organization with 'vmc target -i'."
+      end
+
+      unless client.current_space
+        fail "Please select a space with 'vmc target -i'."
+      end
+    end
+
     def execute(cmd, argv)
       if option(:help)
         invoke :help, :command => cmd.name.to_s
       else
+        cmd.context.new.precondition if cmd.context <= CLI
         super
       end
     rescue Interrupt
@@ -82,18 +101,27 @@ module VMC
         puts c("Not authenticated! Try logging in:", :warning)
 
         invoke :login
-        @client = nil
 
         retry
       end
 
+      log_error(e)
+
       err "Denied: #{e.description}"
+
     rescue Exception => e
+      ensure_config_dir
+
+      log_error(e)
+
       msg = e.class.name
       msg << ": #{e}" unless e.to_s.empty?
       err msg
+    end
 
-      ensure_config_dir
+    def log_error(e)
+      msg = e.class.name
+      msg << ": #{e}" unless e.to_s.empty?
 
       File.open(File.expand_path(VMC::CRASH_FILE), "w") do |f|
         f.puts "Time of crash:"
@@ -125,14 +153,14 @@ module VMC
       option(:color)
     end
 
-    def err(msg, exit_status = 1)
+    def err(msg, status = 1)
       if quiet?
         $stderr.puts(msg)
       else
         puts c(msg, :error)
       end
 
-      exit_status 1
+      exit_status status
     end
 
     def fail(msg)
@@ -141,7 +169,12 @@ module VMC
 
     def sane_target_url(url)
       unless url =~ /^https?:\/\//
-        url = "http://#{url}"
+        begin
+          TCPSocket.new(url, Net::HTTP.https_default_port)
+          url = "https://#{url}"
+        rescue SocketError, Timeout::Error
+          url = "http://#{url}"
+        end
       end
 
       url.gsub(/\/$/, "")
@@ -180,7 +213,7 @@ module VMC
         f.write(sane_target_url(url))
       end
 
-      @client = nil
+      invalidate_client
     end
 
     def targets_info
@@ -221,7 +254,7 @@ module VMC
     end
 
     def remove_target_info
-      ts = target_info
+      ts = targets_info
       ts.delete client_target
       save_targets(ts)
     end
@@ -234,12 +267,17 @@ module VMC
       client.is_a?(CFoundry::V2::Client)
     end
 
+    def invalidate_client
+      @@client = nil
+      client
+    end
+
     def client
-      return @client if @client
+      return @@client if defined?(@@client) && @@client
 
       info = target_info
 
-      @client =
+      @@client =
         case info[:version]
         when 2
           CFoundry::V2::Client.new(client_target, info[:token])
@@ -249,11 +287,11 @@ module VMC
           CFoundry::Client.new(client_target, info[:token])
         end
 
-      @client.proxy = option(:proxy)
-      @client.trace = option(:trace)
+      @@client.proxy = option(:proxy)
+      @@client.trace = option(:trace)
 
       info[:version] ||=
-        case @client
+        case @@client
         when CFoundry::V2::Client
           2
         else
@@ -261,16 +299,26 @@ module VMC
         end
 
       if org = info[:organization]
-        @client.current_organization = @client.organization(org)
+        @@client.current_organization = @@client.organization(org)
       end
 
       if space = info[:space]
-        @client.current_space = @client.space(space)
+        @@client.current_space = @@client.space(space)
       end
 
       save_target_info(info)
 
-      @client
+      @@client
+    end
+
+    class << self
+      def client
+        @@client
+      end
+
+      def client=(c)
+        @@client = c
+      end
     end
   end
 end

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.20"
+  VERSION = "0.4.0.beta.21"
 end

data/vmc-ng/spec/Rakefile

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default, :development)
+
+require 'rake/dsl_definition'
+require 'rake'
+require 'rspec'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "**/*_spec.rb"
+  t.rspec_opts = ["--format", "documentation", "--colour"]
+end
+

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

@@ -0,0 +1,75 @@
+require "./helpers"
+
+describe "App#apps" do
+  it "lists app names" do
+    with_random_apps do |apps|
+      shell("apps").split("\n").should =~
+        apps.collect(&:name)
+    end
+  end
+
+  it "filters by name with --name" do
+    with_random_apps do |apps|
+      app = apps[rand(apps.size)]
+
+      result = shell("apps", "--name", app.name).split("\n")
+      result.should =~ [app.name]
+    end
+  end
+
+  it "filters by runtime with --runtime" do
+    with_random_apps do |apps|
+      app = apps[rand(apps.size)]
+
+      result = shell("apps", "--runtime", app.runtime.name).split("\n")
+      actual =
+        apps.select { |a|
+          /#{app.runtime.name}/ =~ a.runtime.name
+        }.collect(&:name)
+
+      result.should =~ actual
+    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)
+
+      result.should =~ actual
+    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
+    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/helpers.rb

@@ -0,0 +1,103 @@
+require "cfoundry"
+require "vmc"
+
+TARGET = ENV["VMC_TEST_TARGET"] || "http://localhost:8181"
+USER = ENV["VMC_TEST_USER"] || "sre@vmware.com"
+PASSWORD = ENV["VMC_TEST_PASSWORD"] || "test"
+
+module VMCHelpers
+  def random_str
+    format("%x", rand(1000000))
+  end
+
+  def client
+    VMC::CLI.client
+  end
+
+  # invoke a block while logged out
+  def without_auth
+    proxy = client.proxy
+    client.logout
+    client.proxy = nil
+    yield
+  ensure
+    client.login(USER, PASSWORD)
+    client.proxy = proxy
+  end
+
+  # same as Ruby 1.9's Array#sample
+  def sample(ary)
+    ary[rand(ary.size)]
+  end
+
+  # cache frameworks for app generation
+  def frameworks
+    @@frameworks ||= client.frameworks(0)
+  end
+
+  # cache runtimes for app generation
+  def runtimes
+    @@runtimes ||= client.runtimes(0)
+  end
+
+  def with_random_app
+    with_random_apps(1)
+  end
+
+  # create 2-5 random apps, call the block, and then delete them
+  def with_random_apps(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.instances = rand(2)
+
+      app.framework = sample(frameworks)
+      app.runtime = sample(runtimes)
+      app.memory = sample([64, 128, 256, 512])
+      app.create!
+
+      apps << app
+    end
+
+    yield apps
+  ensure
+    apps.each(&:delete!)
+  end
+
+  # invoke a command with a given arglist
+  def shell(*argv)
+    before_out = $stdout
+    before_err = $stderr
+
+    $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}"
+      end
+    end
+
+    $stdout.string
+  ensure
+    $stdout = before_out
+    $stderr = before_err
+  end
+end
+
+RSpec.configure do |c|
+  c.include VMCHelpers
+
+  c.before(:all) do
+    VMC::CLI.client = CFoundry::Client.new(TARGET)
+
+    client.login(:username => USER, :password => PASSWORD)
+    client.current_organization = client.organizations.first
+    client.current_space = client.current_organization.spaces.first
+  end
+end

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

@@ -0,0 +1,34 @@
+require "./helpers"
+
+describe "Start#target" do
+  it "shows target url with no arguments" do
+    shell("target").rstrip.should == client.target
+  end
+
+  describe "switching target url" do
+    before(:each) do
+      @old_client = client
+    end
+
+    after(:each) do
+      VMC::CLI.client = @old_client
+    end
+
+    it "switches target url if given one argument" do
+      shell("target", "http://api.cloudfoundry.com")
+      client.target.should == "http://api.cloudfoundry.com"
+    end
+
+    it "defaults to https if supported by remote" do
+      shell("target", "api.cloudfoundry.com")
+      client.target.should == "https://api.cloudfoundry.com"
+    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}"
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196427
+  hash: 62196425
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 20
-  version: 0.4.0.beta.20
+  - 21
+  version: 0.4.0.beta.21
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-17 00:00:00 Z
+date: 2012-07-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 3
         segments: 
         - 0
         - 3
-        - 6
-        version: 0.3.6
+        - 8
+        version: 0.3.8
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 15
         segments: 
         - 0
         - 0
-        - 5
-        version: 0.0.5
+        - 8
+        version: 0.0.8
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -289,6 +289,34 @@ dependencies:
         version: 0.3.1
   type: :runtime
   version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id018
 description: 
 email: support@vmware.com
 executables: 
@@ -355,6 +383,10 @@ files:
 - vmc-ng/lib/vmc/plugin.rb
 - vmc-ng/lib/vmc/version.rb
 - vmc-ng/lib/vmc.rb
+- vmc-ng/spec/app/apps_spec.rb
+- vmc-ng/spec/helpers.rb
+- vmc-ng/spec/Rakefile
+- vmc-ng/spec/start/target_spec.rb
 - vmc-ng/bin/vmc
 - bin/vmc
 homepage: http://vmware.com