veewee 0.3.0.beta2 → 0.3.1

data/doc/requirements.md

@@ -1 +1,7 @@
-Coming Soon
+More Coming Soon
+
+Development Libraries:
+
+libxslt1-dev
+libxml2-dev
+zlib1g-dev

data/lib/python/parallels_send_string.py

@@ -0,0 +1,76 @@
+import sys
+import prlsdkapi
+import string
+
+if len(sys.argv) != 3:
+    print "Usage: parallels_send_string '<VM_NAME>' '<string>'"
+    exit()
+
+# Parse arguments
+vm_name=sys.argv[1]
+# String to use
+keynames = sys.argv[2].split(' ');
+
+prlsdk = prlsdkapi.prlsdk
+consts = prlsdkapi.prlsdk.consts
+
+# Initialize the Parallels API Library
+prlsdk.InitializeSDK(consts.PAM_DESKTOP_MAC)
+
+# Obtain a server object identifying the Parallels Service.
+server = prlsdkapi.Server()
+
+# Log in. (local as we do Parallels Desktop
+login_job=server.login_local()
+login_job.wait()
+
+# Get a list of virtual machines.
+# Find the specified virtual machine and
+# obtain an object identifying it.
+vm_list = server.get_vm_list()
+result= vm_list.wait()
+
+print prlsdkapi.prlsdk.consts.ScanCodesList
+
+# Look for the VM with the name speficied on the CLI
+found = False
+for i in range(result.get_params_count()):
+  VM = result.get_param_by_index(i)
+  print VM.get_name()
+  if VM.get_name() == vm_name:
+    found = True
+    break
+
+press = consts.PKE_PRESS
+release = consts.PKE_RELEASE
+
+# Access the Remote Desktop Access session
+vm_io = prlsdkapi.VmIO()
+try:
+  vm_io.connect_to_vm(VM).wait()
+except prlsdkapi.PrlSDKError, e:
+  print "Error: %s" % e
+  exit()
+
+for keyname in keynames:
+    if(keyname != ''): 
+	# Keys can also contain special keys like shift, that has to be pressed before and release after
+	# eg. SHIFT-C (Press shift, then press C)
+	keys = keyname.split('#');
+
+	for keypress in keys: 
+    		scan_code = consts.ScanCodesList[keypress]
+    		vm_io.send_key_event(VM,scan_code,press,50)
+
+	# And now the reversed order
+	# eg. Now release C then SHIFT
+	for keypress in reversed(keys):
+    		scan_code = consts.ScanCodesList[keypress]
+    		vm_io.send_key_event(VM,scan_code,release,50)
+
+# End the Remote Deskop Access session
+vm_io.disconnect_from_vm(VM)
+
+# Logoff and deinitialize the library
+server.logoff()
+prlsdkapi.deinit_sdk

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

@@ -8,44 +8,35 @@ module Veewee
 
             #http://www.win.tue.nl/~aeb/linux/kbd/scancodes-1.html
 
-            k=Hash.new
-            k['1'] = '02 82' ; k['2'] = '03 83' ; k['3'] = '04 84'; k['4']= '05 85' ;
-            k['5']='06 86'; k['6'] = '07 87' ; k['7'] = '08 88'; k['8'] = '09 89'; k['9']= '0a 8a';
-            k['0']='0b 8b'; k['-'] = '0c 8c'; k['='] = '0d 8d' ;
-            k['Tab'] = '0f 8f';
-            k['q']  = '10 90' ;       k['w']  = '11 91' ;       k['e']  = '12 92';
-            k['r'] = '13 93'       ; k['t'] = '14 94'       ; k['y'] = '15 95';
-            k['u']= '16 96'        ; k['i']='17 97';      k['o'] = '18 98'       ; k['p'] = '19 99' ;
-
-            k['Q']  = '2a 10 aa' ; k['W']  = '2a 11 aa' ; k['E']  = '2a 12 aa'; k['R'] = '2a 13 aa' ; k['T'] = '2a 14 aa' ; k['Y'] = '2a 15 aa'; k['U']= '2a 16 aa' ; k['I']='2a 17 aa'; k['O'] = '2a 18 aa' ; k['P'] = '2a 19 aa' ;
-
-            k['a'] = '1e 9e'; k['s']  = '1f 9f' ; k['d']  = '20 a0' ; k['f']  = '21 a1'; k['g'] = '22 a2' ; k['h'] = '23 a3' ; k['j'] = '24 a4';
-            k['k']= '25 a5' ; k['l']='26 a6';
-            k['A'] = '2a 1e aa 9e'; k['S']  = '2a 1f aa 9f' ; k['D']  = '2a 20 aa a0' ; k['F']  = '2a 21 aa a1';
-            k['G'] = '2a 22 aa a2' ; k['H'] = '2a 23 aa a3' ; k['J'] = '2a 24 aa a4'; k['K']= '2a 25 aa a5' ; k['L']='2a 26 aa a6';
-
-            k[';'] = '27 a7' ;k['"']='2a 28 aa a8';k['\'']='28 a8';
-
-            k['\\'] = '2b ab';   k['|'] = '2a 2b aa 8b';
-
-            k['[']='1a 9a'; k[']']='1b 9b';
-            k['<']='2a 33 aa b3'; k['>']='2a 34 aa b4';
-            k['$']='2a 05 aa 85';
-            k['+']='2a 0d aa 8d';
-
-            k['?']='2a 35 aa b5';
-            k['z'] = '2c ac'; k['x']  = '2d ad' ; k['c']  = '2e ae' ; k['v']  = '2f af'; k['b'] = '30 b0' ; k['n'] = '31 b1' ;
-            k['m'] = '32 b2';
-            k['Z'] = '2a 2c aa ac'; k['X']  = '2a 2d aa ad' ; k['C']  = '2a 2e aa ae' ; k['V']  = '2a 2f aa af';
-            k['B'] = '2a 30 aa b0' ; k['N'] = '2a 31 aa b1' ; k['M'] = '2a 32 aa b2';
-
-            k[',']= '33 b3' ; k['.']='34 b4'; k['/'] = '35 b5' ;k[':'] = '2a 27 aa a7';
-            k['%'] = '2a 06 aa 86';  k['_'] = '2a 0c aa 8c';
-            k['&'] = '2a 08 aa 88';
-            k['('] = '2a 0a aa 8a';
-            k[')'] = '2a 0b aa 8b';
-
+            # keycode hash, seeded with 'Tab' - which is special as it's longer than 1 char
+            k = { 'Tab' => '0f 8f' }
+            
+            # add keycodes
+
+            # "pure" keys (no modifier keys)
+            lower_keys = {
+              '1234567890-='  => 0x02,
+              'qwertyuiop[]'  => 0x10,
+              'asdfghjkl;\'`' => 0x1e,
+              '\\zxcvbnm,./'  => 0x2b
+            }.each do |keys, offset|
+              keys.split('').each_with_index do |key, idx|
+                k[key] = sprintf('%02x %02x', idx + offset, idx + offset + 0x80)
+              end
+            end
 
+            # upcase keys (with shift)
+            {
+              '!@#$%^&*()_+'  => 0x02,
+              'QWERTYUIOP{}'  => 0x10,
+              'ASDFGHJKL:"~'  => 0x1e,
+              '|ZXCVBNM<>?'   => 0x2b
+            }.each do |keys, offset|
+              keys.split('').each_with_index do |key, idx|
+                k[key] = sprintf('2a %02x aa %02x', idx + offset, idx + offset + 0x80)
+              end
+            end
+            
             special=Hash.new;
             special['<Enter>'] = '1c 9c';
             special['<Backspace>'] = '0e 8e';
@@ -53,7 +44,7 @@ module Veewee
             special['<Return>'] = '1c 9c'
             special['<Esc>'] = '01 81';
             special['<Tab>'] = '0f 8f';
-            special['<KillX>'] = '1d 38 0e';
+            special['<KillX>'] = '1d 38 0e b8';
             special['<Wait>'] = 'wait';
 
             special['<Up>'] = '48 c8';
@@ -67,16 +58,8 @@ module Veewee
             special['<Right>'] = '4d cd';
             special['<Home>'] = '47 c7';
 
-            special['<F1>'] = '3b';
-            special['<F2>'] = '3c';
-            special['<F3>'] = '3d';
-            special['<F4>'] = '3e';
-            special['<F5>'] = '3f';
-            special['<F6>'] = '40';
-            special['<F7>'] = '41';
-            special['<F8>'] = '42';
-            special['<F9>'] = '43';
-            special['<F10>'] = '44';
+            # F1 .. F10
+            (1..10).each { |num| special["<F#{num}>"] = sprintf('%02x', num + 0x3a) }
 
             keycodes=''
             thestring.gsub!(/ /,"<Spacebar>")

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

@@ -19,18 +19,11 @@ module Veewee
 
             ui.info "Typing:[#{counter}]: "+s
 
-            keycodes=self.string_to_parallels_keycode(s)
+	    # No need to send the state, we always PRESS then RELEASE.
+	    # So we send the whole string at once and press/release every string item
+            keystring=self.string_to_parallels_keycode_string(s)
 
-            # A keycode is a hash {'code' => 'U' , 'state' => 'pressed'}
-            keycodes.each do |keycode|
-              unless keycode['code']=="wait"
-                send_keycode(keycode)
-                sleep 0.01
-              else
-                sleep 1
-              end
-            end
-            #sleep after each sequence (needs to be param)
+	    send_string(keystring);
           }
 
           ui.info "Done typing."
@@ -39,95 +32,76 @@ module Veewee
 
         end
 
-        def send_keycode(keycode)
-          python_script=File.join(File.dirname(__FILE__),'..','..','..','..','..','python','parallels_send_key.py')
-          command="python #{python_script} '#{self.name}' '#{keycode['code']}' '#{keycode['state']}'"
+        def send_string(keystring)
+          python_script=File.join(File.dirname(__FILE__),'..','..','..','..','..','python','parallels_send_string.py')
+          command="python #{python_script} '#{self.name}' '#{keystring}'"
           shell_results=shell_exec("#{command}")
         end
 
-        # Returns hash
-        def k2h(key,state)
-          return { 'code' => key, 'state' => state}
-        end
-
-        # Returns hash
-        def press2h(key)
-          k2h(key,'press')
-        end
-
-        # Returns hash
-        def release2h(key)
-          k2h(key,'release')
-        end
-
         # Returns array
-        def press_release(key)
-          seq=Array.new
-          seq << press2h(key)
-          seq << release2h(key)
-          return seq
+        def press_key(key)
+	  return key
         end
 
         # Returns array
         def shift(sequence)
           seq=Array.new
-          seq << press2h('SHIFT_LEFT')
+          seq << press_key('SHIFT_LEFT')
           sequence.each do |s|
             seq << s
           end
-          seq << release2h('SHIFT_LEFT')
           return seq
         end
 
-        def string_to_parallels_keycode(thestring)
+        def string_to_parallels_keycode_string(thestring)
 
 
           # Setup one key presses
           k=Hash.new
           for key in 'A'..'Z'
-            k[key] = shift(press_release(key))
+            k[key] = shift(press_key(key))
           end
 
           for key in 'a'..'z'
-            k[key] = press_release(key.upcase)
+            k[key] = press_key(key.upcase)
           end
 
           for key in '0'..'9'
-            k[key] = press_release(key.upcase)
+            k[key] = press_key(key.upcase)
           end
 
-          k['>'] = shift(press_release('GREATER'))
-          k['.'] = press_release('GREATER')
-          k['<'] = shift(press_release('LESS'))
-          k[':'] = shift(press_release('COLON'))
-          k[';'] = press_release('COLON')
-          k['/'] = press_release('SLASH')
-          k[' '] = press_release('SPACE')
-          k['-'] = press_release('MINUS')
-          k['\''] = press_release('QUOTE')
-          k['{'] = press_release('CBRACE_LEFT')
-          k['}'] = press_release('CBRACE_RIGHT')
-          k['`'] = press_release('TILDA')
-          k['~'] = shift(press_release('TILDA'))
-
-          k['_'] = shift(press_release('MINUS'))
-          k['?'] = shift(press_release('SLASH'))
-          k['"'] = shift(press_release('QUOTE'))
-          k[')'] = shift(press_release('0'))
-          k['!'] = shift(press_release('1'))
-          k['@'] = shift(press_release('2'))
-          k['#'] = shift(press_release('3'))
-          k['$'] = shift(press_release('4'))
-          k['%'] = shift(press_release('5'))
-          k['^'] = shift(press_release('6'))
-          k['&'] = shift(press_release('7'))
-          k['*'] = shift(press_release('8'))
-          k['('] = shift(press_release('9'))
-          k['|'] = shift(press_release('BACKSLASH'))
-          k[','] = press_release('LESS')
-          k['\\'] = press_release('BACKSLASH')
-          k['+'] = shift(press_release('PLUS'))
-          k['='] = press_release('PLUS')
+          k['>'] = shift(press_key('GREATER'))
+          k['.'] = press_key('GREATER')
+          k['<'] = shift(press_key('LESS'))
+          k[':'] = shift(press_key('COLON'))
+          k[';'] = press_key('COLON')
+          k['/'] = press_key('SLASH')
+          k[' '] = press_key('SPACE')
+          k['-'] = press_key('MINUS')
+          k['\''] = press_key('QUOTE')
+          k['{'] = press_key('CBRACE_LEFT')
+          k['}'] = press_key('CBRACE_RIGHT')
+          k['`'] = press_key('TILDA')
+          k['~'] = shift(press_key('TILDA'))
+
+          k['_'] = shift(press_key('MINUS'))
+          k['?'] = shift(press_key('SLASH'))
+          k['"'] = shift(press_key('QUOTE'))
+          k[')'] = shift(press_key('0'))
+          k['!'] = shift(press_key('1'))
+          k['@'] = shift(press_key('2'))
+          k['#'] = shift(press_key('3'))
+          k['$'] = shift(press_key('4'))
+          k['%'] = shift(press_key('5'))
+          k['^'] = shift(press_key('6'))
+          k['&'] = shift(press_key('7'))
+          k['*'] = shift(press_key('8'))
+          k['('] = shift(press_key('9'))
+          k['|'] = shift(press_key('BACKSLASH'))
+          k[','] = press_key('LESS')
+          k['\\'] = press_key('BACKSLASH')
+          k['+'] = shift(press_key('PLUS'))
+          k['='] = press_key('PLUS')
 
           # Setup special keys
           special=Hash.new;
