ccbuilder 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/befog

@@ -75,10 +75,10 @@ begin
 
   when "list"
     one_client = CCBuilder::ONEClient.new(verbose)
-    format = "%7s %16s %30s %15s"
-    puts format % ['ID', 'IP', 'HOST', 'STATE'] if table
-    one_client.list.each do |vm| 
-      puts format % [vm['id'], vm['ip'], vm['host'], vm['state']]
+    format = "%7s %6s %9s   %-17s %s"
+    puts format % ['ID', 'STATUS', 'VMHOST', 'IP', 'HOST'] if table
+    one_client.list.sort {|x,y| x['id'] <=> y['id'] }.each do |vm| 
+      puts format % [vm['id'], vm['status'], vm['vmhost'] ? vm['vmhost'] : '-', vm['ip'], vm['host']]
     end
 
   when "delete"

data/lib/ONEClient.rb

@@ -50,11 +50,12 @@ module CCBuilder
             vm = OpenNebula::VirtualMachine.new_with_id(id, @one_client)
             vm.info
             ip = vm.template_str.scan(/IP=(\d+\.\d+\.\d+\.\d+),/)[0][0]
-            state = vm.state_str
+            status = vm.status
+            vmhost = vm["HISTORY/HOSTNAME"]
             host = Resolv::getname(ip)
             Thread.pass
             puts "VM ##{id} with ip #{ip} resolved to name #{host}" if @verbose
-            vms << { 'id' => id, 'ip' => ip, 'host' => host, 'state' => state }
+            vms << { 'id' => id, 'ip' => ip, 'host' => host, 'status' => status, 'vmhost' => vmhost }
             STDOUT.flush
             id = queue.pop
           end 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ccbuilder
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Dennis Klein
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 +02:00
+date: 2010-08-18 00:00:00 +02:00
 default_executable: befog
 dependencies: 
 - !ruby/object:Gem::Dependency