foodtaster 0.0.7 → 0.0.8

data/README.md

@@ -1,5 +1,7 @@
 # Foodtæster
 
+[![Gem Version](https://badge.fury.io/rb/foodtaster.png)](http://badge.fury.io/rb/foodtaster)
+
 Foodtaster is a library for testing your Chef code with RSpec. Specs
 are actually executed on VirtualBox machine(s) managed by
 [Vagrant](http://www.vagrantup.com/).
@@ -96,8 +98,22 @@ You are ready to write cookbook specs. Run them as usual with command:
 
     bundle exec rspec spec
 
+## Roadmap
+
+- foodtaster-example-single-cookbook repo
+- tests/specs
+- documentation
+- comments in code
+- inline sahara plugin into vagrant-foodtaster-server
+- Capistrno support or just an example
+- Puppet support
+- LXC support
+
 ## Contributing
 
+If you found a bug or you wish to implement something from Roadmap,
+use this workflow:
+
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)

data/foodtaster.gemspec

@@ -6,7 +6,7 @@ require 'foodtaster/version'
 Gem::Specification.new do |gem|
   gem.name          = "foodtaster"
   gem.version       = Foodtaster::VERSION
-  gem.authors       = ["Mike Lapshin"]
+  gem.authors       = ["Mike Lapshin", "Serzh Nechyporchuk"]
   gem.email         = ["mikhail.a.lapshin@gmail.com"]
   gem.description   = %q{RSpec for Chef cookbooks run on Vagrant}
   gem.summary       = %q{Foodtaster is a library for testing your Chef code with RSpec.}

data/lib/foodtaster/client.rb

@@ -25,10 +25,11 @@ module Foodtaster
       client
     end
 
-    [:vm_defined?, :prepare_vm, :rollback_vm,
+    [:vm_defined?, :rollback_vm,
       :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|
+      :start_vm, :make_initial_snapshot_on_vm, :vm_ip,
+      :put_file_to_vm, :get_file_from_vm].each do |method_name|
        define_method method_name do |*args|
          begin
            @v.send(method_name, *args)

data/lib/foodtaster/rspec/dsl_methods.rb

@@ -2,20 +2,17 @@ module Foodtaster
   module RSpec
     module DslMethods
       def require_vm(vm_name)
-        let(vm_name) do
-          get_vm(vm_name)
-        end
-
+        define_method(vm_name) { get_vm(vm_name) }
         before(:all) { 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]
+        rollback = options.key?(:rollback) ? options[:rollback] : !Foodtaster.config.skip_rollback
 
         before(:all) do
           vm = get_vm(vm_name)
-          vm.rollback unless skip_rollback
+          vm.rollback if rollback
 
           run_chef_on(vm_name, &block)
         end

data/lib/foodtaster/rspec/example_methods.rb

@@ -8,11 +8,14 @@ module Foodtaster
       end
 
       def run_chef_on(vm_name, &block)
-        chef_config = ChefConfig.new.tap{ |conf| block.call(conf) }.to_hash
-        @previous_chef_config = chef_config
+        chef_config = ChefConfig.new
+        instance_exec chef_config, &block
+        chef_config_as_hash = chef_config.to_hash
+
+        @previous_chef_config = chef_config_as_hash
 
         vm = get_vm(vm_name)
-        vm.run_chef(chef_config)
+        vm.run_chef(chef_config_as_hash)
       end
 
       def rerun_chef_on(vm_name)

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

@@ -0,0 +1,18 @@
+RSpec::Matchers.define :have_running_service do |service|
+  match do |vm|
+    @result = vm.execute("status #{service}").stdout
+    @result =~ /start\/running/
+  end
+
+  failure_message_for_should do |vm|
+    "expected that #{vm.name} should have running service '#{service}' but was '#{@result}'"
+  end
+
+  failure_message_for_should_not do |vm|
+    "expected that #{vm.name} should not have running service '#{service}' but was '#{@result}'"
+  end
+
+  description do
+    "running service '#{service}'"
+  end
+end

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

@@ -38,18 +38,17 @@ RSpec::Matchers.define :have_package do |package|
   end
 end
 
-# TODO: I'm not sure if lsof is installed by default
 RSpec::Matchers.define :listen_port do |port|
   match do |vm|
-    ->{ vm.execute("sudo lsof -i :#{port.to_s} > /dev/null") }.should be_successful
+    vm.execute("lsof -i :#{port.to_s}").should be_successful
   end
 
   failure_message_for_should do |vm|
-    "expected that #{vm.name} should listen port '#{port}'"
+    "expected that #{vm.name} should listen to port '#{port}'"
   end
 
   failure_message_for_should_not do |vm|
-    "expected that #{vm.name} should not listen port '#{port}'"
+    "expected that #{vm.name} should not listen to port '#{port}'"
   end
 
   description do

data/lib/foodtaster/version.rb

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

data/lib/foodtaster/vm.rb

@@ -87,6 +87,18 @@ module Foodtaster
       self.running? && self.initial_snapshot_made?
     end
 
+    def ip
+      @client.vm_ip(name)
+    end
+
+    def put_file(local_fn, vm_fn)
+      @client.put_file_to_vm(name, local_fn, vm_fn)
+    end
+
+    def get_file(vm_fn, local_fn)
+      @client.get_file_from_vm(name, vm_fn, local_fn)
+    end
+
     def shutdown
       Foodtaster.logger.debug "#{name}: Shutting down VM"
       @client.shutdown_vm(name)

metadata

@@ -2,14 +2,15 @@
 name: foodtaster
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mike Lapshin
+- Serzh Nechyporchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -48,6 +49,7 @@ files:
 - lib/foodtaster/rspec/dsl_methods.rb
 - lib/foodtaster/rspec/example_methods.rb
 - lib/foodtaster/rspec/matchers/file_matcher.rb
+- lib/foodtaster/rspec/matchers/service_matcher.rb
 - lib/foodtaster/rspec/matchers/simple_matchers.rb
 - lib/foodtaster/rspec/matchers/user_matcher.rb
 - lib/foodtaster/rspec_run.rb