vagrant-chef-zero 0.3.0 → 0.4.0

data/.gitignore

@@ -1,4 +1,5 @@
 *.lock
+.zero-knife.rb
 .vagrant
 pkg
 coverage

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.4.0
+
+* Always write out a simple Knife configuration file to `.zero-knife.rb` to make it easier to use Knife with the server.
+
+* Switch to RSpec for tests.  Thanks to @tduffield for porting the existing tests.
+
+* Chef-Zero now uses the Chef-Zero gem to manage starting and stopping of the server.  While this may change in the future, it is the simplest solution for now.
+
+
 ## 0.3.0
 
 * Add support for `chef_repo_path`, graciously provided by @tduffield via pull request, as I was taking too long.

data/Makefile

@@ -6,7 +6,7 @@ install:
 clean:
 	@bundle exec rake clean
 test:
-	@bundle exec rake test
+	@bundle exec rake rspec_test
 
 vagrant:
 	@bundle exec vagrant up

data/README.md

@@ -16,7 +16,7 @@ vagrant plugin install vagrant-chef-zero
 
 ### Compatability
 
-Currently only NIX systems supported at this time due to a call to `lsof` to find running Chef Zero servers.
+Currently only tested on NIX systems, though I believe most NIX only commands have been removed.
 
 As for Vagrant providers, it has only been tested with VirtualBox. It should be possible to add support for other providers by changing certain assumptions, such as always running Chef-Zero on the host machine.
 
@@ -63,6 +63,18 @@ These are uploaded via the `Ridley` gem.  It is the same backend that `Berkshelf
 
 Currently only JSON files are supported as we do not have the Chef libraries to serialize `.rb` files.
 
+### Knife Configuration
+
+When Chef-Zero starts, it will write out `zero-knife.rb` to your current directory.  This will be a valid Knife configuration file with the following fields
+
+```ruby
+chef_server_url "foo:bar"
+node_name "baz"
+client_key "/path/to/tmp/key.pem"
+```
+
+If you wish to manipulate the Chef Zero server manually, you can pass this config file to Knife with `-c .zero-knife.rb`
+
 ### Lingering Chef-Zero Servers
 
 If for some reason you are unable to have Vagrant destroy the Chef-Zero server, you can find the PID it by running `lsof -i tcp:#{port}` where `port` is 4000 by default.
@@ -81,3 +93,9 @@ You don't need to specify one! If no url is specified, `Vagrant-Chef-Zero` will
 
 Not required.  As `Chef-Zero` does no authentication we can fake this.  If it is left unspecified we will use a default value of `dummy-validator`.
 
+# Contributors
+
+* Tom Duffield (@tduffield)
+* Ben Dean (@b-dean)
+* Jesse Nelson (@spheromak)
+* Mark Cornick (@markcornick)

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rake/testtask'
 require 'bundler/setup'
 require 'bundler/gem_tasks'
 
@@ -10,15 +9,14 @@ $stderr.sync = true
 # Change to the directory of this file.
 Dir.chdir(File.expand_path("../", __FILE__))
 
-# This installs the tasks that help with gem creation and
-# publishing.
-#Bundler::GemHelper.install_tasks
+# Make testing the default task
+task :default => "rspec_test"
 
-# Default task is to run the unit tests
-task :default => "test"
-
-Rake::TestTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
+task :rspec_test do |t|
+  test_output = %x[ bundle exec rspec spec ]
+  puts test_output
+  coverage = %x[ cat ./coverage/.last_run.json | grep covered | awk '{print $2}' ]
+  puts "Coverage: #{coverage}"
 end
 
 task :clean do |t|
@@ -28,4 +26,5 @@ task :clean do |t|
   FileUtils.rm_rf '.vagrant'
   FileUtils.rm_rf 'coverage'
   FileUtils.rm_rf 'Gemfile.lock'
+  FileUtils.rm_rf 'zero-knife.rb'
 end

data/Vagrantfile

@@ -10,9 +10,18 @@ Vagrant.configure("2") do |config|
   #config.chef_zero.cookbooks =    "spec/vagrant-chef-zero/fixtures/cookbooks"
   #config.chef_zero.roles = "foobar"
 
+  # Single Box Config
   config.vm.box = ENV['YIPIT_VAGRANT_BOX']
   config.vm.provision :chef_client do |chef|
     chef.run_list = [
     ]
   end
+
+  # config.vm.define :box1 do |box1|
+  #   box1.vm.box = ENV['YIPIT_VAGRANT_BOX']
+  # end
+
+  # config.vm.define :box2 do |box2|
+  #   box2.vm.box = ENV['YIPIT_VAGRANT_BOX']
+  # end
 end

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 77.17
+    "covered_percent": 91.91
   }
 }

data/coverage/.resultset.json

@@ -65,6 +65,8 @@
         1,
         null,
         1,
+        null,
+        1,
         0,
         0,
         null,
@@ -79,40 +81,28 @@
         1,
         null,
         1,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        null,
-        0,
-        0,
-        0,
+        2,
         null,
+        2,
+        1,
+        1,
         null,
+        1,
+        1,
+        1,
         null,
         1,
         0,
         0,
-        0,
-        0,
-        0,
         null,
         null,
         null,
-        1,
-        2,
-        2,
         null,
         null,
         1,
-        0,
-        0,
-        0,
-        null,
-        null,
+        1,
+        1,
+        1,
         null,
         null,
         null,
@@ -120,31 +110,43 @@
         null
       ],
       "/Users/andrewgross/dev/andrew/vagrant-chef-zero/spec/lib/server_helpers_spec.rb": [
+        1,
         1,
         null,
         1,
         null,
         1,
-        4,
-        4,
+        1,
         null,
         null,
-        4,
+        1,
         null,
         null,
         1,
         null,
-        1,
-        1,
+        3,
         null,
         null,
+        4,
         1,
+        3,
+        3,
+        3,
+        3,
+        null,
         null,
         1,
+        null,
         1,
+        3,
+        3,
         null,
         null,
         1,
+        null,
+        1,
+        2,
+        1,
         1,
         1,
         null,
@@ -154,10 +156,10 @@
         1,
         null,
         1,
+        2,
         1,
+        2,
         null,
-        null,
-        1,
         1,
         1,
         null,
@@ -165,22 +167,36 @@
         null,
         null,
         null,
+        1,
         null,
         1,
+        2,
         null,
+        null,
+        1,
+        1,
         1,
         1,
         null,
         null,
-        1,
         null,
+        null,
+        null
+      ],
+      "/Users/andrewgross/dev/andrew/vagrant-chef-zero/lib/vagrant-chef-zero/env.rb": [
+        1,
         1,
-        0,
-        0,
         null,
         null,
         null,
+        1,
         null,
+        1,
+        null,
+        1,
+        null,
+        1,
+        3,
         null,
         null,
         null,
@@ -239,13 +255,13 @@
         null,
         null,
         1,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
+        5,
+        5,
+        5,
+        5,
+        5,
+        5,
+        5,
         null,
         null,
         1,
@@ -253,7 +269,7 @@
         null,
         null,
         1,
-        5,
+        10,
         null,
         null,
         1,
@@ -272,6 +288,6 @@
         null
       ]
     },
-    "timestamp": 1375159113
+    "timestamp": 1376928062
   }
 }

data/lib/vagrant-chef-zero/action/reconfig.rb

@@ -19,6 +19,8 @@ module VagrantPlugins
 
             @validation_client_name = get_validation_client_name(env)
             set_config("@validation_client_name", @validation_client_name, env)
+
+            write_knife_config(env)
           end
 
           if berkshelf_enabled?(env)
@@ -35,4 +37,4 @@ module VagrantPlugins
 
     end
   end
-end
+end

data/lib/vagrant-chef-zero/action/start.rb

@@ -18,6 +18,8 @@ module VagrantPlugins
           end
 
           start_chef_zero(env)
+          write_knife_config(env)
+
           @app.call(env)
         end
 
@@ -25,4 +27,4 @@ module VagrantPlugins
 
     end
   end
-end
+end

data/lib/vagrant-chef-zero/action/stop.rb

@@ -17,6 +17,8 @@ module VagrantPlugins
             return @app.call(env)
           end
           stop_chef_zero(env)
+          rm_knife_config(env)
+
           @app.call(env)
         end
 
@@ -24,4 +26,4 @@ module VagrantPlugins
 
     end
   end
-end
+end

data/lib/vagrant-chef-zero/env.rb

@@ -6,6 +6,8 @@ module VagrantPlugins
     class Env
       # @return [Vagrant::UI::Colored]
       attr_accessor :ui
+      # @return [ChefZero::Server]
+      attr_accessor :server
 
       def initialize
         @ui = ::Vagrant::UI::Colored.new.scope('Chef Zero')

data/lib/vagrant-chef-zero/env_helpers.rb

@@ -2,6 +2,21 @@ module VagrantPlugins
   module ChefZero
     module EnvHelpers
 
+      def write_knife_config(env)
+        File.open("#{env[:root_path]}/.zero-knife.rb", 'w') do |f|
+          f.puts <<-EOF
+            chef_server_url '#{get_chef_server_url(env)}'
+            node_name 'zero-host'
+            client_key '#{get_key_path(env)}'
+          EOF
+        end
+      end
+
+      def rm_knife_config(env)
+        File.unlink "#{env[:root_path]}/.zero-knife.rb" if File.exists? "#{env[:root_path]}/.zero-knife.rb"
+        File.unlink get_key_path(env) if File.exists? get_key_path(env)
+      end
+
       def server_info(env)
         dict = { host: nil, client_name: nil, client_key: nil }
         provisioners(:chef_client, env).each do |provisioner|
@@ -102,4 +117,4 @@ module VagrantPlugins
 
     end
   end
-end
+end

data/lib/vagrant-chef-zero/plugin.rb

@@ -37,6 +37,8 @@ module VagrantPlugins
 
       action_hook(:chef_zero_up, :machine_action_up, &method(:provision))
 
+      action_hook(:chef_zero_reload, :machine_action_reload, &method(:provision))
+
       action_hook(:chef_zero_provision, :machine_action_provision, &method(:provision))
 
       action_hook(:chef_zero_provision, :machine_action_reload, &method(:provision))

data/lib/vagrant-chef-zero/server_helpers.rb

@@ -3,42 +3,30 @@ module VagrantPlugins
     module ServerHelpers
 
       def start_chef_zero(env)
-        port = get_port(env)
-        host = get_host(env)
-        if ! chef_zero_server_running?(port)
-          vagrant_gems = ENV['GEM_PATH'].split(':').select { |gp| gp.include?('vagrant.d')}.first
-          chef_zero_binary = ::File.join(vagrant_gems, "bin", "chef-zero")
-          proc = IO.popen("#{chef_zero_binary} --host #{host} --port #{port} 2>&1 > /dev/null")
+        require 'chef_zero/server'
+
+        unless env[:chef_zero].server && env[:chef_zero].server.running?
+          port = get_port(env)
+          host = get_host(env)
+
+          env[:chef_zero].server = ::ChefZero::Server.new(host: host, port: port)
+          env[:chef_zero].server.start_background
           env[:chef_zero].ui.info("Starting Chef Zero at http://#{host}:#{port}")
-        end
-        while ! chef_zero_server_running?(port)
-          sleep 1
-          env[:chef_zero].ui.warn("Waiting for Chef Zero to start")
-        end
-      end
 
-      def stop_chef_zero(env)
-        port = get_port(env)
-        if chef_zero_server_running?(port)
-          pid = get_chef_zero_server_pid(port)
-          env[:chef_zero].ui.info("Stopping Chef Zero")
-          system("kill #{pid}")
+          until env[:chef_zero].server.running?
+            sleep 1
+            env[:chef_zero].ui.warn("Waiting for Chef Zero to start")
+          end
         end
+      
       end
 
-      def chef_zero_server_running?(port)
-        pid = get_chef_zero_server_pid(port)
-        !! pid
-      end
-
-      def get_chef_zero_server_pid(port)
-        pid = %x[ lsof -i tcp:#{port} | grep -E 'ruby|chef-zero' | awk '{print $2}' ]
-        if pid && pid != ""
-          return pid
+      def stop_chef_zero(env)    
+        if env[:chef_zero].server && env[:chef_zero].server.running?
+          env[:chef_zero].ui.info("Stopping Chef Zero")
+          env[:chef_zero].server.stop
         end
-        return nil
       end
-
     end
   end
 end

data/lib/vagrant-chef-zero/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ChefZero
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/spec/lib/config_spec.rb

@@ -12,12 +12,12 @@ describe "VagrantPlugins::ChefZero::Config" do
     it "should set all paths to nil" do 
       d = DummyClass.new
       d.finalize!
-      d.chef_repo_path.must_equal nil
-      d.roles.must_equal nil
-      d.environments.must_equal nil
-      d.nodes.must_equal nil
-      d.cookbooks.must_equal nil
-      d.data_bags.must_equal nil
+      d.chef_repo_path.should eql nil
+      d.roles.should eql nil
+      d.environments.should eql nil
+      d.nodes.should eql nil
+      d.cookbooks.should eql nil
+      d.data_bags.should eql nil
     end
 
   end
@@ -28,21 +28,22 @@ describe "VagrantPlugins::ChefZero::Config" do
       d = DummyClass.new
       d.chef_repo_path = "/foo"
       d.finalize!
-      d.chef_repo_path.must_equal "/foo"
+      d.chef_repo_path.should eql "/foo"
     end
     
 
     it "should use sane defaults and prefix all fixture paths with the chef_repo_path" do
+      DummyClass.any_instance.stub(:path_exists?).and_return(true)
       d = DummyClass.new
-      d.stubs(:path_exists?).returns(true)
+      #d.stubs(:path_exists?).returns(true)
       d.chef_repo_path = "/foo"
       d.finalize!
 
-      d.roles.must_equal "/foo/roles"
-      d.environments.must_equal "/foo/environments"
-      d.nodes.must_equal "/foo/nodes"
-      d.cookbooks.must_equal "/foo/cookbooks"
-      d.data_bags.must_equal "/foo/data_bags"
+      d.roles.should eql "/foo/roles"
+      d.environments.should eql "/foo/environments"
+      d.nodes.should eql "/foo/nodes"
+      d.cookbooks.should eql "/foo/cookbooks"
+      d.data_bags.should eql "/foo/data_bags"
     end
 
 
@@ -54,7 +55,7 @@ describe "VagrantPlugins::ChefZero::Config" do
       d.chef_repo_path = "/foo"
       d.finalize!
 
-      d.roles.must_equal nil
+      d.roles.should eql nil
     end
   end
 
@@ -63,22 +64,20 @@ describe "VagrantPlugins::ChefZero::Config" do
     describe "specific fixture path is also defined" do
 
       it "should use sane defaults for all fixture paths except the overloaded path" do
-        DummyClass.any_instance.stubs(:path_exists?).returns(true)
+        DummyClass.any_instance.stub(:path_exists?).and_return(true)
         d = DummyClass.new
         d.chef_repo_path = "/foo"
         d.roles = "/bar/roles"
         d.finalize!
 
-        d.roles.must_equal "/bar/roles"
-        d.environments.must_equal "/foo/environments"
-        d.nodes.must_equal "/foo/nodes"
-        d.cookbooks.must_equal "/foo/cookbooks"
-        d.data_bags.must_equal "/foo/data_bags"
+        d.roles.should eql "/bar/roles"
+        d.environments.should eql "/foo/environments"
+        d.nodes.should eql "/foo/nodes"
+        d.cookbooks.should eql "/foo/cookbooks"
+        d.data_bags.should eql "/foo/data_bags"
       end
 
     end
   end
   
-
-
 end

data/spec/lib/server_helpers_spec.rb

@@ -1,65 +1,72 @@
 require_relative '../spec_helper'
+require 'chef_zero/server'
 
-describe 'VagrantPlugins::ChefZero::ServerHelpers' do
-
-  before do
-  class DummyClass
+describe VagrantPlugins::ChefZero::ServerHelpers do
+  
+  class DummyServerHelpers
     include VagrantPlugins::ChefZero::ServerHelpers
   end
 
-  @d = DummyClass.new
+  class DummyChefZeroEnv < VagrantPlugins::ChefZero::Env
   end
 
-  describe "chef_zero_server_running?" do
-
-    it "should have an chef_zero_server_running method" do
-      @d.must_respond_to(:chef_zero_server_running?)
-    end
-
-    describe "server is running" do
+  before do
+    # We need to prevent ChefZero::Server from actually binding to any addresses
+    ::Puma::Server.any_instance.stub(:add_tcp_listener)
+  end
 
-      before do
-        @d.stubs(:get_chef_zero_server_pid).returns("bar")
-      end
+  let(:d) { DummyServerHelpers.new }
+  let(:env) { 
+    h = Hash.new
+    h[:chef_zero] = DummyChefZeroEnv.new
+    h[:machine] = double('machine')
+    h
+  }
 
-      it "should show that the server is running" do
-        port = "foo"
-        @d.chef_zero_server_running?(port).must_equal true
-      end
+  describe "#start_chef_zero" do 
 
+    before do
+      d.stub(:get_port) { "4000" }
+      d.stub(:get_host) { "127.0.0.1" }
     end
 
-    describe "server not running" do
+    context "when chef-zero server is already running" do
 
-      before do
-        @d.stubs(:get_chef_zero_server_pid).returns(nil)
-      end
-
-      it "should show that the server is running" do
-        port = "foo"
-        @d.chef_zero_server_running?(port).must_equal false
+      it "should take no action" do
+        env[:chef_zero].stub_chain(:server, :running?) { true }
+        env[:chef_zero].stub_chain(:server, :start_background)
+        d.start_chef_zero(env)
+        env[:chef_zero].server.should_not have_received(:start_background)
       end
 
     end
 
-  end
+    context "when chef-zero server is not running" do
 
-  describe "stop_chef_zero" do
+      it "should start the server in the background" do
+        env[:chef_zero].stub_chain(:server, :running?) { false }
+        env[:chef_zero].stub_chain(:server, :start_background) do
+          env[:chef_zero].stub_chain(:server, :running?) { true }
+        end
+        d.start_chef_zero(env)
+        env[:chef_zero].server.should have_received(:start_background)
+      end
 
-    it "should have an stop_chef_zero method" do
-      @d.must_respond_to(:stop_chef_zero)
     end
+  end # describe #start_chef_zero
 
-    describe "server is running" do
+  describe "#stop_chef_zero" do
 
-      before do
-        @d.stubs(:chef_zero_server_running?).returns(true)
-        @d.stubs(:`).returns
-
-      end
+    before do 
+      env[:chef_zero].stub_chain(:server, :running?) { true }
+    end
 
+    it "should stop server" do
+      env[:chef_zero].stub_chain(:server, :stop)
+      d.stop_chef_zero(env)
+      env[:chef_zero].server.should have_received(:stop)
     end
 
-  end
+  end # describe #stop_chef_zero
 
 end

data/spec/spec_helper.rb

@@ -6,16 +6,4 @@ require_relative "../lib/vagrant-chef-zero"
 require_relative "../lib/vagrant-chef-zero/server_helpers.rb"
 require_relative "../lib/vagrant-chef-zero.rb"
 
-require 'minitest/autorun'
-require 'minitest/spec'
-require 'minitest/mock'
-require 'mocha/setup' # This should be after any minitest requires
-require 'turn'
-require 'json'
-
-Turn.config do |c|
-  # :outline  - turn's original case/test outline mode [default]
-  c.format  = :outline
-  # use humanized test names (works only with :outline format)
-  c.natural = true
-end
+require 'json'

data/vagrant-chef-zero.gemspec

@@ -31,9 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rake"
-  s.add_development_dependency "turn"
-  s.add_development_dependency "minitest", '< 5.0'
-  s.add_development_dependency "minitest-reporters"
+  s.add_development_dependency "rspec"
 
   # The following block taken from @mitchellh 's vagrant-aws code
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -162,39 +162,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -277,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1290762954162071308
+      hash: -1000113792365389957
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: