vagrant-foodtaster-server 0.0.8 → 0.0.9

data/.gitignore

@@ -18,3 +18,4 @@ test/tmp
 test/version_tmp
 tmp
 spec/environment/*.box
+.vagrant

data/.rspec

@@ -0,0 +1 @@
+--format documentation

data/Gemfile

@@ -1,4 +1,11 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in vagrant-drb-server.gemspec
 gemspec
+
+group :development do
+  gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.3.5'
+end
+
+group :test do
+  gem 'rspec'
+end

data/README.md

@@ -9,23 +9,20 @@ protocol.
 
 ## Installation
 
-First, install [sahara](http://github.com/jedi4ever/sahara/) plugin for snapshot support:
-
-    vagrant plugin install sahara
-
-Then, install Foodtaster Server:
-
     vagrant plugin install vagrant-foodtaster-server
 
 ## Usage
 
 To start server:
 
-    vagrant foodtaster-server
+    vagrant foodtaster-server [port number]
 
 To terminate press Ctrl+C.
 
 ## Limitations
 
 *   only VirtualBox provider is supported
-*   only chef-solo provisioner is supported
+*   only chef-solo provisioner is supported
+
+## Developing
+For developing and testing plugin, please, place any box with installed Chef to spec/environment/test.box.

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+task_dir = File.expand_path("../tasks", __FILE__)
+Dir["#{task_dir}/**/*.rake"].each do |task_file|
+    load task_file
+end

data/bin/autospec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'autospec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'autospec')

data/bin/erubis

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'erubis' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('erubis', 'erubis')

data/bin/htmldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/ldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/bin/thor

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('thor', 'thor')

data/bin/vagrant

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'vagrant' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('vagrant', 'vagrant')

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

@@ -8,12 +8,13 @@ module Vagrant
         def execute
           argv = parse_options
 
-          port_number = argv.size == 0 ? 35672 : argv[0].to_i
-          DRb.start_service "druby://localhost:#{port_number}", Vagrant::Foodtaster::Server::Server.new(@app, @env)
+          host, port = parse_args(argv.first)
+          DRb.start_service "druby://#{host}:#{port}", Vagrant::Foodtaster::Server::Server.new(@app, @env)
           DRb.thread.join
 
         rescue RuntimeError, Errno::EADDRINUSE => e
           write_formatted_exception_message(e)
+          exit 1
         rescue Interrupt
           DRb.stop_service
         end
@@ -24,6 +25,17 @@ module Vagrant
           error = "#{e.message}\n\nServer Error Backtrace:\n  #{e.backtrace.join("\n  ")}"
           @env.ui.error(error)
         end
+
+        def parse_args(args)
+          host, port = if args && args.include?(':')
+                         args.split(':')
+                       else
+                          [nil, args]
+                       end
+          host ||= 'localhost'
+          port ||= 35672
+          [host, port]
+        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Vagrant
   module Foodtaster
     module Server
-      VERSION = "0.0.8"
+      VERSION = "0.0.9"
     end
   end
 end

data/spec/environment/Vagrantfile

@@ -0,0 +1,12 @@
+$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+Vagrant.require_plugin 'vagrant-foodtaster-server'
+SERVER_IP = '10.0.2.15'
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "test"
+  config.vm.box_url = "test.box"
+  config.vm.network 'private_network', ip: SERVER_IP
+  config.vm.provision :chef_solo do |chef|
+    chef.cookbooks_path = %w[../fixtures/cookbooks]
+  end
+end

data/spec/fixtures/cookbooks/test/metadata.rb

@@ -0,0 +1,6 @@
+maintainer       "me"
+maintainer_email "me@mail.me"
+license          "All rights reserved"
+description      "test cookboos"
+long_description "Long"
+version          "0.0.1"

data/spec/fixtures/cookbooks/test/recipes/chef_test_recipe.rb

@@ -0,0 +1,4 @@
+file "/tmp/hello" do
+  content 'Hello, Foodtaster!'
+  action :create
+end

data/spec/spec_helper.rb

@@ -0,0 +1,37 @@
+require 'bundler/setup'
+require 'support/test_client'
+
+PROJECT_ROOT = File.expand_path('../../', __FILE__)
+SERVER_PORT = 31415
+SERVER_IP = '10.0.2.15'
+
+RSpec.configure do |config|
+  config.color_enabled = true
+end
+
+def with_test_root(command)
+  <<-BASH
+cd #{PROJECT_ROOT}/spec/environment && \
+#{command}
+  BASH
+end
+
+def start_server
+  @pid = Process.spawn(
+    with_test_root("vagrant foodtaster-server #{SERVER_PORT}"),
+    pgroup: true)
+  sleep 1
+end
+
+def stop_server
+  Process.kill('INT', -@pid)
+end
+
+def execute(command)
+  system with_test_root(command)
+end
+
+
+def client
+  @client ||= TestClient.new(SERVER_PORT)
+end

data/spec/support/test_client.rb

@@ -0,0 +1,23 @@
+require 'drb'
+
+class TestClient
+  def initialize(port)
+    DRb.start_service("druby://localhost:0")
+    @v = DRbObject.new_with_uri("druby://localhost:#{port}")
+  end
+
+  [:vm_defined?, :rollback_vm, :vm_ip,
+   :put_file_to_vm, :get_file_from_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|
+     define_method method_name do |*args|
+       begin
+         @v.send(method_name, *args)
+       rescue DRb::DRbUnknownError => e
+         puts "Folowing exception was raised on server:\n#{e.unknown.buf}"
+         raise e
+       end
+     end
+   end
+end

data/spec/vagrant-foodtaster-server/server_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+require 'vagrant-foodtaster-server/server'
+
+require 'tempfile'
+require 'tmpdir'
+
+describe Vagrant::Foodtaster::Server::Server do
+  before(:each) do
+    start_server
+  end
+
+  after(:each) do
+    stop_server
+  end
+
+  before(:each) do
+    execute('bundle exec vagrant halt -f')
+    client.start_vm(:default)
+  end
+
+  it 'should start vm' do
+    client.vm_running?(:default).should be_true
+  end
+
+  it 'should shutdown started vm' do
+    client.shutdown_vm(:default)
+    client.vm_running?(:default).should_not be_true
+  end
+
+  it 'should return ip for vm' do
+    client.vm_ip(:default).should == SERVER_IP
+  end
+
+  it 'should check if vm defined' do
+    client.vm_defined?(:default).should be_true
+    client.vm_defined?(:magic).should_not be_true
+  end
+
+  it 'should put and get files' do
+    Tempfile.open('recipe') do |recipe|
+      client.put_file_to_vm(:default, recipe.path, 'recipe')
+    end
+
+    Dir.mktmpdir do |dir|
+      client.get_file_from_vm(:default, 'recipe', dir + '/recipe')
+      File.exist?(dir + '/recipe').should be_true
+    end
+  end
+
+  it 'should execute command on vm' do
+    result =
+      client.execute_command_on_vm(:default, 'echo Hello, Foodtaster!')
+    result[:stdout].should == "Hello, Foodtaster!\n"
+    result[:exit_status].should == 0
+  end
+
+  it 'should make initial snapshot on vm' do
+    client.make_initial_snapshot_on_vm(:default)
+    client.initial_snapshot_made_on_vm?(:default).should be_true
+  end
+
+  it 'should run chef in vm' do
+    run_config = {
+      run_list: ['test::chef_test_recipe'],
+      json: {}
+    }
+    client.run_chef_on_vm(:default, run_config)
+    result = client.execute_command_on_vm(:default, 'cat /tmp/hello')
+    result[:stdout].should == "Hello, Foodtaster!"
+  end
+end

data/tasks/spec.rake

@@ -0,0 +1,10 @@
+require 'bundler/setup'
+require 'vagrant'
+
+task :spec do
+  opts = { cwd: File.expand_path('../../spec/environment', __FILE__) }
+  p opts
+  env = Vagrant::Environment.new(opts)
+  env.cli('up')
+  env.unload
+end

metadata

@@ -2,7 +2,7 @@
 name: vagrant-foodtaster-server
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mike Lapshin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -31,21 +31,43 @@ dependencies:
 description: A Foodtaster DRb server.
 email:
 - mikhail.a.lapshin@gmail.com
-executables: []
+executables:
+- autospec
+- erubis
+- htmldiff
+- ldiff
+- rspec
+- thor
+- vagrant
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/autospec
+- bin/erubis
+- bin/htmldiff
+- bin/ldiff
+- bin/rspec
+- bin/thor
+- bin/vagrant
 - lib/vagrant-foodtaster-server.rb
 - 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
+- spec/environment/Vagrantfile
+- spec/fixtures/cookbooks/test/metadata.rb
+- spec/fixtures/cookbooks/test/recipes/chef_test_recipe.rb
+- spec/spec_helper.rb
+- spec/support/test_client.rb
+- spec/vagrant-foodtaster-server/server_spec.rb
+- tasks/spec.rake
 - vagrant-foodtaster-server.gemspec
 homepage: ''
 licenses:
@@ -73,5 +95,11 @@ 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: []
+test_files:
+- spec/environment/Vagrantfile
+- spec/fixtures/cookbooks/test/metadata.rb
+- spec/fixtures/cookbooks/test/recipes/chef_test_recipe.rb
+- spec/spec_helper.rb
+- spec/support/test_client.rb
+- spec/vagrant-foodtaster-server/server_spec.rb
 has_rdoc: