More library changes

5 files changed, 54 insertions, 9 deletions

diff --git a/ev/vm/lib/vm.rb b/ev/vm/lib/vm.rb
index 6b17dd8..59c8ae1 100644
--- a/ev/vm/lib/vm.rb
+++ b/ev/vm/lib/vm.rb
@@ -14,7 +14,7 @@ Camping.goes :Vm
 module Vm::Controllers
   class Active < REST 'active'
     def read(name)
-      @name = name
+      @vm = vm(name)
       render :view_active
     end
 
@@ -22,6 +22,11 @@ module Vm::Controllers
       render :list_active
     end
 
+    # Moved create to its own class, much like "destroy"
+    # Should probably determine which is the correct pattern here
+  end
+
+  class Create < REST 'create'
     def create
       puts "Created!"
       redirect R(Active)
@@ -48,7 +53,7 @@ module Vm::Views
         head do
           title 'Everest'
           link :rel => 'stylesheet', :type => 'text/css', 
-               :href => "https://" + self.env[:SERVER_NAME] + '/css/style.css', :media => 'screen'
+               :href => '/css/style.css', :media => 'screen'
         end
         body do
           div.content do
@@ -60,12 +65,50 @@ module Vm::Views
 
     #TODO: Bug - the name can't support a '-' because of the regex parsing it off
     def view_active
-      puts vm(@name)
+      require 'pp'
+      pp @vm
+      ul.vm! do
+        li do
+          label 'Name:', :for => 'name'
+          span.name! @vm[:name]
+        end
+
+        li do
+          label 'UUID:', :for => 'uuid'
+          span.uuid! @vm[:uuid]
+        end
+
+        li do
+          label 'Used Memory:', :for => 'used_mem'
+          span.used_mem! @vm[:used_mem]
+        end
+
+        li do
+          label 'OS Type:', :for => 'os_type'
+          span.os_type! @vm[:os_type]
+        end
+
+        li do
+          label 'State:', :for => 'state'
+          span.state! @vm[:state]
+        end
+
+        li do
+          label 'CPUs:', :for => 'cpus'
+          span.cpus! @vm[:cpus]
+        end
+
+        li do
+          label 'CPU Time:', :for => 'cpu_time'
+          span.cpu_time! @vm[:cpu_time]
+        end
+
+      end
     end
 
     def list_active
       div.active! do
-        table :cellpadding => 3 do
+        table do
           tr do
             th 'Name', :align => :left
             th 'State'
@@ -74,11 +117,13 @@ module Vm::Views
             
           vms do |vm|
             tr do
-              td { a vm[:name], :href => R(Vm::Controllers::Active, vm[:id]) }
+              td { a vm[:name], :href => R(Vm::Controllers::Active, vm[:name] + ".html") }
               td vm[:state]
               td do
-                form(:method => :delete, :action => R(Vm::Controllers::Destroy, vm[:id])) do
-                  input :type => :submit, :value => 'Destroy'
+                unless vm[:state] == 'shut off' or vm[:state] == 'paused' then
+                  form(:method => :delete, :action => R(Vm::Controllers::Destroy, vm[:name])) do
+                    input :type => :submit, :value => 'Destroy'
+                  end
                 end
               end
             end
diff --git a/everest-lib/lib/everest-lib.rb b/everest-lib/lib/everest-lib.rb
index d8f3448..708bb76 100644
--- a/everest-lib/lib/everest-lib.rb
+++ b/everest-lib/lib/everest-lib.rb
@@ -108,7 +108,7 @@ module EverestLib
     def vms(filter = :all, &block)
       block ||= lambda {|val| val}
       # Supply a custom format pattern to properly parse the virsh output
-      pattern = /\s*([\w-]*)\s*([-\w]*)\s*(.*)/
+      pattern = /\s*([\w-]*)\s*([-\.\w]*)\s*(.*)/
       parse_columns("virsh list --#{filter.to_s} | tail -n +3", [:id, :name, :state], pattern, &block)
     end
 
diff --git a/everest-lib/pkg/everest-lib-0.0.9.gem b/everest-lib/pkg/everest-lib-0.0.9.gem
index 1cade18..e54197f 100644
--- a/everest-lib/pkg/everest-lib-0.0.9.gem
+++ b/everest-lib/pkg/everest-lib-0.0.9.gem
diff --git a/everest-lib/pkg/everest-lib-0.0.9.tgz b/everest-lib/pkg/everest-lib-0.0.9.tgz
index d58111a..eca1f74 100644
--- a/everest-lib/pkg/everest-lib-0.0.9.tgz
+++ b/everest-lib/pkg/everest-lib-0.0.9.tgz
diff --git a/everest-lib/pkg/everest-lib-0.0.9/lib/everest-lib.rb b/everest-lib/pkg/everest-lib-0.0.9/lib/everest-lib.rb
index d8f3448..708bb76 100644
--- a/everest-lib/pkg/everest-lib-0.0.9/lib/everest-lib.rb
+++ b/everest-lib/pkg/everest-lib-0.0.9/lib/everest-lib.rb
@@ -108,7 +108,7 @@ module EverestLib
     def vms(filter = :all, &block)
       block ||= lambda {|val| val}
       # Supply a custom format pattern to properly parse the virsh output
-      pattern = /\s*([\w-]*)\s*([-\w]*)\s*(.*)/
+      pattern = /\s*([\w-]*)\s*([-\.\w]*)\s*(.*)/
       parse_columns("virsh list --#{filter.to_s} | tail -n +3", [:id, :name, :state], pattern, &block)
     end