vmc-IronFoundry 0.3.16.IF.3 → 0.3.17.IF.2

data/lib/cli.rb

@@ -1,6 +1,7 @@
-ROOT = File.expand_path(File.dirname(__FILE__))
-WINDOWS = !!(RUBY_PLATFORM =~ /mingw|mswin32|cygwin/)
+require "rbconfig"
 
+ROOT = File.expand_path(File.dirname(__FILE__))
+WINDOWS = !!(RbConfig::CONFIG['host_os'] =~ /mingw|mswin32|cygwin/)
 
 module VMC
   autoload :Client,           "#{ROOT}/vmc/client"

data/lib/cli/commands/services.rb

@@ -167,7 +167,7 @@ module VMC::Cli::Command
       else
         wait_for_tunnel_start(port)
         unless start_local_prog(clients, client_name, conn_info, port)
-          err "'#{client_name}' executation failed; is it in your $PATH?"
+          err "'#{client_name}' execution failed; is it in your $PATH?"
         end
       end
     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

data/lib/cli/frameworks.rb

@@ -19,13 +19,18 @@ module VMC::Cli
       'WSGI'     => ['wsgi',    { :mem => '64M',  :description => 'Python WSGI Application'}],
       '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'}]
     }
 
     class << self
 
-      def known_frameworks
-        FRAMEWORKS.keys
+      def known_frameworks(available_frameworks)
+        frameworks = []
+        FRAMEWORKS.each do |key,fw|
+          frameworks << key if available_frameworks.include? [fw[0]]
+        end
+        frameworks
       end
 
       def lookup(name)
@@ -88,17 +93,13 @@ module VMC::Cli
               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
 
           # ASP.NET 4.0
           elsif !Dir.glob('*.config').empty?
             if File.exist?('web.config')
               return Framework.lookup('ASP.NET 4.0')
             end
+
           # PHP
           elsif !Dir.glob('*.php').empty?
             return Framework.lookup('PHP')
@@ -115,6 +116,16 @@ 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')
+
+          # 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
           end
 
           # Default to Standalone if no other match was made

data/lib/cli/manifest_helper.rb

@@ -197,7 +197,7 @@ module VMC::Cli::ManifestHelper
           "Select Application Type",
           :indexed => true,
           :default => framework,
-          :choices => VMC::Cli::Framework.known_frameworks
+          :choices => VMC::Cli::Framework.known_frameworks(frameworks_info)
         )
       )
       display "Selected #{framework}"

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

data/lib/cli/zip_util.rb

@@ -10,7 +10,7 @@ module VMC::Cli
     class << self
 
       def to_dev_null
-        if !!RUBY_PLATFORM['mingw'] || !!RUBY_PLATFORM['mswin32'] || !!RUBY_PLATFORM['cygwin']
+        if WINDOWS
           'nul'
         else
           '/dev/null'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmc-IronFoundry
 version: !ruby/object:Gem::Version
-  version: 0.3.16.IF.3
+  version: 0.3.17.IF.2
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &26166276 !ruby/object:Gem::Requirement
+  requirement: &26494716 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *26166276
+  version_requirements: *26494716
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &26165652 !ruby/object:Gem::Requirement
+  requirement: &26494260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *26165652
+  version_requirements: *26494260
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &26165028 !ruby/object:Gem::Requirement
+  requirement: &26493816 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,10 +49,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *26165028
+  version_requirements: *26493816
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &26163612 !ruby/object:Gem::Requirement
+  requirement: &26492916 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *26163612
+  version_requirements: *26492916
 - !ruby/object:Gem::Dependency
   name: interact
-  requirement: &26163120 !ruby/object:Gem::Requirement
+  requirement: &26484864 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *26163120
+  version_requirements: *26484864
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &26162628 !ruby/object:Gem::Requirement
+  requirement: &26484408 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *26162628
+  version_requirements: *26484408
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &26161044 !ruby/object:Gem::Requirement
+  requirement: &26483808 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +93,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *26161044
+  version_requirements: *26483808
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &26160564 !ruby/object:Gem::Requirement
+  requirement: &26483304 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,10 +104,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26160564
+  version_requirements: *26483304
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26160216 !ruby/object:Gem::Requirement
+  requirement: &26482776 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,18 +115,18 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *26160216
+  version_requirements: *26482776
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &26159808 !ruby/object:Gem::Requirement
+  requirement: &26482320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *26159808
+  version_requirements: *26482320
 description: Client library and CLI that provides access to the VMware Cloud Application
   Platform.
 email: help@ironfoundry.org