vagrant-foodtaster-server 0.0.2 → 0.0.3

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
 *.rbc
+*.swp
+*.swo
 .bundle
 .config
 .yardoc

data/README.md

@@ -1,11 +1,8 @@
 # Vagrant Foodtaster Server
 
-Foodtaster is a tool for testing Chef cookbooks using RSpec and
-Vagrant. This plugin allows Foodtaster to interact with Vagrant via
-simple DRb protocol.
-
-Foodtaster is in early development stage, so don't expect too much
-from code and functionality.
+[Foodtaster](http://github.com/mlapshin/foodtaster) is a tool for
+testing Chef cookbooks using RSpec and Vagrant. This Vagrant plugin
+allows Foodtaster to interact with Vagrant via simple DRb protocol.
 
 ## Installation
 

data/lib/vagrant-foodtaster-server.rb

@@ -1,3 +1,4 @@
 require "vagrant"
 require "vagrant-foodtaster-server/plugin"
 require "vagrant-foodtaster-server/version"
+require "vagrant-foodtaster-server/string_ext"

data/lib/vagrant-foodtaster-server/server.rb

@@ -4,7 +4,21 @@ class VagrantFoodtasterServer
       @env = env
       @app = app
 
-      @sahara = Sahara::Session::Command.new(@app, @env)
+      begin
+        require 'sahara/session/virtualbox'
+      rescue LoadError
+        raise RuntimeError, <<-EOT.strip_heredoc
+          Cannot find `sahara' plugin. Please, make sure that `sahara' plugin is installed using command:
+          $ vagrant plugin list
+
+          If `sahara' plugin is not installed, install it:
+          $ vagrant plugin install sahara
+        EOT
+      end
+    end
+
+    def version
+      VagrantFoodtasterServer::VERSION
     end
 
     def redirect_stdstreams(stdout, stderr)
@@ -16,19 +30,35 @@ class VagrantFoodtasterServer
       vm = get_vm(vm_name)
 
       if vm.state.id.to_s != 'running'
-        vm.action(:up, provision_enabled: false)
+        chef_run_list = get_chef_solo_run_list(vm)
+        provision_types = [:shell, :puppet]
+
+        unless chef_run_list.empty?
+          provision_types << :chef_solo
+        end
+
+        vm.action(:up,
+                  provision_types: provision_types,
+                  provision_enabled: true)
       end
 
-      unless @sahara.is_snapshot_mode_on?(vm)
-        @sahara.on(vm)
+      sahara = sahara_for(vm)
+
+      unless sahara.is_snapshot_mode_on?
+        sahara.on
       end
     end
 
     def rollback_vm(vm_name)
       vm = get_vm(vm_name)
-      @env.ui.info "[FT] rollback #{vm_name}"
 
-      @sahara.rollback(vm)
+      sahara_for(vm).rollback
+    end
+
+    def shutdown_vm(vm_name)
+      vm = get_vm(vm_name)
+
+      vm.action(:halt)
     end
 
     def vm_defined?(vm_name)
@@ -37,18 +67,10 @@ class VagrantFoodtasterServer
 
     def run_chef_on_vm(vm_name, current_run_config)
       vm = get_vm(vm_name)
-      chef_solo_config = vm.config.vm.provisioners.find { |p| p.name == :chef_solo }
 
-      unless chef_solo_config
-        raise RuntimeError, <<-EOT
-          VM '#{vm_name}' doesn't have a configured chef-solo provisioner, which is requied by Foodtaster to run specs on this VM.
-          Please, add dummy chef-solo provisioner to your Vagrantfile, like this:
+      validate_vm!(vm)
 
-          config.vm.provision :chef_solo do |chef|
-            chef.cookbooks_path = %w[site-cookbooks]
-          end
-        EOT
-      end
+      chef_solo_config = vm.config.vm.provisioners.find { |p| p.name == :chef_solo }
 
       provisioner_klass = Vagrant.plugin("2").manager.provisioners[:chef_solo]
       provisioner = provisioner_klass.new(vm, chef_solo_config.config)
@@ -56,7 +78,11 @@ class VagrantFoodtasterServer
       current_run_chef_solo_config = apply_current_run_config(vm.config, current_run_config)
       provisioner.configure(current_run_chef_solo_config)
 
-      provisioner.provision
+      begin
+        provisioner.provision
+      rescue Exception
+        raise RuntimeError, "Chef Run failed on #{vm_name} with config #{current_run_config.inspect}"
+      end
     end
 
     def execute_command_on_vm(vm_name, command)
@@ -72,14 +98,47 @@ class VagrantFoodtasterServer
 
     private
 
+    def sahara_for(vm)
+      Sahara::Session::Virtualbox.new(vm)
+    end
+
+    def get_chef_solo_run_list(vm)
+      vm.config.vm.provisioners.map do |c|
+        if c.name == :chef_solo
+          c.config.run_list
+        else
+          nil
+        end
+      end.compact.flatten
+    end
+
     def get_vm(vm_name)
       @env.machine(vm_name, :virtualbox)
     end
 
+    def validate_vm!(vm)
+      chef_solo_config = vm.config.vm.provisioners.find { |p| p.name == :chef_solo }
+
+      unless chef_solo_config
+        raise RuntimeError, <<-EOT.strip_heredoc
+          VM '#{vm.name}' doesn't have a configured chef-solo provisioner, which is requied by Foodtaster to run specs on this VM.
+          Please, add dummy chef-solo provisioner to your Vagrantfile, like this:
+          config.vm.provision :chef_solo do |chef|
+            chef.cookbooks_path = %w[site-cookbooks]
+          end
+        EOT
+      end
+    end
+
     def apply_current_run_config(vm_config, current_run_config)
       modified_config = vm_config.dup
-      modified_config.vm.provisioners[0].config.run_list = current_run_config[:run_list]
-      modified_config.vm.provisioners[0].config.json = current_run_config[:json]
+
+      provisioner_index = modified_config.vm.provisioners.find_index do |prov|
+        prov.name == :chef_solo
+      end
+
+      modified_config.vm.provisioners[provisioner_index].config.run_list = current_run_config[:run_list]
+      modified_config.vm.provisioners[provisioner_index].config.json = current_run_config[:json]
 
       modified_config
     end

data/lib/vagrant-foodtaster-server/server_command.rb

@@ -8,12 +8,19 @@ class VagrantFoodtasterServer
 
       port_number = argv.size == 0 ? 35672 : argv[0].to_i
       DRb.start_service "druby://localhost:#{port_number}", VagrantFoodtasterServer::Server.new(@app, @env)
+      DRb.thread.join
 
-      begin
-        DRb.thread.join
-      rescue Interrupt
-        DRb.stop_service
-      end
+    rescue RuntimeError, Errno::EADDRINUSE => e
+      write_formatted_exception_message(e)
+    rescue Interrupt
+      DRb.stop_service
+    end
+
+    private
+
+    def write_formatted_exception_message(e)
+      error = "#{e.message}\n\nServer Error Backtrace:\n  #{e.backtrace.join("\n  ")}"
+      @env.ui.error(error)
     end
   end
 end

data/lib/vagrant-foodtaster-server/string_ext.rb

@@ -0,0 +1,7 @@
+class String
+  def strip_heredoc
+    indent = scan(/^[ \t]*(?=\S)/).min.try(:size) || 0
+    gsub(/^[ \t]{#{indent}}/, '')
+  end
+end
+

data/lib/vagrant-foodtaster-server/version.rb

@@ -1,3 +1,3 @@
 class VagrantFoodtasterServer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/vagrant-foodtaster-server.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{A Foodtaster DRb server.}
   gem.summary       = %q{Foodtaster is a tool for testing Chef cookbooks using RSpec and Vagrant. This plugin allows Foodtaster to interact with Vagrant via simple DRb protocol. }
   gem.homepage      = ""
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-foodtaster-server
 version: !ruby/object:Gem::Version
-  version: 0.0.2
   prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Mike Lapshin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies: []
 description: A Foodtaster DRb server.
 email:
@@ -27,10 +27,12 @@ files:
 - lib/vagrant-foodtaster-server/plugin.rb
 - lib/vagrant-foodtaster-server/server.rb
 - lib/vagrant-foodtaster-server/server_command.rb
+- lib/vagrant-foodtaster-server/string_ext.rb
 - lib/vagrant-foodtaster-server/version.rb
 - vagrant-foodtaster-server.gemspec
 homepage: ''
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -49,9 +51,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Foodtaster is a tool for testing Chef cookbooks using RSpec and Vagrant.
   This plugin allows Foodtaster to interact with Vagrant via simple DRb protocol.
 test_files: []
+has_rdoc: