veewee 0.3.0.alpha6 → 0.3.0.alpha7

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

@@ -98,7 +98,7 @@ module Veewee
                 if !code.nil?
                   keycodes=keycodes+code+' '
                 else
-                  env.ui.info "no scan code for #{thestring.slice(0,1)}"
+                  ui.error "no scan code for #{thestring.slice(0,1)}"
                 end
                 #pop one
                 thestring=thestring.slice(1,thestring.length-1)

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

@@ -24,7 +24,7 @@ module Veewee
             defaults={:mute => true, :status => 0}
             options=defaults.merge(options)
             result=ShellResult.new("","",-1)
-            env.ui.info "Executing #{command}" unless options[:mute]
+            ui.info "Executing #{command}" unless options[:mute]
             env.logger.debug "Command: \"#{command}\""
             env.logger.debug "Output:"
             env.logger.debug "-------"
@@ -32,15 +32,15 @@ module Veewee
             IO.popen("#{escaped_command}"+ " 2>&1") { |p|
               p.each_line{ |l|
                 result.stdout+=l
-                env.ui.info(l,{:new_line => false})  unless options[:mute]
+                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]
-                env.ui.error "Error: We executed a shell command and the exit status was not #{options[:status]}"
-                env.ui.error "- Command :#{command}."
-                env.ui.error "- Exitcode :#{result.status}."
-                env.ui.error "- Output   :\n#{result.stdout}"
+                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
             }

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

@@ -26,19 +26,18 @@ module Veewee
 
             options=defaults.merge(options)
 
-            env.ui.info  "Waiting for ssh login on #{ip} with user #{options[:user]} to sshd on port => #{options[:port]} to work, timeout=#{options[:timeout]} sec"
+            ui.info  "Waiting for ssh login on #{ip} with user #{options[:user]} to sshd on port => #{options[:port]} to work, timeout=#{options[:timeout]} sec"
 
             begin
               Timeout::timeout(options[:timeout]) do
                 connected=false
                 while !connected do
                   begin
-                    env.ui.info ".",{:new_line => false}
+                    env.ui.info ".",{:new_line => false , :prefix => false}
                     Net::SSH.start(ip, options[:user], { :port => options[:port] , :password => options[:password], :paranoid => false , :timeout => options[:timeout] }) do |ssh|
-                      env.ui.info "\n"
 
+                      ui.info "\n", {:prefix => false}
                       block.call(ip);
-                      env.ui.info ""
                       return true
                     end
                   rescue Net::SSH::Disconnect,Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ENETUNREACH,Errno::ETIMEDOUT, Errno::ENETUNREACH
@@ -47,10 +46,10 @@ module Veewee
                 end
               end
             rescue Timeout::Error
-              env.ui.error "Ssh timeout #{options[:timeout]} sec has been reached."
+              ui.error "Ssh timeout #{options[:timeout]} sec has been reached."
               exit -1
             end
-            env.ui.info ""
+            ui.info ""
             return false
           end
 
@@ -61,14 +60,13 @@ module Veewee
             options=defaults.merge(options)
 
             Net::SSH.start( host,options[:user],options ) do |ssh|
-              env.ui.info "Transferring #{filename} to #{destination} "
+              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}
-
+                env.ui.info ".",{:new_line => false , :prefix => false}
               end
             end
-            env.ui.info ""
+            ui.info "", {:prefix => false}
           end
 
 
@@ -81,7 +79,7 @@ module Veewee
             stderr=""
             status=-99999
 
-            env.ui.info "Executing command: #{command}"
+            ui.info "Executing command: #{command}"
 
             Net::SSH.start(host, options[:user], { :port => options[:port], :password => options[:password], :paranoid => false }) do |ssh|
 
@@ -102,7 +100,7 @@ module Veewee
                   ch.on_data do |c, data|
                     stdout+=data
 
-                    env.ui.info data,{:new_line => false}
+                    ui.info data
 
                   end
 
@@ -110,7 +108,7 @@ module Veewee
                   ch.on_extended_data do |c, type, data|
                     stderr+=data
 
-                    env.ui.info data,{:new_line => false}
+                    ui.info data
 
                   end
 
@@ -120,18 +118,18 @@ module Veewee
                     exit_code = data.read_long
                     status=exit_code
                     if exit_code > 0
-                      env.ui.info "ERROR: exit code #{exit_code}"
+                      ui.info "ERROR: exit code #{exit_code}"
                     else
-                      #env.ui.info "Successfully executed"
+                      #ui.info "Successfully executed"
                     end
                   end
 
                   channel.on_request("exit-signal") do |ch, data|
-                    env.ui.info "SIGNAL: #{data.read_long}"
+                    ui.info "SIGNAL: #{data.read_long}"
                   end
 
                   ch.on_close {
-                    #env.ui.info "done!"
+                    #ui.info "done!"
                   }
                   #status=ch.exec "echo $?"
                 end

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

@@ -26,7 +26,7 @@ module Veewee
 
           # This tries to guess a local free tcp port 
           def guess_free_port(min_port,max_port)
-            env.ui.info "Received port hint - #{min_port}"
+            ui.info "Received port hint - #{min_port}"
 
             guessed_port=nil
 
@@ -38,10 +38,10 @@ module Veewee
             end
 
             if guessed_port.nil?
-              env.ui.info "No free port available: tried #{min_port}..#{max_port}"
+              ui.error "No free port available: tried #{min_port}..#{max_port}"
               exit -1
             else
-              env.ui.info "Found port #{guessed_port} available"
+              ui.info "Found port #{guessed_port} available"
             end
 
             return guessed_port
@@ -58,7 +58,7 @@ module Veewee
                 connected=false
                 while !connected do
                   begin
-                    env.ui.info "trying connection"
+                    ui.info "trying connection"
                     s = TCPSocket.new(ip, options[:port])
                     s.close
                     block.call(ip);

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

@@ -9,19 +9,19 @@ module Veewee
 
           class FileServlet < WEBrick::HTTPServlet::AbstractServlet
 
-            attr_reader :env
+            attr_reader :ui
 
-            def initialize(server,localfile,env)
+            def initialize(server,localfile,ui)
               super(server)
               @server=server
               @localfile=localfile
-              @env=env
+              @ui=ui
             end
 
             def do_GET(request,response)
               response['Content-Type']='text/plain'
               response.status = 200
-              env.ui.info "Serving file #{@localfile}"
+              ui.info "Serving file #{@localfile}"
               displayfile=File.open(@localfile,'r')
               content=displayfile.read()
               response.body=content
@@ -51,10 +51,10 @@ module Veewee
               :AccessLog => webrick_logger
             )
             env.logger.debug("mounting file /#{filename}")
-            s.mount("/#{filename}", Veewee::Provider::Core::Helper::Servlet::FileServlet,File.join(web_dir,filename),env)
+            s.mount("/#{filename}", Veewee::Provider::Core::Helper::Servlet::FileServlet,File.join(web_dir,filename),ui)
             trap("INT"){
               s.shutdown
-              env.ui.info "Stopping webserver"
+              ui.info "Stopping webserver"
               exit
             }
             s.start

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

@@ -12,6 +12,13 @@ module Veewee
 
         include ::Veewee::Provider::Core::Helper::Shell
 
+        def ui
+          return @_ui if defined?(@_ui)
+          @_ui = @env.ui.dup
+          @_ui.resource = @name
+          @_ui
+        end
+
         def initialize(name,options,env)
 
           @env=env
@@ -29,7 +36,7 @@ module Veewee
             # Get a real box object from the Provider
             box=Object.const_get("Veewee").const_get("Provider").const_get(type.to_s.capitalize).const_get("Box").new(name,env)
           rescue Error => ex
-            env.ui.error "Could not instante the box #{name} with provider #{type} ,#{ex}"
+            ui.error "Could not instante the box #{name} with provider #{type} ,#{ex}"
             raise
           end
         end
@@ -44,19 +51,19 @@ module Veewee
         end
 
         def gem_available?(gemname)
-            env.logger.info "Checking for gem #{gemname}"
+          env.logger.info "Checking for gem #{gemname}"
+          available=false
+          begin
+            available=true unless Gem::Specification::find_by_name("#{gemname}").nil?
+          rescue Gem::LoadError
+            env.logger.info "Error loading gem #{gemname}"
             available=false
-            begin
-              available=true unless Gem::Specification::find_by_name("#{gemname}").nil?
-            rescue Gem::LoadError
-              env.logger.info "Error loading gem #{gemname}"
-              available=false
-            rescue
-              env.logger.info "Falling back to old syntax for #{gemname}"
-              available=Gem.available?("#{gemname}")
-              env.logger.info "Old syntax #{gemname}.available? #{available}"
-            end
-            return available
+          rescue
+            env.logger.info "Falling back to old syntax for #{gemname}"
+            available=Gem.available?("#{gemname}")
+            env.logger.info "Old syntax #{gemname}.available? #{available}"
+          end
+          return available
         end
 
         def gems_available?(names)

data/lib/veewee/provider/core/provider/tunnel.rb

@@ -13,27 +13,27 @@ module Veewee
         host=@connection.uri.host
         user=@connection.uri.user
 
-        env.ui.info "Enabling tunneling"
+        ui.info "Enabling tunneling"
         @forward_threads=Array.new
         @forward_threads<< Thread.new {
           Net::SSH.start(host, user, ssh_options) do |ssh_session|
           forwardings.each do |forwarding|
             begin
-              env.ui.info "Forwarding remote port #{forwarding[:remote_port]} from #{box_name} to local port #{forwarding[:local_port]}"
-              env.ui.info host
-              env.ui.info user
-              env.ui.info ""
+              ui.info "Forwarding remote port #{forwarding[:remote_port]} from #{box_name} to local port #{forwarding[:local_port]}"
+              ui.info host
+              ui.info user
+              ui.info ""
               ssh_session.forward.local(forwarding[:local_port], "127.0.0.1",forwarding[:remote_port])
             rescue Errno::EACCES
-              env.ui.info "  Error - Access denied to forward remote port #{forwarding[:remote_port]} from #{name} to local port #{forwarding[:local_port]}"
+              ui.info "  Error - Access denied to forward remote port #{forwarding[:remote_port]} from #{name} to local port #{forwarding[:local_port]}"
             end
           end
           ssh_session.loop {true}
           end
         }
-        env.ui.info @forward_threads.first.status
+        ui.info @forward_threads.first.status
         @forward_threads.first.run
-        env.ui.info @forward_threads.first.status
+        ui.info @forward_threads.first.status
 
       end
 

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

@@ -10,7 +10,7 @@ module Veewee
         def console_type(sequence,type_options={})
           vnc_port=@connection.servers.all(:name => name).first.vnc_port
           display_port=vnc_port.to_i - 5900
-          env.ui.success "Sending keystrokes to VNC port :#{display_port} - TCP port: #{vnc_port}"
+          ui.success "Sending keystrokes to VNC port :#{display_port} - TCP port: #{vnc_port}"
           vnc_type(sequence,"127.0.0.1",display_port)
         end
 

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

@@ -34,8 +34,8 @@ module Veewee
           rescue SystemExit => e
             Kernel.exit(e.status)
           rescue Exception => e
-            env.ui.error("#{e.message} (#{e.class})")
-            env.ui.error(e.backtrace.join("\n"))
+            ui.error("#{e.message} (#{e.class})")
+            ui.error(e.backtrace.join("\n"))
             Kernel.exit(1)
           end
 

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

@@ -45,7 +45,7 @@ module Veewee
           #
           # Attach cdrom
           full_iso_file=File.join(env.config.veewee.iso_dir,definition.iso_file)
-          env.ui.info "Mounting cdrom: #{full_iso_file}"
+          ui.info "Mounting cdrom: #{full_iso_file}"
           command ="prlctl set '#{self.name}' --device-add cdrom --enable --image '#{full_iso_file}'"
           shell_exec("#{command}")
 

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

@@ -5,7 +5,7 @@ module Veewee
 
         def destroy(options={})
           unless self.exists?
-            env.ui.error "Error:: You tried to destroy a non-existing box '#{name}'"
+            ui.error "Error:: You tried to destroy a non-existing box '#{name}'"
             exit -1
           end
 

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

@@ -34,7 +34,7 @@ module Veewee
           # When we get here, ssh is available and no postinstall scripts have been executed yet
           # So we begin by transferring the ISO file of the vmware tools
 
-          env.logger.info "About to transfer parallels tools iso buildinfo to the box #{name} - #{ip_address} - #{ssh_options}"
+          ui.info "About to transfer parallels tools iso buildinfo to the box #{name} - #{ip_address} - #{ssh_options}"
           iso_image=guest_iso_path
           self.scp(iso_image,File.basename(iso_image))
         end

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

@@ -11,13 +11,13 @@ module Veewee
 
         def send_sequence(sequence)
 
-          env.ui.info ""
+          ui.info ""
 
           counter=0
           sequence.each { |s|
             counter=counter+1
 
-            env.ui.info "Typing:[#{counter}]: "+s
+            ui.info "Typing:[#{counter}]: "+s
 
             keycodes=self.string_to_parallels_keycode(s)
 
@@ -33,8 +33,8 @@ module Veewee
             #sleep after each sequence (needs to be param)
           }
 
-          env.ui.info "Done typing."
-          env.ui.info ""
+          ui.info "Done typing."
+          ui.info ""
 
 
         end
@@ -179,7 +179,7 @@ module Veewee
                   keycodes << c
                 end
               else
-                env.ui.info "no scan code for #{thestring.slice(0,1)}"
+                ui.info "no scan code for #{thestring.slice(0,1)}"
               end
               #pop one
               thestring=thestring.slice(1,thestring.length-1)

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

@@ -34,8 +34,8 @@ module Veewee
           rescue SystemExit => e
             Kernel.exit(e.status)
           rescue Exception => e
-            env.ui.error("#{e.message} (#{e.class})")
-            env.ui.error(e.backtrace.join("\n"))
+            ui.error("#{e.message} (#{e.class})")
+            ui.error(e.backtrace.join("\n"))
             Kernel.exit(1)
           end
 

data/lib/veewee/provider/virtualbox/box/destroy.rb

@@ -6,7 +6,7 @@ module Veewee
         def destroy(option={})
 
           unless self.exists?
-            env.ui.error "Error:: You tried to destroy a non-existing box '#{name}'"
+            ui.error "Error:: You tried to destroy a non-existing box '#{name}'"
             exit -1
           end
 
@@ -20,8 +20,8 @@ module Veewee
           end
 
           command="#{@vboxcmd} unregistervm  \"#{name}\" --delete"
-          env.ui.info command
-          env.ui.info "Deleting vm #{name}"
+          ui.info command
+          ui.info "Deleting vm #{name}"
 
           #Exec and system stop the execution here
           shell_exec("#{command}",{:mute => true})
@@ -44,14 +44,14 @@ module Veewee
                 command="#{@vboxcmd} closemedium disk \"#{location}\""
               end
 
-              env.ui.info "Deleting disk #{location}"
-              env.ui.info "#{command}"
+              ui.info "Deleting disk #{location}"
+              ui.info "#{command}"
 
               shell_exec("#{command}",{:mute => true})
 
               if File.exists?(location)
-                env.ui.info "We tried to delete the disk file via virtualbox '#{location} but failed"
-                env.ui.info "Removing it manually"
+                ui.info "We tried to delete the disk file via virtualbox '#{location} but failed"
+                ui.info "Removing it manually"
                 FileUtils.rm(location)
                 exit -1
               end

data/lib/veewee/provider/virtualbox/box/export_vagrant.rb

@@ -10,7 +10,7 @@ module Veewee
 
           # Check if box already exists
           unless self.exists?
-            env.ui.info "#{name} is not found, maybe you need to build it first?"
+            ui.info "#{name} is not found, maybe you need to build it first?"
             exit
           end
 
@@ -28,19 +28,19 @@ module Veewee
 
           # We need to shutdown first
           if self.running?
-            env.ui.info "Vagrant requires the box to be shutdown, before it can export"
-            env.ui.info "Sudo also needs to work for user #{definition.ssh_user}"
-            env.ui.info "Performing a clean shutdown now."
+            ui.info "Vagrant requires the box to be shutdown, before it can export"
+            ui.info "Sudo also needs to work for user #{definition.ssh_user}"
+            ui.info "Performing a clean shutdown now."
 
             self.halt
 
             #Wait for state poweroff
             while (self.running?) do
-              env.ui.info ".",{:new_line => false}
+              ui.info ".",{:new_line => false}
               sleep 1
             end
-            env.ui.info ""
-            env.ui.info "Machine #{name} is powered off cleanly"
+            ui.info ""
+            ui.info "Machine #{name} is powered off cleanly"
           end
 
           #Vagrant requires a relative path for output of boxes
@@ -54,28 +54,28 @@ module Veewee
           box_path=path1.relative_path_from(path2).to_s
 
           if File.exists?("#{box_path}")
-            env.ui.info "box #{name}.box already exists"
+            ui.info "box #{name}.box already exists"
             exit
           end
 
-          env.ui.info "Executing vagrant voodoo:"
+          ui.info "Executing vagrant voodoo:"
           export_command="vagrant package --base '#{name}' --output '#{box_path}'"
-          env.ui.info "#{export_command}"
+          ui.info "#{export_command}"
           shell_exec("#{export_command}") #hmm, needs to get the gem_home set?
-          env.ui.info ""
+          ui.info ""
 
           #add_ssh_nat_mapping back!!!!
           #vagrant removes the mapping
           #we need to restore it in order to be able to login again
           self.add_ssh_nat_mapping
 
-          env.ui.info "To import it into vagrant type:"
-          env.ui.info "vagrant box add '#{name}' '#{box_path}'"
-          env.ui.info ""
-          env.ui.info "To use it:"
-          env.ui.info "vagrant init '#{name}'"
-          env.ui.info "vagrant up"
-          env.ui.info "vagrant ssh"
+          ui.info "To import it into vagrant type:"
+          ui.info "vagrant box add '#{name}' '#{box_path}'"
+          ui.info ""
+          ui.info "To use it:"
+          ui.info "vagrant init '#{name}'"
+          ui.info "vagrant up"
+          ui.info "vagrant ssh"
         end
 
       end #Module