veewee 0.3.1 → 0.3.2

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

@@ -5,6 +5,10 @@ module Veewee
 
         def build(options={})
 
+          if definition.nil?
+            raise Veewee::Error,"Could not find the definition. Make sure you are one level above the definitions directory when you execute the build command."
+          end
+
           # Requires valid definition
 
           ui.info "Building Box #{name} with Definition #{definition.name}:"
@@ -74,6 +78,7 @@ module Veewee
             sleep 2
           end
 
+
           self.transfer_buildinfo(options)
 
           # Filtering post install files based upon --postinstall-include and --postinstall--exclude
@@ -81,9 +86,13 @@ module Veewee
 
           self.handle_postinstall(options)
 
-          ui.success "The box #{name} was built succesfully!"
+          ui.success "The box #{name} was build succesfully!"
           ui.info "You can now login to the box with:"
-          ui.info ssh_command_string
+          if (definition.winrm_user && definition.winrm_password)
+            env.ui.info winrm_command_string
+          else
+            env.ui.info ssh_command_string
+          end
 
           return self
         end
@@ -165,11 +174,11 @@ module Veewee
           kickstartfiles=definition.kickstart_file
 
           if kickstartfiles.nil? || kickstartfiles.length == 0
-            ui.info "Skipping webserver as no kickstartfile was specified"
+            env.ui.info "Skipping webserver as no kickstartfile was specified"
+          else
+            env.ui.info "Starting a webserver #{definition.kickstart_ip}:#{definition.kickstart_port}\n"
           end
 
-          ui.info "Starting a webserver #{definition.kickstart_ip}:#{definition.kickstart_port}\n"
-
           # Check if the kickstart is an array or a single string
           if kickstartfiles.is_a?(String)
             # Let's turn it into an array
@@ -197,17 +206,23 @@ module Veewee
           definition.postinstall_files.each do |postinstall_file|
             # Filenames of postinstall_files are relative to their definition
             filename=File.join(definition.path,postinstall_file)
-            self.scp(filename,File.basename(filename))
-            self.exec("chmod +x \"#{File.basename(filename)}\"")
+            self.copy_to_box(filename,File.basename(filename))
+            if not (definition.winrm_user && definition.winrm_password)
+              self.exec("chmod +x \"#{File.basename(filename)}\"")
+            end
           end
 
           # 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.scp(pre_filename,File.basename(pre_filename))
-            self.exec("chmod +x \"#{File.basename(pre_filename)}\"")
-            # Inject the call to the real script by executing the first argument (it will be the postinstall script file name to be executed)
-            self.exec("execute=\"\\n# We must execute the script passed as the first argument\\n\\$1\" && printf \"%b\\n\" \"$execute\" >> #{File.basename(pre_filename)}")
+            self.copy_to_box(filename,File.basename(pre_filename))
+            if (definition.winrm_user && definition.winrm_password)
+              # not implemented on windows yet
+            else
+              self.exec("chmod +x \"#{File.basename(pre_filename)}\"")
+              # Inject the call to the real script by executing the first argument (it will be the postinstall script file name to be executed)
+              self.exec("execute=\"\\n# We must execute the script passed as the first argument\\n\\$1\" && printf \"%b\\n\" \"$execute\" >> #{File.basename(pre_filename)}")
+            end
           end
 
           # Now iterate over the postinstall files
@@ -218,14 +233,19 @@ module Veewee
             unless File.basename(postinstall_file).start_with?("_")
 
               unless definition.pre_postinstall_file.to_s.empty?
+                raise 'not implemented on windows yet' if (definition.winrm_user && definition.winrm_password)
                 # Filename of pre_postinstall_file are relative to their definition
                 pre_filename=File.join(definition.path, definition.pre_postinstall_file)
                 # Upload the pre postinstall script if not already transfered
                 command = "./" + File.basename(pre_filename)
                 command = sudo(command) + " ./"+File.basename(filename)
               else
-                command = "./"+File.basename(filename)
-                command = sudo(command)
+                if (definition.winrm_user && definition.winrm_password)
+                  # no sudo on windows, batch files only please?
+                  self.exec(File.basename(filename))
+                else
+                  self.exec(sudo("./"+File.basename(filename)))
+                end
               end
 
               self.exec(command)
@@ -249,7 +269,7 @@ module Veewee
               infofile.puts "#{info[:content]}"
               infofile.rewind
               infofile.close
-              self.scp(infofile.path,info[:filename])
+              self.copy_to_box(infofile.path,info[:filename])
               infofile.delete
             rescue RuntimeError => ex
               ui.error("Error transfering file #{info[:filename]} failed, possible not enough permissions to write? #{ex}",:prefix => false)

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

@@ -0,0 +1,17 @@
+module Veewee
+  module Provider
+    module  Core
+      module BoxCommand
+
+        def copy_to_box(localfile,remotefile,options={})
+          raise Veewee::Error,"Box is not running" unless self.running?
+          if definition.winrm_user && definition.winrm_password # prefer winrm 
+            self.wincp(localfile,remotefile,options)
+          else
+            self.scp(localfile,remotefile,options)
+          end
+        end
+      end # Module
+    end # Module
+  end # Module
+end # Module

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

@@ -8,25 +8,44 @@ module Veewee
          "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p #{ssh_options[:port]} -l #{definition.ssh_user} #{self.ip_address}"
         end
 
+        def winrm_command_string
+          "knife winrm -m #{self.ip_address} -P #{winrm_options[:port]} -x #{definition.winrm_user}" +
+            " -P #{definition.winrm_password} COMMAND"
+        end
+
         def exec(command,options={})
           raise Veewee::Error,"Box is not running" unless self.running?
-          begin
-            new_options=ssh_options.merge(options)
-            self.when_ssh_login_works(self.ip_address,new_options) do
-              begin
-                env.logger.info "About to execute remote command #{command} on box #{name} - #{self.ip_address} - #{new_options}"
-                result=self.ssh_execute(self.ip_address,command,new_options)
+          if definition.winrm_user && definition.winrm_password
+            begin
+              new_options=winrm_options.merge(options)
+              self.when_winrm_login_works(self.ip_address,winrm_options.merge(options)) do
+                result = self.winrm_execute(self.ip_address,command,new_options)
                 return result
-              rescue RuntimeError => ex
-                error= "Error executing command #{command} : #{ex}"
-                error+="\n#{ex.backtrace.join("\n")}" unless ex.backtrace.empty?
-                raise Veewee::SshError, error
               end
+            rescue RuntimeError => ex
+              env.ui.error "Error executing command #{command} : #{ex}"
+              raise Veewee::WinrmError, ex
+            end
+          else # definition.ssh_user && definition.ssh_password
+            begin
+              new_options=ssh_options.merge(options)
+              self.when_ssh_login_works(self.ip_address,new_options) do
+                begin
+                  env.logger.info "About to execute remote command #{command} on box #{name} - #{self.ip_address} - #{new_options}"
+                  result=self.ssh_execute(self.ip_address,command,new_options)
+                  return result
+                rescue RuntimeError => ex
+                  env.ui.error "Error executing command #{command} : #{ex}"
+                  raise Veewee::SshError, ex
+                end
+              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
             end
-          rescue Net::SSH::AuthenticationFailed => ex
-            raise Veewee::SshError, "Authentication failure\n"+ex
           end
 
+
         end
       end # Module
     end # Module

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

@@ -5,6 +5,7 @@ module Veewee
         def create_floppy(floppy_filename)
           # Todo Check for java
           # Todo check output of commands
+          # Todo allow for .erb templates
 
           # Check for floppy
           unless definition.floppy_files.nil?

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

@@ -9,9 +9,13 @@ module Veewee
             if options["force"]==true
               self.poweroff
             else
-              self.exec("echo '#{definition.shutdown_cmd}' > /tmp/shutdown.sh")
-              self.exec("chmod +x /tmp/shutdown.sh")
-              self.exec(sudo("/tmp/shutdown.sh"))
+              if definition.winrm_user && definition.winrm_password # prefer winrm 
+                self.exec("#{definition.shutdown_cmd}")
+              else
+                self.exec("echo '#{definition.shutdown_cmd}' > /tmp/shutdown.sh")
+                self.exec("chmod +x /tmp/shutdown.sh")
+                self.exec(sudo("/tmp/shutdown.sh"))
+              end
             end
           else
             raise Veewee::Error,"Box is not running"

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

@@ -6,7 +6,7 @@ module Veewee
         def validate_tags(tags,options)
 
           unless self.exists?
-            ui.error "Error:: You tried to validate box '#{name}' but it does not exit"
+            ui.error "Error:: You tried to validate box '#{name}' but it does not exist"
             exit -1
           end
 
@@ -31,7 +31,13 @@ module Veewee
           ENV['VEEWEE_BOXNAME']=@name
           ENV['VEEWEE_PROVIDER']=@provider.name
 
-          feature_path=File.join(File.dirname(__FILE__),"..","..","..","..","..","validation","veewee.feature")
+          if definition.winrm_user && definition.winrm_password # prefer winrm 
+            featurefile="veewee-windows.feature"
+          else
+            featurefile="veewee.feature"
+          end
+
+          feature_path=File.join(File.dirname(__FILE__),"..","..","..","..","..","validation",featurefile)
 
           features=Array.new
           features[0]=feature_path

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

@@ -0,0 +1,120 @@
+require 'veewee/provider/core/helper/winrm'
+module Veewee
+  module Provider
+    module  Core
+      module BoxCommand
+
+        def wincp(localfile,remotefile,options={})
+          raise Veewee::Error,"Box is not running" unless self.running?
+
+          # Calculate an available kickstart port which we will use for wincp
+          definition.kickstart_port = "7000" if definition.kickstart_port.nil?
+          guessed_port=guess_free_port(definition.kickstart_port.to_i,7199).to_s
+          if guessed_port.to_s!=definition.kickstart_port
+            env.ui.warn "Changing wincp port from #{definition.kickstart_port} to #{guessed_port}"
+            definition.kickstart_port=guessed_port.to_s
+          end
+
+          if self.exec("cmd.exe /C dir #{wget_vbs_file} > %TEMP%\\null",{:exitcode=>"*"}).status != 0
+            env.ui.warn "Creating wget.vbs"
+            create_wget_vbs_command do |command_chunk, chunk_num|
+              self.exec("cmd.exe /C echo \"Rendering '#{wget_vbs_file}' chunk #{chunk_num}\" && #{command_chunk}")
+            end
+          end
+
+          
+          env.ui.warn "Spinning up a wait_for_http_request on http://#{host_ip_as_seen_by_guest}:#{definition.kickstart_port}#{localfile}"
+          webthread=allow_for_http_request(localfile,{
+              :port => definition.kickstart_port,
+              :host => definition.kickstart_ip,
+              :timeout => definition.kickstart_timeout,
+              :web_dir => '/'
+            })
+          
+          begin
+            self.when_winrm_login_works(self.ip_address,winrm_options.merge(options)) do
+              env.ui.info "Going to try and copy #{localfile} to #{remotefile.inspect}"
+              self.exec("cmd.exe /C cscript %TEMP%\\wget.vbs /url:http://#{host_ip_as_seen_by_guest}:#{definition.kickstart_port}#{localfile} /path:#{remotefile}")
+              # while true do
+              #   sleep 0.1 # used to debug
+              # end
+            end
+          end
+        end
+
+
+        def wget_vbs_file
+          "%TEMP%\\\\wget.vbs"
+        end
+
+        def create_wget_vbs_command(&block)
+          bootstrap_bat = []
+          chunk_num = 0
+          wget_vbs.each_line do |line|
+            # escape WIN BATCH special chars
+            line.gsub!(/[(<|>)^]/).each{|m| "^#{m}"}
+            # windows commands are limited to 2047 characters
+            if((bootstrap_bat + [line]).join(" && ").size > 2047 )
+              yield bootstrap_bat.join(" && "), chunk_num += 1
+              bootstrap_bat = []
+            end
+            bootstrap_bat << ">> #{wget_vbs_file} (echo.#{line.chomp.strip})"
+          end
+          yield bootstrap_bat.join(" && "), chunk_num += 1
+          bootstrap_bat = []
+        end
+
+        def wget_vbs
+          wget_vbs = <<-WGET
+url = WScript.Arguments.Named("url")
+path = WScript.Arguments.Named("path")
+Set objXMLHTTP = CreateObject("MSXML2.ServerXMLHTTP")
+Set wshShell = CreateObject( "WScript.Shell" )
+Set objUserVariables = wshShell.Environment("USER")
+
+'http proxy is optional
+'attempt to read from HTTP_PROXY env var first
+On Error Resume Next
+
+If NOT (objUserVariables("HTTP_PROXY") = "") Then
+objXMLHTTP.setProxy 2, objUserVariables("HTTP_PROXY")
+
+'fall back to named arg
+ElseIf NOT (WScript.Arguments.Named("proxy") = "") Then
+objXMLHTTP.setProxy 2, WScript.Arguments.Named("proxy")
+End If
+
+On Error Goto 0
+
+objXMLHTTP.open "GET", url, false
+objXMLHTTP.send()
+If objXMLHTTP.Status = 200 Then
+Set objADOStream = CreateObject("ADODB.Stream")
+objADOStream.Open
+objADOStream.Type = 1
+objADOStream.Write objXMLHTTP.ResponseBody
+objADOStream.Position = 0
+Set objFSO = Createobject("Scripting.FileSystemObject")
+If objFSO.Fileexists(path) Then objFSO.DeleteFile path
+Set objFSO = Nothing
+objADOStream.SaveToFile path
+objADOStream.Close
+Set objADOStream = Nothing
+End if
+Set objXMLHTTP = Nothing
+WGET
+          #escape_and_echo(win_wget)
+          wget_vbs
+        end
+
+        # escape WIN BATCH special chars
+        # and prefixes each line with an
+        # echo
+        def escape_and_echo(file_contents)
+          file_contents.gsub(/^(.*)$/, 'echo.\1').gsub(/([(<|>)^])/, '^\1')
+        end
+
+      end # Module
+    end # Module
+  end # Module
+end # Module

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

@@ -0,0 +1,59 @@
+require 'veewee/provider/core/helper/winrm'
+module Veewee
+  module Provider
+    module  Core
+      module BoxCommand
+
+
+        def winrm(command=nil,options={})
+
+          raise Veewee::Error,"Box is not running" unless self.running?
+          winrm_options={:user => definition.winrm_user,:password => definition.winrm_password, :port => definition.winrm_host_port, :exitcode => '*'}
+
+          if (command.nil?)
+            env.ui.info "This is a simple interactive shell"
+            env.ui.info "To exit interactive mode, use 'quit!'"
+
+            while 1
+              command = ui.ask("veewee>")
+              case command.strip
+              when 'quit!'
+                env.ui.info 'Bye!'
+                break
+              else
+                winrm_execute(self.ip_address,command,winrm_options.merge(options))
+              end
+            end
+          else
+            winrm_execute(self.ip_address,command,winrm_options.merge(options))
+          end
+
+
+        end
+
+        private
+        def winrm_options(options)
+
+          command_options = [
+            #"-q", #Suppress warning messages
+            #            "-T", #Pseudo-terminal will not be allocated because stdin is not a terminal.
+            "-p #{winrm_options[:port]}",
+            "-o UserKnownHostsFile=/dev/null",
+            "-t -o StrictHostKeyChecking=no",
+            "-o IdentitiesOnly=yes",
+            "-o VerifyHostKeyDNS=no"
+          ]
+          if !(definition.winrm_key.nil? ||  definition.winrm_key.length!="")
+            command_options << "-i #{definition.winrm_key}"
+          end
+          commandline_options="#{command_options.join(" ")} ".strip
+
+          user_option=definition.winrm_user.nil? ? "" : "-l #{definition.winrm_user}"
+
+          return "#{commandline_options} #{user_option}"
+        end
+      end # Module
+    end # Module
+  end # Module
+end # Module
+

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

@@ -0,0 +1,47 @@
+module Veewee
+  module Provider
+    module Core
+      module Helper
+
+        module Comm
+
+          def comm_method
+            if (definition.winrm_user && definition.winrm_password)
+              :winrm
+            else
+              :ssh
+            end
+          end
+
+          def when_comm_login_works(ip="127.0.0.1", options = {  } , &block)
+            case comm_method
+            when :winrm
+              when_winrm_login_works(ip,options,block)
+            when :ssh
+              when_ssh_login_works(ip,options,block)
+            end
+          end
+
+          def comm_transfer_file(host,filename,destination = '.' , options = {})
+            case comm_method
+            when :winrm
+              winrm_transfer_file(host,filename,destination,options)
+            when :ssh
+              ssh_transfer_file(host,filename,destination,options)
+            end
+          end
+
+          def comm_execute(host,command, options = { :progress => "on"} )
+            case comm_method
+            when :winrm
+              winrm_execute(host,command, options )
+            when :ssh
+              ssh_execute(host,command, options )
+            end
+          end
+
+        end #Class
+      end #Module
+    end #Module
+  end #Module
+end #Module