vmc 0.3.16.beta.5 → 0.3.16.beta.6

data/Rakefile

@@ -30,6 +30,8 @@ TESTS_TO_BUILD = ["#{TESTS_PATH}/java_web/java_tiny_app",
              "#{TESTS_PATH}/lift/hello_lift",
              "#{TESTS_PATH}/spring/roo-guestbook",
              "#{TESTS_PATH}/spring/spring-osgi-hello",
+             "#{TESTS_PATH}/standalone/java_app",
+             "#{TESTS_PATH}/standalone/python_app"
             ]
 
 desc "Build the tests. If the git hash associated with the test assets has not changed, nothing is built. To force a build, invoke 'rake build[--force]'"

data/lib/cli/commands/apps.rb

@@ -371,7 +371,6 @@ module VMC::Cli::Command
 
     def check_deploy_directory(path)
       err 'Deployment path does not exist' unless File.exists? path
-      err 'Deployment path is not a directory' unless File.directory? path
       return if File.expand_path(Dir.tmpdir) != File.expand_path(path)
       err "Can't deploy applications from staging directory: [#{Dir.tmpdir}]"
     end
@@ -410,101 +409,112 @@ module VMC::Cli::Command
       explode_dir = "#{Dir.tmpdir}/.vmc_#{appname}_files"
       FileUtils.rm_rf(explode_dir) # Make sure we didn't have anything left over..
 
-      Dir.chdir(path) do
-        # Stage the app appropriately and do the appropriate fingerprinting, etc.
-        if war_file = Dir.glob('*.war').first
-          VMC::Cli::ZipUtil.unpack(war_file, explode_dir)
-        else
-          check_unreachable_links(path)
-          FileUtils.mkdir(explode_dir)
+      if path =~ /\.(war|zip)$/
+        #single file that needs unpacking
+        VMC::Cli::ZipUtil.unpack(path, explode_dir)
+      elsif !File.directory? path
+        #single file that doesn't need unpacking
+        FileUtils.mkdir(explode_dir)
+        FileUtils.cp(path,explode_dir)
+      else
+        Dir.chdir(path) do
+          # Stage the app appropriately and do the appropriate fingerprinting, etc.
+          if war_file = Dir.glob('*.war').first
+            VMC::Cli::ZipUtil.unpack(war_file, explode_dir)
+          elsif zip_file = Dir.glob('*.zip').first
+            VMC::Cli::ZipUtil.unpack(zip_file, explode_dir)
+          else
+            check_unreachable_links(path)
+            FileUtils.mkdir(explode_dir)
 
-          files = Dir.glob('{*,.[^\.]*}')
+            files = Dir.glob('{*,.[^\.]*}')
 
-          # Do not process .git files
-          files.delete('.git') if files
+            # Do not process .git files
+            files.delete('.git') if files
 
-          FileUtils.cp_r(files, explode_dir)
+            FileUtils.cp_r(files, explode_dir)
 
-          find_sockets(explode_dir).each do |s|
-            File.delete s
+            find_sockets(explode_dir).each do |s|
+              File.delete s
+            end
           end
         end
+      end
 
-        # Send the resource list to the cloudcontroller, the response will tell us what it already has..
-        unless @options[:noresources]
-          display '  Checking for available resources: ', false
-          fingerprints = []
-          total_size = 0
-          resource_files = Dir.glob("#{explode_dir}/**/*", File::FNM_DOTMATCH)
-          resource_files.each do |filename|
-            next if (File.directory?(filename) || !File.exists?(filename))
-            fingerprints << {
-              :size => File.size(filename),
-              :sha1 => Digest::SHA1.file(filename).hexdigest,
-              :fn => filename
-            }
-            total_size += File.size(filename)
-          end
-
-          # Check to see if the resource check is worth the round trip
-          if (total_size > (64*1024)) # 64k for now
-            # Send resource fingerprints to the cloud controller
-            appcloud_resources = client.check_resources(fingerprints)
-          end
-          display 'OK'.green
-
-          if appcloud_resources
-            display '  Processing resources: ', false
-            # We can then delete what we do not need to send.
-            appcloud_resources.each do |resource|
-              FileUtils.rm_f resource[:fn]
-              # adjust filenames sans the explode_dir prefix
-              resource[:fn].sub!("#{explode_dir}/", '')
-            end
-            display 'OK'.green
-          end
+      # Send the resource list to the cloudcontroller, the response will tell us what it already has..
+      unless @options[:noresources]
+        display '  Checking for available resources: ', false
+        fingerprints = []
+        total_size = 0
+        resource_files = Dir.glob("#{explode_dir}/**/*", File::FNM_DOTMATCH)
+        resource_files.each do |filename|
+          next if (File.directory?(filename) || !File.exists?(filename))
+          fingerprints << {
+            :size => File.size(filename),
+            :sha1 => Digest::SHA1.file(filename).hexdigest,
+            :fn => filename
+          }
+          total_size += File.size(filename)
+        end
 
+        # Check to see if the resource check is worth the round trip
+        if (total_size > (64*1024)) # 64k for now
+          # Send resource fingerprints to the cloud controller
+          appcloud_resources = client.check_resources(fingerprints)
         end
+        display 'OK'.green
 
-        # If no resource needs to be sent, add an empty file to ensure we have
-        # a multi-part request that is expected by nginx fronting the CC.
-        if VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
-          Dir.chdir(explode_dir) do
-            File.new(".__empty__", "w")
+        if appcloud_resources
+          display '  Processing resources: ', false
+          # We can then delete what we do not need to send.
+          appcloud_resources.each do |resource|
+            FileUtils.rm_f resource[:fn]
+            # adjust filenames sans the explode_dir prefix
+            resource[:fn].sub!("#{explode_dir}/", '')
           end
+          display 'OK'.green
         end
-        # Perform Packing of the upload bits here.
-        display '  Packing application: ', false
-        VMC::Cli::ZipUtil.pack(explode_dir, upload_file)
-        display 'OK'.green
 
-        upload_size = File.size(upload_file);
-        if upload_size > 1024*1024
-          upload_size  = (upload_size/(1024.0*1024.0)).round.to_s + 'M'
-        elsif upload_size > 0
-          upload_size  = (upload_size/1024.0).round.to_s + 'K'
-        else
-          upload_size = '0K'
+      end
+
+      # If no resource needs to be sent, add an empty file to ensure we have
+      # a multi-part request that is expected by nginx fronting the CC.
+      if VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
+        Dir.chdir(explode_dir) do
+          File.new(".__empty__", "w")
         end
+      end
+      # Perform Packing of the upload bits here.
+      display '  Packing application: ', false
+      VMC::Cli::ZipUtil.pack(explode_dir, upload_file)
+      display 'OK'.green
 
-        upload_str = "  Uploading (#{upload_size}): "
-        display upload_str, false
+      upload_size = File.size(upload_file);
+      if upload_size > 1024*1024
+        upload_size  = (upload_size/(1024.0*1024.0)).round.to_s + 'M'
+      elsif upload_size > 0
+        upload_size  = (upload_size/1024.0).round.to_s + 'K'
+      else
+        upload_size = '0K'
+      end
 
-        FileWithPercentOutput.display_str = upload_str
-        FileWithPercentOutput.upload_size = File.size(upload_file);
-        file = FileWithPercentOutput.open(upload_file, 'rb')
+      upload_str = "  Uploading (#{upload_size}): "
+      display upload_str, false
 
-        client.upload_app(appname, file, appcloud_resources)
-        display 'OK'.green if VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
+      FileWithPercentOutput.display_str = upload_str
+      FileWithPercentOutput.upload_size = File.size(upload_file);
+      file = FileWithPercentOutput.open(upload_file, 'rb')
 
-        display 'Push Status: ', false
-        display 'OK'.green
-      end
+      client.upload_app(appname, file, appcloud_resources)
+      display 'OK'.green if VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
 
-    ensure
-      # Cleanup if we created an exploded directory.
-      FileUtils.rm_f(upload_file) if upload_file
-      FileUtils.rm_rf(explode_dir) if explode_dir
+      display 'Push Status: ', false
+      display 'OK'.green
+
+      ensure
+        # Cleanup if we created an exploded directory.
+        FileUtils.rm_f(upload_file) if upload_file
+        FileUtils.rm_rf(explode_dir) if explode_dir
     end
 
     def check_app_limit
@@ -908,6 +918,8 @@ module VMC::Cli::Command
       url = info(:url) || info(:urls)
       mem, memswitch = nil, info(:mem)
       memswitch = normalize_mem(memswitch) if memswitch
+      command = info(:command)
+      runtime = info(:runtime)
 
       # Check app existing upfront if we have appname
       app_checked = false
@@ -934,9 +946,30 @@ module VMC::Cli::Command
         err "Application '#{appname}' already exists, use update or delete."
       end
 
-      default_url = "#{appname}.#{target_base}"
+      if ignore_framework
+        framework = VMC::Cli::Framework.new
+      elsif f = info(:framework)
+        info = Hash[f["info"].collect { |k, v| [k.to_sym, v] }]
+
+        framework = VMC::Cli::Framework.create(f["name"], info)
+        exec = framework.exec if framework && framework.exec
+      else
+        framework = detect_framework(prompt_ok)
+      end
+
+      err "Application Type undetermined for path '#{@application}'" unless framework
+
+      if not runtime
+        default_runtime = framework.default_runtime @application
+        runtime = detect_runtime(default_runtime, !no_prompt) if framework.prompt_for_runtime?
+      end
+      command = ask("Start Command") if !command && framework.require_start_command?
+
+      default_url = "None"
+      default_url = "#{appname}.#{VMC::Cli::Config.suggest_url}" if framework.require_url?
+
 
-      unless no_prompt || url
+      unless no_prompt || url || !framework.require_url?
         url = ask(
           "Application Deployed URL",
           :default => default_url
@@ -947,29 +980,18 @@ module VMC::Cli::Command
         # this common error
         url = nil if YES_SET.member? url
       end
-
+      url = nil if url == "None"
+      default_url = nil if default_url == "None"
       url ||= default_url
 
-      if ignore_framework
-        framework = VMC::Cli::Framework.new
-      elsif f = info(:framework)
-        info = Hash[f["info"].collect { |k, v| [k.to_sym, v] }]
-
-        framework = VMC::Cli::Framework.new(f["name"], info)
-        exec = framework.exec if framework && framework.exec
-      else
-        framework = detect_framework(prompt_ok)
-      end
-
-      err "Application Type undetermined for path '#{@application}'" unless framework
-
       if memswitch
         mem = memswitch
       elsif prompt_ok
         mem = ask("Memory Reservation",
-                  :default => framework.memory, :choices => mem_choices)
+                  :default => framework.memory(runtime),
+                  :choices => mem_choices)
       else
-        mem = framework.memory
+        mem = framework.memory runtime
       end
 
       # Set to MB number
@@ -984,14 +1006,15 @@ module VMC::Cli::Command
         :name => "#{appname}",
         :staging => {
            :framework => framework.name,
-           :runtime => info(:runtime)
+           :runtime => runtime
         },
         :uris => Array(url),
         :instances => instances,
         :resources => {
           :memory => mem_quota
-        },
+        }
       }
+      manifest[:staging][:command] = command if command
 
       # Send the manifest to the cloud controller
       client.create_app(appname, manifest)

data/lib/cli/frameworks.rb

@@ -11,6 +11,7 @@ module VMC::Cli
       'Grails'   => ['grails',  { :mem => '512M', :description => 'Java SpringSource Grails Application'}],
       'Lift'   =>   ['lift',    { :mem => '512M', :description => 'Scala Lift Application'}],
       'JavaWeb'  => ['java_web',{ :mem => '512M', :description => 'Java Web Application'}],
+      'Standalone'     => ['standalone',    { :mem => '64M', :description => 'Standalone Application'}],
       'Sinatra'  => ['sinatra', { :mem => '128M', :description => 'Sinatra Application'}],
       'Node'     => ['node',    { :mem => '64M',  :description => 'Node.js Application'}],
       'PHP'      => ['php',     { :mem => '128M', :description => 'PHP Application'}],
@@ -27,16 +28,33 @@ module VMC::Cli
       end
 
       def lookup(name)
-        return Framework.new(*FRAMEWORKS[name])
+        return create(*FRAMEWORKS[name])
       end
 
       def lookup_by_framework(name)
         FRAMEWORKS.each do |key,fw|
-          return Framework.new(fw[0], fw[1]) if fw[0] == name
+          return create(fw[0],fw[1]) if fw[0] == name
+        end
+      end
+
+      def create(name,opts)
+        if name == "standalone"
+          return StandaloneFramework.new(name, opts)
+        else
+          return Framework.new(name,opts)
         end
       end
 
       def detect(path, available_frameworks)
+        if !File.directory? path
+          if path.end_with?('.war')
+            return detect_framework_from_war path
+          elsif available_frameworks.include?(["standalone"])
+            return Framework.lookup('Standalone')
+          else
+            return nil
+          end
+        end
         Dir.chdir(path) do
           # Rails
           if File.exist?('config/environment.rb')
@@ -46,30 +64,13 @@ module VMC::Cli
           elsif File.exist?('config.ru') && available_frameworks.include?(["rack"])
             return Framework.lookup('Rack')
 
-          # Java
-          elsif Dir.glob('*.war').first || File.exist?('WEB-INF/web.xml')
-            war_file = Dir.glob('*.war').first
+          # Java Web Apps
+          elsif Dir.glob('*.war').first
+            return detect_framework_from_war(Dir.glob('*.war').first)
 
-            if war_file
-              contents = ZipUtil.entry_lines(war_file)
-            else
-              contents = Dir['**/*'].join("\n")
-            end
+          elsif File.exist?('WEB-INF/web.xml')
+            return detect_framework_from_war
 
-            # Spring/Lift Variations
-            if contents =~ /WEB-INF\/lib\/grails-web.*\.jar/
-              return Framework.lookup('Grails')
-            elsif contents =~ /WEB-INF\/lib\/lift-webkit.*\.jar/
-              return Framework.lookup('Lift')
-            elsif contents =~ /WEB-INF\/classes\/org\/springframework/
-              return Framework.lookup('Spring')
-            elsif contents =~ /WEB-INF\/lib\/spring-core.*\.jar/
-              return Framework.lookup('Spring')
-            elsif contents =~ /WEB-INF\/lib\/org\.springframework\.core.*\.jar/
-              return Framework.lookup('Spring')
-            else
-              return Framework.lookup('JavaWeb')
-            end
           # Simple Ruby Apps
           elsif !Dir.glob('*.rb').empty?
             matched_file = nil
@@ -81,17 +82,16 @@ module VMC::Cli
               end
             end
             if matched_file
+              # Sinatra apps
               f = Framework.lookup('Sinatra')
               f.exec = "ruby #{matched_file}"
               return f
             end
-
           # Node.js
           elsif !Dir.glob('*.js').empty?
             if File.exist?('server.js') || File.exist?('app.js') || File.exist?('index.js') || File.exist?('main.js')
               return Framework.lookup('Node')
             end
-
           # PHP
           elsif !Dir.glob('*.php').empty?
             return Framework.lookup('PHP')
@@ -108,19 +108,42 @@ module VMC::Cli
           # Python
           elsif !Dir.glob('wsgi.py').empty?
             return Framework.lookup('WSGI')
-
           end
+
+          # Default to Standalone if no other match was made
+          return Framework.lookup('Standalone') if available_frameworks.include?(["standalone"])
         end
-        nil
       end
 
+      private
+      def detect_framework_from_war(war_file=nil)
+        if war_file
+          contents = ZipUtil.entry_lines(war_file)
+        else
+          #assume we are working with current dir
+          contents = Dir['**/*'].join("\n")
+        end
+
+        # Spring/Lift Variations
+        if contents =~ /WEB-INF\/lib\/grails-web.*\.jar/
+          return Framework.lookup('Grails')
+        elsif contents =~ /WEB-INF\/lib\/lift-webkit.*\.jar/
+          return Framework.lookup('Lift')
+        elsif contents =~ /WEB-INF\/classes\/org\/springframework/
+          return Framework.lookup('Spring')
+        elsif contents =~ /WEB-INF\/lib\/spring-core.*\.jar/
+          return Framework.lookup('Spring')
+        elsif contents =~ /WEB-INF\/lib\/org\.springframework\.core.*\.jar/
+          return Framework.lookup('Spring')
+        else
+          return Framework.lookup('JavaWeb')
+        end
+      end
     end
 
-    attr_reader   :name, :description, :memory, :console
+    attr_reader   :name, :description, :console
     attr_accessor :exec
 
-    alias :mem :memory
-
     def initialize(framework=nil, opts={})
       @name = framework || DEFAULT_FRAMEWORK
       @memory = opts[:mem] || DEFAULT_MEM
@@ -132,6 +155,80 @@ module VMC::Cli
     def to_s
       description
     end
+
+    def require_url?
+      true
+    end
+
+    def require_start_command?
+      false
+    end
+
+    def prompt_for_runtime?
+      false
+    end
+
+    def default_runtime(path)
+      nil
+    end
+
+    def memory(runtime=nil)
+      @memory
+    end
+
+    alias :mem :memory
+  end
+
+  class StandaloneFramework < Framework
+    def require_url?
+      false
+    end
+
+    def require_start_command?
+      true
+    end
+
+    def prompt_for_runtime?
+      true
+    end
+
+    def default_runtime(path)
+      if !File.directory? path
+        if path =~ /\.(jar|class)$/
+          return "java"
+        elsif path =~ /\.(rb)$/
+          return "ruby18"
+        elsif path =~ /\.(zip)$/
+          return detect_runtime_from_zip path
+        end
+      else
+        Dir.chdir(path) do
+          return "ruby18" if not Dir.glob('**/*.rb').empty?
+          if !Dir.glob('**/*.class').empty? || !Dir.glob('**/*.jar').empty?
+            return "java"
+          elsif Dir.glob('*.zip').first
+            zip_file = Dir.glob('*.zip').first
+            return detect_runtime_from_zip zip_file
+          end
+        end
+      end
+      return nil
+    end
+
+    def memory(runtime=nil)
+      default_mem = @memory
+      default_mem = '128M' if runtime =~ /\Aruby/ || runtime == "php"
+      default_mem = '512M' if runtime == "java"
+      default_mem
+    end
+
+    private
+    def detect_runtime_from_zip(zip_file)
+      contents = ZipUtil.entry_lines(zip_file)
+      if contents =~ /\.(jar)$/
+        return "java"
+      end
+    end
   end
 
 end

data/lib/cli/manifest_helper.rb

@@ -82,22 +82,11 @@ module VMC::Cli::ManifestHelper
     name = manifest("name") ||
       set(ask("Application Name", :default => manifest("name")), "name")
 
-    url_template = manifest("url") || DEFAULTS["url"]
-    url_resolved = url_template.dup
-    resolve_lexically(url_resolved)
-
-    url = ask("Application Deployed URL", :default => url_resolved)
-
-    url = url_template if url == url_resolved
-
-    # common error case is for prompted users to answer y or Y or yes or
-    # YES to this ask() resulting in an unintended URL of y. Special
-    # case this common error
-    url = DEFAULTS["url"] if YES_SET.member? url
 
-    set url, "url"
 
-    unless manifest "framework"
+    if manifest "framework"
+      framework = VMC::Cli::Framework.lookup_by_framework manifest("framework","name")
+    else
       framework = detect_framework
       set framework.name, "framework", "name"
       set(
@@ -110,11 +99,44 @@ module VMC::Cli::ManifestHelper
       )
     end
 
+    default_runtime = manifest "runtime"
+    if not default_runtime
+      default_runtime = framework.default_runtime(@application)
+      set(detect_runtime(default_runtime), "runtime") if framework.prompt_for_runtime?
+    end
+    default_command = manifest "command"
+    set ask("Start Command", :default => default_command), "command" if framework.require_start_command?
+
+    url_template = manifest("url") || DEFAULTS["url"]
+    url_resolved = url_template.dup
+    resolve_lexically(url_resolved)
+
+    if !framework.require_url?
+      url_resolved = "None"
+    end
+    url = ask("Application Deployed URL", :default => url_resolved)
+
+    if url == url_resolved && url != "None"
+      url = url_template
+    end
+
+    # common error case is for prompted users to answer y or Y or yes or
+    # YES to this ask() resulting in an unintended URL of y. Special
+    # case this common error
+    url = url_resolved if YES_SET.member? url
+
+    if(url == "None")
+      url = nil
+    end
+
+    set url, "url"
+
+    default_mem = manifest("mem")
+    default_mem = framework.memory(manifest("runtime")) if not default_mem
     set ask(
       "Memory reservation",
       :default =>
-        manifest("mem") ||
-          manifest("framework", "info", "mem") ||
+          default_mem ||
           DEFAULTS["mem"],
       :choices => ["128M", "256M", "512M", "1G", "2G"]
     ), "mem"
@@ -184,6 +206,24 @@ module VMC::Cli::ManifestHelper
     framework
   end
 
+  # Detect the appropriate runtime.
+  def detect_runtime(default, prompt_ok=true)
+    runtime = nil
+    runtime_keys=[]
+    runtimes_info.keys.each {|runtime_key| runtime_keys << runtime_key.dup }
+    runtime_keys.sort!
+    if prompt_ok
+      runtime =  ask(
+          "Select Runtime",
+          :indexed => true,
+          :default => default,
+          :choices => runtime_keys
+      )
+      display "Selected #{runtime}"
+    end
+    runtime
+  end
+
   def bind_services(user_services, chosen = 0)
     svcname = ask(
       "Which one?",

data/lib/cli/runner.rb

@@ -289,7 +289,7 @@ class VMC::Cli::Runner
         set_cmd(:apps, :instances, 2)
       else
         usage('vmc instances <appname>')
-        set_cmd(:apps, :instances, @args.size == 1 ? 1 : 0)
+        set_cmd(:apps, :instances, 1)
       end
 
     when 'crashes'

data/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.16.beta.5'
+    VERSION = '0.3.16.beta.6'
   end
 end

metadata

@@ -1,144 +1,142 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vmc
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.16.beta.6
   prerelease: 7
-  version: 0.3.16.beta.5
 platform: ruby
-authors: 
+authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-02 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json_pure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70220526276780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.1
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70220526276780
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &70220526276020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70220526276020
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70220526275540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: terminal-table
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70220526275540
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: &70220526274820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: interact
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70220526274820
+- !ruby/object:Gem::Dependency
+  name: interact
+  requirement: &70220526274360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70220526274360
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &70220526273900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.2.6
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70220526273900
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &70220526273440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70220526273440
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70220526273060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70220526273060
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70220526272520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70220526272520
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70220526272020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
-  version_requirements: *id010
-description: Client library and CLI that provides access to the VMware Cloud Application Platform.
+  prerelease: false
+  version_requirements: *70220526272020
+description: Client library and CLI that provides access to the VMware Cloud Application
+  Platform.
 email: support@vmware.com
-executables: 
+executables:
 - vmc
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - LICENSE
 - README.md
 - Rakefile
@@ -181,33 +179,29 @@ files:
 - caldecott_helper/Gemfile.lock
 - caldecott_helper/server.rb
 - bin/vmc
-has_rdoc: true
 homepage: http://vmware.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Client library and CLI that provides access to the VMware Cloud Application Platform.
+summary: Client library and CLI that provides access to the VMware Cloud Application
+  Platform.
 test_files: []
-