vmc-IronFoundry 0.3.17.IF.2 → 0.3.18

data/lib/cli/console_helper.rb

@@ -51,7 +51,7 @@ module VMC::Cli
         begin
           results = @telnet_client.login("Name"=>auth_info["username"],
             "Password"=>auth_info["password"])
-          lines = results.split("\n")
+          lines = results.sub("Login: Password: ", "").split("\n")
           last_line = lines.pop
           if last_line =~ /[$%#>] \z/n
             prompt = last_line
@@ -105,29 +105,31 @@ module VMC::Cli
     end
 
     def readline_with_history(prompt)
-      line = Readline.readline(prompt, true)
-      return '' if line.nil?
-      #Don't keep blank or repeat commands in history
-      if line =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == line
-        Readline::HISTORY.pop
-      end
+      line = Readline::readline(prompt)
+      return nil if line == nil || line == 'quit' || line == 'exit'
+      Readline::HISTORY.push(line) if not line =~ /^\s*$/ and Readline::HISTORY.to_a[-1] != line
       line
     end
 
     def run_console(prompt)
-      while(cmd = readline_with_history(prompt))
-        if(cmd == "exit" || cmd == "quit")
-          #TimeoutError expected, as exit doesn't return anything
-          @telnet_client.cmd("String"=>cmd,"Timeout"=>1) rescue TimeoutError
-          close_console
+      prev = trap("INT")  { |x| exit_console; prev.call(x); exit }
+      prev = trap("TERM") { |x| exit_console; prev.call(x); exit }
+      loop do
+        cmd = readline_with_history(prompt)
+        if(cmd == nil)
+          exit_console
           break
         end
-        if !cmd.empty?
-          prompt = send_console_command_display_results(cmd, prompt)
-        end
+        prompt = send_console_command_display_results(cmd, prompt)
       end
     end
 
+    def exit_console
+      #TimeoutError expected, as exit doesn't return anything
+      @telnet_client.cmd("String"=>"exit","Timeout"=>1) rescue TimeoutError
+      close_console
+    end
+
     def send_console_command_display_results(cmd, prompt)
       begin
         lines = send_console_command cmd
@@ -155,4 +157,4 @@ module VMC::Cli
       }
     end
   end
-end
+end

data/lib/cli/frameworks.rb

@@ -20,7 +20,8 @@ module VMC::Cli
       'Django'   => ['django',  { :mem => '128M', :description => 'Python Django Application'}],
       'ASP.NET 4.0'  => ['aspdotnet', { :mem => '64M', :description => 'ASP.NET 4.0 Application'}],
       'dotNet'   => ['dotNet',  { :mem => '128M', :description => '.Net Web Application'}],
-      'Rack'     => ['rack', { :mem => '128M', :description => 'Rack Application'}]
+      'Rack'     => ['rack', { :mem => '128M', :description => 'Rack Application'}],
+      'Play'     => ['play',  { :mem => '256M', :description => 'Play Framework Application'}]
     }
 
     class << self
@@ -55,6 +56,8 @@ module VMC::Cli
         if !File.directory? path
           if path.end_with?('.war')
             return detect_framework_from_war path
+          elsif path.end_with?('.zip')
+            return detect_framework_from_zip path, available_frameworks
           elsif available_frameworks.include?(["standalone"])
             return Framework.lookup('Standalone')
           else
@@ -126,6 +129,11 @@ module VMC::Cli
             if File.exist?('server.js') || File.exist?('app.js') || File.exist?('index.js') || File.exist?('main.js')
               return Framework.lookup('Node')
             end
+
+          # Play or Standalone Apps
+          elsif Dir.glob('*.zip').first
+            zip_file = Dir.glob('*.zip').first
+            return detect_framework_from_zip zip_file, available_frameworks
           end
 
           # Default to Standalone if no other match was made
@@ -133,7 +141,6 @@ module VMC::Cli
         end
       end
 
-      private
       def detect_framework_from_war(war_file=nil)
         if war_file
           contents = ZipUtil.entry_lines(war_file)
@@ -157,6 +164,19 @@ module VMC::Cli
           return Framework.lookup('JavaWeb')
         end
       end
+
+      def detect_framework_from_zip(zip_file, available_frameworks)
+        contents = ZipUtil.entry_lines(zip_file)
+        detect_framework_from_zip_contents(contents, available_frameworks)
+      end
+
+      def detect_framework_from_zip_contents(contents, available_frameworks)
+        if available_frameworks.include?(["play"]) && contents =~ /lib\/play\..*\.jar/
+          return Framework.lookup('Play')
+        elsif available_frameworks.include?(["standalone"])
+          return Framework.lookup('Standalone')
+        end
+      end
     end
 
     attr_reader   :name, :description, :console
@@ -236,7 +256,7 @@ module VMC::Cli
     def memory(runtime=nil)
       default_mem = @memory
       default_mem = '128M' if runtime =~ /\Aruby/ || runtime == "php"
-      default_mem = '512M' if runtime == "java"
+      default_mem = '512M' if runtime == "java" || runtime == "java7"
       default_mem
     end
 

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.17.IF.2'
+    VERSION = '0.3.18'
   end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: vmc-IronFoundry
 version: !ruby/object:Gem::Version
-  version: 0.3.17.IF.2
-  prerelease: 7
+  version: 0.3.18
+  prerelease: 
 platform: ruby
 authors:
 - VMware / Iron Foundry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &26494716 !ruby/object:Gem::Requirement
+  requirement: &22424532 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *26494716
+  version_requirements: *22424532
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &26494260 !ruby/object:Gem::Requirement
+  requirement: &22424004 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *26494260
+  version_requirements: *22424004
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &26493816 !ruby/object:Gem::Requirement
+  requirement: &22423608 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,10 +49,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *26493816
+  version_requirements: *22423608
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &26492916 !ruby/object:Gem::Requirement
+  requirement: &22371264 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *26492916
+  version_requirements: *22371264
 - !ruby/object:Gem::Dependency
   name: interact
-  requirement: &26484864 !ruby/object:Gem::Requirement
+  requirement: &22370856 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *26484864
+  version_requirements: *22370856
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &26484408 !ruby/object:Gem::Requirement
+  requirement: &22370352 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *26484408
+  version_requirements: *22370352
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &26483808 !ruby/object:Gem::Requirement
+  requirement: &22369776 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,21 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *26483808
+  version_requirements: *22369776
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: &22369392 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *22369392
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &26483304 !ruby/object:Gem::Requirement
+  requirement: &22369068 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,10 +115,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26483304
+  version_requirements: *22369068
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26482776 !ruby/object:Gem::Requirement
+  requirement: &22368528 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +126,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *26482776
+  version_requirements: *22368528
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &26482320 !ruby/object:Gem::Requirement
+  requirement: &22368048 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,7 +137,7 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *26482320
+  version_requirements: *22368048
 description: Client library and CLI that provides access to the VMware Cloud Application
   Platform.
 email: help@ironfoundry.org
@@ -195,9 +206,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16