foodtaster 0.0.6 → 0.0.7

data/lib/foodtaster/client.rb

@@ -26,8 +26,9 @@ module Foodtaster
     end
 
     [:vm_defined?, :prepare_vm, :rollback_vm,
-     :run_chef_on_vm, :execute_command_on_vm,
-     :shutdown_vm, :vm_prepared?].each do |method_name|
+      :run_chef_on_vm, :execute_command_on_vm,
+      :shutdown_vm, :vm_running?, :initial_snapshot_made_on_vm?,
+      :start_vm, :make_initial_snapshot_on_vm].each do |method_name|
        define_method method_name do |*args|
          begin
            @v.send(method_name, *args)

data/lib/foodtaster/rspec/dsl_methods.rb

@@ -3,8 +3,10 @@ module Foodtaster
     module DslMethods
       def require_vm(vm_name)
         let(vm_name) do
-          get_vm(vm_name).tap { |vm| vm.prepare }
+          get_vm(vm_name)
         end
+
+        before(:all) { get_vm(vm_name) }
       end
 
       def run_chef_on(vm_name, options = {}, &block)

data/lib/foodtaster/rspec/example_methods.rb

@@ -2,7 +2,9 @@ module Foodtaster
   module RSpec
     module ExampleMethods
       def get_vm(vm_name)
-        Foodtaster::Vm.get(vm_name)
+        Foodtaster::Vm.get(vm_name).tap do |vm|
+          vm.prepare unless vm.prepared?
+        end
       end
 
       def run_chef_on(vm_name, &block)

data/lib/foodtaster/version.rb

@@ -1,3 +1,3 @@
 module Foodtaster
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/foodtaster/vm.rb

@@ -53,13 +53,38 @@ module Foodtaster
       self.class.register_vm(self)
     end
 
+    def running?
+      @client.vm_running?(self.name)
+    end
+
+    def initial_snapshot_made?
+      @client.initial_snapshot_made_on_vm?(self.name)
+    end
+
+    def start!
+      Foodtaster.logger.info "#{name}: Power on machine"
+      @client.start_vm(self.name)
+    end
+
+    def make_initial_snapshot!
+      Foodtaster.logger.info "#{name}: Creating initial snapshot"
+      @client.make_initial_snapshot_on_vm(self.name)
+    end
+
     def prepare
       Foodtaster.logger.info "#{name}: Preparing VM"
-      @client.prepare_vm(name)
+
+      unless running?
+        self.start!
+      end
+
+      unless initial_snapshot_made?
+        self.make_initial_snapshot!
+      end
     end
 
     def prepared?
-      @client.vm_prepared?(name)
+      self.running? && self.initial_snapshot_made?
     end
 
     def shutdown

metadata

@@ -2,7 +2,7 @@
 name: foodtaster
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Mike Lapshin