@@ -153,10 +127,10 @@ module Veewee
           special['<Home>'] = [{ 'code' => 'HOME', 'state' => 'press' }]
 
           for i in 1..12 do
-            special["<F#{i}>"] = press_release("F#{i}")
+            special["<F#{i}>"] = press_key("F#{i}")
           end
 
-          keycodes=Array.new
+          keycodes= ""
 
           until thestring.length == 0
             nospecial=true;
@@ -165,7 +139,7 @@ module Veewee
                 #take thestring
                 #check if it starts with a special key + pop special string
                 special[key].each do |c|
-                  keycodes << c
+                  keycodes.concat("#{c['code']} ")
                 end
                 thestring=thestring.slice(key.length,thestring.length-key.length)
                 nospecial=false;
@@ -176,7 +150,11 @@ module Veewee
               code=k[thestring.slice(0,1)]
               if !code.nil?
                 code.each do |c|
-                  keycodes << c
+		  if(c == 'SHIFT_LEFT'):
+                  	keycodes.concat("#{c}\#")
+		  else
+                  	keycodes.concat("#{c} ")
+		  end
                 end
               else
                 ui.info "no scan code for #{thestring.slice(0,1)}"

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

@@ -6,7 +6,7 @@ module Veewee
         def build_info
           info=super
           info << { :filename => ".vbox_version",
-                    :content => "#{self.vbox_version}" }
+                    :content => "#{self.vboxga_version}" }
         end
 
          # Transfer information provide by the provider to the box
@@ -14,7 +14,7 @@ module Veewee
          #
          def transfer_buildinfo(options)
            super(options)
-           iso_image="VBoxGuestAdditions_#{self.vbox_version}.iso"
+           iso_image="VBoxGuestAdditions_#{self.vboxga_version}.iso"
            env.logger.info "About to transfer virtualbox guest additions iso to the box #{name} - #{ip_address} - #{ssh_options}"
            self.scp("#{File.join(env.config.veewee.iso_dir,iso_image)}",File.basename(iso_image))
          end

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

@@ -98,7 +98,7 @@ module Veewee
         end
 
         def attach_guest_additions
-          full_iso_file=File.join(env.config.veewee.iso_dir,"VBoxGuestAdditions_#{self.vbox_version}.iso")
+          full_iso_file=File.join(env.config.veewee.iso_dir,"VBoxGuestAdditions_#{self.vboxga_version}.iso")
           ui.info "Mounting guest additions: #{full_iso_file}"
           command ="#{@vboxcmd} storageattach \"#{name}\" --storagectl \"IDE Controller\" --type dvddrive --port 1 --device 0 --medium \"#{full_iso_file}\""
           shell_exec("#{command}")

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

@@ -4,13 +4,12 @@ module Veewee
       module BoxCommand
 
         def download_vbox_guest_additions_iso(options)
-          version=self.vbox_version
+          version=self.vboxga_version
           isofile="VBoxGuestAdditions_#{version}.iso"
           url="http://download.virtualbox.org/virtualbox/#{version}/#{isofile}"
           ui.info "Downloading vbox guest additions iso v #{version} - #{url}"
           download_iso(url,isofile)
         end
-
       end
     end
   end

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

@@ -2,6 +2,7 @@ module Veewee
   module Provider
     module Virtualbox
       module BoxCommand
+        UNSYNCED_VERSIONS = {"4.2.1" => "4.2.0", "4.1.23" => "4.1.22"}
 
         # Return the major/minor/incremental version of VirtualBox.
         # For example: 4.1.8_Debianr75467 -> 4.1.8
@@ -12,6 +13,13 @@ module Veewee
           return version
         end
 
+        def vboxga_version
+          affected_version?(self.vbox_version) ? UNSYNCED_VERSIONS[self.vbox_version] : self.vbox_version
+        end
+      protected
+        def affected_version?(ver)
+          RUBY_PLATFORM.downcase.include?("darwin") && UNSYNCED_VERSIONS.has_key?(ver)
+        end
       end
     end
   end

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.3.0.beta2"
+  ::Veewee::VERSION="0.3.1"
 end