foodtaster 0.0.4 → 0.0.6

data/lib/foodtaster/client.rb

@@ -27,7 +27,7 @@ module Foodtaster
 
     [:vm_defined?, :prepare_vm, :rollback_vm,
      :run_chef_on_vm, :execute_command_on_vm,
-     :shutdown_vm].each do |method_name|
+     :shutdown_vm, :vm_prepared?].each do |method_name|
        define_method method_name do |*args|
          begin
            @v.send(method_name, *args)

data/lib/foodtaster/rspec/dsl_methods.rb

@@ -2,9 +2,9 @@ module Foodtaster
   module RSpec
     module DslMethods
       def require_vm(vm_name)
-        Foodtaster::RSpecRun.current.require_vm(vm_name)
-
-        let(vm_name) { get_vm(vm_name) }
+        let(vm_name) do
+          get_vm(vm_name).tap { |vm| vm.prepare }
+        end
       end
 
       def run_chef_on(vm_name, options = {}, &block)

data/lib/foodtaster/rspec/example_methods.rb

@@ -2,7 +2,7 @@ module Foodtaster
   module RSpec
     module ExampleMethods
       def get_vm(vm_name)
-        Foodtaster::RSpecRun.current.get_vm(vm_name)
+        Foodtaster::Vm.get(vm_name)
       end
 
       def run_chef_on(vm_name, &block)

data/lib/foodtaster/rspec_run.rb

@@ -1,32 +1,19 @@
-require 'set'
-
 module Foodtaster
   class RSpecRun
+    attr_reader :client
+
     def initialize
-      @required_vm_names = Set.new
       @client = nil
       @server_process = nil
       @stopped = false
     end
 
-    def require_vm(vm_name)
-      @required_vm_names.add(vm_name.to_sym)
-    end
-
-    def required_vm_names
-      @required_vm_names
-    end
-
-    def get_vm(vm_name)
-      Foodtaster::Vm.new(vm_name, @client)
-    end
-
     def start
       setup_signal_handlers
       start_server_and_connect_client
 
       if (@server_process.nil? || @server_process.alive?) && @client
-        prepare_required_vms
+        # prepare_required_vms
       else
         if @server_process
           Foodtaster.logger.fatal "Failed to start Foodtaster DRb Server:\n\n#{@server_process.output}"
@@ -43,7 +30,7 @@ module Foodtaster
 
       @stopped = true
       puts "" # newline after rspec output
-      shutdown_required_vms if Foodtaster.config.shutdown_vms
+      Vm.shutdown_running_vms if Foodtaster.config.shutdown_vms
       terminate_server
     end
 
@@ -75,14 +62,6 @@ module Foodtaster
       end
     end
 
-    def prepare_required_vms
-      self.required_vm_names.each { |vm_name| get_vm(vm_name).prepare }
-    end
-
-    def shutdown_required_vms
-      self.required_vm_names.each { |vm_name| get_vm(vm_name).shutdown }
-    end
-
     def start_server_and_connect_client
       drb_port = Foodtaster.config.drb_port
 

data/lib/foodtaster/version.rb

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

data/lib/foodtaster/vm.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Foodtaster
   class Vm
     class ExecResult
@@ -18,13 +20,37 @@ module Foodtaster
 
     attr_reader :name
 
-    def initialize(name, client)
+    @@vms = Set.new
+
+    class << self
+      def register_vm(vm)
+        @@vms << vm
+      end
+
+      def shutdown_running_vms
+        @@vms.each do |vm|
+          vm.shutdown if vm.prepared?
+        end
+      end
+
+      def find_by_name(vm_name)
+        @@vms.find { |vm| vm.name == vm_name }
+      end
+
+      def get(vm_name)
+        find_by_name(vm_name) || self.new(vm_name)
+      end
+    end
+
+    def initialize(name)
       @name = name
-      @client = client
+      @client = Foodtaster::RSpecRun.current.client
 
       unless @client.vm_defined?(name)
         raise ArgumentError, "No machine defined with name #{name}"
       end
+
+      self.class.register_vm(self)
     end
 
     def prepare
@@ -32,6 +58,10 @@ module Foodtaster
       @client.prepare_vm(name)
     end
 
+    def prepared?
+      @client.vm_prepared?(name)
+    end
+
     def shutdown
       Foodtaster.logger.debug "#{name}: Shutting down VM"
       @client.shutdown_vm(name)

metadata

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