veewee 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGJiYzY0MzVhMmQ3NWE3YWMzODhkZjg0NzJkOTVmYzEzYjg1YmM5OQ==
+    NjZjNmNkY2FiMjZjZGM0ZTk0ODUwYThmYzhiMzBmYWZkOGI4YmFkOA==
   data.tar.gz: !binary |-
-    MmQzNmI5ZDI4OWIzM2QyNjM3MGY0NTVjNmZhMTYwZDgxZmVmNzkwMg==
+    MjUyM2UzZWIzOTJiNDk2YzBjOTU0YmYwOGMxNmIwNDcxNjYzMmEwMg==
 SHA512:
   metadata.gz: !binary |-
-    MjIyMGM1YmVkMmI1YzU4ZjA2MzFmYTcwNmU3OWYwZDRhNWJmNTk4YmRjZDZi
-    ZTI3MmFkNDA3MWI3MmZjNjA1MzdmY2MxYTQyOTEwNjZhMzgwMzA3ZDhiOGJm
-    NDY3NTRhYmFhYjVhY2NlYWQwNjhiZjZjNWI4ZTkzOWU4OWUyNDc=
+    OTM3MzVlYzQ3NTZhNTEyODIwMjQ3NDcyMDNjNzFhZGNmOTk0MmViOTE1ZGVi
+    OTAyNjM3OWM4ZTY2MGQ2N2I2N2IxODA1YWJkMzE5MWEyNTYyZDliZTA4NDZh
+    NzVhOWNkN2M0M2FkMDM0OTY3YmU5MmUxYmVlNTYxOTA0ODBiNWY=
   data.tar.gz: !binary |-
-    M2FiMDk4M2Q4ZWU0YTczZWJkM2YyOTczYWRkOGJjZmE3NzM3YTM4NWMxMGFm
-    Yjg1OWUyMGRhZDhjMjJjOWFjZDUxZjc1MzkzYjM2NmVlNDllNmNjNThjNWVm
-    NjNkY2I1M2VhMWQ1OTYzNTc1ZTc2YTY4MWFiNGYwNzFkMjMyNmI=
+    OWU3ZmQwMTRmY2JjNTI0YTFhYzNlMWU1YWExZDhjZWRjYjFjOGI1MjFlOTM5
+    OWI5ODlhMjA0MGJmN2NmNmQwMjVlY2U3ZjExYTM1YWYyNTNlOGQ2MGRlOWM0
+    NWI3MmYwODM4ZWVkMDI5NzhhMjFjMGFiODE2OTM1YzlkMDQyMGY=

data/doc/customize.md

@@ -192,6 +192,31 @@ Each provider _can_ take options that are specific the provider; more details wi
 
 This box will have `pae` and `ioapic` enabled with VirtualBox, and will use the `brlxc0` bridge with KVM (on libvirt).
 
+## Using Yaml for storing configuration
+
+You can store definitions in `*.yml` files, loading them is as easy as:
+
+    Veewee::Definition.declare_yaml(file_name1, filename2 ...)
+
+For example given those 3 files:
+
+    .
+    ├── definitions
+    │   └── myubuntubox
+    │       ├── definition.rb
+    │       ├── definition.yml
+    │       ├── 64bit.yml
+    │       ├── 32bit.yml
+    │       └── ...
+
+And `definition.rb` with
+
+    Veewee::Definition.declare_yaml('definition.yml', '64bit.yml')
+
+Then veewee will read first `definition.yml` and `64bit.yml`, this way
+it is possible to mix multiple possible combinations of systems,
+versions, and architectures. All the configurations available in
+`declare` are also valid in `*yml` files.
 
 ## Up Next
 

data/lib/veewee/command/group_base.rb

@@ -92,9 +92,9 @@ module Veewee
       #
       def self.register(options = {})
         # self refers to the class object of the provider subclass
-        self.class_variable_set(:@@command, options[:command])
-        self.class_variable_set(:@@description, options[:description])
-        self.class_variable_set(:@@provider, options[:provider])
+        self.send(:class_variable_set, :@@command,     options[:command]    )
+        self.send(:class_variable_set, :@@description, options[:description])
+        self.send(:class_variable_set, :@@provider,    options[:provider]   )
         CLI.register(self, options[:command], options[:command], options[:description], options[:opts])
       end
 

data/lib/veewee/command/helpers.rb

@@ -6,8 +6,9 @@ module Veewee
       def initialize_environment(args, options, config)
         raise Errors::CLIMissingEnvironment if !config[:env]
         @env = config[:env]
+        @env.cwd = File.expand_path(@options[:cwd]) if @options[:cwd]
       end
 
      end
   end
-end
+end

data/lib/veewee/config/ostypes.yml

@@ -10,22 +10,22 @@ Windows7:
   :vbox: Windows7
   :parallels: win-7
 Windows8:
-  :fusion:
+  :fusion: windows8
   :kvm:
   :vbox: Windows8
   :parallels: win-8
 Windows8_64:
-  :fusion:
+  :fusion: windows8-64
   :kvm:
   :vbox: Windows8_64
   :parallels: win-8
 Windows81:
-  :fusion:
+  :fusion: windows8
   :kvm:
   :vbox: Windows81
   :parallels: win-8
 Windows81_64:
-  :fusion:
+  :fusion: windows8-64
   :kvm:
   :vbox: Windows81_64
   :parallels: win-8
@@ -348,10 +348,10 @@ NetBSD_64:
   :vbox: NetBSD_64
   :parallels: other
 ESXi5:
-  :fusion: vmkernel5 
+  :fusion: vmkernel5
   :kvm:
-  :vbox: 
-  :parallels: 
+  :vbox:
+  :parallels:
 Darwin_10_7:
   :fusion: darwin11
   :kvm:

data/lib/veewee/definition.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 require 'ostruct'
 require 'veewee/provider/core/helper/iso'
 
@@ -124,6 +125,12 @@ module Veewee
 
     end
 
+    def declare_yaml(*files)
+      files.each do |file|
+        declare(YAML.load_file(file))
+      end
+    end
+
     # Class method to loading a definition
     def self.load(name, env)
 

data/lib/veewee/environment.rb

@@ -26,10 +26,10 @@ module Veewee
     # - :validation_dir  : directory that contains a list of validation tests, that can be run after building a box
     # - :tmp_dir         : directory that will be used for creating temporary files, needs to be rewritable, default to $environment_dir/tmp
     attr_accessor :template_path
-    attr_accessor :definition_dir
-    attr_accessor :iso_dir
+    attr_writer   :definition_dir
+    attr_writer   :iso_dir
     attr_accessor :validation_dir
-    attr_accessor :tmp_dir
+    attr_writer   :tmp_dir
 
     # The {UI} Object to communicate with the outside world
     attr_writer :ui
@@ -66,11 +66,8 @@ module Veewee
       defaults = {
         :cwd => cwd,
         :veewee_filename => "Veeweefile",
-        :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)
@@ -107,6 +104,16 @@ module Veewee
       return self
     end
 
+    def definition_dir
+      @definition_dir ||= File.join(cwd, "definitions")
+    end
+    def iso_dir
+      @iso_dir ||= File.join(cwd, "iso")
+    end
+    def tmp_dir
+      tmp_dir ||= File.join(cwd, "tmp")
+    end
+
     def self.workdir
       ENV['VEEWEE_DIR'] || Dir.pwd
     end

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

@@ -1,11 +1,12 @@
 require 'veewee/provider/core/helper/ssh'
 require 'shellwords'
+require 'pathname'
+
 module Veewee
   module Provider
     module  Core
       module BoxCommand
 
-
         def ssh(command=nil,options={})
 
           raise Veewee::Error,"Box is not running" unless self.running?
@@ -23,7 +24,8 @@ module Veewee
             end
           else
             ssh_options={:user => definition.ssh_user,:password => definition.ssh_password, :port => definition.ssh_host_port}
-            ssh_execute(host_ip,command,ssh_options)
+            ssh_options[:keys] = ssh_key_to_a(definition.ssh_key) if definition.ssh_key
+            ssh_execute(host_ip, command, ssh_options)
           end
 
         end
@@ -37,13 +39,17 @@ module Veewee
             "-p #{ssh_options[:port]}",
             "-o UserKnownHostsFile=/dev/null",
             "-t -o StrictHostKeyChecking=no",
-            "-o IdentitiesOnly=yes",
             "-o VerifyHostKeyDNS=no"
           ]
-          if !(definition.ssh_key.nil? ||  definition.ssh_key.empty?)
-            # Filenames of SSH keys are relative to their definition
-            ssh_key = File.join(definition.path, definition.ssh_key)
-            command_options << "-i #{ssh_key}"
+          if definition.ssh_key
+            command_options << "-o IdentitiesOnly=yes"
+            ssh_keys = ssh_key_to_a(ssh_key)
+            ssh_keys.each do |ssh_keys|
+              # Filenames of SSH keys are relative to their definition
+              ssh_key = Pathname.new(definition.ssh_key)
+              ssh_key = File.join(definition.path, ssh_key) if ssh_key.relative?
+              command_options << "-i #{ssh_key}"
+            end
           end
           commandline_options="#{command_options.join(" ")} ".strip
 

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

@@ -31,15 +31,15 @@ module Veewee
             pbar = nil
             uri = URI.parse(url)
             uri.open(
-              :content_length_proc => lambda {|t|
-              if t && 0 < t
-                pbar = ProgressBar.new("Fetching file", t)
-                pbar.file_transfer_mode
-              end
-            },
+              :content_length_proc => lambda { |t|
+                if t && 0 < t
+                  pbar = ProgressBar.new("Fetching file", t)
+                  pbar.file_transfer_mode
+                end
+              },
               :progress_proc => lambda {|s|
-              pbar.set s if pbar
-            },
+                pbar.set s if pbar
+              },
               #consider proxy env vars only if host is not excluded
               :proxy => !no_proxy?(uri.host)
             ) { |src|
@@ -58,6 +58,7 @@ module Veewee
 
           #return true if host is excluded from proxy via no_proxy env var, false otherwise
           def no_proxy? host
+            return false if host.nil?
             @no_proxy ||= (ENV['NO_PROXY'] || ENV['no_proxy'] || 'localhost, 127.0.0.1').split(/\s*,\s*/)
             @no_proxy.each do |host_addr|
               return true if host.match(Regexp.quote(host_addr)+'$')

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

@@ -20,31 +20,36 @@ module Veewee
           # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/185404
           # This should work on windows too now
           # This will result in a ShellResult structure with stdout, stderr and status
-          def shell_exec(command,options = {:mute => true,:status => 0,:stderr => "&1"})
-            defaults={:mute => true, :status => 0}
-            options=defaults.merge(options)
-            result=ShellResult.new("","",-1)
+          def shell_exec(command, options = {})
+            defaults = { :mute => true, :status => 0, :stderr => "&1" }
+            options  = defaults.merge(options)
+            result   = ShellResult.new("","",-1)
             ui.info "Executing #{command}" unless options[:mute]
             env.logger.debug "Command: \"#{command}\""
             env.logger.debug "Output:"
             env.logger.debug "-------"
-            escaped_command=command
+            escaped_command = command
             stderr_redirect = options[:stderr]? options[:stderr] : "&1"
-            IO.popen("#{escaped_command}"+ " 2>#{stderr_redirect}") { |p|
-              p.each_line{ |l|
-                result.stdout+=l
-                ui.info(l,{:new_line => false})  unless options[:mute]
-                env.logger.debug(l.chomp)
-              }
-              result.status=Process.waitpid2(p.pid)[1].exitstatus
-              if result.status.to_i!=options[:status]
+            io_options = {}
+            io_options[:external_encoding] = options[:external_encoding] if options[:external_encoding]
+
+            IO.popen("#{escaped_command}"+ " 2>#{stderr_redirect}", io_options) do |pipe|
+              pipe.each_line do |line|
+                result.stdout += line
+                ui.info(line, :new_line => false)  unless options[:mute]
+                env.logger.debug(line.chomp)
+              end
+              result.status = Process.waitpid2(pipe.pid)[1].exitstatus
+              if
+                result.status.to_i != options[:status]
+              then
                 ui.error "Error: We executed a shell command and the exit status was not #{options[:status]}"
                 ui.error "- Command :#{command}."
                 ui.error "- Exitcode :#{result.status}."
                 ui.error "- Output   :\n#{result.stdout}"
                 raise Veewee::Error,"Wrong exit code for command #{command}"
               end
-            }
+            end
             return result
           end
 

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

@@ -1,3 +1,7 @@
+require 'socket'
+require 'net/ssh'
+require 'net/scp'
+
 module Veewee
   module Provider
     module Core
@@ -15,211 +19,211 @@ module Veewee
           end
         end
 
-        module Ssh
-
-          require 'socket'
-
-          # nonblocking ssh connection check
-          def tcp_test_ssh(hostname, port, timeout = 2)                        
-            
-            addr = Socket.getaddrinfo(hostname, nil)
-            sockaddr = Socket.pack_sockaddr_in(port, addr[0][3])
-
-            Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0).tap do |socket|
-              socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-              begin
-                socket.connect_nonblock(sockaddr)
-
-              rescue IO::WaitWritable
-                if IO.select(nil, [socket], nil, timeout)
-                  begin
-                    result = socket.connect_nonblock(sockaddr)
-                    if result == 0 
-                      socket.close
-                      return true
-                    end
-                  rescue Errno::EISCONN
-                    socket.close
-                    return true
-                  rescue
-                    socket.close
-                    return false
-                  end
-                else
-                  socket.close
-                  return false
-                end
-              end
+      end
+    end
+  end
+end
+
+module Veewee::Provider::Core::Helper::Ssh
+
+  def build_ssh_options
+    ssh_options={
+      :user => definition.ssh_user,
+      :port => 22,
+      :password => definition.ssh_password,
+      :timeout => definition.ssh_login_timeout.to_i
+    }
+    ssh_options[:keys] = ssh_key_to_a(definition.ssh_key) if definition.ssh_key
+    return ssh_options
+  end
+
+  def ssh_key_to_a(ssh_key)
+    case ssh_key
+    when "" then []
+    else Array(ssh_key)
+    end
+  end
+
+  # nonblocking ssh connection check
+  def tcp_test_ssh(hostname, port, timeout = 2)
+
+    addr = Socket.getaddrinfo(hostname, nil)
+    sockaddr = Socket.pack_sockaddr_in(port, addr[0][3])
+
+    Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0).tap do |socket|
+      socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+      begin
+        socket.connect_nonblock(sockaddr)
+
+      rescue IO::WaitWritable
+        if IO.select(nil, [socket], nil, timeout)
+          begin
+            result = socket.connect_nonblock(sockaddr)
+            if result == 0
+              socket.close
+              return true
             end
-            false
+          rescue Errno::EISCONN
+            socket.close
+            return true
+          rescue
+            socket.close
+            return false
           end
-
-          require 'net/ssh'
-          require 'net/scp'
-
-          def when_ssh_login_works(ip="127.0.0.1", options = {  } , &block)
-
-            defaults={ :port => '22', :timeout => 20000 }
-
-            options=defaults.merge(options)
-
-            timeout = options[:timeout]
-            timeout=ENV['VEEWEE_TIMEOUT'].to_i unless ENV['VEEWEE_TIMEOUT'].nil?
-
-            unless options[:mute]
-            ui.info  "Waiting for ssh login on #{ip} with user #{options[:user]} to sshd on port => #{options[:port]} to work, timeout=#{timeout} sec"
-            end
-
-            run_hook(:before_ssh)
-
-            begin
-              Timeout::timeout(timeout) do
-                connected=false
-                while !connected do
-                  begin
-                    env.ui.info ".",{:new_line => false , :prefix => false} unless options[:mute]
-                    if tcp_test_ssh(ip, options[:port])
-                      Net::SSH.start(ip, options[:user],
-                                     { :port => options[:port],
-                                       :password => options[:password],
-                                       :auth_methods => ['password','publickey','keyboard-interactive'],
-                                       :paranoid => false ,
-                                       :timeout => timeout }) do |ssh|
-
-                        ui.info "\n", {:prefix => false} unless options[:mute]
-                        block.call(ip);
-                        return true
-                      end
-                    else 
-                      sleep 5
-                    end
-                  rescue Net::SSH::Disconnect, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ENETUNREACH, Errno::ETIMEDOUT
-                    sleep 5
-                  end
-                end
+        else
+          socket.close
+          return false
+        end
+      end
+    end
+    false
+  end
+
+  def when_ssh_login_works(ip="127.0.0.1", options = {  } , &block)
+    defaults={ :port => '22', :timeout => 20000 }
+    options=defaults.merge(options)
+
+    timeout = options[:timeout]
+    timeout = ENV['VEEWEE_TIMEOUT'].to_i unless ENV['VEEWEE_TIMEOUT'].nil?
+
+    unless options[:mute]
+      ui.info  "Waiting for ssh login on #{ip} with user #{options[:user]} to sshd on port => #{options[:port]} to work, timeout=#{timeout} sec"
+    end
+
+    run_hook(:before_ssh)
+
+    begin
+      Timeout::timeout(timeout) do
+        connected=false
+        while !connected do
+          begin
+            env.ui.info ".",{:new_line => false , :prefix => false} unless options[:mute]
+            if
+              tcp_test_ssh(ip, options[:port])
+            then
+              ssh_connection(ip, options, :timeout => timeout ) do |ssh|
+                ui.info "\n", {:prefix => false} unless options[:mute]
+                block.call(ip);
+                return true
               end
-            rescue IOError
-              ui.info "Received a disconnect; moving on"
+            else
               sleep 5
-            rescue Timeout::Error
-              raise Veewee::Error, "Ssh timeout #{timeout} sec has been reached."
             end
-            ui.info ""
-            return false
+          rescue Net::SSH::Disconnect, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ENETUNREACH, Errno::ETIMEDOUT
+            sleep 5
           end
+        end
+      end
+    rescue IOError
+      ui.info "Received a disconnect; moving on"
+      sleep 5
+    rescue Timeout::Error
+      raise Veewee::Error, "Ssh timeout #{timeout} sec has been reached."
+    end
+    ui.info ""
+    return false
+  end
+
+  def ssh_transfer_file(host,filename,destination = '.' , options = {})
+
+    ssh_connection( host, options ) do |ssh|
+      ui.info "Transferring #{filename} to #{destination} "
+      ssh.scp.upload!( filename, destination ) do |ch, name, sent, total|
+        #   print "\r#{destination}: #{(sent.to_f * 100 / total.to_f).to_i}%"
+        env.ui.info ".",{:new_line => false , :prefix => false}
+      end
+    end
+    ui.info "", {:prefix => false}
+  end
+
+
+  def ssh_execute(host,command, options = { :progress => "on"} )
+    defaults= { :port => "22", :exitcode => "0", :user => "root"}
+    options=defaults.merge(options)
+    pid=""
+    stdin=command
+    stdout=""
+    stderr=""
+    status=-99999
+
+    unless options[:mute]
+      ui.info "Executing command: #{command}"
+    end
+
+    ssh_connection( host, options ) do |ssh|
+
+      # open a new channel and configure a minimal set of callbacks, then run
+      # the event loop until the channel finishes (closes)
+      channel = ssh.open_channel do |ch|
+
+        #request pty for sudo stuff and so
+        ch.request_pty do |ch, success|
+          raise "Error requesting pty" unless success
+        end
 
+        ch.exec "#{command}" do |ch, success|
+          raise "could not execute command" unless success
 
-          def ssh_transfer_file(host,filename,destination = '.' , options = {})
-
-            defaults={
-              :paranoid => false,
-              :auth_methods => ['password','publickey','keyboard-interactive']
-            }
-            options=defaults.merge(options)
-
-            Net::SSH.start( host,options[:user],options ) do |ssh|
-              ui.info "Transferring #{filename} to #{destination} "
-              ssh.scp.upload!( filename, destination ) do |ch, name, sent, total|
-                #   print "\r#{destination}: #{(sent.to_f * 100 / total.to_f).to_i}%"
-                env.ui.info ".",{:new_line => false , :prefix => false}
-              end
-            end
-            ui.info "", {:prefix => false}
+          # "on_data" is called when the process writes something to stdout
+          ch.on_data do |c, data|
+            stdout+=data
+            ui.info(data, :new_line => false) unless options[:mute]
           end
 
+          # "on_extended_data" is called when the process writes something to stderr
+          # NOTE: When requesting a pty (ch.request_pty), everything goes to stdout
+          ch.on_extended_data do |c, type, data|
+            stderr+=data
+            ui.info(data, :new_line => false) unless options[:mute]
+          end
 
-          def ssh_execute(host,command, options = { :progress => "on"} )
-            defaults= { :port => "22", :exitcode => "0", :user => "root"}
-            options=defaults.merge(options)
-            pid=""
-            stdin=command
-            stdout=""
-            stderr=""
-            status=-99999
-
-            unless options[:mute]
-              ui.info "Executing command: #{command}"
-            end
-
-            Net::SSH.start(host, options[:user], {
-                             :port => options[:port],
-                             :password => options[:password],
-                             :auth_methods => ['password','publickey','keyboard-interactive'],
-                             :paranoid => false }) do |ssh|
-
-              # open a new channel and configure a minimal set of callbacks, then run
-              # the event loop until the channel finishes (closes)
-              channel = ssh.open_channel do |ch|
-
-                #request pty for sudo stuff and so
-                ch.request_pty do |ch, success|
-                  raise "Error requesting pty" unless success
-                end
-
-                ch.exec "#{command}" do |ch, success|
-                  raise "could not execute command" unless success
-
-
-                  # "on_data" is called when the process writes something to stdout
-                  ch.on_data do |c, data|
-                    stdout+=data
-
-                    ui.info(data, :new_line => false) unless options[:mute]
-
-                  end
-
-                  # "on_extended_data" is called when the process writes something to stderr
-                  # NOTE: When requesting a pty (ch.request_pty), everything goes to stdout
-                  ch.on_extended_data do |c, type, data|
-                    stderr+=data
-
-                    ui.info(data, :new_line => false) unless options[:mute]
-
-                  end
-
-                  #exit code
-                  #http://groups.google.com/group/comp.lang.ruby/browse_thread/thread/a806b0f5dae4e1e2
-                  channel.on_request("exit-status") do |ch, data|
-                    exit_code = data.read_long
-                    status=exit_code
-                    if exit_code > 0
-                      ui.info "ERROR: exit code #{exit_code}" unless options[:mute]
-                    else
-                      #ui.info "Successfully executed"
-                    end
-                  end
-
-                  channel.on_request("exit-signal") do |ch, data|
-                    ui.info "SIGNAL: #{data.read_long}" unless options[:mute]
-                  end
-
-                  ch.on_close {
-                    #ui.info "done!"
-                  }
-                  #status=ch.exec "echo $?"
-                end
-              end
-              channel.wait
-            end
-
-
-            if (status.to_s != options[:exitcode] )
-              if (options[:exitcode]=="*")
-                #its a test so we don't need to worry
-              else
-                raise Veewee::Provider::Core::Helper::SshResult.new(stdout,stderr,status), "Exitcode was not what we expected"
-              end
-
+          #exit code
+          #http://groups.google.com/group/comp.lang.ruby/browse_thread/thread/a806b0f5dae4e1e2
+          channel.on_request("exit-status") do |ch, data|
+            exit_code = data.read_long
+            status=exit_code
+            if exit_code > 0
+              ui.info "ERROR: exit code #{exit_code}" unless options[:mute]
+            else
+              #ui.info "Successfully executed"
             end
-
-            return Veewee::Provider::Core::Helper::SshResult.new(stdout,stderr,status)
-
           end
 
+          channel.on_request("exit-signal") do |ch, data|
+            ui.info "SIGNAL: #{data.read_long}" unless options[:mute]
+          end
 
-
-        end #Class
-      end #Module
-    end #Module
-  end #Module
-end #Module
+          ch.on_close {
+            #ui.info "done!"
+          }
+          #status=ch.exec "echo $?"
+        end
+      end
+      channel.wait
+    end
+
+    if (status.to_s != options[:exitcode] )
+      if (options[:exitcode]=="*")
+        #its a test so we don't need to worry
+      else
+        raise Veewee::Provider::Core::Helper::SshResult.new(stdout,stderr,status), "Exitcode was not what we expected"
+      end
+
+    end
+
+    return Veewee::Provider::Core::Helper::SshResult.new(stdout,stderr,status)
+  end
+
+  def ssh_connection(host, options, defaults={}, &block)
+    options=defaults.merge(options)
+    options={
+      :auth_methods => %w[ password publickey keyboard-interactive ],
+      :paranoid => false
+    }.merge(options)
+    options=Hash[ options.select { |key, value| Net::SSH::VALID_OPTIONS.include?(key) } ]
+    Net::SSH.start( host, options[:user], options ) do |ssh|
+      yield ssh
+    end
+  end
+
+end

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

@@ -4,16 +4,10 @@ module Veewee
       module BoxCommand
 
         def ssh_options
-          ssh_options={
-            :user => definition.ssh_user,
-            :port => 22,
-            :password => definition.ssh_password,
-            :timeout => definition.ssh_login_timeout.to_i
-          }
-          return ssh_options
+          build_ssh_options
         end
 
-      end # End Module
-    end # End Module
-  end # End Module
-end # End Module
+      end
+    end
+  end
+end

data/lib/veewee/provider/parallels/box/export.rb

@@ -175,7 +175,7 @@ module Veewee
         def optimize_disk
           env.ui.info "Optimizing Disk"
           path_to_hdd = File.join read_settings.fetch("Home"), "harddisk.hdd"
-          optimize_command = "#{@prldisktool} compact --buildmap --hdd #{path_to_hdd}"
+          optimize_command = "#{@prldisktool} compact --hdd #{path_to_hdd}"
           shell_exec optimize_command
         end
       end #Module

data/lib/veewee/provider/parallels/box/helper/ssh_options.rb

@@ -5,13 +5,7 @@ module Veewee
 
         # Translate the definition ssh options to ssh options that can be passed to Net::Ssh calls
         def ssh_options
-          ssh_options={
-            :user => definition.ssh_user,
-            :port => 22,
-            :password => definition.ssh_password,
-            :timeout => definition.ssh_login_timeout.to_i
-          }
-          return ssh_options
+          build_ssh_options
         end
 
       end

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

@@ -4,22 +4,16 @@ module Veewee
       module BoxCommand
 
         def ssh_options
-          port=definition.ssh_host_port
-          if self.exists?
-            forward=self.forwarding("guestssh")
-            unless forward.nil?
-              port=forward[:host_port]
+          build_ssh_options.tap do |options|
+            port = definition.ssh_host_port
+            if self.exists?
+              forward=self.forwarding("guestssh")
+              unless forward.nil?
+                port=forward[:host_port]
+              end
             end
+            options[:port] = port
           end
-
-          ssh_options={
-            :user => definition.ssh_user,
-            :port => port,
-            :password => definition.ssh_password,
-            :timeout => definition.ssh_login_timeout.to_i
-          }
-          return ssh_options
-
         end
 
       end

data/lib/veewee/provider/vmfusion/box/helper/ssh_options.rb

@@ -5,13 +5,7 @@ module Veewee
 
         # Translate the definition ssh options to ssh options that can be passed to Net::Ssh calls
         def ssh_options
-          ssh_options={
-            :user => definition.ssh_user,
-            :port => 22,
-            :password => definition.ssh_password,
-            :timeout => definition.ssh_login_timeout.to_i
-          }
-          return ssh_options
+          build_ssh_options
         end
 
       end

data/lib/veewee/provider/vmfusion/provider.rb

@@ -22,12 +22,12 @@ module Veewee
 
         def fusion_version
           # We ask the system profiler for all installed software
-          shell_results = shell_exec("system_profiler SPApplicationsDataType")
+          shell_results = shell_exec("system_profiler SPApplicationsDataType", :external_encoding => Encoding::UTF_8)
 
           env.logger.info("Checking version by querying the system_profiler")
           env.logger.debug(shell_results.stdout)
 
-          if (shell_results.stdout == "")
+          if shell_results.stdout == ""
             ui.warn "Could not detect the exact version of vmware. assuming 5.1"
             version = "5.1"
           else

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.0"
+  ::Veewee::VERSION="0.4.1"
 end

data/templates/Debian-7.0-amd64-netboot/definition.rb

@@ -6,9 +6,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-7.0.0-amd64-netinst.iso",
-  :iso_src => "",
-  :iso_download_instructions => "- You need to download this manually as the ISO is no longer directly downloadable.\n"+
-    "Visit http://cdimage.debian.org/cdimage/archive/7.0.0/amd64/ and download it via torrent or jigdo",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.0.0/amd64/iso-cd/debian-7.0.0-amd64-netinst.iso",
   :iso_md5 => "6a55096340b5b1b7d335d5b559e13ea0",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.0-i386-netboot/definition.rb

@@ -7,9 +7,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
   :iso_file => "debian-7.0.0-i386-netinst.iso",
-  :iso_src => "",
-  :iso_download_instructions => "- You need to download this manually as the ISO is no longer directly downloadable.\n"+
-    "Visit http://cdimage.debian.org/cdimage/archive/7.0.0/i386/ and download it via torrent or jigdo",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.0.0/i386/iso-cd/debian-7.0.0-i386-netinst.iso",
   :iso_md5 => "a6b93666a5393334accb7ac4ee28d949",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.1.0-amd64-netboot/definition.rb

@@ -6,9 +6,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-7.1.0-amd64-netinst.iso",
-  :iso_src => "",
-  :iso_download_instructions => "- You need to download this manually as the ISO is no longer directly downloadable.\n"+
-    "Visit http://cdimage.debian.org/cdimage/archive/7.1.0/amd64/ and download it via torrent or jigdo",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.1.0/amd64/iso-cd/debian-7.1.0-amd64-netinst.iso",
   :iso_md5 => "80f498a1f9daa76bc911ae13692e4495",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.1.0-i386-netboot/definition.rb

@@ -4,9 +4,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
   :iso_file => "debian-7.1.0-i386-netinst.iso",
-  :iso_src => "",
-  :iso_download_instructions => "- You need to download this manually as the ISO is no longer directly downloadable.\n"+
-    "Visit http://cdimage.debian.org/cdimage/archive/7.1.0/i386/ and download it via torrent or jigdo",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.1.0/i386/iso-cd/debian-7.1.0-i386-netinst.iso",
   :iso_md5 => "a70efb67ca061175eabe7c5dc04ab323",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.2.0-amd64-netboot/definition.rb

@@ -6,9 +6,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-7.2.0-amd64-netinst.iso",
-  :iso_src => "",
-  :iso_download_instructions => "- You need to download this manually as the ISO is no longer directly downloadable.\n"+
-    "Visit http://cdimage.debian.org/cdimage/archive/7.2.0/amd64/ and download it via torrent or jigdo",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.2.0/amd64/iso-cd/debian-7.2.0-amd64-netinst.iso",
   :iso_md5 => "b86774fe4de88be6378ba3d71b8029bd",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.2.0-amd64-netboot/vagrant.sh

@@ -7,8 +7,9 @@ useradd -G sudo -p $(perl -e'print crypt("vagrant", "vagrant")') -m -s /bin/bash
 
 # Install vagrant keys
 mkdir -pm 700 /home/vagrant/.ssh
-curl -Lo /home/vagrant/.ssh/authorized_keys \
-  'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub'
+curl -fLo /home/vagrant/.ssh/authorized_keys \
+  'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' ||
+  exit $?
 chmod 0600 /home/vagrant/.ssh/authorized_keys
 chown -R vagrant:vagrant /home/vagrant/.ssh
 

data/templates/Debian-7.2.0-i386-netboot/definition.rb

@@ -4,9 +4,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
   :iso_file => "debian-7.2.0-i386-netinst.iso",
-  :iso_src => "",
-  :iso_download_instructions => "- You need to download this manually as the ISO is no longer directly downloadable.\n"+
-    "Visit http://cdimage.debian.org/cdimage/archive/7.2.0/i386/ and download it via torrent or jigdo",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.2.0/i386/iso-cd/debian-7.2.0-i386-netinst.iso",
   :iso_md5 => "564282a81b5aef7015501e497fc63d81",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.2.0-i386-netboot/vagrant.sh

@@ -11,8 +11,9 @@ useradd -G sudo -p $(perl -e'print crypt("vagrant", "vagrant")') -m -s /bin/bash
 
 # Install vagrant keys
 mkdir -pm 700 /home/vagrant/.ssh
-curl -Lo /home/vagrant/.ssh/authorized_keys \
-  'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub'
+curl -fLo /home/vagrant/.ssh/authorized_keys \
+  'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' ||
+  exit $?
 chmod 0600 /home/vagrant/.ssh/authorized_keys
 chown -R vagrant:vagrant /home/vagrant/.ssh
 

data/templates/Debian-7.3.0-amd64-netboot/definition.rb

@@ -6,9 +6,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-7.3.0-amd64-netinst.iso",
-  :iso_src => "",
-  :iso_download_instructions => "- You need to download this manually as the ISO is no longer directly downloadable.\n"+
-    "Visit http://cdimage.debian.org/cdimage/archive/7.3.0/amd64/ and download it via torrent or jigdo",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.3.0/amd64/iso-cd/debian-7.3.0-amd64-netinst.iso",
   :iso_md5 => "72473e8a5e65b61acc7efde90d9f71d1",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.3.0-i386-netboot/definition.rb

@@ -4,9 +4,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
   :iso_file => "debian-7.3.0-i386-netinst.iso",
-  :iso_src => "",
-  :iso_download_instructions => "- You need to download this manually as the ISO is no longer directly downloadable.\n"+
-    "Visit http://cdimage.debian.org/cdimage/archive/7.3.0/i386/ and download it via torrent or jigdo",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.3.0/i386/iso-cd/debian-7.3.0-i386-netinst.iso",
   :iso_md5 => "04c58f30744e64a0459caf7d7cace479",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.4.0-amd64-netboot/definition.rb

@@ -6,9 +6,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-7.4.0-amd64-netinst.iso",
-  :iso_src => "",
-  :iso_download_instructions => "- You need to download this manually as the ISO is no longer directly downloadable.\n"+
-    "Visit http://cdimage.debian.org/cdimage/archive/7.4.0/amd64/ and download it via torrent or jigdo",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso",
   :iso_md5 => "e7e9433973f082a297793c3c5010b2c5",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.4.0-i386-netboot/definition.rb

@@ -4,9 +4,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
   :iso_file => "debian-7.4.0-i386-netinst.iso",
-  :iso_src => "",
-  :iso_download_instructions => "- You need to download this manually as the ISO is no longer directly downloadable.\n"+
-    "Visit http://cdimage.debian.org/cdimage/archive/7.4.0/i386/ and download it via torrent or jigdo",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.4.0/i386/iso-cd/debian-7.4.0-i386-netinst.iso",
   :iso_md5 => "7339b668a81b417ac023d73739dc6a03",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.5.0-amd64-netboot/definition.rb

@@ -6,9 +6,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-7.5.0-amd64-netinst.iso",
-  :iso_src => "",
-  :iso_download_instructions => "- You need to download this manually as the ISO is no longer directly downloadable.\n"+
-    "Visit http://cdimage.debian.org/cdimage/archive/7.5.0/amd64/ and download it via torrent or jigdo",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-netinst.iso",
   :iso_md5 => "8fdb6715228ea90faba58cb84644d296",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.5.0-i386-netboot/definition.rb

@@ -4,7 +4,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
   :iso_file => "debian-7.5.0-i386-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/cdimage/archive/7.5.0/i386/iso-cd/debian-7.5.0-i386-netinst.iso",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.5.0/i386/iso-cd/debian-7.5.0-i386-netinst.iso",
   :iso_md5 => "0e6eaacb5a5828473afe90f6df9c8f16",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.6.0-amd64-netboot/definition.rb

@@ -6,7 +6,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-7.6.0-amd64-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/debian-cd/7.6.0/amd64/iso-cd/debian-7.6.0-amd64-netinst.iso",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.6.0/amd64/iso-cd/debian-7.6.0-amd64-netinst.iso",
   :iso_md5 => "8a3c2ad7fd7a9c4c7e9bcb5cae38c135",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-7.6.0-i386-netboot/definition.rb

@@ -4,7 +4,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
   :iso_file => "debian-7.6.0-i386-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/debian-cd/7.6.0/i386/iso-cd/debian-7.6.0-i386-netinst.iso",
+  :iso_src => "http://mirror.i3d.net/pub/debian-cd/7.6.0/i386/iso-cd/debian-7.6.0-i386-netinst.iso",
   :iso_md5 => "528e1a7315da1bbf50bd4d187880a519",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/veewee.gemspec

@@ -5,6 +5,7 @@ Gem::Specification.new do |s|
   s.name        = "veewee"
   s.version     = Veewee::VERSION
   s.platform    = Gem::Platform::RUBY
+  s.license     = 'MIT'
   s.authors     = ["Patrick Debois"]
   s.email       = ["patrick.debois@jedi.be"]
   s.homepage    = "http://github.com/jedi4ever/veewee/"
@@ -34,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_dependency "fog", "~> 1.8"
   s.add_dependency "childprocess"
   s.add_dependency "grit"
-  s.add_dependency "fission", "0.4.0"
+  s.add_dependency "fission", "0.5.0"
   s.add_dependency "to_slug"
   s.add_dependency "os", "~> 0.9.6"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: veewee
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Patrick Debois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: to_slug
   requirement: !ruby/object:Gem::Requirement
@@ -2327,7 +2327,8 @@ files:
 - validation/vagrant.pub
 - veewee.gemspec
 homepage: http://github.com/jedi4ever/veewee/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []