vmc 0.4.0.beta.3 → 0.4.0.beta.5

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

@@ -36,7 +36,7 @@ module VMC
     desc "push [NAME]", "Push an application, syncing changes if it exists"
     group :apps, :manage
     flag(:name) { ask("Name") }
-    flag(:path, :default => ".")
+    flag(:path)
     flag(:url) { |name, target|
       ask("URL", :default => "#{name}.#{target}")
     }
@@ -69,7 +69,7 @@ module VMC
       ask "Bind other services to application?", :default => false
     }
     def push(name = nil)
-      path = File.expand_path(input(:path))
+      path = File.expand_path(input(:path) || ".")
 
       name ||= input(:name)
 
@@ -90,19 +90,20 @@ module VMC
       domain = client.target.sub(/^https?:\/\/api\.(.+)\/?/, '\1')
       app.urls = [input(:url, name, domain)]
 
-      framework = input(:framework, ["other"] + detected.keys.sort, default)
-      if framework == "other"
-        forget(:framework)
+      if detected.empty?
         framework = input(:framework, frameworks.keys.sort, nil)
+      else
+        framework = input(:framework, ["other"] + detected.keys.sort, default)
+        if framework == "other"
+          forget(:framework)
+          framework = input(:framework, frameworks.keys.sort, nil)
+        end
       end
 
       framework_runtimes =
-        frameworks[framework]["runtimes"].collect do |k|
-          "#{k["name"]} (#{k["description"]})"
-        end
+        frameworks[framework]["runtimes"].collect { |k| k["name"] }
 
-      # TODO: include descriptions
-      runtime = input(:runtime, framework_runtimes.sort).split.first
+      runtime = input(:runtime, framework_runtimes.sort)
 
       app.framework = framework
       app.runtime = runtime

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

@@ -220,7 +220,7 @@ module VMC
     end
 
     def passed_value(flag)
-      if (val = options[flag]) && \
+      if (val = inputs[flag] || options[flag]) && \
           !val.is_a?(VMC::Interactive::InteractiveDefault)
         val
       end

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

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196453
+  hash: 62196457
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 3
-  version: 0.4.0.beta.3
+  - 5
+  version: 0.4.0.beta.5
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-04 00:00:00 Z
+date: 2012-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -281,14 +281,30 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 23
         segments: 
         - 0
-        - 1
         - 2
-        version: 0.1.2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: tunnel-vmc-plugin
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id017
 description: 
 email: support@vmware.com
 executables: