veewee 0.3.7 → 0.3.9

data/lib/veewee/definitions.rb

@@ -2,6 +2,7 @@ require 'grit'
 require 'veewee/definition'
 require 'veewee/templates'
 require 'veewee/template'
+require 'erb'
 
 module Veewee
   class Definitions
@@ -10,16 +11,20 @@ module Veewee
 
     def initialize(env)
       @env = env
+      @definitions = {}
       return self
     end
 
+
     def [](name)
-      begin
-        definition = Veewee::Definition.load(name, env)
-        return definition
-      rescue Veewee::DefinitionNotExist
-        return nil
+      if @definitions[name].nil?
+        begin
+          @definitions[name] = Veewee::Definition.load(name, env)
+        rescue Veewee::DefinitionNotExist
+          return nil
+        end
       end
+      @definitions[name]
     end
 
     # Fetch all definitions
@@ -107,7 +112,7 @@ module Veewee
       else
         begin
           env.logger.debug("Starting copy '#{template.path}' to '#{dst_dir}'")
-          FileUtils.cp_r(template.path + "/.", dst_dir)
+          FileUtils.cp_r(template.path + "/.", dst_dir, :preserve => true)
           env.logger.debug("Copy '#{template.path}' to '#{dst_dir}' succesful")
         rescue Exception => ex
           env.logger.fatal("Copy '#{template.path}' to #{dst_dir}' failed: #{ex}")
@@ -115,6 +120,22 @@ module Veewee
         end
       end
 
+      # If the template includes a NOTICE.erb or NOTICE.txt file, display it to the user
+      # .erb file takes priority, then .txt
+      notice_erb = File.join(dst_dir, 'NOTICE.erb')
+      notice_txt = File.join(dst_dir, 'NOTICE.txt')
+      if File.exist?(notice_erb)
+        template = File.read(notice_erb)
+        text = ERB.new(template).result(binding)
+      elsif File.exist?(notice_txt)
+        text = File.read(notice_txt)
+      end
+
+      if text
+        env.ui.warn("Template #{template_name} includes this NOTICE text you should first read:\n")
+        env.ui.info("#{text}\n")
+      end
+
       definition = env.definitions[definition_name]
       return definition
     end

data/lib/veewee/environment.rb

@@ -18,8 +18,6 @@ module Veewee
     # The valid name for a Veeweefile for this environment
     attr_accessor :veewee_filename
 
-    attr_accessor :loglevel
-
     # This initializes a new Veewee Environment
     # settings argument is a hash with the following options
     # - :definition_dir   : where definitions are located
@@ -45,22 +43,29 @@ module Veewee
     # Hash element of all templates available
     attr_accessor :templates
 
-    # Hash element of all templates available
+    # Hash element of all providers available
     attr_accessor :providers
 
-    # Hash elelement of all OStypes
+    # Hash element of all OS types
     attr_reader :ostypes
 
+    # Path to the config file
+    attr_reader :config_filepath
+
+    attr_accessor :current_provider
+
     def initialize(options = {})
+      # symbolify commandline options
+      options = options.inject({}) {|result,(key,value)| result.update({key.to_sym => value})}
 
-      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)
+      # cwd is again merged later with all options but it has to merged here
+      # because several defaults are generated from it
+      cwd = options[:cwd] || Veewee::Environment.workdir
 
       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"),
@@ -69,6 +74,9 @@ module Veewee
       }
 
       options = defaults.merge(options)
+
+      @config_filepath = File.join(options[:cwd], options[:veewee_filename])
+
       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) })
@@ -78,13 +86,6 @@ module Veewee
       end
       options = options.merge(veeweefile_config)
 
-      # 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"
-        end
-      end
-
       logger.info("environment") { "Environment initialized (#{self})" }
 
       # Injecting all variables of the options and assign the variables
@@ -106,6 +107,10 @@ module Veewee
       return self
     end
 
+    def self.workdir
+      ENV['VEEWEE_DIR'] || Dir.pwd
+    end
+
     #---------------------------------------------------------------
     # Config Methods
     #---------------------------------------------------------------
@@ -156,7 +161,6 @@ module Veewee
 
     def load_config!
       @config = Config.new({ :env => self }).load_veewee_config()
-
       return self
     end
 
@@ -188,26 +192,31 @@ module Veewee
     def logger
       return @logger if @logger
 
-      # Figure out where the output should go to.
       output = nil
-      if ENV["VEEWEE_LOG"] == "STDOUT"
+      loglevel = Logger::ERROR
+
+      # Figure out where the output should go to.
+      if ENV["VEEWEE_LOG"]
         output = STDOUT
-      elsif ENV["VEEWEE_LOG"] == "NULL"
-        output = nil
-      elsif ENV["VEEWEE_LOG"]
-        output = ENV["VEEWEE_LOG"]
-      else
-        output = nil #log_path.join("#{Time.now.to_i}.log")
+        loglevel = Logger.const_get(ENV["VEEWEE_LOG"].upcase)
       end
 
-      # Create the logger and custom formatter
+        # Create the logger and custom formatter
       @logger = ::Logger.new(output)
+      @logger.level = loglevel
       @logger.formatter = Proc.new do |severity, datetime, progname, msg|
         "#{datetime} - #{progname} - [#{resource}] #{msg}\n"
       end
-
       @logger
     end
 
+    # Get box from current provider
+    def get_box(name)
+      if current_provider.nil?
+        raise "Provider is unset in the environment."
+      else
+        providers[current_provider].get_box(name)
+      end
+    end
   end #Class
 end #Module

data/lib/veewee/error.rb

@@ -1,6 +1,6 @@
 module Veewee
   class Error < StandardError
-    attr_reader :orginal
+    attr_reader :original
 
     def initialize(msg, original = $!)
       super(msg)

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

@@ -3,6 +3,20 @@ module Veewee
     module Core
       module BoxCommand
 
+        def run_hook(name)
+          hooks = definition.instance_variable_get(:@hooks)
+          if ! hooks.nil?
+            hook = hooks[name]
+            if hook.nil?
+              ui.info "Hook ##{name} is not defined"
+            else
+              raise Veewee::Error, "Hook is not callable" if ! hook.respond_to?(:call)
+              ui.info "Running ##{name} hook"
+              hook.call
+            end
+          end
+        end
+
         def build(options={})
 
           if definition.nil?
@@ -39,12 +53,18 @@ module Veewee
             raise Veewee::Error, "The box should have been deleted by now. Something went terribly wrong. Sorry"
           end
 
+          run_hook(:before_create)
+
           self.create(options)
 
+          run_hook(:after_create)
+
           # Check the GUI mode required
           env.logger.info "Provider asks the box to start: GUI enabled? #{!options['nogui']}"
           self.up(options)
 
+          run_hook(:after_up)
+
           # Waiting for it to boot
           ui.info "Waiting #{definition.boot_wait.to_i} seconds for the machine to boot"
           sleep definition.boot_wait.to_i
@@ -66,7 +86,10 @@ module Veewee
           })
 
           # Type the boot sequence
-          self.console_type(boot_sequence)
+          Thread.new do
+            self.console_type(boot_sequence)
+            run_hook(:after_boot_sequence)
+          end
 
           self.handle_kickstart(options)
 
@@ -78,15 +101,22 @@ module Veewee
             sleep 2
           end
 
+          if ! definition.skip_iso_transfer then
+            self.transfer_buildinfo(options)
+          end
 
-          self.transfer_buildinfo(options)
+          # Transfer the VEEWEE_<params> environment variables + definition.params
+          # into .veewee_params
+          self.transfer_params(options)
 
           # Filtering post install files based upon --postinstall-include and --postinstall--exclude
           definition.postinstall_files=filter_postinstall_files(options)
 
           self.handle_postinstall(options)
 
-          ui.success "The box #{name} was build successfully!"
+          run_hook(:after_postinstall)
+
+          ui.success "The box #{name} was built successfully!"
           ui.info "You can now login to the box with:"
           if (definition.winrm_user && definition.winrm_password)
             env.ui.info winrm_command_string
@@ -202,7 +232,6 @@ module Veewee
         # It requires a box(to login to) and a definition(listing the postinstall files)
         def handle_postinstall(options)
 
-          # Transfer all postinstall files
           definition.postinstall_files.each do |postinstall_file|
             # Filenames of postinstall_files are relative to their definition
             filename=File.join(definition.path,postinstall_file)
@@ -215,7 +244,7 @@ module Veewee
           # Prepare a pre_poinstall file if needed (not nil , or not empty)
           unless definition.pre_postinstall_file.to_s.empty?
             pre_filename=File.join(definition.path, definition.pre_postinstall_file)
-            self.copy_to_box(filename,File.basename(pre_filename))
+            self.copy_to_box(pre_filename,File.basename(pre_filename))
             if (definition.winrm_user && definition.winrm_password)
               # not implemented on windows yet
             else
@@ -239,6 +268,8 @@ module Veewee
                 # Upload the pre postinstall script if not already transfered
                 command = "./" + File.basename(pre_filename)
                 command = sudo(command) + " ./"+File.basename(filename)
+
+                self.exec(command)
               else
                 if (definition.winrm_user && definition.winrm_password)
                   # no sudo on windows, batch files only please?
@@ -248,8 +279,6 @@ module Veewee
                 end
               end
 
-              self.exec(command)
-
             else
               env.logger.info "Skipping postinstallfile #{postinstall_file}"
             end
@@ -278,6 +307,41 @@ module Veewee
           end
         end
 
+        def transfer_params(options)
+          filename = ".veewee_params"
+          content = ""
+
+          params = {}
+
+          # First check params in definition
+          params.merge!(definition.params) unless definition.params.nil?
+
+          # Environment vars override
+          veewee_env = ENV.select{|key,value| key.to_s.match(/^VEEWEE_/) }
+          veewee_env.each do |key,value|
+            params[key.gsub(/^VEEWEE_/,'')] = value
+          end
+
+          # Iterate over params
+          params.each do |key,value|
+            content += "export #{key}='#{value}'\n"
+          end
+
+          begin
+            infofile=Tempfile.open("#{filename}")
+            # Force binary mode to prevent windows from putting CR-LF end line style
+            # http://www.ruby-forum.com/topic/127453#568546
+            infofile.binmode
+            infofile.puts "#{content}"
+            infofile.rewind
+            infofile.close
+            self.copy_to_box(infofile.path,filename)
+            infofile.delete
+          rescue RuntimeError => ex
+            ui.error("Error transfering file #{filename} failed, possible not enough permissions to write? #{ex}",:prefix => false)
+            raise Veewee::Error,"Error transfering file #{filename} failed, possible not enough permissions to write? #{ex}"
+          end
+        end
 
       end #Module
     end #Module

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

@@ -41,7 +41,7 @@ module Veewee
               end
             rescue Net::SSH::AuthenticationFailed => ex # may want to catch winrm auth fails as well
               env.ui.error "Authentication failure"
-              raise Veewee::SshError, "Authentication failure\n"+ex
+              raise Veewee::SshError, "Authentication failure\n"+ex.inspect
             end
           end
 

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

@@ -21,7 +21,7 @@ module Veewee
               env.logger.info "Removing previous floppy file"
               FileUtils.rm(floppy_file)
             end
-            command="java -jar #{javacode_dir}/dir2floppy.jar \"#{temp_dir}\" \"#{floppy_file}\""
+            command="java -jar \"#{javacode_dir}/dir2floppy.jar\" \"#{temp_dir}\" \"#{floppy_file}\""
             shell_exec("#{command}")
           end
         end

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

@@ -9,10 +9,11 @@ module Veewee
 
           raise Veewee::Error,"Box is not running" unless self.running?
 
+          host_ip=self.ip_address
+
           if (options[:interactive]==true)
             # Command line options
             extended_command="#{command}"
-            host_ip=self.ip_address
 
             unless host_ip.nil? || host_ip==""
               ssh_command="ssh #{ssh_commandline_options(options)} #{host_ip} \"#{extended_command}\""
@@ -92,4 +93,3 @@ module Veewee
     end # Module
   end # Module
 end # Module
-

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

@@ -15,47 +15,154 @@ module Veewee
             exit -1
           end
 
-          require 'cucumber'
+          if definition.winrm_user && definition.winrm_password # prefer winrm
+            checks = checks_windows
+          else
+            checks = checks_linux
+          end
 
-          require 'cucumber/rspec/disable_option_parser'
-          require 'cucumber/cli/main'
+          # Some reject here based on tags
+          checks.reject! { |c|
+            tagged = false
+            c[:tags].each do |t|
+              tagged = true if tags.include?(t)
+            end
+            ! tagged
+          }
 
-          # Passing ssh options via ENV varialbles to cucumber
-          # VEEWEE_SSH_USER, VEEWEE_SSH_PASSWORD ,VEEWEE_SSH_PORT
-          cucumber_vars=ssh_options
-          cucumber_vars.each do |key,value|
-            ENV['VEEWEE_'+key.to_s.upcase]=cucumber_vars[key].to_s
-          end
+          # Assume clean exitcode
+          exitcode = 0
 
-          # Pass the name of the box
-          ENV['VEEWEE_BOXNAME']=@name
-          ENV['VEEWEE_PROVIDER']=@provider.name
+          # Loop over checks
+          checks.each do |check|
+            if check[:sudo]
+              result = check_output_sudorun(check[:command],check[:expected_string])
+            else
+              result = check_output_run(check[:command],check[:expected_string])
+            end
 
-          if definition.winrm_user && definition.winrm_password # prefer winrm 
-            featurefile="veewee-windows.feature"
-          else
-            featurefile="veewee.feature"
+            if result[:match]
+              ui.success("#{check[:description]} - OK")
+            else
+              ui.error("#{check[:description]} - FAILED")
+              ui.error("Command: #{check[:command]}")
+              ui.error("Expected string #{check[:expected_string]}")
+              ui.error("Output: #{check[:output]}")
+              exitcode = -1
+            end
           end
 
-          feature_path=File.join(File.dirname(__FILE__),"..","..","..","..","..","validation",featurefile)
+          exit -1 if exitcode < 0
+        end
+
+        def check_output_sudorun(command,expected_string)
+          result = { :command => command,
+                     :expected_string => expected_string,
+                     :output => nil
+                   }
+
+          begin
+            self.exec("echo '#{command}' > /tmp/validation.sh && chmod a+x /tmp/validation.sh", :mute => true)
+            sshresult = self.exec(self.sudo("/tmp/validation.sh"),:mute => true)
+
+            result[:output]   = sshresult.stdout
+            result[:match]    = ! sshresult.stdout.match(/#{expected_string}/).nil?
+          rescue
+            result[:match] = false
+          end
+          return result
+        end
 
-          features=Array.new
-          features[0]=feature_path
-          features << "--tags"
-          features << tags.map {|t| "@#{t}"}.join(',')
+        def check_output_run(command,expected_string)
+          result = { :command => command,
+                     :expected_string => expected_string,
+                     :output => nil
+                   }
 
           begin
-            # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.
-            failure = Cucumber::Cli::Main.execute(features.dup)
-            Kernel.exit(failure ? 1 : 0)
-          rescue SystemExit => e
-            Kernel.exit(e.status)
-          rescue Exception => e
-            ui.error("#{e.message} (#{e.class})")
-            ui.error(e.backtrace.join("\n"))
-            Kernel.exit(1)
+            sshresult = self.exec(command, {:exitcode => '*',:mute => true})
+            result[:output]   = sshresult.stdout
+            result[:match]    = ! sshresult.stdout.match(/#{expected_string}/).nil?
+          rescue
+            result[:match] = false
           end
+          return result
+        end
+
+        def checks_linux
+          return [
+            { :description => 'Checking user',
+              :tags => [ 'virtualbox','kvm', 'parallels'],
+              :command => 'who am i',
+              :expected_string => definition.ssh_user,
+              :sudo => false
+          },
+          { :description => 'Checking sudo',
+            :tags => [ 'virtualbox','kvm', 'parallels'],
+            :command => 'whoami',
+            :expected_string => 'root',
+            :sudo => true
+          },
+          { :description => 'Checking ruby',
+            :tags => [ 'virtualbox','kvm', 'parallels','ruby'],
+            :command => '. /etc/profile ;ruby --version 2> /dev/null 1> /dev/null;  echo $?',
+            :expected_string => "0",
+            :sudo => false
+          },
+          { :description => 'Checking gem',
+            :tags => [ 'virtualbox','kvm', 'parallels','gem'],
+            :command => '. /etc/profile ;gem --version 2> /dev/null 1> /dev/null;  echo $?',
+            :expected_string => "0",
+            :sudo => false
+          },
+          { :description => 'Checking chef',
+            :tags => [ 'chef'],
+            :command => '. /etc/profile ;chef-client --version 2> /dev/null 1>/dev/null; echo $?',
+            :expected_string => "0",
+            :sudo => false
+          },
+          { :description => 'Checking puppet',
+            :tags => [ 'puppet'],
+            :command => '. /etc/profile ;puppet --version 2> /dev/null 1>/dev/null; echo $?',
+            :expected_string => "0",
+            :sudo => false
+          },
+          { :description => 'Checking shared folder',
+            :tags => [ 'vagrant'],
+            :command => 'mount|grep veewee-validation; echo $?',
+            :expected_string => "0",
+            :sudo => false
+          }
+          ]
+        end
 
+        def checks_windows
+          return [
+            { :description => 'Checking user',
+              :tags => [ 'virtualbox','kvm','vmfusion'],
+              :command => 'whoami',
+              :expected_string => definition.ssh_user,
+              :sudo => false
+          },
+          { :description => 'Checking ruby',
+            :tags => [ 'virtualbox','kvm','vmfusion'],
+            :command => 'ruby --version > %TEMP%\devnull && echo %ERRORLEVEL%',
+            :expected_string => "0",
+            :sudo => false
+          },
+          { :description => 'Checking gem',
+            :tags => [ 'virtualbox','kvm','vmfusion'],
+            :command => 'gem --version > %TEMP%\devnull && echo %ERRORLEVEL%',
+            :expected_string => "0",
+            :sudo => false
+          },
+          { :description => 'Checking chef',
+            :tags => [ 'chef'],
+            :command => 'chef-client --version > %TEMP%\devnull && echo %ERRORLEVEL%',
+            :expected_string => "0",
+            :sudo => false
+          },
+          ]
         end
       end #Module