veewee 0.4.5.1 → 0.5.0.alpha1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzk4NzUyZDE4NTc4N2M0MmNkZGU1MmVlMmE1ZjYxMjVlYzZmYzhiMw==
+    MDgwZThlZDY5ZTBmZDFhZDVjYjQ3YzRmMjFlY2NmNzBiMmZlYTMyMg==
   data.tar.gz: !binary |-
-    YmYxNTQ5ZjU4MDgxZDk3ZDhiM2E5YWExZTE4YjI1ODVhNmJjNTQ1OA==
+    ZmEwZTc3MTc4OGFiY2IzZDZjOWQ4ODc4ZmQ4NDMwMmY0NjhlOTQyNQ==
 SHA512:
   metadata.gz: !binary |-
-    NjQ5ZDczYWI1MTc1ODEyYWQ0MWYzMTY5MDdlNGFlYWFjZDMyYmQzZmY3MjI4
-    OTBkYjllMGUzNmViOTRlMGRiYjkwMmU3OTMxOTE4MGVhNWUwMWM4NmU2OTE2
-    NTZhZDIzYzQxODgyMTljYmIzZWNkNGM4NmJlNGIwZDBlNzNiZjQ=
+    MzNlYTg0YTIyN2JjYWZmMDdkMzAxMTdmNmI4ZGVjNGM0NmRhMmU3NWY3YjUw
+    NjMwM2M3ZWY4OWJlYzg2ZTRhYTU0MzgzMmE0NGFlMzc4MTA2ZmU2NGE1M2Nk
+    NDUyNTNhZjBkZTJhZjhkOGU5YWYxMjkyYjM0OWMzMjc5NmIzYTA=
   data.tar.gz: !binary |-
-    MTM5NjhjYWMxNjk5Zjk4YmNmNzE3Yjg5NmMwNjQzN2RmMTBlMTdkZGY0NDg4
-    NTE0OTE0MTljNmNkMDRiZTExZWM2MTg5NzRhNjRkN2Y1ZGM1Y2Y3M2IyYTMx
-    ODUwZTY2YzhmNjQ1MzRmZWJmMWYyNWU4M2I2MGY3MzZiYmFmMGY=
+    Y2Q4ZjE4MDJkZThlYTM0YTU2MDcyMmI4M2NhOWM0OWRiMzM0MmU5YzllYjNi
+    OGI1OTAzZDIwMTIwZDBlMzZkZjE4YTI3NmZmMzM0Y2UzM2JhZGZjZTMxMTRi
+    NGM1YTM4YjhhMGRmYTU0MDk1MGY2NzBlYjg1NGY0NDQ2OThhNzA=

data/.gitignore

@@ -20,7 +20,5 @@ pkg/*
 virtualfloppy.vfd
 *.swp
 AutoPartition.app
-.ruby-version
-.rbenv-gemsets
+.rvmrc
 .project
-.ruby-version

data/.ruby-gemset

@@ -0,0 +1 @@
+veewee

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p547

data/doc/basics.md

@@ -62,6 +62,17 @@ Veewee provides templates for a lot of different operation systems. To see all t
 
 Templates have the same structure as definitions, but templates are used to generate definitions. Definitions are simply **your** customizable templates that you can modify as you see fit.
 
+### Template sources
+
+Veewee will detect all gems with `veewee-templates` gemspec `metadata` pointing to templates directory:
+
+```ruby
+  spec.metadata = {
+    "veewee-templates" => "templates"
+  }
+```
+
+For example see [veewee.gemspec](../veewee.gemspec).
 
 ## Create a definition
 

data/lib/veewee/environment.rb

@@ -66,7 +66,7 @@ module Veewee
       defaults = {
         :cwd => cwd,
         :veewee_filename => "Veeweefile",
-        :template_path => [File.expand_path(File.join(File.dirname(__FILE__), "..", "..", 'templates')), "templates"],
+        :template_path => ["templates"],
         :validation_dir => File.join(File.expand_path(File.join(File.dirname(__FILE__), "..", "..")), "validation"),
       }
 

data/lib/veewee/provider/core/helper/scancode.rb

@@ -35,15 +35,16 @@ module Veewee
             end
           end
 
-          @@special_keys=Hash.new;
+          @@special_keys = Hash.new;
           @@special_keys['<Enter>'] = '1c 9c';
           @@special_keys['<Backspace>'] = '0e 8e';
+          @@special_keys['<Bs>'] = '0e 8e';
           @@special_keys['<Spacebar>'] = '39 b9';
           @@special_keys['<Return>'] = '1c 9c'
           @@special_keys['<Esc>'] = '01 81';
           @@special_keys['<Tab>'] = '0f 8f';
           @@special_keys['<KillX>'] = '1d 38 0e b8';
-          @@special_keys['<Wait>'] = 'wait';
+          @@special_keys['<Wait(\d*)>'] = 'wait';
 
           @@special_keys['<Up>'] = '48 c8';
           @@special_keys['<Down>'] = '50 d0';
@@ -52,6 +53,7 @@ module Veewee
           @@special_keys['<End>'] = '4f cf';
           @@special_keys['<Insert>'] = '52 d2';
           @@special_keys['<Delete>'] = '53 d3';
+          @@special_keys['<Del>'] = '53 d3';
           @@special_keys['<Left>'] = '4b cb';
           @@special_keys['<Right>'] = '4d cd';
           @@special_keys['<Home>'] = '47 c7';
@@ -69,13 +71,15 @@ module Veewee
 
             until thestring.length == 0
               nospecial=true;
-              @@special_keys.keys.each { |key|
-                if thestring.match(/^#{key}/i)
+              @@special_keys.each { |key, value|
+                if
+                  result = thestring.match(/^#{key}/i)
+                then
                   #take thestring
                   #check if it starts with a special key + pop special string
-                  keycodes=keycodes+@@special_keys[key]+' ';
-                  thestring=thestring.slice(key.length,thestring.length-key.length)
-                  nospecial=false;
+                  keycodes += value + result.captures.join(",") + ' '
+                  thestring = thestring.slice(result.string.length, thestring.length-result.string.length)
+                  nospecial = false;
                   break;
                 end
               }

data/lib/veewee/provider/core/helper/web.rb

@@ -2,87 +2,87 @@ module Veewee
   module Provider
     module Core
       module Helper
+
         require 'webrick'
 
         include WEBrick
 
-        module Servlet
-
-          class FileServlet < WEBrick::HTTPServlet::AbstractServlet
-            attr_reader :ui, :threaded
-
-            def initialize(server,localfile,ui,threaded)
-              super(server)
-              @server=server
-              @localfile=localfile
-              @ui=ui
-              @threaded=threaded
-            end
-
-            def do_GET(request,response)
-              response['Content-Type']='text/plain'
-              response.status = 200
-              content = File.open(@localfile, "r").read
-              response.body =
-              case File.extname(@localfile)
-              when ".erb"
-                ui.info "Rendering and serving file #{@localfile}"
-                ERB.new(content).result(binding)
-              else
-                ui.info "Serving file #{@localfile}"
-                content
-              end
-              if not @threaded
-                ui.info "Shutting down for #{@localfile}"
-                @server.shutdown
-              end
-            end
-          end
-        end
-
         module Web
-          def wait_for_http_request(filename, urlname, options) # original blocking
-            server_for_http_request(filename, urlname, options) do |server|
-              server.start
+          def wait_for_http_request(filename, urlname, options) # thread with timeout
+            thread  = allow_for_http_request(filename, urlname, options)
+            timeout = options[:timeout] || 60
+            thread.join(timeout) or begin
+              thread.kill
+              raise "File #{filename.inspect} was not requested as #{urlname.inspect} in #{timeout} seconds, are you using firewall blocking connections to port: #{options[:port]}?"
             end
           end
 
           def allow_for_http_request(filename, urlname, options) # start in new thread
-            server_for_http_request(filename, urlname, options.merge({:threaded => false})) do |server|
-              t = Thread.new { server.start }
-              t.abort_on_exception = true
+            thread = Thread.new do
+              server_for_http_request(filename, urlname, options)
             end
+            thread.abort_on_exception = true
+            trap("INT") { thread.kill }
+            thread
+          end
+
+        private
+
+          def server_for_http_request(filename, urlname, options)
+            initialize_server(options[:port])
+            mount_file(filename, urlname)
+            @server.start
+          ensure
+            server_shutdown
           end
 
-          def server_for_http_request(filename, urlname, options, &block)
+          def initialize_server(port)
             # Calculate the OS equivalent of /dev/null , on windows this is NUL:
             # http://www.ruby-forum.com/topic/115472
             fn = test(?e, '/dev/null') ? '/dev/null' : 'NUL:'
             webrick_logger = WEBrick::Log.new(fn, WEBrick::Log::INFO)
 
-            timeout = options[:timeout] || 60
-            Timeout.timeout(timeout) do
-              server =
-              ::WEBrick::HTTPServer.new(
-                :Port => options[:port],
-                :Logger => webrick_logger,
-                :AccessLog => webrick_logger
-              )
-              env.logger.debug("mounting file #{urlname}")
-              server.mount("#{urlname}", Veewee::Provider::Core::Helper::Servlet::FileServlet, filename, ui, options[:threaded])
-              trap("INT"){
-                server.shutdown
-                ui.info "Stopping webserver"
-                exit
-              }
-              yield server
+            @server =
+            ::WEBrick::HTTPServer.new(
+              :Port => port,
+              :Logger => webrick_logger,
+              :AccessLog => webrick_logger,
+            )
+          end
+
+          def mount_file(filename, urlname)
+            urlname = urlname[0..-5] if File.extname(urlname)  == ".erb"
+
+            @server.mount_proc(urlname) do |request, response|
+              ui.info "Serving content for #{urlname}"
+              response['Content-Type']='text/plain'
+              response.status = 200
+              response.body   = read_content(filename)
+              server_shutdown
+            end
+          end
+
+          def read_content(filename)
+            ui.info "Reading content #{filename}"
+            content = File.open(filename, "r").read
+            if File.extname(filename) == ".erb"
+              ui.info "Evaluating template #{filename}"
+              content = ::ERB.new(content).result(binding)
+            end
+            content
+          end
+
+          def server_shutdown
+            if @server
+              ui.info "Stopping webserver"
+              yield @server if block_given?
+              @server.shutdown
+              @server = nil
             end
-          rescue Timeout::Error
-            server.shutdown unless server.nil?
-            raise "File #{filename.inspect} was not requested in #{timeout}seconds, are you using firewall blocking connections to port: #{options[:port]}?"
           end
 
         end #Class
+
       end #Module
     end #Module
   end #Module

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

@@ -29,11 +29,11 @@ module Veewee
             # A workaround is to send the scancodes one-by-one.
             codes=""
             for keycode in keycodes.split(' ') do
-              unless keycode=="wait"
+              case keycode
+              when /^wait(\d*)$/ then sleep_guess($1)
+              else
                 send_keycode(keycode)
                 sleep 0.01
-              else
-                sleep 1
               end
             end
             #sleep after each sequence (needs to be param)
@@ -45,11 +45,19 @@ module Veewee
 
         end
 
+        def sleep_guess(str)
+          str = "1" if str == ""
+          sleep str.to_i
+        end
+
         def send_keycode(keycode)
           command= "#{@vboxcmd} controlvm \"#{name}\" keyboardputscancode #{keycode}"
           env.logger.debug "#{command}"
-          sshresult=shell_exec("#{command}",{:mute => true})
-          unless sshresult.stdout.index("E_ACCESSDENIED").nil?
+          sshresult = shell_exec("#{command}",{:mute => true})
+          env.logger.debug "\
+sshresult.stdout: #{sshresult.stdout.inspect},
+sshresult.stderr: #{sshresult.stderr.inspect}"
+          if sshresult.stdout.index("E_ACCESSDENIED")
             error= "There was an error typing the commands on the console"
             error+="Probably the VM did not get started."
             error+= ""

data/lib/veewee/templates.rb

@@ -1,3 +1,5 @@
+require "gem-content"
+
 module Veewee
   class Templates
 
@@ -53,6 +55,7 @@ module Veewee
     # Traverses path to see which exist or not
     # and checks if available
     def valid_paths(paths)
+      paths = GemContent.get_gem_paths("veewee-templates")
       valid_paths = paths.collect { |path|
         if File.exists?(path) && File.directory?(path)
           env.logger.info "Path #{path} exists"

data/lib/veewee/version.rb

@@ -4,5 +4,5 @@ end
 
 # Only set the version constant if it wasn't set before
 unless defined?(Veewee::VERSION)
-  ::Veewee::VERSION="0.4.5.1"
+  ::Veewee::VERSION="0.5.0.alpha1"
 end

data/templates/archlinux-i386/definition.rb

@@ -1,29 +1,38 @@
 Veewee::Definition.declare({
-  :cpu_count => '1', :memory_size=> '256',
-  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
-  :os_type_id => 'ArchLinux',
-  :iso_file => "archlinux-2010.05-core-i686.iso",
-  :iso_src => "http://archlinux.mirror.kangaroot.net/iso/2010.05/archlinux-2010.05-core-i686.iso",
-  :iso_md5 => "5db5fd11713635cff208b11a498c59ef",
+  :cpu_count   => "1",
+  :memory_size => "256",
+  :disk_size   => "10140",
+  :disk_format => "VDI",
+  :hostiocache => "off",
+  :os_type_id  => "ArchLinux",
+  :iso_file    => "archlinux-2010.05-core-i686.iso",
+  :iso_src     => "http://archlinux.mirror.kangaroot.net/iso/2010.05/archlinux-2010.05-core-i686.iso",
+  :iso_md5     => "5db5fd11713635cff208b11a498c59ef",
   :iso_download_timeout => "1000",
-  :boot_wait => "5", :boot_cmd_sequence => [
+  :boot_wait   => "5",
+  :boot_cmd_sequence => [
     '<Enter>',
-    '<Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait>',
-    '<Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait>',
-    '<Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait>',
-  'root<Enter>',
+    '<Wait30>',
+    'root<Enter>',
     'dhcpcd eth0<Enter><Wait><Wait>',
     'echo "sshd: ALL" > /etc/hosts.allow<Enter>',
     'passwd<Enter>',
     'vagrant<Enter>',
     'vagrant<Enter>',
     '/etc/rc.d/sshd start<Enter><Wait>',
-  'sleep 3 && wget http://%IP%:%PORT%/aif.cfg<Enter>',
+    'sleep 3 && wget http://%IP%:%PORT%/aif.cfg<Enter>',
   ],
-  :kickstart_port => "7122", :kickstart_timeout => "300", :kickstart_file => "aif.cfg",
-  :ssh_login_timeout => "10000", :ssh_user => "root", :ssh_password => "vagrant", :ssh_key => "",
-  :ssh_host_port => "7222", :ssh_guest_port => "22",
-  :sudo_cmd => "sh '%f'",
-  :shutdown_cmd => "shutdown -h now",
-  :postinstall_files => [ "postinstall.sh"], :postinstall_timeout => "10000"
+  :kickstart_port => "7122",
+  :kickstart_timeout => "300",
+  :kickstart_file => "aif.cfg",
+  :ssh_login_timeout => "10000",
+  :ssh_user          => "root",
+  :ssh_password      => "vagrant",
+  :ssh_key           => "",
+  :ssh_host_port     => "7222",
+  :ssh_guest_port    => "22",
+  :sudo_cmd          => "sh '%f'",
+  :shutdown_cmd      => "shutdown -h now",
+  :postinstall_files => [ "postinstall.sh"],
+  :postinstall_timeout => "10000",
 })

data/templates/archlinux-x86_64/definition.rb

@@ -9,34 +9,34 @@ iso_md5 = response[0]
 root_password = 'veewee'
 
 Veewee::Definition.declare({
-  :cpu_count   => '1',
-  :memory_size => '256',
-  :disk_size   => '10140',
-  :disk_format => 'VDI',
-  :hostiocache => 'off',
-  :os_type_id  => 'ArchLinux_64',
+  :cpu_count   => "1",
+  :memory_size => "256",
+  :disk_size   => "10140",
+  :disk_format => "VDI",
+  :hostiocache => "off",
+  :os_type_id  => "ArchLinux_64",
   :iso_file    => iso,
   :iso_src     => "#{iso_mirror}/#{iso}",
   :iso_md5     => iso_md5,
-  :iso_download_timeout => '1000',
-  :boot_wait   => '5',
+  :iso_download_timeout => "1000",
+  :boot_wait   => "5",
   :boot_cmd_sequence => [
     '<Enter>',
-    '<Wait>' * 30,
+    '<Wait30>',
     'echo "sshd: ALL" > /etc/hosts.allow<Enter>',
     'passwd<Enter>',
     "#{root_password}<Enter>",
     "#{root_password}<Enter>",
     'systemctl start sshd.service<Enter><Wait>',
   ],
-  :ssh_login_timeout => '10000',
-  :ssh_user          => 'root',
+  :ssh_login_timeout => "10000",
+  :ssh_user          => "root",
   :ssh_password      => "#{root_password}",
-  :ssh_key           => '',
-  :ssh_host_port     => '7222',
-  :ssh_guest_port    => '22',
+  :ssh_key           => "",
+  :ssh_host_port     => "7222",
+  :ssh_guest_port    => "22",
   :sudo_cmd          => "sh '%f'",
-  :shutdown_cmd      => 'shutdown -h now',
+  :shutdown_cmd      => "shutdown -h now",
   :postinstall_files => [
     'base.sh',
     'pacman.sh',
@@ -55,7 +55,7 @@ Veewee::Definition.declare({
     'cleanup.sh',
     'zerodisk.sh',
   ],
-  :postinstall_timeout => '10000',
+  :postinstall_timeout => "10000",
   :params => {
     #:PACMAN_REFLECTOR_ARGS => '--verbose -l 5 --sort rate --save /etc/pacman.d/mirrorlist',
   }