vmc 0.4.0.beta.59 → 0.4.0.beta.60

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

@@ -15,8 +15,8 @@ module VMC
     input :runtime, :desc => "Filter by runtime regexp"
     input :framework, :desc => "Filter by framework regexp"
     input :url, :desc => "Filter by url regexp"
-    input :one_line, :alias => "-l", :type => :boolean, :default => false,
-      :desc => "Single-line tabular format"
+    input :full, :type => :boolean, :default => false,
+      :desc => "Verbose output format"
     def apps
       msg =
         if space = input[:space]
@@ -44,8 +44,11 @@ module VMC
 
       apps = apps.sort_by(&:name)
 
-      if input[:one_line]
-
+      if input[:full]
+        spaced(apps) do |a|
+          display_app(a)
+        end
+      else
         table(
           ["name", "status", "usage", v2? && "plan", "runtime", "url"],
           apps.collect { |a|
@@ -63,10 +66,6 @@ module VMC
               end
             ]
           })
-      else
-        spaced(apps) do |a|
-          display_app(a)
-        end
       end
     end
 
@@ -788,7 +787,9 @@ module VMC
       end
 
       if input.given?(:framework)
-        framework = input[:framework, client.frameworks]
+        all_frameworks = client.frameworks
+
+        framework = input[:framework, all_frameworks, all_frameworks]
 
         if framework != app.framework
           diff[:framework] = [app.framework.name, framework.name]
@@ -797,7 +798,9 @@ module VMC
       end
 
       if input.given?(:runtime)
-        runtime = input[:runtime, client.runtimes]
+        all_runtimes = client.runtimes
+
+        runtime = input[:runtime, all_runtimes, all_runtimes]
 
         if runtime != app.runtime
           diff[:runtime] = [app.runtime.name, runtime.name]
@@ -863,14 +866,14 @@ module VMC
           :other
         ]
       else
-        framework = input[:framework, all_frameworks]
+        framework = input[:framework, all_frameworks, all_frameworks]
       end
 
 
       if framework.name == "standalone"
         detected_runtimes = detector.detect_runtimes
       else
-        detected_runtimes = detector.runtimes(framework)
+        detected_runtimes = detector.runtimes(framework) || []
       end
 
       if detected_runtimes.size == 1
@@ -878,7 +881,7 @@ module VMC
       end
 
       if detected_runtimes.empty?
-        runtime = input[:runtime, all_runtimes]
+        runtime = input[:runtime, all_runtimes, all_runtimes]
       else
         runtime = input[
           :runtime,

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

@@ -14,6 +14,11 @@ module VMC
       :dotnet => "dotNet"
     }
 
+    # Mismatched framework names
+    FRAMEWORK_NAMES = {
+      :rails => "rails3"
+    }
+
     # Clouseau language symbol => matching runtime names
     LANGUAGE_RUNTIMES = {
       :ruby => /^ruby.*/,
@@ -82,7 +87,8 @@ module VMC
         lang = d.language_name
 
         framework = all_frameworks.find { |f|
-          f.name == name
+          f.name == name ||
+            f.name == FRAMEWORK_NAMES[name]
         }
 
         framework ||= all_frameworks.find { |f|

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.59"
+  VERSION = "0.4.0.beta.60"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1905859163
+  hash: -2015713740
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 59
-  version: 0.4.0.beta.59
+  - 60
+  version: 0.4.0.beta.60
 platform: ruby
 authors: 
 - VMware
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 89
+        hash: 95
         segments: 
         - 0
         - 3
-        - 37
-        version: 0.3.37
+        - 38
+        version: 0.3.38
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -313,12 +313,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 31
         segments: 
         - 0
         - 4
-        - 7
-        version: 0.4.7
+        - 8
+        version: 0.4.8
   type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency