HeSYINUvSBZfxqA-veewee 0.203.1 → 0.203.2

data/lib/veewee/session.rb

@@ -264,8 +264,6 @@ module Veewee
 
         checksums=calculate_checksums(@definition,boxname)
 
-        transaction(boxname,"0-initial-#{checksums[0]}",checksums) do
-
             #Create the Virtualmachine and set all the memory and other stuff
             create_vm(boxname)
 
@@ -331,7 +329,6 @@ module Veewee
               versionfile.close
               versionfile.delete
             end
-        end #initial Transaction
 
 
                counter=1
@@ -340,8 +337,6 @@ module Veewee
 
                  filename=File.join(@definition_dir,boxname,postinstall_file)
 
-                 transaction(boxname,"#{counter}-#{postinstall_file}-#{checksums[counter]}",checksums) do
-
                    Veewee::Ssh.when_ssh_login_works("localhost",ssh_options) do
                     begin
                       Veewee::Ssh.transfer_file("localhost",filename,File.basename(filename),ssh_options)
@@ -357,7 +352,6 @@ module Veewee
                     Veewee::Ssh.execute("localhost","#{newcommand}",ssh_options)
                     end
 
-                 end
                  counter+=1
 
                end
@@ -782,125 +776,6 @@ module Veewee
 
       end
 
-      def self.transaction(boxname,step_name,checksums,&block)
-
-        current_step_nr=step_name.split("-")[0].to_i
-
-        vm=VirtualBox::VM.find(boxname)
-        snapnames=Array.new
-
-        #If vm exists , look for snapshots
-        if !vm.nil?
-          start_snapshot=vm.root_snapshot
-          snapshot=start_snapshot
-          counter=0
-
-          while (snapshot!=nil)
-        	  #puts "#{counter}:#{snapshot.name}"
-         	  snapnames[counter]=snapshot.name
-            counter=counter+1
-            snapshot=snapshot.children[0]
-          end
-        end
-
-        #find the last snapshot matching the state
-        counter=[snapnames.length, checksums.length].min-1
-        last_good_state=counter
-        for c in 0..counter do
-            #puts "#{c}- #{snapnames[c]} - #{checksums[c]}"
-            if !snapnames[c].match("#{c}.*-#{checksums[c]}")
-      #        puts "we found a bad state"
-              last_good_state=c-1
-              break
-            end
-        end
-        #puts "Last good state: #{last_good_state}"
-
-        if (current_step_nr < last_good_state)
-            #puts "fast forwarding #{step_name}"
-            return
-        end
-
-        #puts "Current step: #{current_step_nr}"
-        if (current_step_nr == last_good_state)
-            if vm.running?
-              vm.stop
-            end
-
-            #invalidate later snapshots
-            #puts "remove old snapshots"
-
-            for s in (last_good_state+1)..(snapnames.length-1)
-              puts "Removing step [#{s}] snapshot as it is no more valid"
-              snapshot=vm.find_snapshot(snapnames[s])
-              snapshot.destroy
-              #puts snapshot
-            end
-
-            vm.reload
-            puts "Loading step #{current_step_nr} snapshots as it has not changed"
-            sleep 2
-            goodsnap=vm.find_snapshot(snapnames[last_good_state])
-            goodsnap.restore
-            sleep 2
-            #TODO:Restore snapshot!!!
-            vm.start
-            sleep 4
-            puts "Starting machine"
-        end
-
-        #puts "last good state #{last_good_state}"
-
-
-        if (current_step_nr > last_good_state)
-
-          if (last_good_state==-1)
-            #no initial snapshot is found, clean machine!
-            vm=VirtualBox::VM.find(boxname)
-
-            if !vm.nil?
-              if vm.running?
-                puts "Stopping machine"
-                vm.stop
-                while vm.running?
-                  sleep 1
-                end
-              end
-
-              #detaching cdroms (used to work in 3.x)
-#              vm.medium_attachments.each do |m|
-#                if m.type==:dvd
-#                  #puts "Detaching dvd"
-#                  m.detach
-#                end
-#              end
-
-              vm.reload
-              puts "We found no good state so we are destroying the previous machine+disks"
-              destroy_vm(boxname)
-            end
-
-          end
-
-          #puts "(re-)executing step #{step_name}"
-
-
-          yield
-
-          #Need to look it up again because if it was an initial load
-          vm=VirtualBox::VM.find(boxname)
-          puts "Step [#{current_step_nr}] was successfully - saving state"
-          vm.save_state
-          sleep 2 #waiting for it to be ok
-          #puts "about to snapshot #{vm}"
-          #take snapshot after successful execution
-          vm.take_snapshot(step_name,"snapshot taken by veewee")
-          sleep 2 #waiting for it to be started again
-          vm.start
-        end
-
-        #pp snapnames
-      end
 
 
   end #End Class

data/lib/veewee/version.rb

@@ -1,3 +1,3 @@
 module Veewee
-  VERSION = "0.203.1"
+  VERSION = File.read(File.dirname(__FILE__) + '/../../VERSION')
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: HeSYINUvSBZfxqA-veewee
 version: !ruby/object:Gem::Version 
-  hash: 817
-  prerelease: 
+  hash: 823
+  prerelease: false
   segments: 
   - 0
   - 203
-  - 1
-  version: 0.203.1
+  - 2
+  version: 0.203.2
 platform: ruby
 authors: 
 - Patrick Debois
@@ -16,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 Z
+date: 2012-05-16 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vagrant
@@ -212,7 +213,6 @@ files:
 - lib/veewee/session.rb
 - lib/veewee/shell.rb
 - lib/veewee/ssh.rb
-- lib/veewee/transaction.rb
 - lib/veewee/utils.rb
 - lib/veewee/version.rb
 - lib/veewee/web.rb
@@ -543,6 +543,7 @@ files:
 - validation/vagrant-private.key
 - validation/vagrant.feature
 - validation/vagrant.pub
+has_rdoc: true
 homepage: http://github.com/jedi4ever/veewee/
 licenses: []
 
@@ -574,7 +575,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: veewee
-rubygems_version: 1.8.17
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Vagrant box creation

data/lib/veewee/transaction.rb

@@ -1,113 +0,0 @@
-module Veewee
-  class Transaction
-
-  def transaction(name,params, &block)
-    yield
-  end
-  
-  def transaction2(name,options= { :checksum => "nochecksum"}, &block)
-    yield
-  end
-
-  def self.remove_snapshot_vmachine(vmname,snapname)
-    @vboxcmd=Veewee::Session.determine_vboxcmd
-    
-    Veewee::Shell.execute("#{@vboxcmd} snapshot '#{vmname}' delete '#{snapname}'")
-  end
-
-  def self.create_snapshot_vmachine(vmname,snapname)
-    @vboxcmd=Veewee::Session.determine_vboxcmd
-    
-    Veewee::Shell.execute("#{@vboxcmd} snapshot '#{vmname}' take '#{snapname}'")
-  end
-
-  def self.load_snapshot_vmachine(vmname,snapname)
-    @vboxcmd=Veewee::Session.determine_vboxcmd
-    
-    #if it running , shutdown first
-    if (state_vmachine(vmname)=="running")
-      stop_vmachine(vmname)
-    end
-
-    Veewee::Shell.execute("#{@vboxcmd} snapshot '#{vmname}' restore '#{snapname}'")
-    #sometimes it takes some time to shutdown
-    sleep 2
-    Veewee::Shell.execute("#{@vboxcmd} startvm '#{vmname}'")
-  end
-
-  def self.snapshot_exists(vmname,snapname)
-    list_snapshots(vmname).each { |name|
-      if (name==snapname) then
-        return true
-      end
-    }
-    return false
-  end
-
-  def self.snapshot_version_exists(vmname,snapname)
-        list_snapshots(vmname).each { |name|
-          if name.match(/^#{snapname}-/) then
-            return true
-          end
-        }
-        return false
-  end
-
-  def self.rollback_snapshot(vmname,snapname)
-    delete_flag=false
-    @vboxcmd=Veewee::Session.determine_vboxcmd
-
-    savestate_recover=false
-    if (state_vmachine(vmname)=="running")
-      Veewee::Shell.execute("#{@vboxcmd} controlvm '#{vmname}' savestate")
-      savestate_recover=true
-     end
-
-    list_snapshots(vmname).each { |name|
-      if name.match(/^#{snapname}-/) then
-        delete_flag=true
-      end
-      if (delete_flag) then
-        remove_snapshot_vmachine(vmname,name)
-        sleep 1
-      end
-    }
-    
-    
-     sleep 2
-
-      Veewee::Shell.execute("#{@vboxcmd} startvm '#{vmname}'")
-
-      if (savestate_recover)
-        #Recovering from savestate nukes the network! This trick seem to work
-        #Also within the vm /etc/init.d/networking restart , but that is OS specific
-        #http://www.virtualbox.org/ticket/5666
-        #http://www.virtualbox.org/ticket/5654
-        #This is supposed to be fixed: http://www.virtualbox.org/changeset/25205 but alas
-        Veewee::Shell.execute("#{@vboxcmd} controlvm '#{vmname}' nic1 nat")
-        Veewee::Shell.execute("#{@vboxcmd} controlvm '#{vmname}' setlinkstate1 off")
-        Veewee::Shell.execute("#{@vboxcmd} controlvm '#{vmname}' setlinkstate1 on")
-        sleep 2
-
-        #hmmm, virtualbox => when recovering from a restore , it looses the nat settings!!! So we need to do this again!!
-        #thebox.ssh_enable_vmachine({:hostport => host_port , :guestport => 22} )
-        #http://www.virtualbox.org/changeset/25402
-        #[25402]: NAT: re-establish port-forwarding after savestate / restore state
-
-      end
-
-    end
-
-
-    def self.list_snapshots(vmname)
-      @vboxcmd=Veewee::Session.determine_vboxcmd
-      
-      snapshotresult=Veewee::Shell.execute("#{@vboxcmd} showvminfo --machinereadable '#{vmname}' |grep ^SnapshotName| cut -d '=' -f 2").stdout
-      snapshotlist=snapshotresult.gsub(/\"/,'').split(/\n/)
-      return snapshotlist
-    end
-
-end
-end
-
-