vmc 0.4.0.beta.45 → 0.4.0.beta.46

data/vmc/lib/cli/frameworks.rb

@@ -86,7 +86,7 @@ module VMC::Cli
               next if matched_file
               File.open(fname, 'r') do |f|
                 str = f.read # This might want to be limited
-                matched_file = fname if (str && str.match(/^\s*require[\s\(]*['"]sinatra['"]/))
+                matched_file = fname if (str && str.match(/^\s*require[\s\(]*['"]sinatra['"(\/base['"])]/))
               end
             end
             if matched_file

data/vmc/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.19'
+    VERSION = '0.3.20'
   end
 end

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

@@ -451,13 +451,13 @@ module VMC
       :from_given => by_name("app")
     input :instance, :default => "0",
       :desc => "Instance of application to get the logs of"
-    input :all, :default => false,
+    input :all, :type => :boolean, :default => false,
       :desc => "Get logs for every instance"
     def logs
       app = input[:app]
 
       instances =
-        if input[:all]
+        if input[:all] || input[:instance] == "all"
           app.instances
         else
           app.instances.select { |i| i.id == input[:instance] }
@@ -474,7 +474,7 @@ module VMC
       spaced(instances) do |i|
         logs =
           with_progress(
-              "Getting logs for #{c(app.name, :name)}" +
+              "Getting logs for #{c(app.name, :name)} " +
                 c("\##{i.id}", :instance)) do
             i.files("logs")
           end

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

@@ -129,7 +129,7 @@ module VMC
       end
     end
 
-    desc "Set or display the current target cloud"
+    desc "Set or display the target cloud, organization, and space"
     group :start
     input :url, :argument => :optional,
       :desc => "Target URL to switch to"

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

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 2094814611
+  hash: 1875048273
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 45
-  version: 0.4.0.beta.45
+  - 46
+  version: 0.4.0.beta.46
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-06 00:00:00 Z
+date: 2012-09-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 47
         segments: 
         - 0
         - 3
-        - 29
-        version: 0.3.29
+        - 30
+        version: 0.3.30
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -281,12 +281,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 4
+        version: 0.1.4
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency