vmc 0.4.0.beta.55 → 0.4.0.beta.56

data/vmc-ng/lib/vmc/cli/app.rb

@@ -5,34 +5,6 @@ require "vmc/detect"
 
 module VMC
   class App < CLI
-    # TODO: don't hardcode; bring in from remote
-    MEM_DEFAULTS_FRAMEWORK = {
-      "rails3" => "256M",
-      "spring" => "512M",
-      "grails" => "512M",
-      "lift" => "512M",
-      "java_web" => "512M",
-      "standalone" => "64M",
-      "sinatra" => "128M",
-      "node" => "64M",
-      "php" => "128M",
-      "otp_rebar" => "64M",
-      "wsgi" => "64M",
-      "django" => "128M",
-      "dotNet" => "128M",
-      "rack" => "128M",
-      "play" => "256M"
-    }
-
-    MEM_DEFAULTS_RUNTIME = {
-      "java7" => "512M",
-      "java" => "512M",
-      "php" => "128M",
-      "ruby" => "128M",
-      "ruby19" => "128M"
-    }
-
-
     desc "List your applications"
     group :apps
     input :space, :desc => "Show apps in given space",
@@ -110,42 +82,23 @@ module VMC
     input(:url, :desc => "URL bound to app") { |default|
       ask("URL", :default => default)
     }
-    input(:memory, :desc => "Memory limit") { |framework, runtime|
+    input(:memory, :desc => "Memory limit") { |default|
       ask("Memory Limit",
           :choices => memory_choices,
           :allow_other => true,
-          :default =>
-            MEM_DEFAULTS_RUNTIME[runtime] ||
-              MEM_DEFAULTS_FRAMEWORK[framework] ||
-              "64M")
+          :default => default || "64M")
     }
     input(:instances, :type => :integer,
           :desc => "Number of instances to run") {
       ask("Instances", :default => 1)
     }
     input(:framework, :from_given => find_by_name("framework"),
-          :desc => "Framework to use") { |choices, default, other|
-      choices = choices.sort_by(&:name)
-      choices << other if other
-
-      opts = {
-        :choices => choices,
-        :display => proc { |f|
-          if f == other
-            "other"
-          else
-            f.name
-          end
-        }
-      }
-
-      opts[:default] = default if default
-
-      ask("Framework", opts)
+          :desc => "Framework to use") { |choices, default, all, other|
+      ask_with_other("Framework", choices, default, all, other)
     }
-    input(:runtime, :desc => "Runtime to run it with",
-          :from_given => find_by_name("runtime")) { |choices|
-      ask("Runtime", :choices => choices, :display => proc(&:name))
+    input(:runtime, :from_given => find_by_name("runtime"),
+          :desc => "Runtime to use") { |choices, default, all, other|
+      ask_with_other("Runtime", choices, default, all, other)
     }
     input(:command, :desc => "Startup command for standalone app") {
       ask("Startup command")
@@ -891,23 +844,50 @@ module VMC
       app.production = !!(input[:plan] =~ /^p/i) if v2?
 
       detector = Detector.new(client, path)
-      frameworks = detector.all_frameworks
-      detected, default = detector.frameworks
+      all_frameworks = detector.all_frameworks
+      all_runtimes = detector.all_runtimes
+
+      detected_frameworks = detector.detected_frameworks
+
+      if detected_frameworks.size == 1
+        default_framework = detected_frameworks.first
+      end
 
-      if detected.empty?
-        framework = input[:framework, frameworks]
+      if detected_frameworks.empty?
+        framework = input[:framework, all_frameworks]
       else
-        detected_names = detected.collect(&:name).sort
-        framework = input[:framework, detected, default, :other]
+        framework = input[
+          :framework,
+          detected_frameworks,
+          default_framework,
+          all_frameworks,
+          :other
+        ]
+      end
 
-        if framework == :other
-          input.forget(:framework)
-          framework = input[:framework, frameworks]
-        end
+
+      if framework.name == "standalone"
+        detected_runtimes = detector.detected_runtimes
+      else
+        detected_runtimes = detector.runtimes(framework)
+      end
+
+      if detected_runtimes.size == 1
+        default_runtime = detected_runtimes.first
+      end
+
+      if detected_runtimes.empty?
+        runtime = input[:runtime, all_runtimes]
+      else
+        runtime = input[
+          :runtime,
+          detected_runtimes,
+          default_runtime,
+          all_runtimes,
+          :other
+        ]
       end
 
-      runtimes = framework.runtimes || client.runtimes
-      runtime = input[:runtime, runtimes]
 
       fail "Invalid framework '#{input[:framework]}'" unless framework
       fail "Invalid runtime '#{input[:runtime]}'" unless runtime
@@ -928,7 +908,8 @@ module VMC
 
       app.urls = [url] if url && !v2?
 
-      app.memory = megabytes(input[:memory, framework, runtime])
+      default_memory = detector.suggested_memory(framework) || 64
+      app.memory = megabytes(input[:memory, human_mb(default_memory)])
 
       app = filter(:create_app, app)
 
@@ -1105,6 +1086,32 @@ module VMC
       end
     end
 
+    def ask_with_other(message, choices, default, all, other)
+      choices = choices.sort_by(&:name)
+      choices << other if other
+
+      opts = {
+        :choices => choices,
+        :display => proc { |x|
+          if other && x == other
+            "other"
+          else
+            x.name
+          end
+        }
+      }
+
+      opts[:default] = default if default
+
+      res = ask(message, opts)
+
+      if other && res == other
+        opts[:choices] = all
+        res = ask(message, opts)
+      end
+
+      res
+    end
     def usage(used, limit)
       "#{b(human_size(used))} of #{b(human_size(limit, 0))}"
     end

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

@@ -1,5 +1,36 @@
+require "set"
+
+require "clouseau"
+
 module VMC
   class Detector
+    # "Basic" framework names for a detected language
+    PSEUDO_FRAMEWORKS = {
+      :node => "node",
+      :python => "wsgi",
+      :java => "java_web",
+      :php => "php",
+      :erlang => "otp_rebar",
+      :dotnet => "dotNet"
+    }
+
+    # Clouseau language symbol => matching runtime names
+    LANGUAGE_RUNTIMES = {
+      :ruby => /^ruby.*/,
+      :java => /^java.*/,
+      :node => /^node.*/,
+      :erlang => /^erlang.*/,
+      :dotnet => /^dotNet.*/,
+      :python => /^python.*/,
+      :php => /^php.*/
+    }
+
+    # [Framework]
+    attr_reader :matches
+
+    # Framework
+    attr_reader :default
+
     def initialize(client, path)
       @client = client
       @path = path
@@ -10,89 +41,81 @@ module VMC
     end
 
     def all_runtimes
-      @all_runtiems ||= @client.runtimes
+      @all_runtimes ||= @client.runtimes
     end
 
     def all_frameworks
       @all_frameworks ||= @client.frameworks
+    end
+
+    def matches
+      return @matches if @matches
 
-      @all_frameworks.each do |f|
-        next if f.detection && f.runtimes
+      frameworks = all_frameworks
 
-        if info = framework_info[f.name.to_sym]
-          f.detection = info[:detection]
+      @matches = {}
 
-          runtime_names = info[:runtimes].collect { |r| r[:name] }
-          f.runtimes = all_runtimes.select { |r|
-            runtime_names.include?(r.name)
+      Clouseau.matches(@path).each do |detected|
+        if name = detected.framework_name
+          framework = frameworks.find { |f|
+            f.name == name.to_s
           }
         end
+
+        if !framework && lang = detected.language_name
+          framework = frameworks.find { |f|
+            f.name == PSEUDO_FRAMEWORKS[lang]
+          }
+        end
+
+        next unless framework
+
+        @matches[framework] = detected
       end
 
-      @all_frameworks
+      @matches
     end
 
-    def frameworks
-      matches = []
-      all_frameworks.each do |framework|
-        matched = false
-
-        # e.g. standalone has no detection
-        next if framework.detection.nil? || framework.detection.empty?
-
-        framework.detection.first.each do |file, match|
-          files =
-            if File.file? @path
-              if File.fnmatch(file, @path)
-                [@path]
-              elsif @path =~ /\.(zip|jar|war)/
-                lines = CFoundry::Zip.entry_lines(@path)
-                top = find_top(lines)
-
-                lines.collect(&:name).select do |path|
-                  File.fnmatch(file, path) ||
-                    top && File.fnmatch(top + file, path)
-                end
-              else
-                []
-              end
-            else
-              Dir.glob("#@path/#{file}")
-            end
-
-          unless files.empty?
-            if match == true
-              matched = true
-            elsif match == false
-              matched = false
-              break
-            else
-              begin
-                files.each do |f|
-                  contents = File.open(f, &:read)
-                  if contents =~ Regexp.new(match)
-                    matched = true
-                  end
-                end
-              rescue RegexpError
-                # some regexps may fail on 1.8 as the server runs 1.9
-              end
-            end
-          end
+    def detected_frameworks
+      matches.keys
+    end
+
+    def detected_runtimes
+      langs = Set.new
+
+      Clouseau.matches(@path).each do |detected|
+        if lang = detected.language_name
+          langs << lang
         end
+      end
+
+      runtimes = []
 
-        matches << framework if matched
+      langs.each do |lang|
+        runtimes += runtimes_for(lang)
       end
 
-      if matches.size == 1
-        default = matches.first
+      runtimes
+    end
+
+    def runtimes(framework)
+      if matches[framework] && lang = matches[framework].language_name
+        runtimes_for(lang)
       end
+    end
 
-      [matches, default]
+    def suggested_memory(framework)
+      matches[framework] && mem = matches[framework].memory_suggestion
     end
 
     private
 
+    def runtimes_for(language)
+      all_runtimes.select do |r|
+        LANGUAGE_RUNTIMES[language] === r.name
+      end
+    end
+
     def find_top(entries)
       found = false
 

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.55"
+  VERSION = "0.4.0.beta.56"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -3856277458
+  hash: -4198322296
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 55
-  version: 0.4.0.beta.55
+  - 56
+  version: 0.4.0.beta.56
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-24 00:00:00 Z
+date: 2012-09-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -274,9 +274,25 @@ dependencies:
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: mothership
+  name: clouseau
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :runtime
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: mothership
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -288,11 +304,11 @@ dependencies:
         - 5
         version: 0.1.5
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: manifests-vmc-plugin
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -304,11 +320,11 @@ dependencies:
         - 7
         version: 0.4.7
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: tunnel-dummy-vmc-plugin
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -320,11 +336,11 @@ dependencies:
         - 1
         version: 0.0.1
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: multi_json
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -336,11 +352,11 @@ dependencies:
         - 6
         version: 1.3.6
   type: :runtime
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -353,11 +369,11 @@ dependencies:
         - 2
         version: 0.9.2.2
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -369,11 +385,11 @@ dependencies:
         - 0
         version: 2.11.0
   type: :development
-  version_requirements: *id021
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: simplecov
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -385,7 +401,7 @@ dependencies:
         - 4
         version: 0.6.4
   type: :development
-  version_requirements: *id022
+  version_requirements: *id023
 description: 
 email: support@vmware.com
 executables: