vmcu 0.3.18 → 0.3.19

data/lib/cli/commands/misc.rb

@@ -152,10 +152,10 @@ module VMC::Cli::Command
         require 'win32/registry'
         reg_targets = load_registry_targets
       rescue LoadError
-        err "Unable not import data from Windows Registry"
+        err "Unable to import data from Windows Registry"
         exit 1
       rescue
-        err "Unable not import data from Windows Registry"
+        err "Unable to import data from Windows Registry"
         exit 1
       end
 

data/lib/cli/console_helper.rb

@@ -50,13 +50,14 @@ module VMC::Cli
       5.times do
         begin
           results = @telnet_client.login("Name"=>auth_info["username"],
-            "Password"=>auth_info["password"]) {|line|
-            if line =~ /[$%#>] \z/n
-              prompt = line
-            elsif line =~ /Login failed/
-              err_msg = line
-            end
-          }
+            "Password"=>auth_info["password"])
+          lines = results.split("\n")
+          last_line = lines.pop
+          if last_line =~ /[$%#>] \z/n
+            prompt = last_line
+          elsif last_line =~ /Login failed/
+            err_msg = last_line
+          end
           break
         rescue TimeoutError
           sleep 1
@@ -104,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

data/lib/cli/frameworks.rb

@@ -19,7 +19,8 @@ module VMC::Cli
       'WSGI'     => ['wsgi',    { :mem => '64M',  :description => 'Python WSGI Application'}],
       'Django'   => ['django',  { :mem => '128M', :description => 'Python Django 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
@@ -54,6 +55,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
@@ -109,6 +112,7 @@ module VMC::Cli
           # Python
           elsif !Dir.glob('wsgi.py').empty?
             return Framework.lookup('WSGI')
+
           # .Net
           elsif !Dir.glob('web.config').empty?
             return Framework.lookup('dotNet')
@@ -118,6 +122,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
@@ -125,7 +134,6 @@ module VMC::Cli
         end
       end
 
-      private
       def detect_framework_from_war(war_file=nil)
         if war_file
           contents = ZipUtil.entry_lines(war_file)
@@ -149,6 +157,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

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.18'
+    VERSION = '0.3.19'
   end
 end

data/lib/vmc/client.rb

@@ -492,6 +492,11 @@ class VMC::Client
     headers['PROXY-USER'] = @proxy if @proxy
     headers['CloudTeam'] = @cloud_team if @cloud_team
     headers['ProxyRealm'] = @proxy_realm if @proxy_realm
+
+    if @via_uhuru_cloud && path.index("..") != 0 && @cloud_team == nil
+      raise TargetError, "Cloud team is not set. Use `vmcu cloud-team` to set the cloud team."
+    end
+
     path = "cf/" + path if @via_uhuru_cloud
 
     if content_type
@@ -508,6 +513,7 @@ class VMC::Client
     if request_failed?(status)
       # FIXME, old cc returned 400 on not found for file access
       err = (status == 404 || status == 400) ? NotFound : TargetError
+      err = AuthError if @via_uhuru_cloud && status == 401
       raise err, parse_error_message(status, body)
     else
       return status, body, response_headers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmcu
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -135,6 +135,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement