virtualmaster 0.1.0 → 0.1.1

data/lib/vmaster/callbacks/demo_callback.rb

@@ -10,7 +10,16 @@ callback :demo do
   end
 
   after :shutdown do 
-    puts "That's all folks!"
+    puts "That's all for now"
   end
+
+  after :reboot do
+    puts "It's raining init 6"
+  end
+
+  before :destroy do
+    puts "It's all going to shambles"
+  end
+
 end
 

data/lib/vmaster/helpers.rb

@@ -61,10 +61,10 @@ module VirtualMaster
       profile_list.first
     end
 
-    def self.create_instance(name, image_id, profile_id, realm)
+    def self.create_instance(name, image_id, profile, realm)
       api = VirtualMaster::CLI.api
 
-      api.create_instance(image_id, {:name => name, :hwp_id => profile_id, :realm_id => realm})
+      api.create_instance(image_id, {:name => name, :memory => profile[:memory], :storage => profile[:storage], :realm_id => realm})
     end
   end
 end

data/lib/vmaster/server_commands.rb

@@ -71,17 +71,14 @@ command :create do |c|
 
     abort "Image name '#{options.profile}' not recognized!" unless profile
 
-    hwp = VirtualMaster::Helpers.get_hw_profile(profile[:memory], profile[:storage])
-    abort "Internal error: hardware profile not available" unless hwp
-
     # before :create callbacks
     VirtualMaster::Callbacks.trigger_event(:create, :before, options.__hash__, nil)
 
     say "Creating '#{profile_name}' instance (#{profile[:memory]} MB memory/#{profile[:storage]/1024} GB storage)"
-    
+
     realm = "#{options.zone}-#{options.level}"
-    
-    instance = VirtualMaster::Helpers.create_instance(name, image_id, hwp.id, realm) if options.interactive
+
+    instance = VirtualMaster::Helpers.create_instance(name, image_id, profile, realm) if options.interactive
 
     # TODO handle exceptions (invalid image/profile, limits, etc.)
 
@@ -104,7 +101,7 @@ command :create do |c|
 
         sleep(5)
       end
-      
+
       puts
       puts "Instance ready."
 
@@ -139,14 +136,19 @@ command :list do |c|
   end
 end
 
-def instance_action(action, args)
+def instance_action(action, options, args)
   name = args.shift || abort('server name required')
 
   instance = VirtualMaster::Helpers.get_instance(name)
-  
+
   abort "Invalid instance name!" if instance.nil?
-  
+
+  VirtualMaster::Callbacks.trigger_event(action.to_sym, :before, options.__hash__, instance)
+
   instance.send("#{action}!")
+
+  VirtualMaster::Callbacks.trigger_event(action.to_sym, :after, options.__hash__, instance)
+
 end
 
 %w{start reboot stop shutdown destroy}.each do |cmd|
@@ -166,8 +168,13 @@ end
       c.description = "Remove server"
     end
 
+    # generate options for callbacks
+    VirtualMaster::CLI.callbacks.each do |cb|
+      c.send :option, *(cb.to_option)
+    end
+
     c.action do |args, options|
-      instance_action(c.name, args)
+      instance_action(c.name, options, args)
     end
   end
 end

data/lib/vmaster/version.rb

@@ -1,3 +1,3 @@
 module VirtualMaster
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtualmaster
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70096844415120 !ruby/object:Gem::Requirement
+  requirement: &70352789585640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 4.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70096844415120
+  version_requirements: *70352789585640
 - !ruby/object:Gem::Dependency
   name: deltacloud-client
-  requirement: &70096844414580 !ruby/object:Gem::Requirement
+  requirement: &70352789585100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096844414580
+  version_requirements: *70352789585100
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70096844414100 !ruby/object:Gem::Requirement
+  requirement: &70352789584620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70096844414100
+  version_requirements: *70352789584620
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70096844413440 !ruby/object:Gem::Requirement
+  requirement: &70352789583960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096844413440
+  version_requirements: *70352789583960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70096844412820 !ruby/object:Gem::Requirement
+  requirement: &70352789583320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70096844412820
+  version_requirements: *70352789583320
 description: Command line interface to Virtualmaster. Control your virtual infrastructure.
 email:
 - radim@laststation.net