ievms-ruby 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 249e1aad51f82e11e427dd5fae50c58761401f70
-  data.tar.gz: fd970f847bd82ad62e78525fccbf3689affd5db2
+  metadata.gz: 85c025ffdb4eb040906b9574aebbc02237da1cf5
+  data.tar.gz: b295c401b775fb07805ce59798cf76958332f1e2
 SHA512:
-  metadata.gz: 036bd7897575e55f3f2a06a091a6c233c34fab0e111f536bf120dba21ba593b26d650776033c58ea4bc5a9ced55947fd2cb95eb16e53105c145a754b440f817b
-  data.tar.gz: b5d2a964d5a50c23e90cad5cdd53f14045352bcd22d13edf0a861fe07fe1c84eceed5a17027e9b04d7f4b3a28509fca1357259f5b946b781be1b981a28a84682
+  metadata.gz: 0d64a6d900b41a360351e6817550c7b26a0d3d93e7c8a7c2f87483e720400a13826959ece8174f462be778c68eec1f5b20a90650f3405e53f61934e993a49ceb
+  data.tar.gz: 9686fb30c99d1949019601d24a64a975ad9dbada42b3f7f4b7945646cc9904aa6e9c7c5b3393bfcf3fc0066d5d44840f82bb3a9566be109a4c4474f49648b8c1

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+next version
+- start using a Changelog
+- add powershell as admin method and command
+- add safe start, stop and reboot def's
+- disply out from admin cmd's
+- default headless
+
+0.1.0
+- initial prototype with a log of functionality

data/README.md

@@ -6,10 +6,7 @@
 [![Dependency Status](https://gemnasium.com/mipmip/ievms-ruby.svg)](https://gemnasium.com/mipmip/ievms-ruby)
 [![Inline docs](http://inch-ci.org/github/mipmip/ievms-ruby.svg?branch=master)](http://inch-ci.org/github/mipmip/ievms-ruby)
 
-Ruby interface for boxes made by ievms.sh. Use this Library to provision your
-IE boxes from https://modern.ie.
-
-Next to [ievms.sh](https://github.com/xdissent/ievms), `ievms-ruby` also works great in combination with [iectrl](https://github.com/xdissent/iectrl).
+Ruby interface for managing and provisioning IE/Windows Machines from https://modern.ie.
 
 ## WinBoxes supported
 
@@ -23,9 +20,9 @@ Next to [ievms.sh](https://github.com/xdissent/ievms), `ievms-ruby` also works g
 
 * Upload and download files from guest machine
 * Execute cmd.exe and powershell commands on guest machine
-* Execute cmd.exe and powershell commands on guest machine as admin
-* Shortcut commands for Windows guest like `cat`, `ps`, `reboot` and `shutdown`
-* To be used as CLI utility or as library in a ruby script.
+* Execute commands on guest machine as admin
+* CLI with shortcut commands for Windows guests like `cat`, `ps`, `reboot` and `shutdown`
+* Integrated Chocolatey commands to easily install packages
 
 ## Requirements
 
@@ -34,10 +31,6 @@ Next to [ievms.sh](https://github.com/xdissent/ievms), `ievms-ruby` also works g
 * VirtualBox Extension Pack and Guest Additions >= 5.0.6
 * Windows Machines created by [ievms](https://github.com/xdissent/ievms)
 
-### Recommended
-* [iectrl](https://github.com/xdissent/iectrl), cli interface for simple
- ievms admin commands
-
 ## Usage
 
 ### As library
@@ -59,6 +52,8 @@ $ ievmsrb help
 
 Commands:
   ievmsrb cat [vbox name] [file path]                             # cat file from path in Win vbox
+  ievmsrb choco_inst [vbox name] [package]                        # Install package in win box with Chocolatey
+  ievmsrb choco_uninst [vbox name] [package]                      # Uninstall package in win box with Chocolatey
   ievmsrb cmd [vbox name] [command to execute]                    # Run command with cmd.exe in Win vbox
   ievmsrb cmd_adm [vbox name] [command to execute]                # Run command as Administrator with cmd.exe in Win vbox
   ievmsrb copy_from [vbox name] [path in vbox] [local file]       # Copy file from Win vbox to local path
@@ -66,8 +61,17 @@ Commands:
   ievmsrb copy_to_as_adm [vbox name] [local file] [path in vbox]  # Copy local file to Win vbox as Administrator
   ievmsrb help [COMMAND]                                          # Describe available commands or one specific command
   ievmsrb ps [vbox name]                                          # Show running tasks in Win vbox
+  ievmsrb pwrsh_as_adm [vbox name] [command to execute]           # Run command as Administrator with PowerShell in Win vbox
   ievmsrb reboot [vbox name]                                      # Reboot Win box
+  ievmsrb reset_ievms_taskmgr [vbox name]                         # Reset ievms task manager
+  ievmsrb restore_clean [vbox name]                               # Restore clean snapshot
   ievmsrb shutdown [vbox name]                                    # Shutdown Win vbox
+  ievmsrb start [vbox name]                                       # Start Win box
+  ievmsrb version                                                 # display version
+
+Options:
+  -v, [--verbose], [--no-verbose]  # Be more verbose
+      [--timeout=N]                # Timeout in seconds
 ```
 
 Read the docs for more info about [ievms-ruby CLI usage](http://mipmip.github.io/ievms-ruby/cli/).
@@ -83,12 +87,8 @@ To run the tests you need to fullfil the testing requirements first:
 
 * "IE9 - Win7" installed by ievms.sh and make sure its running
 
-* [iectrl](https://github.com/xdissent/iectrl), cli interface for simple
-
 ```bash
-$ npm install iectrl
-$ echo 'PATH="$HOME/node_modules/.bin:$PATH"' >> ~/.profile
-$ source ~/.Provider
+curl -s https://raw.githubusercontent.com/xdissent/ievms/master/ievms.sh | env IEVMS_VERSIONS="9" bash
 ```
 
 * Create an new virtual machine called `standbymachine`. Keep the disk size as

data/docs/cli.md

@@ -54,3 +54,9 @@ Turn of the Filewall executing a command as Administator
 $ ievmsrb cmd_adm "IE9 - Win7" 'NetSh Advfirewall set allprofiles state off'
 ```
 
+
+Show all current account information
+To display the user rights that have been assigned to the account you used to log on to a Windows system, use the whoami command line tool with the /priv switch:
+```
+ievmsrb cmd "IE9 - Win7" "Whoami /ALL"
+```

data/lib/ievms/ievms_cli.rb

@@ -2,70 +2,106 @@ class IevmsRb < Thor
   class_option :verbose, :desc => 'Be more verbose', :type => :boolean, :aliases => '-v'
   class_option :timeout, :desc => 'Timeout in seconds', :type => :numeric
 
+  def initialize(*args)
+    super
+
+    #p args
+
+    if args[0].count > 0
+      @machine = Ievms::WindowsGuest.new args[0][0]
+      @machine.verbose = true if options[:verbose]
+      @machine.timeout_secs = options[:timeout] if options[:timeout]
+    end
+  end
+
+  desc "version", "display version"
+  def version
+    print Ievms::VERSION
+  end
+
   desc "cat [vbox name] [file path]", "cat file from path in Win vbox"
   def cat(vbox_name,guest_path)
-    init vbox_name
     print @machine.download_string_from_file_to_guest guest_path, true
   end
 
   desc "ps [vbox name]", "Show running tasks in Win vbox"
   def ps(vbox_name)
-    init vbox_name
     print @machine.run_command "tasklist"
   end
 
   desc "shutdown [vbox name]", "Shutdown Win vbox"
   def shutdown(vbox_name)
-    init vbox_name
-    print @machine.run_command "shutdown.exe /s /f /t 0"
+    @machine.shutdown
   end
 
+  option :gui, :desc => 'start as gui', :type => :boolean
+  desc "start [vbox name]", "Start Win box"
+  def start(vbox_name)
+    @machine.headless = false if options[:gui]
+    @machine.start
+  end
+
+  desc "restore_clean [vbox name]", "Restore clean snapshot"
+  def restore_clean(vbox_name)
+    @machine.restore_clean_snapshot
+  end
   desc "reboot [vbox name]", "Reboot Win box"
   def reboot(vbox_name)
-    init vbox_name
-    print @machine.run_command "shutdown.exe /r /f /t 0"
+    @machine.reboot
   end
 
   desc "copy_to_as_adm [vbox name] [local file] [path in vbox]", "Copy local file to Win vbox as Administrator"
   def copy_to_as_adm(vbox_name,local_path, guest_path)
-    init vbox_name
     @machine.upload_file_to_guest_as_admin(local_path, guest_path, false)
   end
 
   desc "copy_to [vbox name] [local file] [path in vbox]", "Copy local file to Win vbox"
   def copy_to(vbox_name,local_path, guest_path)
-    init vbox_name
     @machine.upload_file_to_guest(local_path, guest_path, false)
   end
 
   desc "copy_from [vbox name] [path in vbox] [local file]", "Copy file from Win vbox to local path"
   def copy_from(vbox_name, guest_path, local_path)
-    init vbox_name
     @machine.download_file_from_guest(guest_path, local_path, false)
   end
 
   desc "cmd [vbox name] [command to execute]", "Run command with cmd.exe in Win vbox"
   def cmd(vbox_name,command)
-    init vbox_name
-
     print @machine.run_command command
     print "\n"
   end
 
   desc "cmd_adm [vbox name] [command to execute]", "Run command as Administrator with cmd.exe in Win vbox"
   def cmd_as_adm(vbox_name,command)
-    init vbox_name
-
     print @machine.run_command_as_admin command
   end
 
-  private
+#  desc "pwrsh [vbox name] [command to execute]", "Run command with PowerShell in Win vbox"
+#  def pwrsh(vbox_name,command)
+#    print @machine.run_powershell_cmd command
+#  end
+
+  desc "pwrsh_as_adm [vbox name] [command to execute]", "Run command as Administrator with PowerShell in Win vbox"
+  def pwrsh_as_adm(vbox_name,command)
+    print @machine.run_powershell_cmd_as_admin command
+  end
+
+  desc "choco_inst [vbox name] [package]", "Install package in win box with Chocolatey"
+  def choco_inst(vbox_name,pkg)
+    @machine.choco_install pkg
+  end
 
-  def init vbox_name
-    @machine = Ievms::WindowsGuest.new vbox_name
-    #@machine.methods.sort
-    @machine.verbose = true if options[:verbose]
-    @machine.timeout_secs = options[:timeout] if options[:timeout]
+  desc "choco_uninst [vbox name] [package]", "Uninstall package in win box with Chocolatey"
+  def choco_uninst(vbox_name,pkg)
+    @machine.choco_uninstall pkg
   end
+
+  desc "reset_ievms_taskmgr [vbox name]", "Reset ievms task manager"
+  def reset_ievms_taskmgr(vbox_name)
+    @machine.end_ievms_task
+  end
+
+  private
+
 end
 

data/lib/ievms/version.rb

@@ -1,3 +1,3 @@
 module Ievms
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/ievms/windows_guest.rb

@@ -16,18 +16,21 @@ IEVMS_HOME = ENV['HOME']+'/.ievms'
 module Ievms
   class WindowsGuest
     attr_accessor :verbose
+    attr_accessor :headless
     attr_accessor :timeout_secs
 
     def initialize(vbox_name)
+      @vbox_name = vbox_name
+
+      check_virtualbox_version
+      is_vm?
 
       @verbose = false
+      @headless = true
       @timeout_secs = 600 #default timeout for a single task 5 minutes
-
-      @vbox_name = vbox_name
-
-      is_vm vbox_name
     end
 
+    # copy file from guest (win) machine to host machine
     def download_file_from_guest(guest_path, local_path, quiet=false)
 
       log_stdout "Copying #{guest_path} to #{local_path}", quiet
@@ -55,17 +58,23 @@ module Ievms
       FileUtils.rm File.join(IEVMS_HOME,File.basename(local_path))
     end
 
+    # return string from remote file
     def download_string_from_file_to_guest( guest_path, quiet=false)
       log_stdout "Copying #{guest_path} to tempfile.txt", quiet
       guestcontrol_exec "cmd.exe", "cmd.exe /c copy \"#{guest_path}\" \"E:\\tmpfile.txt\""
 
-      string = IO.read(File.join(IEVMS_HOME,'tmpfile.txt'))
-      FileUtils.rm File.join(IEVMS_HOME,'tmpfile.txt')
+      tmpfile = File.join(IEVMS_HOME,'tmpfile.txt')
+      if File.exists? tmpfile
+        string = IO.read(tmpfile)
+        FileUtils.rm tmpfile
+      else
+        string = ''
+      end
       string
     end
 
+    # make remote file from string
     def upload_string_as_file_to_guest(string, guest_path, quiet=false)
-
       tmp = Tempfile.new('txtfile')
       tmp.write "#{string}\n"
       path = tmp.path
@@ -86,13 +95,20 @@ module Ievms
       run_command 'del C:\Users\IEUser\.tempadminfile', true
     end
 
-    # execute existibg batch file in Windows guest as Administrator
-    def run_command_as_admin(command,quiet=false)
+    # execute existing batch file in Windows guest as Administrator
+    def run_command_as_admin(command,quiet=false, dont_wait=false)
       log_stdout "Executing command as administrator: #{command}", quiet
 
       run_command 'if exist C:\Users\IEUser\ievms.bat del C:\Users\IEUser\ievms.bat && Exit', true
+      upload_string_as_file_to_guest('C:\Users\IEUser\ievms_cmd.bat > C:\Users\IEUser\ievms.txt', 'C:\Users\IEUser\ievms.bat', true)
 
-      upload_string_as_file_to_guest(command, 'C:\Users\IEUser\ievms.bat', true)
+      run_command 'if exist C:\Users\IEUser\ievms.bat del C:\Users\IEUser\ievms_cmd.bat && Exit', true
+      upload_string_as_file_to_guest(command, 'C:\Users\IEUser\ievms_cmd.bat', true)
+
+      if(dont_wait)
+        guestcontrol_exec "schtasks.exe", "schtasks.exe /run /tn ievms"
+        return
+      end
 
       _ = Timeout::timeout(@timeout_secs) {
 
@@ -108,6 +124,9 @@ module Ievms
         end
       }
 
+      run_command 'if exist C:\Users\IEUser\ievms.bat del C:\Users\IEUser\ievms_cmd.bat && Exit', true
+      print download_string_from_file_to_guest 'c:\Users\IEUser\ievms.txt' unless quiet
+      download_string_from_file_to_guest 'c:\Users\IEUser\ievms.txt', true
     end
 
     # execute existing batch file in Windows guest
@@ -117,14 +136,136 @@ module Ievms
       out
     end
 
+
+    #def run_powershell_cmd(command, quiet=false)
+    #  run_command '@powershell -NoProfile -Command "' + command +'"', quiet
+    #end
+
+    def run_powershell_cmd_as_admin(command, quiet=false)
+      run_command_as_admin  '@powershell -NoProfile -ExecutionPolicy unrestricted -Command "' + command + '"', quiet
+    end
+
+    # shutdown windows machine
+    def shutdown(quiet=false)
+      log_stdout "Trying to shutdown ...", false if @verbose
+      if powered_off?
+        log_stdout "Already powered off.", false
+      else
+        log_stdout "shutting down ...", quiet
+#        run_command_as_admin "shutdown.exe /s /f /t 0", quiet
+        run_command "shutdown.exe /s /f /t 0", quiet
+        wait_for_shutdown
+      end
+    end
+
+    # start windows, finish as soon as boot is complete
+    def start(quiet=false)
+      if powered_off?
+        log_stdout "starting ...", quiet
+
+        if(@headless)
+          type = 'headless'
+        else
+          type = 'gui'
+        end
+        `VBoxManage startvm "#{@vbox_name}" --type #{type}`
+        wait_for_guestcontrol
+      else
+        log_stdout "Already started ...", quiet
+      end
+    end
+
+    # reboot windows machine
+    def reboot(quiet=false)
+      log_stdout "rebooting...", quiet
+      shutdown(true)
+      start(true)
+    end
+
+    def restore_clean_snapshot(quiet=false)
+      log_stdout "Restoring Clean Snapshot ...", quiet
+      shutdown
+      cmd = "VBoxManage snapshot \"#{@vbox_name}\" restore clean"
+      log_stdout cmd, false if @verbose
+      stdout,_,_ = Open3.capture3(cmd)
+      print stdout
+    end
+
+    # show status of administrative ievms task.
     def schtasks_query_ievms
       out, _, _ = guestcontrol_exec "schtasks.exe", "schtasks.exe /query /tn ievms"
       out
     end
 
+    # install choco package(s)
+    def choco_install(pkg, quiet=false)
+      if ! chocolatey?
+        log_stdout "First time.. installing Chocolatey first", quiet
+        install_chocolatey
+      end
+
+      log_stdout "Installing with choco: #{pkg} \n", quiet
+      run_powershell_cmd_as_admin("choco install -y #{pkg}", false)
+    end
+
+    # uninstall package(s)
+    def choco_uninstall(pkg,quiet=false)
+      if chocolatey?
+        log_stdout "Uninstalling with choco: #{pkg} \n", false
+        run_powershell_cmd_as_admin("cuninst -y #{pkg}", false)
+      else
+        log_stdout "Chocolatey is not installed, guess you don't need to uninstall anything.", quiet
+      end
+    end
+
+    # is chocolatey installed
+    def chocolatey?
+      out = run_command_as_admin('@powershell -Command "choco"',false)
+      if out.include?("CommandNotFoundException")
+        return false
+      else
+        return true
+      end
+    end
+
+    # install the Chocolatey Package Manager for Windows
+    def install_chocolatey(quiet=false)
+      log_stdout "Installing Chocolatey", quiet
+      run_command_as_admin('@powershell -NoProfile -ExecutionPolicy unrestricted -Command "(iex ((new-object net.webclient).DownloadString(\'https://chocolatey.org/install.ps1\'))) >$null 2>&1" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin')
+      reboot
+    end
+
+    # end the administrative task
+    def end_ievms_task(quiet=true)
+      run_command('schtasks.exe /End /TN ievms', quiet)
+    end
+
+    # true when machine powered off
+    def powered_off?
+      cmd = "VBoxManage showvminfo \"#{@vbox_name}\" | grep \"State:\""
+      print cmd if @verbose
+      out = `#{cmd}`
+      print out if @verbose
+      if out.include?('powered off') || out.include?('aborted')
+        return true
+      end
+    end
+
+    # return true when run level is 3 boot complete
+    def boot_complete?
+      out = `VBoxManage showvminfo "#{@vbox_name}" | grep 'Additions run level:'`
+      print out if @verbose
+      if out[-2..-2].to_i == 3
+        return true
+      end
+    end
+
+    ###############################################################
+
     private
 
     def log_stdout(msg, quiet=true)
+      quiet = false if @verbose
       print "[#{@vbox_name}] #{msg}\n" unless quiet
     end
 
@@ -133,7 +274,7 @@ module Ievms
     def guestcontrol_exec(image, cmd)
 
       _ = Timeout::timeout(@timeout_secs) {
-        wait_for_guestcontrol(@vbox_name)
+        wait_for_guestcontrol
         cmd = "VBoxManage guestcontrol \"#{@vbox_name}\" run --username \"#{USERNAME}\" --password '#{PASSWD}' --exe \"#{image}\" -- #{cmd}"
 
         log_stdout cmd, false if @verbose
@@ -143,29 +284,38 @@ module Ievms
 
     end
 
-    # function taken from ievms
     # Pause execution until guest control is available for a virtual machine
-    def wait_for_guestcontrol(vboxname)
-      run_level = 0
-      while run_level < 3 do
-        print "Waiting for #{vboxname} to be available for guestcontrol...\n" if @verbose
-        out = `VBoxManage showvminfo "#{vboxname}" | grep 'Additions run level:'`
-        run_level = out[-2..-2].to_i
-        if run_level < 3
-          sleep 3
-        end
+    def wait_for_guestcontrol
+      until boot_complete? do
+        print "Waiting for #{@vbox_name} to be available for guestcontrol...\n" if @verbose
+        sleep 3
       end
     end
 
-    # Is it a virtual machine in VirtualBox?
-    def is_vm(vboxname)
-      cmd = "VBoxManage showvminfo \"#{vboxname}\""
+    # Pause execution until guest machine has shut down
+    def wait_for_shutdown
+      until powered_off? do
+        print "Waiting for #{@vbox_name} to be finished shutdown...\n" if @verbose
+        sleep 3
+      end
+    end
+
+    # raise when version is not compatible
+    def check_virtualbox_version
+      if Gem::Version.new(`VBoxManage -v`.strip.split('r')[0]) < Gem::Version.new('5.0.6')
+        raise "VirtualBox >= 5.0.6 is not installed"
+      end
+    end
 
+    # raise when name is not a virtual machine in VirtualBox
+    def is_vm?
+      cmd = "VBoxManage showvminfo \"#{@vbox_name}\""
       _, stderr, _ = Open3.capture3(cmd)
       if stderr.include? 'Could not find a registered machine named'
-        raise "Virtual Machine #{vboxname} does not exist"
+        raise "Virtual Machine #{@vbox_name} does not exist"
       end
     end
 
+
   end
 end

data/test/test_helper.rb

@@ -1,10 +1,15 @@
 require 'simplecov'
+require 'thor'
+require 'timeout'
 
 SimpleCov.start do
   add_filter '/test/'
   add_filter '/vendor/'
 end
 
+require 'ievms/ievms_cli'
+require 'ievms/windows_guest'
+
 require 'minitest'
 require 'minitest/unit'
 require 'minitest/autorun'
@@ -13,6 +18,12 @@ require 'minitest/pride'
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
+machine = Ievms::WindowsGuest.new 'IE9 - Win7'
+machine.headless=true
+machine.verbose=false
+machine.restore_clean_snapshot
+machine = nil
+
 module IevmsRubyTestsShared
 
   def initialize(name = nil)
@@ -21,20 +32,4 @@ module IevmsRubyTestsShared
     super(name) unless name.nil?
   end
 
-  def ensure_machine_running vbox_name
-
-    iectrl = `iectrl status "#{vbox_name}"`
-    if not iectrl.include?('RUNNING')
-      iectrl = `iectrl start "#{vbox_name}"`
-      sleep 5
-      iectrl = `iectrl status "#{vbox_name}"`
-      if not iectrl.include?('RUNNING')
-        iectrl = `VBoxManage startvm --type headless "#{vbox_name}"`
-        sleep 5
-      end
-
-      IevmsRb.start(['ps', "IE9 - Win7"])
-    end
-
-  end
 end

data/test/test_ievms_cli.rb

@@ -1,101 +1,132 @@
 require 'test_helper'
-require 'thor'
-require 'ievms/ievms_cli'
-require 'ievms/windows_guest'
-require 'timeout'
 
 class TestWin7 < Minitest::Test
   include IevmsRubyTestsShared
 
-
   def setup
-    ensure_machine_running("IE9 - Win7")
+    machine = Ievms::WindowsGuest.new 'IE9 - Win7'
+    machine.headless=true
+    machine.verbose=false
+    machine.start
   end
 
   def test_timeout_option
     assert_raises {
-      run_capture(["cmd", "IE9 - Win7", "ping 127.0.0.1 -n 6 > nul", "--verbose", "--timeout", "3" ])
+      run_thor_capture(["cmd", "IE9 - Win7", "ping 127.0.0.1 -n 6 > nul", "--verbose", "--timeout", "3" ])
     }
   end
 
   def test_ps
-    assert_equal true, run_capture(["ps", "IE9 - Win7"]).include?('winlogon.exe')
+    assert_equal true, run_thor_capture(["ps", "IE9 - Win7"]).include?('winlogon.exe')
   end
 
   def test_help
-    assert_equal true, run_capture([]).include?('[vbox name]')
-    assert_equal true, run_capture(['help']).include?('[file path]')
+    assert_equal true, run_thor_capture([]).include?('[vbox name]')
+    assert_equal true, run_thor_capture(['help']).include?('[file path]')
+  end
+
+  def test_version
+    assert_equal Ievms::VERSION, run_thor_capture(['version'])
   end
 
   def test_copy_from
     FileUtils.rm '/tmp/testdlfile2.txt' if File.exists? '/tmp/testdlfile2.txt'
-    out = run_capture ['copy_from',"IE9 - Win7",'C:\ievms.xml', '/tmp/testdlfile2.txt']
+    out = run_thor_capture ['copy_from',"IE9 - Win7",'C:\ievms.xml', '/tmp/testdlfile2.txt']
 
     assert_equal out, "[IE9 - Win7] Copying C:\\ievms.xml to /tmp/testdlfile2.txt\n"
     assert_equal true, File.exists?('/tmp/testdlfile2.txt')
   end
 
   def test_copy_to
-    IevmsRb.start ['cmd', "IE9 - Win7", 'if exist C:\Users\IEUser\ievms_test_upload3.txt del C:\Users\IEUsers\ievms_test_upload3.txt && Exit']
+    run_thor ['cmd', "IE9 - Win7", 'if exist C:\Users\IEUser\ievms_test_upload3.txt del C:\Users\IEUsers\ievms_test_upload3.txt && Exit']
     FileUtils.rm '/tmp/ievms_test_upload3.txt' if File.exists? '/tmp/ievms_test_upload3.txt'
     `echo "uploadasadmin_yes" > /tmp/ievms_test_upload3.txt`
-    out = run_capture ['copy_to',"IE9 - Win7", '/tmp/ievms_test_upload3.txt', 'C:\Users\IEUser\ievms_test_upload3.txt']
-    out2 = run_capture ['cat',"IE9 - Win7", 'C:\Users\IEUser\ievms_test_upload3.txt']
+    out = run_thor_capture ['copy_to',"IE9 - Win7", '/tmp/ievms_test_upload3.txt', 'C:\Users\IEUser\ievms_test_upload3.txt']
+    out2 = run_thor_capture ['cat',"IE9 - Win7", 'C:\Users\IEUser\ievms_test_upload3.txt']
     assert_equal "[IE9 - Win7] Copying /tmp/ievms_test_upload3.txt to C:\\Users\\IEUser\\ievms_test_upload3.txt\n", out
     assert_match(/uploadasadmin_yes/, out2)
   end
 
   def test_copy_to_as_adm
-    IevmsRb.start ['cmd_as_adm', "IE9 - Win7", 'if exist C:\ievms_test_upload2.txt del C:\ievms_test_upload2.txt && Exit']
+    run_thor ['cmd_as_adm', "IE9 - Win7", 'if exist C:\ievms_test_upload2.txt del C:\ievms_test_upload2.txt && Exit']
     FileUtils.rm '/tmp/ievms_test_upload2.txt' if File.exists? '/tmp/ievms_test_upload2.txt'
     `echo "uploadasadmin_yes" > /tmp/ievms_test_upload2.txt`
 
-    out = run_capture ['copy_to_as_adm',"IE9 - Win7", '/tmp/ievms_test_upload2.txt', 'C:\ievms_test_upload2.txt']
-    out2 = run_capture ['cat',"IE9 - Win7", 'C:\ievms_test_upload2.txt']
+    out = run_thor_capture ['copy_to_as_adm',"IE9 - Win7", '/tmp/ievms_test_upload2.txt', 'C:\ievms_test_upload2.txt']
+    out2 = run_thor_capture ['cat',"IE9 - Win7", 'C:\ievms_test_upload2.txt']
     assert_equal "[IE9 - Win7] Copying /tmp/ievms_test_upload2.txt to C:\\ievms_test_upload2.txt as Administrator\n", out
     assert_match(/uploadasadmin_yes/, out2)
   end
 
   def test_reboot
-    sysinfo =  run_capture(['cmd', "IE9 - Win7", 'systeminfo'])
-    boottime1 = sysinfo.lines.find { |line| line.include?("Boot") }
-    IevmsRb.start(['reboot', "IE9 - Win7"])
-    sleep 5
-    IevmsRb.start(['ps', "IE9 - Win7"])
-
-    sysinfo2 =  run_capture(['cmd', "IE9 - Win7", 'systeminfo'])
-    boottime2 = sysinfo2.lines.find { |line| line.include?("Boot") }
-    refute_equal boottime1, boottime2
+#    sysinfo =  run_thor_capture(['cmd', "IE9 - Win7", 'systeminfo'])
+#    print sysinfo
+#    boottime1 = sysinfo.lines.find { |line| line.include?("Boot") }
+#    print boottime1
+
+    run_thor(['reboot', "IE9 - Win7"])
+
+#    sysinfo2 =  run_thor_capture(['cmd', "IE9 - Win7", 'systeminfo'])
+#    boottime2 = sysinfo2.lines.find { |line| line.include?("Boot") }
+#    p sysinfo2
+#    print boottime2
+    #refute_equal boottime1, boottime2
+    #FIXME update?
   end
 
   def test_shutdown
-    iectrl1 = `iectrl status "IE9 - Win7"`
-    assert_match(/RUNNING/, iectrl1)
-
-    IevmsRb.start(['shutdown', "IE9 - Win7"])
-    sleep 5
-
-    iectrl2 = `iectrl status "IE9 - Win7"`
-    refute_match(/RUNNING/, iectrl2)
+    machine = Ievms::WindowsGuest.new 'IE9 - Win7'
+    assert_equal(true, machine.boot_complete?)
+    run_thor(['shutdown', "IE9 - Win7"])
+    assert_equal(true, machine.powered_off?)
+    assert_match(/Already\ powered\ off/ , run_thor_capture(['shutdown', "IE9 - Win7"]))
   end
 
   def test_cat
-    out =  run_capture(['cat', "IE9 - Win7", 'C:\Windows\System32\Drivers\Etc\hosts'])
+    out =  run_thor_capture(['cat', "IE9 - Win7", 'C:\Windows\System32\Drivers\Etc\hosts'])
     assert_match(/rhino\.acme\.com/, out)
   end
 
   def test_cmd
-    out =  run_capture(['cmd', "IE9 - Win7", 'tasklist'])
+    out =  run_thor_capture(['cmd', "IE9 - Win7", 'tasklist'])
     assert_match(/winlogon\.exe/, out)
   end
 
   def test_cmd_adm
-    out =  run_capture(['cmd', "IE9 - Win7", 'tasklist'])
+    out =  run_thor_capture(['cmd', "IE9 - Win7", 'tasklist'])
     assert_match(/winlogon\.exe/, out)
   end
 
+  #def test_pwrsh_as_adm
+  # p run_thor_capture(['pwrsh_as_adm', "IE9 - Win7", 'curl'])
+  #end
+
+  # takes 5 minutes
+  def test_choco
+    cmd1 = run_thor_capture(['choco_uninst', "IE9 - Win7", 'curl'])
+    assert_match(/Chocolatey\ is\ not\ installed,\ guess\ you/,cmd1)
+    run_thor(['choco_inst', "IE9 - Win7", 'curl'])
+    p run_thor_capture(['cmd_as_adm', "IE9 - Win7", 'curl'])
+    run_thor(['choco_uninst', "IE9 - Win7", 'curl'])
+    p run_thor_capture(['cmd_as_adm', "IE9 - Win7", 'curl'])
+  end
+
+  def test_reset_ievms_taskmgr
+    machine = Ievms::WindowsGuest.new 'IE9 - Win7'
+    machine.run_command_as_admin 'ping 127.0.0.1 -n 30 > nul', true, true
+    run_thor(['reset_ievms_taskmgr', "IE9 - Win7"])
+    assert_match(/Ready/,run_thor_capture(['cmd', "IE9 - Win7", 'schtasks.exe /Query /TN ievms']))
+  end
+
   private
-  def run_capture(args)
+
+  def run_thor(args)
+  #  args << '--verbose'
+    IevmsRb.start(args)
+  end
+
+  def run_thor_capture(args)
+  #  args << '--verbose'
     out, _  = capture_io do
       IevmsRb.start(args)
     end

data/test/test_ievms_win7.rb

@@ -1,14 +1,13 @@
 require 'test_helper'
-require 'ievms/windows_guest'
-require 'timeout'
 
 class TestWin7 < Minitest::Test
 
 include IevmsRubyTestsShared
 
   def setup
-    ensure_machine_running("IE9 - Win7")
     @machine = Ievms::WindowsGuest.new 'IE9 - Win7'
+    @machine.headless=true
+    @machine.start
   end
 
   def test_non_existing_guest
@@ -40,14 +39,14 @@ include IevmsRubyTestsShared
   def test_long_cmd_timeout
     @machine.timeout_secs = 3
     assert_raises {
-      @machine.run_command 'ping 127.0.0.1 -n 6 > nul'
+      @machine.run_command 'ping 127.0.0.1 -n 10 > nul'
     }
   end
 
   def test_long_admin_cmd_timeout
     @machine.timeout_secs = 3
     assert_raises {
-      @machine.run_command_as_admin 'ping 127.0.0.1 -n 6 > nul'
+      @machine.run_command_as_admin 'ping 127.0.0.1 -n 10 > nul'
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ievms-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Pim Snel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md