vmc 0.4.0.beta.39 → 0.4.0.beta.40

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

@@ -179,7 +179,7 @@ module VMC
         end
       end
 
-      runtimes = v2? ? client.runtimes : framework.runtimes
+      runtimes = framework.runtimes || client.runtimes
       runtime = input[:runtime, runtimes]
 
       fail "Invalid framework '#{input[:framework]}'" unless framework

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

@@ -5,27 +5,31 @@ module VMC
       @path = path
     end
 
-    def all_frameworks
-      @client.frameworks
+    def framework_info
+      @framework_info ||= @client.info[:frameworks]
     end
 
-    def find_top(entries)
-      found = false
+    def all_runtimes
+      @all_runtiems ||= @client.runtimes
+    end
 
-      entries.each do |e|
-        is_toplevel =
-          e.ftype == :directory && e.name.index("/") + 1 == e.name.size
+    def all_frameworks
+      @all_frameworks ||= @client.frameworks
 
-        if is_toplevel && e.name !~ /^(\.|__MACOSX)/
-          if found
-            return false
-          else
-            found = e.name
-          end
+      @all_frameworks.each do |f|
+        next if f.detection && f.runtimes
+
+        if info = framework_info[f.name.to_sym]
+          f.detection = info[:detection]
+
+          runtime_names = info[:runtimes].collect { |r| r[:name] }
+          f.runtimes = all_runtimes.select { |r|
+            runtime_names.include?(r.name)
+          }
         end
       end
 
-      found
+      @all_frameworks
     end
 
     def frameworks
@@ -82,5 +86,26 @@ module VMC
 
       [matches, default]
     end
+
+    private
+
+    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.39"
+  VERSION = "0.4.0.beta.40"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1686938957
+  hash: -2328282212
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 39
-  version: 0.4.0.beta.39
+  - 40
+  version: 0.4.0.beta.40
 platform: ruby
 authors: 
 - VMware
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 39
         segments: 
         - 0
         - 3
-        - 25
-        version: 0.3.25
+        - 26
+        version: 0.3.26
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -281,12 +281,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 0
         - 4
-        - 3
-        version: 0.4.3
+        - 4
+        version: 0.4.4
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency