vmc 0.4.0.beta.15 → 0.4.0.beta.16

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

@@ -143,7 +143,7 @@ module VMC
       else
         detected_names = detected.collect(&:name).sort
         framework_name =
-          input[:framework, detected_names + ["other"], default]
+          input[:framework, detected_names + ["other"], default && default.name]
 
         if framework_name == "other"
           input.forget(:framework)
@@ -411,7 +411,7 @@ module VMC
       ask("Memory Limit", :choices => MEM_CHOICES,
           :default => human_size(default * 1024 * 1024, 0))
     }
-    input :restart, :default => true,
+    input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
     def scale(input)
       name = input[:name]
@@ -673,7 +673,7 @@ module VMC
       :desc => "Environment variable name"
     input :value, :argument => :optional,
       :desc => "Environment variable value"
-    input :restart, :default => true,
+    input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
     def set_env(input)
       appname = input[:name]
@@ -715,7 +715,7 @@ module VMC
       :desc => "Application to remove the variable from"
     input :var, :argument => true,
       :desc => "Environment variable name"
-    input :restart, :default => true,
+    input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
     def delete_env(input)
       appname = input[:name]

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

@@ -113,8 +113,12 @@ module VMC
       if !input.given?(:url) && !input.given?(:organization) &&
           !input.given?(:space)
         display_target
-        puts "Organization: #{c(client.current_organization.name, :name)}"
-        puts "Space: #{c(client.current_space.name, :name)}"
+
+        if v2? && client.current_organization && client.current_space
+          puts "Organization: #{c(client.current_organization.name, :name)}"
+          puts "Space: #{c(client.current_space.name, :name)}"
+        end
+
         return
       end
 
@@ -353,7 +357,7 @@ module VMC
 
     def select_org_and_space(input, info)
       if input.given?(:organization) || !org_valid?(info[:organization])
-        orgs = client.current_user.organizations
+        orgs = client.organizations
         fail "No organizations!" if orgs.empty?
 
         if orgs.size == 1 && !input.given?(:organization)
@@ -372,7 +376,7 @@ module VMC
       # switching org probably means switching space
       if input.given?(:organization) || input.given?(:space) || \
             !space_valid?(info[:space])
-        spaces = client.current_user.spaces.select do |s|
+        spaces = client.spaces.select do |s|
           s.organization.id == org.id
         end
 

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

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196477
+  hash: 62196419
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 15
-  version: 0.4.0.beta.15
+  - 16
+  version: 0.4.0.beta.16
 platform: ruby
 authors: 
 - VMware
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 23
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 2
+        version: 0.3.2
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency