vmc 0.3.23 → 0.4.0.beta.1

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

@@ -0,0 +1,3 @@
+module VMC
+  VERSION = "0.1.5"
+end

data/{README.md → vmc/README.md}

@@ -2,7 +2,7 @@
 
 The VMware Cloud CLI. This is the command line interface to VMware's Application Platform
 
-_Copyright 2010-2012, VMware, Inc. Licensed under the
+_Copyright 2010-2011, VMware, Inc. Licensed under the
 MIT license, please see the LICENSE file.  All rights reserved._
 
     Usage: vmc [options] command [<args>] [command_options]
@@ -100,7 +100,3 @@ MIT license, please see the LICENSE file.  All rights reserved._
     vmc login
     bundle package
     vmc push
-
-## File a Bug
-
-To file a bug against Cloud Foundry Open Source and its components, sign up and use our bug tracking system: [http://cloudfoundry.atlassian.net](http://cloudfoundry.atlassian.net)

data/vmc/bin/vmc

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require File.expand_path('../../lib/cli', __FILE__)
+
+VMC::Cli::Runner.run(ARGV.dup)
+

data/{lib → vmc/lib}/cli/commands/user.rb

@@ -1,5 +1,3 @@
-require "cfoundry"
-
 module VMC::Cli::Command
 
   class User < Base
@@ -26,7 +24,7 @@ module VMC::Cli::Command
       err "Need a password" unless password
       login_and_save_token(email, password)
       say "Successfully logged into [#{target_url}]".green
-    rescue CFoundry::Denied
+    rescue VMC::Client::TargetError
       display "Problem with login, invalid account or password when attempting to login to '#{target_url}'".red
       retry if (tries += 1) < 3 && prompt_ok && !@options[:password]
       exit 1
@@ -58,9 +56,7 @@ module VMC::Cli::Command
     private
 
     def login_and_save_token(email, password)
-      cfoundry = CFoundry::Client.new(client.target)
-      cfoundry.trace = @client.trace
-      token = cfoundry.login(:username => email, :password => password)
+      token = client.login(email, password)
       VMC::Cli::Config.store_token(token, @options[:token_file])
     end
 

data/{lib → vmc/lib}/cli/console_helper.rb

@@ -32,20 +32,9 @@ module VMC::Cli
 
     def start_local_console(port, appname)
       auth_info = console_credentials(appname)
-      banner = "Connecting to '#{appname}' console: "
-      display banner, false
-      t = Thread.new do
-        count = 0
-        while count < 90 do
-          display '.', false
-          sleep 1
-          count += 1
-        end
-      end
+      display "Connecting to '#{appname}' console: ", false
       prompt = console_login(auth_info, port)
-      Thread.kill(t)
-      clear(80)
-      display "#{banner}#{'OK'.green}"
+      display "OK".green
       display "\n"
       initialize_readline
       run_console prompt
@@ -58,7 +47,7 @@ module VMC::Cli
       @telnet_client = telnet_client(port)
       prompt = nil
       err_msg = "Login attempt timed out."
-      3.times do
+      5.times do
         begin
           results = @telnet_client.login("Name"=>auth_info["username"],
             "Password"=>auth_info["password"])
@@ -78,6 +67,7 @@ module VMC::Cli
           sleep 5
           @telnet_client = telnet_client(port)
         end
+        display ".", false
       end
       unless prompt
         close_console

data/{lib → vmc/lib}/cli/frameworks.rb

@@ -86,7 +86,7 @@ module VMC::Cli
               next if matched_file
               File.open(fname, 'r') do |f|
                 str = f.read # This might want to be limited
-                matched_file = fname if (str && str.match(/^\s*require[\s\(]*['"]sinatra(\/base)?['"]/))
+                matched_file = fname if (str && str.match(/^\s*require[\s\(]*['"]sinatra['"]/))
               end
             end
             if matched_file

data/{lib → vmc/lib}/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.23'
+    VERSION = '0.3.18'
   end
 end

data/{lib → vmc/lib}/vmc/micro/vmrun.rb

@@ -76,16 +76,12 @@ module VMC::Micro
       path = VMC::Micro.escape_path(VMC::Micro.config_file('offline.conf'))
       run('CopyFileFromHostToGuest', "#{path} /etc/dnsmasq.d/offline.conf")
       run('runProgramInGuest', '/usr/bin/touch /var/vcap/micro/offline')
-      run('runProgramInGuest',
-        "/bin/sed -i -e 's/^[^#]/# &/g' /etc/dnsmasq.d/server || true")
       restart_dnsmasq
     end
 
     def online!
       run('runProgramInGuest', '/bin/rm -f /etc/dnsmasq.d/offline.conf')
       run('runProgramInGuest', '/bin/rm -f /var/vcap/micro/offline')
-      run('runProgramInGuest',
-        "/bin/sed -i -e 's/^# //g' /etc/dnsmasq.d/server || true")
       restart_dnsmasq
     end
 
@@ -137,13 +133,7 @@ module VMC::Micro
         vms.map! { |x| x.downcase }
         vms.include?(@vmx.downcase)
       else
-        # Handle vmx being in a symlinked dir.
-        real_path = nil
-        begin
-          real_path = File.realpath(@vmx)
-        rescue
-        end
-        vms.include?(@vmx) || (real_path && vms.include?(real_path))
+        vms.include?(@vmx)
       end
     end
 

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: 
+  hash: 62196449
+  prerelease: 6
   segments: 
   - 0
-  - 3
-  - 23
-  version: 0.3.23
+  - 4
+  - 0
+  - beta
+  - 1
+  version: 0.4.0.beta.1
 platform: ruby
 authors: 
 - VMware
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-22 00:00:00 Z
+date: 2012-05-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -23,14 +25,6 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
     - - <
       - !ruby/object:Gem::Version 
         hash: 11
@@ -39,6 +33,14 @@ dependencies:
         - 7
         - 0
         version: 1.7.0
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -63,14 +65,6 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
     - - <
       - !ruby/object:Gem::Version 
         hash: 11
@@ -79,6 +73,14 @@ dependencies:
         - 7
         - 0
         version: 1.7.0
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
+        version: 1.6.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -162,118 +164,198 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: cfoundry
+  name: rake
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 115
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 48
-        version: 0.3.48
+        version: "0"
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rspec
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
+        - 1
+        - 3
         - 0
-        version: "0"
-  type: :development
+        version: 1.3.0
+  type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: webmock
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
         - 1
-        - 3
+        - 5
         - 0
-        version: 1.3.0
-  type: :development
+        version: 1.5.0
+  type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: webmock
+  name: json_pure
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 1
+        - 6
         - 5
-        - 0
-        version: 1.5.0
-  type: :development
+        version: 1.6.5
+  type: :runtime
   version_requirements: *id012
-description: Client library and CLI that provides access to the VMware Cloud Application Platform.
+- !ruby/object:Gem::Dependency 
+  name: interact
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 4
+        - 1
+        version: 0.4.1
+  type: :runtime
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: cfoundry
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
+        version: 0.1.2
+  type: :runtime
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 14
+        - 6
+        version: 0.14.6
+  type: :runtime
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: manifests-vmc-plugin
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
+        version: 0.1.2
+  type: :runtime
+  version_requirements: *id016
+description: 
 email: support@vmware.com
 executables: 
 - vmc
 extensions: []
 
-extra_rdoc_files: 
-- README.md
-- LICENSE
+extra_rdoc_files: []
+
 files: 
-- LICENSE
-- README.md
-- Rakefile
-- config/clients.yml
-- config/micro/offline.conf
-- config/micro/paths.yml
-- config/micro/refresh_ip.rb
-- lib/cli/commands/admin.rb
-- lib/cli/commands/apps.rb
-- lib/cli/commands/base.rb
-- lib/cli/commands/manifest.rb
-- lib/cli/commands/micro.rb
-- lib/cli/commands/misc.rb
-- lib/cli/commands/services.rb
-- lib/cli/commands/user.rb
-- lib/cli/config.rb
-- lib/cli/console_helper.rb
-- lib/cli/core_ext.rb
-- lib/cli/errors.rb
-- lib/cli/frameworks.rb
-- lib/cli/manifest_helper.rb
-- lib/cli/runner.rb
-- lib/cli/services_helper.rb
-- lib/cli/tunnel_helper.rb
-- lib/cli/usage.rb
-- lib/cli/version.rb
-- lib/cli/zip_util.rb
-- lib/cli.rb
-- lib/vmc/client.rb
-- lib/vmc/const.rb
-- lib/vmc/micro/switcher/base.rb
-- lib/vmc/micro/switcher/darwin.rb
-- lib/vmc/micro/switcher/dummy.rb
-- lib/vmc/micro/switcher/linux.rb
-- lib/vmc/micro/switcher/windows.rb
-- lib/vmc/micro/vmrun.rb
-- lib/vmc/micro.rb
-- lib/vmc.rb
-- caldecott_helper/Gemfile
-- caldecott_helper/Gemfile.lock
-- caldecott_helper/server.rb
+- vmc/LICENSE
+- vmc/README.md
+- vmc/Rakefile
+- vmc/config/clients.yml
+- vmc/config/micro/offline.conf
+- vmc/config/micro/paths.yml
+- vmc/config/micro/refresh_ip.rb
+- vmc/lib/cli/commands/admin.rb
+- vmc/lib/cli/commands/apps.rb
+- vmc/lib/cli/commands/base.rb
+- vmc/lib/cli/commands/manifest.rb
+- vmc/lib/cli/commands/micro.rb
+- vmc/lib/cli/commands/misc.rb
+- vmc/lib/cli/commands/services.rb
+- vmc/lib/cli/commands/user.rb
+- vmc/lib/cli/config.rb
+- vmc/lib/cli/console_helper.rb
+- vmc/lib/cli/core_ext.rb
+- vmc/lib/cli/errors.rb
+- vmc/lib/cli/frameworks.rb
+- vmc/lib/cli/manifest_helper.rb
+- vmc/lib/cli/runner.rb
+- vmc/lib/cli/services_helper.rb
+- vmc/lib/cli/tunnel_helper.rb
+- vmc/lib/cli/usage.rb
+- vmc/lib/cli/version.rb
+- vmc/lib/cli/zip_util.rb
+- vmc/lib/cli.rb
+- vmc/lib/vmc/client.rb
+- vmc/lib/vmc/const.rb
+- vmc/lib/vmc/micro/switcher/base.rb
+- vmc/lib/vmc/micro/switcher/darwin.rb
+- vmc/lib/vmc/micro/switcher/dummy.rb
+- vmc/lib/vmc/micro/switcher/linux.rb
+- vmc/lib/vmc/micro/switcher/windows.rb
+- vmc/lib/vmc/micro/vmrun.rb
+- vmc/lib/vmc/micro.rb
+- vmc/lib/vmc.rb
+- vmc/caldecott_helper/Gemfile
+- vmc/caldecott_helper/Gemfile.lock
+- vmc/caldecott_helper/server.rb
+- vmc/bin/vmc
+- vmc-ng/LICENSE
+- vmc-ng/Rakefile
+- vmc-ng/lib/vmc/cli/app.rb
+- vmc-ng/lib/vmc/cli/better_help.rb
+- vmc-ng/lib/vmc/cli/command.rb
+- vmc-ng/lib/vmc/cli/dots.rb
+- vmc-ng/lib/vmc/cli/service.rb
+- vmc-ng/lib/vmc/cli/user.rb
+- vmc-ng/lib/vmc/cli.rb
+- vmc-ng/lib/vmc/constants.rb
+- vmc-ng/lib/vmc/detect.rb
+- vmc-ng/lib/vmc/errors.rb
+- vmc-ng/lib/vmc/plugin.rb
+- vmc-ng/lib/vmc/version.rb
+- vmc-ng/lib/vmc.rb
+- vmc-ng/bin/vmc
 - bin/vmc
 homepage: http://vmware.com
 licenses: []
@@ -295,16 +377,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client library and CLI that provides access to the VMware Cloud Application Platform.