livecd 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4424d277c68da97a0db343152719276dee7dda56
-  data.tar.gz: 7382fd602d42158b38d4f6c982ee1a93f7d3006b
+  metadata.gz: 94798cb320642151064f720ee1b0a8bfce011bbc
+  data.tar.gz: 6fb32c65c7d3f7a647e7a2f33d06885c55878007
 SHA512:
-  metadata.gz: d9c7043ba83edc0171a2f8295628b9347c19700bb6160c842fba86a65c213c39c796c013772f7402f887ce62aba678e750536daae44ff0e9740efebe6d287035
-  data.tar.gz: f2bfa796391b8ec7d5fcdd8433d5ce4efb39fa1f3faaca7d04d33c6c9cb0aeffb1259a50a9bfb52e6bc8bf717dd27d0539edbdaefd422b345690e8b9c9fbea84
+  metadata.gz: 7cf73a0b32f8e93bf90617ab8e0f6465e00a40412b466714b0bfb4ffac2d5e8daf8bddfdd1e81652fa9b9e5a19d2e1a1c6bae05df3cdec6350f0a33ffcd98198
+  data.tar.gz: 08578b09c77d95ec54cd9693cf67232dea1f70a22183fa5bb6009b22bd70bac7e969431d194ce1c1d5faf5f19bdabb81c3b445de861bbb6514deaa7fcaf2ddcf

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 script: "bundle exec rake"
 rvm:
+  - "1.9.2"
   - "1.9.3"
+  - "2.0.0"
   - "jruby-19mode"
   - "rbx-19mode"

data/CHANGELOG

@@ -1,3 +1,4 @@
+0.8: fixed bug where sometimes machines aren't removed the first time you run stop
 0.7: added installation instructions + published on rubygems
 0.6: added rake and ci (skeleton)
 0.5: bufix incorrect require path

data/lib/livecd.rb

@@ -1,6 +1,6 @@
 
 module Livecd
-  VERSION = '0.7'
+  VERSION = '0.8'
   VM_PREFIX = 'livecd-'
 
   def list_vms
@@ -22,12 +22,36 @@ module Livecd
     list_vms.include? name
   end
 
+  def get_vm_state( name )
+    vboxinfo = `vboxmanage showvminfo --machinereadable livecd-webforpentester`
+    state = vboxinfo.match(/VMState=\"([^\"]+)\"/)
+    (state.nil?) ? nil : state[1]
+  end
+
   def stop_vm( name )
     # if it exists:
-    puts "stopping vm #{name}"
     if exists_vm?(name)
-      `vboxmanage controlvm #{id(name)} poweroff`
+
+      if get_vm_state(name) != 'PoweredOff'
+        puts "stopping vm #{name}"
+        `vboxmanage controlvm #{id(name)} poweroff`
+      end
+
+      for i in 1..4
+        sleep 0.5
+        state = get_vm_state name
+        if state.nil?
+          puts "Can't get state for vm '#{name}'. It may already be destroyed."
+          break
+        elsif state == 'poweroff'
+          break
+        end
+      end
+
+      puts "removing vm #{name}"
       `vboxmanage unregistervm #{id(name)} --delete`
+    else
+      $stderr.puts "Can't find vm '#{name}' to stop it."
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livecd
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies: []
 description: run livecds easily
 email: dominik.richter@googlemail.com