vmc 0.4.0.beta.56 → 0.4.0.beta.57

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

@@ -847,27 +847,21 @@ module VMC
       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_frameworks.empty?
-        framework = input[:framework, all_frameworks]
-      else
+      if detected_framework = detector.detect_framework
         framework = input[
           :framework,
-          detected_frameworks,
-          default_framework,
+          [detected_framework],
+          detected_framework,
           all_frameworks,
           :other
         ]
+      else
+        framework = input[:framework, all_frameworks]
       end
 
 
       if framework.name == "standalone"
-        detected_runtimes = detector.detected_runtimes
+        detected_runtimes = detector.detect_runtimes
       else
         detected_runtimes = detector.runtimes(framework)
       end

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

@@ -25,114 +25,95 @@ module VMC
       :php => /^php.*/
     }
 
-    # [Framework]
-    attr_reader :matches
-
-    # Framework
-    attr_reader :default
-
     def initialize(client, path)
       @client = client
       @path = path
     end
 
-    def framework_info
-      @framework_info ||= @client.info[:frameworks]
+    # detect the framework
+    def detect_framework
+      detected && frameworks[detected]
+    end
+
+    # detect the language and return the appropriate runtimes
+    def detect_runtimes
+      if detected && lang = detected.language_name
+        runtimes_for(lang)
+      end
+    end
+
+    # determine runtimes for a given framework based on the language its
+    # detector reports itself as
+    def runtimes(framework)
+      if detector = detectors[framework]
+        runtimes_for(detector.language_name)
+      end
+    end
+
+    # determine suitable memory allocation via the framework's detector
+    def suggested_memory(framework)
+      if detector = detectors[framework]
+        detector.memory_suggestion
+      end
     end
 
+    # helper so that this is cached somewhere
     def all_runtimes
       @all_runtimes ||= @client.runtimes
     end
 
+    # helper so that this is cached somewhere
     def all_frameworks
       @all_frameworks ||= @client.frameworks
     end
 
-    def matches
-      return @matches if @matches
-
-      frameworks = all_frameworks
-
-      @matches = {}
-
-      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
+    private
 
-      @matches
+    def detected
+      @detected ||= Clouseau.detect(@path)
     end
 
-    def detected_frameworks
-      matches.keys
-    end
+    def map_detectors!
+      @framework_detectors = {}
+      @detector_frameworks = {}
 
-    def detected_runtimes
-      langs = Set.new
+      Clouseau.detectors.each do |d|
+        name = d.framework_name.to_s
+        lang = d.language_name
 
-      Clouseau.matches(@path).each do |detected|
-        if lang = detected.language_name
-          langs << lang
-        end
-      end
+        framework = all_frameworks.find { |f|
+          f.name == name
+        }
 
-      runtimes = []
+        framework ||= all_frameworks.find { |f|
+          f.name == PSEUDO_FRAMEWORKS[lang]
+        }
 
-      langs.each do |lang|
-        runtimes += runtimes_for(lang)
+        next unless framework
+
+        @framework_detectors[framework] = d
+        @detector_frameworks[d] = framework
       end
 
-      runtimes
+      nil
     end
 
-    def runtimes(framework)
-      if matches[framework] && lang = matches[framework].language_name
-        runtimes_for(lang)
-      end
+    # Framework -> Detector
+    def detectors
+      map_detectors! unless @framework_detectors
+      @framework_detectors
     end
 
-    def suggested_memory(framework)
-      matches[framework] && mem = matches[framework].memory_suggestion
+    # Detector -> Framework
+    def frameworks
+      map_detectors! unless @detector_frameworks
+      @detector_frameworks
     end
 
-    private
-
     def runtimes_for(language)
       all_runtimes.select do |r|
         LANGUAGE_RUNTIMES[language] === r.name
       end
     end
-
-    def find_top(entries)
-      found = false
-
-      entries.each do |e|
-        is_toplevel =
-          e.ftype == :directory && e.name.index("/") + 1 == e.name.size
-
-        if is_toplevel && e.name !~ /^(\.|__MACOSX)/
-          if found
-            return false
-          else
-            found = e.name
-          end
-        end
-      end
-
-      found
-    end
   end
 end

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

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -4198322296
+  hash: 1537108025
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 56
-  version: 0.4.0.beta.56
+  - 57
+  version: 0.4.0.beta.57
 platform: ruby
 authors: 
 - VMware
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 87
+        hash: 85
         segments: 
         - 0
         - 3
-        - 34
-        version: 0.3.34
+        - 35
+        version: 0.3.35
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency