veewee 0.3.6 → 0.3.7

data/lib/veewee/definitions.rb

@@ -9,13 +9,13 @@ module Veewee
     attr_accessor :env
 
     def initialize(env)
-      @env=env
+      @env = env
       return self
     end
 
     def [](name)
       begin
-        definition=Veewee::Definition.load(name,env)
+        definition = Veewee::Definition.load(name, env)
         return definition
       rescue Veewee::DefinitionNotExist
         return nil
@@ -24,22 +24,22 @@ module Veewee
 
     # Fetch all definitions
     def each(&block)
-      definitions=Hash.new
+      definitions = Hash.new
 
       env.logger.debug("[Definition] Searching #{env.definition_dir} for definitions:")
-      subdirs=Dir.glob("#{env.definition_dir}/*")
+      subdirs = Dir.glob("#{env.definition_dir}/*")
 
       subdirs.each do |sub|
-        name=File.basename(sub)
+        name = File.basename(sub)
         env.logger.debug("[Definition] possible definition '#{name}' found")
         begin
-          definitions[name]=Veewee::Definition.load(name,env)
+          definitions[name] = Veewee::Definition.load(name, env)
         rescue Veewee::DefinitionError => ex
           env.logger.debug("[Definition] failed to load definition from directory '#{name}' #{ex}")
         end
       end
 
-      if definitions.length==0
+      if definitions.length == 0
         env.logger.debug("[Definition] no definitions found")
       end
 
@@ -53,23 +53,21 @@ module Veewee
     # Options are : :force => true to overwrite an existing definition
     #
     # Returns definition object
-
-
-    def define(definition_name,template_name,options = {})
+    def define(definition_name, template_name, options = {})
 
       # Default is not to overwrite
-      options = {'force' => false}.merge(options)
+      options = { 'force' => false }.merge(options)
 
       env.logger.debug("Forceflag : #{options['force']}")
 
-      git_template=false
+      git_template = false
       # Check if the template is a git repo
       if template_name.start_with?("git://")
-        git_template=true
+        git_template = true
       end
 
       # Check if template exists
-      template=env.templates[template_name]
+      template = env.templates[template_name]
       if template.nil? and ! git_template
         env.logger.fatal("Template '#{template_name}' does not exist")
         raise Veewee::TemplateError, "Template '#{template_name}' does not exist"
@@ -80,20 +78,20 @@ module Veewee
       create_definition_dir_if_needed
 
       # Check if definition does not exist
-      definition=env.definitions[definition_name]
+      definition = env.definitions[definition_name]
       unless definition.nil?
         env.logger.debug("Definition '#{definition_name}' exists")
-        if options['force']==true
-          self.undefine(definition_name,options)
+        if options['force'] == true
+          self.undefine(definition_name, options)
         else
-           raise Veewee::DefinitionError,"Definition #{definition_name} already exists and no force option was given"
+          raise Veewee::DefinitionError, "Definition #{definition_name} already exists and no force option was given"
         end
       end
 
       env.logger.info("Creating definition #{definition_name} in directory '#{env.definition_dir}' ")
-      dst_dir="#{File.join(env.definition_dir,definition_name)}"
+      dst_dir = "#{File.join(env.definition_dir, definition_name)}"
       FileUtils.mkdir(dst_dir)
-      env.logger.debug("Definition Directory '#{File.join(env.definition_dir,definition_name)}' succesfuly created")
+      env.logger.debug("Definition Directory '#{File.join(env.definition_dir, definition_name)}' succesfuly created")
 
       # Start copying/cloning the directory of the template to the definition directory
       if (git_template)
@@ -109,33 +107,33 @@ module Veewee
       else
         begin
           env.logger.debug("Starting copy '#{template.path}' to '#{dst_dir}'")
-          FileUtils.cp_r(template.path+"/.",dst_dir)
-          env.logger.debug("Copy '#{template.path}' to '#{dst_dir}' succesfull")
+          FileUtils.cp_r(template.path + "/.", dst_dir)
+          env.logger.debug("Copy '#{template.path}' to '#{dst_dir}' succesful")
         rescue Exception => ex
           env.logger.fatal("Copy '#{template.path}' to #{dst_dir}' failed: #{ex}")
-          raise Veewee::Error , "Copy '#{template.path}' to #{dst_dir}' failed: #{ex}"
+          raise Veewee::Error, "Copy '#{template.path}' to #{dst_dir}' failed: #{ex}"
         end
       end
 
-      definition=env.definitions[definition_name]
+      definition = env.definitions[definition_name]
       return definition
     end
 
 
     # This function undefines/removes the definition by removing the directoy with definition_name
     # under env.definition_dir
-    def undefine(definition_name,options = {})
-      definition=env.definitions[definition_name]
+    def undefine(definition_name, options = {})
+      definition = env.definitions[definition_name]
       unless definition.nil?
 
         #TODO: Needs to be more defensive!!
         env.logger.debug("[Undefine] About to remove '#{definition.path} for '#{definition_name}'")
         begin
-          if File.exists?(File.join(definition.path,"definition.rb"))
+          if File.exists?(File.join(definition.path, "definition.rb"))
             FileUtils.rm_rf(definition.path)
           else
             env.logger.fatal("Aborting delete: The directory definition.path does not contain a definition.rb file")
-            raise Veewee::DefinitionError,"Aborting delete: The directory definition.path does not contain a definition.rb file"
+            raise Veewee::DefinitionError, "Aborting delete: The directory definition.path does not contain a definition.rb file"
           end
         rescue Exception => ex
           env.logger.fatal("Removing '#{definition.path} for '#{definition_name}' failed: #{ex}")
@@ -143,7 +141,7 @@ module Veewee
         end
         env.logger.debug("Removing '#{definition.path} for '#{definition_name}' succesful")
       else
-        raise Veewee::DefinitionError,"Definition '#{definition_name}' does not exist"
+        raise Veewee::DefinitionError, "Definition '#{definition_name}' does not exist"
       end
     end
 
@@ -170,6 +168,5 @@ module Veewee
       end
     end
 
-
   end
 end

data/lib/veewee/environment.rb

@@ -51,25 +51,25 @@ module Veewee
     # Hash elelement of all OStypes
     attr_reader :ostypes
 
-    def initialize(options={})
+    def initialize(options = {})
 
       cwd = ENV['VEEWEE_DIR'] || Dir.pwd
       # If a cwd was provided as option it overrules the default
       cwd = options[:cwd] if options.has_key?(:cwd)
 
-      defaults={
+      defaults = {
         :cwd => cwd,
         :veewee_filename => "Veeweefile",
         :loglevel => :info,
-        :definition_dir => File.join(cwd,"definitions"),
-        :template_path => [File.expand_path(File.join(File.dirname(__FILE__),"..","..",'templates')),"templates"],
-        :iso_dir => File.join(cwd,"iso"),
-        :validation_dir => File.join(File.expand_path(File.join(File.dirname(__FILE__),"..","..")),"validation"),
-        :tmp_dir => File.join(cwd,"tmp")
+        :definition_dir => File.join(cwd, "definitions"),
+        :template_path => [File.expand_path(File.join(File.dirname(__FILE__), "..", "..", 'templates')), "templates"],
+        :iso_dir => File.join(cwd, "iso"),
+        :validation_dir => File.join(File.expand_path(File.join(File.dirname(__FILE__), "..", "..")), "validation"),
+        :tmp_dir => File.join(cwd, "tmp")
       }
 
       options = defaults.merge(options)
-      veeweefile_config = defaults.keys.inject({}) do |memo,obj|
+      veeweefile_config = defaults.keys.inject({}) do |memo, obj|
         if config.env.methods.include?(obj) && !config.env.send(obj).nil?
           memo.merge({ obj => config.env.send(obj) })
         else
@@ -81,7 +81,7 @@ module Veewee
       # We need to set this variable before the first call to the logger object
       if options.has_key?("debug")
         if options["debug"] == true
-          ENV['VEEWEE_LOG']="STDOUT"
+          ENV['VEEWEE_LOG'] = "STDOUT"
         end
       end
 
@@ -94,14 +94,14 @@ module Veewee
       end
 
       # Definitions
-      @definitions=Veewee::Definitions.new(self)
-      @templates=Veewee::Templates.new(self)
-      @providers=Veewee::Providers.new(self)
+      @definitions = Veewee::Definitions.new(self)
+      @templates = Veewee::Templates.new(self)
+      @providers = Veewee::Providers.new(self, options)
 
       # Read ostypes
-      yamlfile=File.join(File.dirname(__FILE__),"config","ostypes.yml")
+      yamlfile = File.join(File.dirname(__FILE__), "config", "ostypes.yml")
       logger.info "Reading ostype yamlfile #{yamlfile}"
-      @ostypes=YAML.load_file(yamlfile)
+      @ostypes = YAML.load_file(yamlfile)
 
       return self
     end
@@ -125,7 +125,7 @@ module Veewee
     #
     # @return [UI]
     def ui
-      @ui ||=  UI.new(self)
+      @ui ||= UI.new(self)
     end
 
     #---------------------------------------------------------------
@@ -155,7 +155,7 @@ module Veewee
     end
 
     def load_config!
-      @config=Config.new({:env => self}).load_veewee_config()
+      @config = Config.new({ :env => self }).load_veewee_config()
 
       return self
     end

data/lib/veewee/error.rb

@@ -1,25 +1,28 @@
 module Veewee
-    class Error < StandardError
-      attr_reader :orginal
-      def initialize(msg, original=$!)
-        super(msg)
-        @original = original; end
-    end
+  class Error < StandardError
+    attr_reader :orginal
 
-    class DefinitionError < Error
+    def initialize(msg, original = $!)
+      super(msg)
+      @original = original
     end
 
-    class DefinitionNotExist < DefinitionError
-    end
+  end
 
-    class TemplateError < Error
-    end
+  class DefinitionError < Error
+  end
 
-    class SshError < Error
-    end
+  class DefinitionNotExist < DefinitionError
+  end
 
-    class WinrmError < Error
-    end
+  class TemplateError < Error
+  end
+
+  class SshError < Error
+  end
+
+  class WinrmError < Error
+  end
 end
 
 #Usage (from the exceptional ruby book)

data/lib/veewee/provider/core/box/build.rb

@@ -86,7 +86,7 @@ module Veewee
 
           self.handle_postinstall(options)
 
-          ui.success "The box #{name} was build succesfully!"
+          ui.success "The box #{name} was build successfully!"
           ui.info "You can now login to the box with:"
           if (definition.winrm_user && definition.winrm_password)
             env.ui.info winrm_command_string

data/lib/veewee/provider/kvm/box.rb

@@ -29,14 +29,9 @@ module Veewee
 
         def initialize(name,env)
 
-          require 'libvirt'
-          require 'fog'
-
           super(name,env)
 
-          @connection=::Fog::Compute.new(:provider => "Libvirt",
-                                         :libvirt_uri => "qemu:///system",
-                                         :libvirt_ip_command => "arp -an |grep $mac|cut -d '(' -f 2 | cut -d ')' -f 1")
+          @connection=::Fog::Compute[:libvirt]
 
         end
 

data/lib/veewee/provider/kvm/box/validate_kvm.rb

@@ -5,7 +5,7 @@ module Veewee
 
         def validate_kvm(options)
 
-          validate_tags( [ 'vbox', 'puppet', 'chef'],options)
+          validate_tags( [ 'kvm', 'puppet', 'chef'],options)
 
         end
       end #Module

data/lib/veewee/provider/kvm/provider.rb

@@ -5,62 +5,49 @@ module Veewee
     module Kvm
       class Provider < Veewee::Provider::Core::Provider
 
-        # Translate the definition ssh options to ssh options that can be passed to Net::Ssh calls
-        # We expect plain ssh for a connection
-
         def check_requirements
-          ["ruby-libvirt","fog"].each do |gemname|
-            unless gem_available?(gemname)
-              raise Veewee::Error,"The kvm provider requires the gem '#{gemname}' to be installed\n"    + "gem install #{gemname}"
-            end
-          end
+          require 'fog'
+
+          env.logger.info "Falling back to qemu:///system for libvirt URI if no value is specified in the .fog config file"
+          Fog.credentials[:libvirt_uri] ||= "qemu:///system"
+
+          env.logger.info "Setting libvirt IP Command if not already defined in .fog config file"
+          Fog.credentials[:libvirt_ip_command] ||= "arp -an |grep $mac|cut -d '(' -f 2 | cut -d ')' -f 1"
 
-          env.logger.info "Checking for version of libvirt"
           begin
-            require 'libvirt'
-            env.logger.info "Opening a libvirt connection to qemu:///system"
-            conn = ::Libvirt::open("qemu:///system")
+            env.logger.info "Opening a libvirt connection using fog.io"
+            conn = Fog::Compute[:libvirt]
             env.logger.info "Libvirt connection established"
 
-            env.logger.info "Found capabilities:"
-            env.logger.info "#{conn.capabilities}"
+            env.logger.debug "Found capabilities:"
+            env.logger.debug "#{conn.client.capabilities}"
 
             env.logger.info "Checking available storagepools"
-            pools=conn.list_storage_pools
-            env.logger.info "Storagepools: #{pools.join(',')}"
-            if pools.count < 1
-              raise Veewee::Error,"You need at least one (active) storage pool defined. This needs to be available if you connect to qemu:///system"
-            end
+            conn.pools.any? or raise Veewee::Error, "You need at least one (active) storage pool defined in #{Fog.credentials[:libvirt_uri]}."
 
-            #env.logger.info "Checking available networks"
-            #networks=conn.list_networks
-            #env.logger.info "Networks: #{networks.join(',')}"
-            #if networks.count < 1
-            #  raise Veewee::Error,"You need at least one (active) network defined. This needs to be available if you connect to qemu:///system"
-            #end
+            env.logger.info "Checking available networks"
+            conn.networks.any? or raise Veewee::Error,"You need at least one (active) network defined. This needs to be available if you connect to qemu:///system"
 
             # http://www.libvirt.org/html/libvirt-libvirt.html#virGetVersion
             # format major * 1,000,000 + minor * 1,000 + release
             env.logger.info "Checking libvirt version"
-            libvirt_version=conn.version
-            if libvirt_version < 8003
-              raise Veewee::Error,"You need at least libvirt version 0.8.3 or higher "
+            if conn.client.libversion < 8003
+              raise Veewee::Error, "You need at least libvirt version 0.8.3 or higher "
             end
-            conn.close
           rescue Exception => ex
             raise Veewee::Error, "There was a problem opening a connection to libvirt: #{ex}"
           end
 
           unless self.shell_exec("arp").status == 0
-            raise Veewee::Error,"Could not execute the arp command. This is required to find the IP address of the VM"
+            raise Veewee::Error, "Could not execute the arp command. This is required to find the IP address of the VM"
           end
 
         end
 
 
-        def build(definition_name,box_name,options)
+        def build(definition_name, box_name, options)
 
-          super(definition_name,box_name,options)
+          super(definition_name, box_name, options)
 
         end
 

data/lib/veewee/provider/virtualbox/box/helper/create.rb

@@ -35,7 +35,7 @@ module Veewee
 
           unless definition.nil?
             #Map SSH Ports
-            command="#{@vboxcmd} modifyvm '#{name}' --natpf1 'guestwinrm,tcp,,#{definition.winrm_host_port},,#{definition.winrm_guest_port}'"
+            command="#{@vboxcmd} modifyvm \"#{name}\" --natpf1 'guestwinrm,tcp,,#{definition.winrm_host_port},,#{definition.winrm_guest_port}'"
             shell_exec("#{command}")
           end
         end
@@ -162,6 +162,10 @@ module Veewee
           command="#{@vboxcmd} modifyvm \"#{name}\" --memory #{definition.memory_size}"
           shell_exec("#{command}")
 
+          #setting video memory size
+          command="#{@vboxcmd} modifyvm \"#{name}\" --vram #{definition.video_memory_size}"
+          shell_exec("#{command}")
+          
           #setting bootorder
           command="#{@vboxcmd} modifyvm \"#{name}\" --boot1 disk --boot2 dvd --boot3 none --boot4 none"
           shell_exec("#{command}")

data/lib/veewee/providers.rb

@@ -1,31 +1,32 @@
 module Veewee
+  class Providers
+    def initialize(env, options = {})
+      @env = env
+      @options = options
+      @providers = Hash.new
+    end
 
-    class Providers
-      def initialize(env)
-        @env=env
-        @providers=Hash.new
-      end
-
-      def [](name)
-             return @providers[name] if @providers.has_key?(name)
+    def [](name)
+      return @providers[name] if @providers.has_key?(name)
 
-             begin
-               require_path='veewee/provider/'+name.to_s.downcase+"/provider"
-               require require_path
+      begin
+        require_path = 'veewee/provider/' + name.to_s.downcase + "/provider"
+        require require_path
 
-               provider=Object.const_get("Veewee").const_get("Provider").const_get(name.to_s.capitalize).const_get("Provider").new(name,{},@env)
+        provider = Object.const_get("Veewee").const_get("Provider").const_get(name.to_s.capitalize).const_get("Provider").new(name, @options, @env)
 
-               @providers[name]=provider
-             rescue ::Veewee::Error => e
-                raise
-             rescue Error => e
-               env.ui.error "Error loading provider with #{name},#{$!}",:prefix => false
-             end
+        @providers[name] = provider
+      rescue ::Veewee::Error => e
+        raise
+      rescue Error => e
+        env.ui.error "Error loading provider with #{name}, #{$!}", :prefix => false
       end
 
-      def length
-        @providers.length
-      end
+    end
+
+    def length
+      @providers.length
+    end
 
   end
 end #Module Veewee