vmc 0.4.0.beta.44 → 0.4.0.beta.45

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

@@ -378,8 +378,6 @@ module VMC
       :desc => "Applications to start",
       :from_given => by_name("app")
     def instances
-      no_v2
-
       apps = input[:apps]
       fail "No applications given." if apps.empty?
 
@@ -391,7 +389,7 @@ module VMC
 
         spaced(instances) do |i|
           if quiet?
-            line i.index
+            line i.id
           else
             line
             display_instance(i)
@@ -451,20 +449,18 @@ module VMC
     input :app, :argument => true,
       :desc => "Application to get the logs of",
       :from_given => by_name("app")
-    input :instance, :type => :numeric, :default => 0,
+    input :instance, :default => "0",
       :desc => "Instance of application to get the logs of"
     input :all, :default => false,
       :desc => "Get logs for every instance"
     def logs
-      no_v2
-
       app = input[:app]
 
       instances =
         if input[:all]
           app.instances
         else
-          app.instances.select { |i| i.index == input[:instance] }
+          app.instances.select { |i| i.id == input[:instance] }
         end
 
       if instances.empty?
@@ -479,7 +475,7 @@ module VMC
         logs =
           with_progress(
               "Getting logs for #{c(app.name, :name)}" +
-                c("\##{i.index}", :instance)) do
+                c("\##{i.id}", :instance)) do
             i.files("logs")
           end
 
@@ -513,9 +509,15 @@ module VMC
           app.file(*input[:path].split("/"))
         end
 
-      line unless quiet?
+      if quiet?
+        print file
+      else
+        line
 
-      print file
+        file.split("\n").each do |l|
+          line l
+        end
+      end
     end
 
     desc "Examine an app's files"
@@ -527,15 +529,19 @@ module VMC
       :desc => "Path of directory to list"
     def files
       app = input[:app]
+      path = input[:path]
 
-      files =
-        with_progress("Getting file listing") do
-          app.files(*input[:path].split("/"))
-        end
+      if quiet?
+        files =
+          with_progress("Getting file listing") do
+            app.files(*path.split("/"))
+          end
 
-      line unless quiet?
-      files.each do |file|
-        line file.join("/")
+        files.each do |file|
+          line file.join("/")
+        end
+      else
+        invoke :file, :app => app, :path => path
       end
     end
 
@@ -569,8 +575,6 @@ module VMC
       :desc => "Application to get the stats for",
       :from_given => by_name("app")
     def stats
-      no_v2
-
       app = input[:app]
 
       stats =
@@ -920,7 +924,7 @@ module VMC
     end
 
     def display_instance(i)
-      start_line "instance #{c("\##{i.index}", :instance)}: "
+      start_line "instance #{c("\##{i.id}", :instance)}: "
       puts "#{b(c(i.state.downcase, state_color(i.state)))} "
 
       indented do

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

@@ -106,7 +106,6 @@ module VMCHelpers
 
     thd_group = ThreadGroup.new
     thd = Thread.new do
-      thd_group.add(thd)
       begin
         VMC::CLI.new.invoke(command, inputs, given, :quiet => true)
       rescue SystemExit => e
@@ -126,6 +125,8 @@ EOF
       end
     end
 
+    thd_group.add(thd)
+
     begin
       $vmc_event.process = thd
 

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

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

data/vmc-ng/spec/app/push_spec.rb

@@ -60,7 +60,7 @@ describe "App#push" do
 
       app.should be
       app.name.should == name
-      app.instances.should == instances
+      app.total_instances.should == instances
       app.framework.should == framework
       app.runtime.should == runtime
       #app.url.should == url # TODO v2

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -842654508
+  hash: 2094814611
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 44
-  version: 0.4.0.beta.44
+  - 45
+  version: 0.4.0.beta.45
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-05 00:00:00 Z
+date: 2012-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 41
         segments: 
         - 0
         - 3
-        - 28
-        version: 0.3.28
+        - 29
+        version: 0.3.29
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency