vagrant-foodtaster-server 0.0.7 → 0.0.8

data/.gitignore

@@ -17,3 +17,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+spec/environment/*.box

data/README.md

@@ -1,8 +1,11 @@
 # Vagrant Foodtaster Server
 
+[![Gem Version](https://badge.fury.io/rb/vagrant-foodtaster-server.png)](http://badge.fury.io/rb/vagrant-foodtaster-server)
+
 [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.
+allows Core Foodtaster library to interact with Vagrant via simple DRb
+protocol.
 
 ## Installation
 

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

@@ -1,8 +1,14 @@
-class VagrantFoodtasterServer < Vagrant.plugin("2")
-  name "Foodtaster Server"
+module Vagrant
+  module Foodtaster
+    module Server
+      class Plugin < Vagrant.plugin("2")
+        name "Foodtaster Server"
 
-  command 'foodtaster-server' do
-    require_relative 'server_command'
-    VagrantFoodtasterServer::ServerCommand
+        command 'foodtaster-server' do
+          require_relative 'server_command'
+          ServerCommand
+        end
+      end
+    end
   end
 end

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

@@ -1,159 +1,174 @@
-class VagrantFoodtasterServer
-  class Server
-    def initialize(app, env)
-      @env = env
-      @app = app
-
-      begin
-        require 'sahara/session/virtualbox'
-      rescue LoadError
-        raise RuntimeError, <<-EOT.strip_heredoc
+module Vagrant
+  module Foodtaster
+    module Server
+      class Server
+        def initialize(app, env)
+          @env = env
+          @app = app
+
+          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
+          end
+        end
 
-    def version
-      VagrantFoodtasterServer::VERSION
-    end
+        def version
+          Vagrant::Foodtaster::Server::VERSION
+        end
 
-    def redirect_stdstreams(stdout, stderr)
-      $stdout = stdout
-      $stderr = stderr
-    end
+        def redirect_stdstreams(stdout, stderr)
+          $stdout = stdout
+          $stderr = stderr
+        end
 
-    def make_initial_snapshot_on_vm(vm_name)
-      vm = get_vm(vm_name)
-      sahara_for(vm).on
-    end
+        def make_initial_snapshot_on_vm(vm_name)
+          vm = get_vm(vm_name)
+          sahara_for(vm).on
+        end
 
-    def start_vm(vm_name)
-      vm = get_vm(vm_name)
-      chef_run_list = get_chef_solo_run_list(vm)
-      provision_types = [:shell, :puppet]
+        def start_vm(vm_name)
+          vm = get_vm(vm_name)
+          chef_run_list = get_chef_solo_run_list(vm)
+          provision_types = [:shell, :puppet]
 
-      unless chef_run_list.empty?
-        provision_types << :chef_solo
-      end
+          unless chef_run_list.empty?
+            provision_types << :chef_solo
+          end
 
-      vm.action(:up,
-                provision_types: provision_types,
-                provision_enabled: true)
-    end
+          vm.action(:up,
+                    provision_types: provision_types,
+                    provision_enabled: true)
+        end
 
-    def vm_running?(vm_name)
-      vm = get_vm(vm_name)
-      vm.state.id.to_s == 'running'
-    end
+        def vm_running?(vm_name)
+          vm = get_vm(vm_name)
+          vm.state.id.to_s == 'running'
+        end
 
-    def initial_snapshot_made_on_vm?(vm_name)
-      vm = get_vm(vm_name)
-      sahara_for(vm).is_snapshot_mode_on?
-    end
+        def initial_snapshot_made_on_vm?(vm_name)
+          vm = get_vm(vm_name)
+          sahara_for(vm).is_snapshot_mode_on?
+        end
 
-    def rollback_vm(vm_name)
-      vm = get_vm(vm_name)
+        def rollback_vm(vm_name)
+          vm = get_vm(vm_name)
 
-      sahara_for(vm).rollback
-    end
+          sahara_for(vm).rollback
+        end
 
-    def shutdown_vm(vm_name)
-      vm = get_vm(vm_name)
+        def shutdown_vm(vm_name)
+          vm = get_vm(vm_name)
 
-      vm.action(:halt)
-    end
+          vm.action(:halt)
+        end
 
-    def vm_defined?(vm_name)
-      @env.machine_names.include?(vm_name)
-    end
+        def vm_ip(vm_name)
+          vm = get_vm(vm_name)
+          networks = vm.config.vm.networks
+          private_network_conf = networks.find { |n| n.first == :private_network }
 
-    def vm_prepared?(vm_name)
-      vm = get_vm(vm_name)
-      sahara = sahara_for(vm)
+          private_network_conf ? private_network_conf.last[:ip] : nil
+        end
 
-      vm.state.id.to_s == 'running' && sahara.is_snapshot_mode_on?
-    end
+        def put_file_to_vm(vm_name, local_fn, vm_fn)
+          vm = get_vm(vm_name)
+          vm.communicate.upload(local_fn, vm_fn)
+        end
 
-    def run_chef_on_vm(vm_name, current_run_config)
-      vm = get_vm(vm_name)
+        def get_file_from_vm(vm_name, vm_fn, local_fn)
+          vm = get_vm(vm_name)
+          vm.communicate.download(vm_fn, local_fn)
+        end
 
-      validate_vm!(vm)
+        def vm_defined?(vm_name)
+          @env.machine_names.include?(vm_name)
+        end
 
-      chef_solo_config = vm.config.vm.provisioners.find { |p| p.name == :chef_solo }
+        def run_chef_on_vm(vm_name, current_run_config)
+          vm = get_vm(vm_name)
 
-      provisioner_klass = Vagrant.plugin("2").manager.provisioners[:chef_solo]
-      provisioner = provisioner_klass.new(vm, chef_solo_config.config)
+          validate_vm!(vm)
 
-      current_run_chef_solo_config = apply_current_run_config(vm.config, current_run_config)
-      provisioner.configure(current_run_chef_solo_config)
+          chef_solo_config = vm.config.vm.provisioners.find { |p| p.name == :chef_solo }
 
-      begin
-        provisioner.provision
-      rescue Exception
-        raise RuntimeError, "Chef Run failed on #{vm_name} with config #{current_run_config.inspect}"
-      end
-    end
+          provisioner_klass = Vagrant.plugin("2").manager.provisioners[:chef_solo]
+          provisioner = provisioner_klass.new(vm, chef_solo_config.config)
 
-    def execute_command_on_vm(vm_name, command)
-      vm = get_vm(vm_name)
-      exec_result = {}
+          current_run_chef_solo_config = apply_current_run_config(vm.config, current_run_config)
+          provisioner.configure(current_run_chef_solo_config)
 
-      exec_result[:exit_status] = vm.communicate.sudo(command, error_check: false) do |stream_type, data|
-        exec_result[stream_type] = exec_result[stream_type].to_s + data
-      end
+          begin
+            provisioner.provision
+          rescue StandardError => e
+            raise RuntimeError, "Chef Run failed on #{vm_name} with config #{current_run_config.inspect}.\n\nOriginal Exception was:\n#{e.class.name}\n#{e.message}"
+          end
+        end
 
-      exec_result
-    end
+        def execute_command_on_vm(vm_name, command)
+          vm = get_vm(vm_name)
+          exec_result = {}
 
-    private
+          exec_result[:exit_status] = vm.communicate.sudo(command, error_check: false) do |stream_type, data|
+            exec_result[stream_type] = exec_result[stream_type].to_s + data
+          end
 
-    def sahara_for(vm)
-      Sahara::Session::Virtualbox.new(vm)
-    end
+          exec_result
+        end
+
+        private
 
-    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
+        def sahara_for(vm)
+          Sahara::Session::Virtualbox.new(vm)
         end
-      end.compact.flatten
-    end
 
-    def get_vm(vm_name)
-      @env.machine(vm_name, :virtualbox)
-    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 }
+        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
+          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
+          end
+        end
 
-    def apply_current_run_config(vm_config, current_run_config)
-      modified_config = vm_config.dup
+        def apply_current_run_config(vm_config, current_run_config)
+          modified_config = vm_config.dup
 
-      provisioner_index = modified_config.vm.provisioners.find_index do |prov|
-        prov.name == :chef_solo
-      end
+          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.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
+          modified_config
+        end
+      end
     end
   end
 end

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

@@ -1,26 +1,30 @@
 require 'drb'
 require_relative 'server'
 
-class VagrantFoodtasterServer
-  class ServerCommand < Vagrant.plugin(2, :command)
-    def execute
-      argv = parse_options
+module Vagrant
+  module Foodtaster
+    module Server
+      class ServerCommand < Vagrant.plugin(2, :command)
+        def execute
+          argv = parse_options
 
-      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
+          port_number = argv.size == 0 ? 35672 : argv[0].to_i
+          DRb.start_service "druby://localhost:#{port_number}", Vagrant::Foodtaster::Server::Server.new(@app, @env)
+          DRb.thread.join
 
-    rescue RuntimeError, Errno::EADDRINUSE => e
-      write_formatted_exception_message(e)
-    rescue Interrupt
-      DRb.stop_service
-    end
+        rescue RuntimeError, Errno::EADDRINUSE => e
+          write_formatted_exception_message(e)
+        rescue Interrupt
+          DRb.stop_service
+        end
 
-    private
+        private
 
-    def write_formatted_exception_message(e)
-      error = "#{e.message}\n\nServer Error Backtrace:\n  #{e.backtrace.join("\n  ")}"
-      @env.ui.error(error)
+        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
   end
 end

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

@@ -1,3 +1,7 @@
-class VagrantFoodtasterServer
-  VERSION = "0.0.7"
+module Vagrant
+  module Foodtaster
+    module Server
+      VERSION = "0.0.8"
+    end
+  end
 end

data/vagrant-foodtaster-server.gemspec

@@ -5,8 +5,8 @@ require 'vagrant-foodtaster-server/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "vagrant-foodtaster-server"
-  gem.version       = VagrantFoodtasterServer::VERSION
-  gem.authors       = ["Mike Lapshin"]
+  gem.version       = Vagrant::Foodtaster::Server::VERSION
+  gem.authors       = ["Mike Lapshin", "Serzh Nechyporchuk"]
   gem.email         = ["mikhail.a.lapshin@gmail.com"]
   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. }
@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.add_runtime_dependency 'sahara'
 end

metadata

@@ -2,15 +2,32 @@
 name: vagrant-foodtaster-server
 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
-dependencies: []
+date: 2013-11-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
+  name: sahara
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Foodtaster DRb server.
 email:
 - mikhail.a.lapshin@gmail.com