foodtaster 0.0.1 → 0.0.3

data/.gitignore

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

data/README.md

@@ -1,4 +1,4 @@
-# Foodtaster
+# Foodtæster
 
 Foodtaster is a library for testing your Chef code with RSpec. Specs
 are actually executed on VirtualBox machine(s) managed by
@@ -36,13 +36,13 @@ describe "nginx::default" do
     vm0.should open_page("http://localhost/")
 
     vm0.should have_file("/etc/init.d/nginx")
-    vm0.should have_file("/etc/nginx/nginx.conf").with_content(/gzip on/)
+    vm0.should have_file("/etc/nginx/nginx.conf").with_content(/gzip on/).with_mode(0644)
   end
 
   it "should have valid nginx config" do
     result = vm0.execute("nginx -t")
 
-    result.should be_successfull
+    result.should be_successful
     result.stdout.should include("/etc/nginx/nginx.conf syntax is ok")
   end
 end
@@ -52,7 +52,9 @@ end
 
 First, install Vagrant for your system following [official
 instructions](http://docs.vagrantup.com/v2/installation/index.html).
-Then, install two plugins: `sahara` and `vagrant-foodtaster-server`:
+Then, install two Vagrant plugins:
+[sahara](http://github.com/jedi4ever/sahara) and
+[vagrant-foodtaster-server](http://github.com/mlapshin/vagrant-foodtaster-server):
 
     vagrant plugin install sahara
     vagrant plugin install vagrant-foodtaster-server
@@ -61,6 +63,10 @@ That's all, you are ready to go.
 
 ## Usage
 
+Check out [foodtaster-example
+repository](http://github.com/mlapshin/foodtaster-example) or
+follow this instructions.
+
 In your Chef repository, create a basic Gemfile:
 
     source 'https://rubygems.org/'
@@ -101,4 +107,4 @@ You are ready to write cookbook specs. Run them as usual with command:
 ## License
 
 Foodtaster is distributed under [MIT
-License](http://raw.github.com/mlapshin/foodtaster/master/LICENSE).
+License](http://raw.github.com/mlapshin/foodtaster/master/LICENSE).

data/foodtaster.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{RSpec for Chef cookbooks run on Vagrant}
   gem.summary       = %q{Foodtaster is a library for testing your Chef code with RSpec.}
   gem.homepage      = "http://github.com/mlapshin/foodtaster"
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/foodtaster/client.rb

@@ -2,29 +2,69 @@ require 'drb'
 
 module Foodtaster
   class Client
-    def initialize(drb_port)
-      # start local service to be able to redirect stdout & stderr
-      # to client
-      DRb.start_service("druby://localhost:0")
-      @v = DRbObject.new_with_uri("druby://localhost:#{drb_port}")
+    MAX_ATTEMPTS = 20
 
-      init
-    end
+    def self.connect(drb_port, server_process = nil)
+      attempt_index = 1
+      begin
+        sleep 0.2
+        client = Foodtaster::Client.new(drb_port)
+      rescue DRb::DRbConnError => e
+        Foodtaster.logger.debug "DRb connection failed (attempt #{attempt_index}/#{MAX_ATTEMPTS}): #{e.message}"
+        attempt_index += 1
+        retry if attempt_index <= MAX_ATTEMPTS && (server_process.nil? || server_process.alive?)
+      end
 
-    [:vm_defined?, :prepare_vm, :rollback_vm,
-     :run_chef_on_vm, :execute_command_on_vm].each do |method_name|
-      define_method method_name do |*args|
-        @v.send(method_name, *args)
+      if client
+        Foodtaster.logger.debug "DRb connection established"
+      else
+        Foodtaster.logger.debug "Can't connect to Foodtaster DRb Server"
       end
+
+      client
     end
 
-    private
+    [:vm_defined?, :prepare_vm, :rollback_vm,
+     :run_chef_on_vm, :execute_command_on_vm,
+     :shutdown_vm].each do |method_name|
+       define_method method_name do |*args|
+         begin
+           @v.send(method_name, *args)
+         rescue DRb::DRbUnknownError => e
+           message = "Folowing exception was raised on server:\n#{e.unknown.buf}"
+           Foodtaster.logger.fatal(message)
+           raise e
+         end
+       end
+     end
 
-    def init
-      $stdout.extend DRbUndumped
-      $stderr.extend DRbUndumped
+     private
 
-      @v.redirect_stdstreams($stdout, $stderr)
-    end
+     def initialize(drb_port)
+       # start local service to be able to redirect stdout & stderr
+       # to client
+       DRb.start_service("druby://localhost:0")
+       @v = DRbObject.new_with_uri("druby://localhost:#{drb_port}")
+
+       init
+     end
+
+     private
+
+     def init
+       $stdout.extend DRbUndumped
+       $stderr.extend DRbUndumped
+
+       @v.redirect_stdstreams($stdout, $stderr)
+       check_version
+     end
+
+     def check_version
+       server_version = @v.version
+
+       if server_version != Foodtaster::VERSION
+         Foodtaster.logger.warn "Warning: Foodtaster DRb Server version doesn't match Foodtaster Gem version.\n\nDRb Server version: #{server_version}\nFoodtaster Gem version: #{Foodtaster::VERSION}\n"
+       end
+     end
   end
 end

data/lib/foodtaster/config.rb

@@ -1,6 +1,7 @@
 module Foodtaster
   class Config
-    %w(log_level drb_port vagrant_binary).each do |attr|
+    %w(log_level drb_port vagrant_binary shutdown_vms
+       skip_rollback start_server).each do |attr|
       attr_accessor attr.to_sym
     end
 
@@ -8,6 +9,9 @@ module Foodtaster
       @log_level = :info
       @drb_port = 35672
       @vagrant_binary = 'vagrant'
+      @shutdown_vms = false
+      @skip_rollback = false
+      @start_server = true
     end
 
     def self.default

data/lib/foodtaster/rspec/dsl_methods.rb

@@ -1,18 +1,22 @@
 module Foodtaster
   module RSpec
     module DslMethods
-      def run_chef_on(vm_name, &block)
+      def require_vm(vm_name)
         Foodtaster::RSpecRun.current.require_vm(vm_name)
 
-        skip_rollback = true
+        let(vm_name) { get_vm(vm_name) }
+      end
+
+      def run_chef_on(vm_name, options = {}, &block)
+        require_vm(vm_name)
+        skip_rollback = Foodtaster.config.skip_rollback || options[:skip_rollback]
 
         before(:all) do
           vm = get_vm(vm_name)
           vm.rollback unless skip_rollback
+
           run_chef_on(vm_name, &block)
         end
-
-        let(vm_name) { get_vm(vm_name) }
       end
     end
   end

data/lib/foodtaster/rspec/example_methods.rb

@@ -7,10 +7,20 @@ module Foodtaster
 
       def run_chef_on(vm_name, &block)
         chef_config = ChefConfig.new.tap{ |conf| block.call(conf) }.to_hash
+        @previous_chef_config = chef_config
+
         vm = get_vm(vm_name)
         vm.run_chef(chef_config)
       end
 
+      def rerun_chef_on(vm_name)
+        raise RuntimeError, "No previous Chef run was made" unless @previous_chef_config
+        vm = get_vm(vm_name)
+        vm.run_chef(@previous_chef_config)
+      end
+
+      alias :repeat_chef_run :rerun_chef_on
+
       private
 
       class ChefConfig

data/lib/foodtaster/rspec/matchers/file_matcher.rb

@@ -28,6 +28,12 @@ module Foodtaster
             @results[:owner] = (@actual_owner.to_s == @owner.to_s)
           end
 
+          if @mode
+            @actual_mode = vm.execute("sudo stat #{@path} -c \"%a\"").stdout.chomp
+
+            @results[:mode] = (@actual_mode == @mode.to_s(8))
+          end
+
           @results.values.all?
         end
 
@@ -43,10 +49,17 @@ module Foodtaster
           self
         end
 
+        def with_mode(mode)
+          @mode = mode
+
+          self
+        end
+
         def failure_message_for_should
           ["expected that #{@vm.name} should have file '#{@path}'",
             @content && !@results[:content] && "with content #{@content.inspect}, but actual content is:\n#{@actual_content.inspect}\n",
-            @owner && !@results[:owner] && "with owner #{@owner}, but actual owner is #{@actual_owner}"].delete_if { |a| !a }.join(" ")
+            @owner && !@results[:owner] && "with owner #{@owner}, but actual owner is #{@actual_owner}",
+            @mode && !@results[:mode] && "with mode #{@mode.to_s(8)}(octal), but actual mode is #{@actual_mode}(octal)"].delete_if { |a| !a }.join(" ")
         end
 
         def failure_message_for_should_not
@@ -56,7 +69,8 @@ module Foodtaster
         def description
           ["have file '#{@path}'",
             @content && "with content #{@content.inspect}",
-            @owner && "with owner #{@owner}"].delete_if { |a| !a }.join(" ")
+            @owner && "with owner #{@owner}",
+            @mode && "with mode #{@mode}"].delete_if { |a| !a }.join(" ")
         end
       end
 

data/lib/foodtaster/rspec_run.rb

@@ -5,7 +5,8 @@ module Foodtaster
     def initialize
       @required_vm_names = Set.new
       @client = nil
-      @server_pid = nil
+      @server_process = nil
+      @stopped = false
     end
 
     def require_vm(vm_name)
@@ -21,15 +22,28 @@ module Foodtaster
     end
 
     def start
-      at_exit { self.stop }
-
-      Foodtaster.logger.debug "Starting Foodtaster specs run"
+      setup_signal_handlers
       start_server_and_connect_client
-      prepare_required_vms
+
+      if (@server_process.nil? || @server_process.alive?) && @client
+        prepare_required_vms
+      else
+        if @server_process
+          Foodtaster.logger.fatal "Failed to start Foodtaster DRb Server:\n\n#{@server_process.output}"
+        else
+          Foodtaster.logger.fatal "Failed to connect to Foodtaster DRb Server"
+        end
+
+        exit 1
+      end
     end
 
     def stop
+      return if @stopped
+
+      @stopped = true
       puts "" # newline after rspec output
+      shutdown_required_vms if Foodtaster.config.shutdown_vms
       terminate_server
     end
 
@@ -47,51 +61,45 @@ module Foodtaster
 
     private
 
+    def setup_signal_handlers
+      terminator = proc {
+        self.stop
+        exit 1
+      }
+
+      trap("INT", &terminator)
+      trap("TERM", &terminator)
+
+      at_exit do
+        self.stop
+      end
+    end
+
     def prepare_required_vms
       self.required_vm_names.each { |vm_name| get_vm(vm_name).prepare }
     end
 
-    def start_server_and_connect_client(drb_port = Foodtaster.config.drb_port)
-      vagrant_binary = Foodtaster.config.vagrant_binary
-      vagrant_server_cmd = "#{vagrant_binary} foodtaster-server #{drb_port.to_s} &> /tmp/vagrant-foodtaster-server-output.txt"
+    def shutdown_required_vms
+      self.required_vm_names.each { |vm_name| get_vm(vm_name).shutdown }
+    end
 
-      @server_pid = Process.spawn(vagrant_server_cmd, pgroup: true)
-      Foodtaster.logger.debug "Started foodtaster-server on port #{drb_port} with PID #{@server_pid}"
+    def start_server_and_connect_client
+      drb_port = Foodtaster.config.drb_port
 
+      start_server(drb_port) if Foodtaster.config.start_server
       connect_client(drb_port)
     end
 
-    def connect_client(drb_port)
-      retry_count = 0
-      begin
-        sleep 0.2
-        @client = Foodtaster::Client.new(drb_port)
-      rescue DRb::DRbConnError => e
-        Foodtaster.logger.debug "DRb connection failed: #{e.message}"
-        retry_count += 1
-        retry if retry_count < 10
-      end
-
-      if @client.nil?
-        server_output = File.read("/tmp/vagrant-foodtaster-server-output.txt")
-
-        Foodtaster.logger.fatal "Cannot start or connect to Foodtaster DRb server."
-        Foodtaster.logger.fatal "Server output:\n#{server_output}\n"
-
-        exit 1
-      else
-        Foodtaster.logger.debug "DRb connection established"
-      end
+    def start_server(drb_port)
+      @server_process = Foodtaster::ServerProcess.new(drb_port)
     end
 
     def terminate_server
-      pgid = Process.getpgid(@server_pid) rescue 0
+      @server_process && @server_process.terminate
+    end
 
-      if pgid > 0
-        Process.kill("INT", -pgid)
-        Process.wait(-pgid)
-        Foodtaster.logger.debug "Terminated foodtaster-server process"
-      end
+    def connect_client(drb_port)
+      @client = Foodtaster::Client.connect(drb_port, @server_process)
     end
   end
 end

data/lib/foodtaster/server_process.rb

@@ -0,0 +1,39 @@
+require 'open3'
+
+module Foodtaster
+  class ServerProcess
+    def initialize(drb_port)
+      Foodtaster.logger.debug "Starting Foodtaster specs run"
+
+      vagrant_binary = Foodtaster.config.vagrant_binary
+
+      _, @pipe_out, thread = Open3.popen2("#{vagrant_binary} foodtaster-server #{drb_port}",
+                                          pgroup: true, err: [:child, :out])
+
+      @pid = thread.pid
+      @pgid = Process.getpgid(@pid)
+
+      Foodtaster.logger.debug "Started foodtaster-server on port #{drb_port} with PID #{@pid}"
+    end
+
+    def output
+      @pipe_out.read
+    end
+
+    def alive?
+      Process.kill(0, @pid) == 1 rescue false
+    end
+
+    def terminate
+      if alive?
+        @pipe_out.close
+
+        if @pgid > 0
+          Process.kill("TERM", -@pgid)
+          Process.waitpid(-@pgid) rescue nil
+          Foodtaster.logger.debug "Terminated Foodtaster DRb Server process"
+        end
+      end
+    end
+  end
+end

data/lib/foodtaster/version.rb

@@ -1,3 +1,3 @@
 module Foodtaster
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/foodtaster/vm.rb

@@ -6,8 +6,8 @@ module Foodtaster
       attr_reader :exit_status
 
       def initialize(hash)
-        @stderr = hash[:stderr]
-        @stdout = hash[:stdout]
+        @stderr = hash[:stderr].to_s
+        @stdout = hash[:stdout].to_s
         @exit_status = hash[:exit_status]
       end
 
@@ -32,8 +32,13 @@ module Foodtaster
       @client.prepare_vm(name)
     end
 
+    def shutdown
+      Foodtaster.logger.debug "#{name}: Shutting down VM"
+      @client.shutdown_vm(name)
+    end
+
     def rollback
-      Foodtaster.logger.info "#{name}: Rollbacking VM"
+      Foodtaster.logger.info "#{name}: Rolling back VM"
       @client.rollback_vm(name)
     end
 
@@ -42,12 +47,17 @@ module Foodtaster
       exec_result_hash = @client.execute_command_on_vm(name, command)
 
       Foodtaster.logger.debug "#{name}: Finished with #{exec_result_hash[:exit_status]}"
-      Foodtaster.logger.debug "#{name}: STDOUT: #{exec_result_hash[:stdout].chomp}"
-      Foodtaster.logger.debug "#{name}: STDERR: #{exec_result_hash[:stderr].chomp}"
+      Foodtaster.logger.debug "#{name}: STDOUT: #{exec_result_hash[:stdout].to_s.chomp}"
+      Foodtaster.logger.debug "#{name}: STDERR: #{exec_result_hash[:stderr].to_s.chomp}"
 
       ExecResult.new(exec_result_hash)
     end
 
+    def execute_as(user, command)
+      cmd = %Q[sudo su -l #{user} -c "#{command}"]
+      self.execute cmd
+    end
+
     def run_chef(config)
       Foodtaster.logger.info "#{name}: Running Chef with Run List #{config[:run_list].join(', ')}"
       Foodtaster.logger.debug "#{name}: with JSON: #{config[:json].inspect}"

data/lib/foodtaster.rb

@@ -4,9 +4,10 @@ require 'foodtaster/rspec'
 require 'logger'
 
 module Foodtaster
-  autoload :Client, 'foodtaster/client'
-  autoload :Vm,     'foodtaster/vm'
-  autoload :RSpecRun, 'foodtaster/rspec_run'
+  autoload :Client,        'foodtaster/client'
+  autoload :ServerProcess, 'foodtaster/server_process'
+  autoload :Vm,            'foodtaster/vm'
+  autoload :RSpecRun,      'foodtaster/rspec_run'
 
   class << self
     def logger

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: foodtaster
 version: !ruby/object:Gem::Version
-  version: 0.0.1
   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:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -51,10 +51,12 @@ files:
 - lib/foodtaster/rspec/matchers/simple_matchers.rb
 - lib/foodtaster/rspec/matchers/user_matcher.rb
 - lib/foodtaster/rspec_run.rb
+- lib/foodtaster/server_process.rb
 - lib/foodtaster/version.rb
 - lib/foodtaster/vm.rb
 homepage: http://github.com/mlapshin/foodtaster
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -73,8 +75,9 @@ 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 library for testing your Chef code with RSpec.
 test_files: []
+has_rdoc: