vagrant-chef-zero 0.4.0 → 0.4.1

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

@@ -21,7 +21,7 @@ module VagrantPlugins
         end
 
         def destroy(hook)
-          hook.after(VagrantPlugins::ProviderVirtualBox::Action::DestroyUnusedNetworkInterfaces, VagrantPlugins::ChefZero::Action.chef_zero_destroy)
+          hook.before(VagrantPlugins::ProviderVirtualBox::Action::DestroyUnusedNetworkInterfaces, VagrantPlugins::ChefZero::Action.chef_zero_destroy)
         end
 
       end

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

@@ -5,28 +5,86 @@ module VagrantPlugins
       def start_chef_zero(env)
         require 'chef_zero/server'
 
-        unless env[:chef_zero].server && env[:chef_zero].server.running?
-          port = get_port(env)
-          host = get_host(env)
+        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}")
+        unless chef_zero_server_running?(host, port)
+          vagrant_gems = ENV['GEM_PATH'].split(':').select { |gp| gp.include?('vagrant.d')}.first
+          chef_zero_binary = ::File.join(vagrant_gems, "bin", "chef-zero")
+          fork_process(chef_zero_binary, host, port, env)
+          wait_for_server_to_start(host, port, env)
+        end
+      end
+
+      def fork_process(command, host, port, env)
+        IO.popen("#{command} --host #{host} --port #{port} 2>&1 > /dev/null")
+        env[:chef_zero].ui.info("Starting Chef Zero at http://#{host}:#{port}")
+      end
+
+      def wait_for_server_to_start(host, port, env)
+        until chef_zero_server_running?(host, port)
+          sleep 1
+          env[:chef_zero].ui.warn("Waiting for Chef Zero to start")
+        end
+      end
+
+      def chef_zero_server_running?(host, port)
+        timeout = 0.5 # Seconds
+        Timeout::timeout(timeout) do
+          return port_open?(host, port) && is_a_chef_zero_server?(host, port)
+        end
+      rescue Timeout::Error
+        false
+      end
+
+      def is_a_chef_zero_server?(host, port)
+        require "net/http"
+        require "uri"
+        # Seems silly to rebuild the URI after deconstructing it earlier
+        uri = URI::HTTP.build({ :host => host, :port => port.to_i, :path => "/"})
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.open_timeout = 0.5 # Seconds
+        http.read_timeout = 0.5 # Seconds
+        request = Net::HTTP::Get.new(uri.request_uri)
+        response = http.request(request)
+        return response['server'] == "chef-zero"
+      end
 
-          until env[:chef_zero].server.running?
-            sleep 1
-            env[:chef_zero].ui.warn("Waiting for Chef Zero to start")
+      # Taken from SO, http://stackoverflow.com/questions/517219/ruby-see-if-a-port-is-open
+      def port_open?(ip, port, seconds=0.5)
+        begin
+          TCPSocket.new(ip, port).close
+          true
+        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+          false
+        end
+      end
+
+      def stop_chef_zero(env)
+        host = get_host(env)
+        port = get_port(env)
+        if chef_zero_server_running?(host, port)
+          pid = get_chef_zero_server_pid(port)
+          if pid
+            kill_process(env, pid)
           end
         end
-      
       end
 
-      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
+      def kill_process(env, pid)
+        env[:chef_zero].ui.info("Stopping Chef Zero")
+        system("kill -s SIGTERM #{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
+        else
+          return false
         end
       end
+
     end
   end
 end

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

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

data/spec/lib/server_helpers_spec.rb

@@ -10,11 +10,6 @@ describe VagrantPlugins::ChefZero::ServerHelpers do
   class DummyChefZeroEnv < VagrantPlugins::ChefZero::Env
   end
 
-  before do
-    # We need to prevent ChefZero::Server from actually binding to any addresses
-    ::Puma::Server.any_instance.stub(:add_tcp_listener)
-  end
-
   let(:d) { DummyServerHelpers.new }
   let(:env) { 
     h = Hash.new
@@ -28,15 +23,18 @@ describe VagrantPlugins::ChefZero::ServerHelpers do
     before do
       d.stub(:get_port) { "4000" }
       d.stub(:get_host) { "127.0.0.1" }
+      d.stub(:fork_process) { }
+      d.stub(:wait_for_server_to_start) { true }
+      ENV['GEM_PATH'] += ":/foo/bar/vagrant.d/bin"
     end
 
     context "when chef-zero server is already running" do
 
       it "should take no action" do
-        env[:chef_zero].stub_chain(:server, :running?) { true }
-        env[:chef_zero].stub_chain(:server, :start_background)
+        d.stub(:port_open?) { true }
+        d.stub(:is_a_chef_zero_server?) { true }
         d.start_chef_zero(env)
-        env[:chef_zero].server.should_not have_received(:start_background)
+        d.should_not have_received(:fork_process)
       end
 
     end
@@ -44,12 +42,8 @@ describe VagrantPlugins::ChefZero::ServerHelpers do
     context "when chef-zero server is not running" 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)
+        d.should have_received(:fork_process)
       end
 
     end
@@ -58,13 +52,17 @@ describe VagrantPlugins::ChefZero::ServerHelpers do
   describe "#stop_chef_zero" do
 
     before do 
-      env[:chef_zero].stub_chain(:server, :running?) { true }
+      d.stub(:get_host) { "127.0.0.1" }
+      d.stub(:get_port) { "4000" }
+      d.stub(:kill_process) { }
+      d.stub(:port_open?) { true }
+      d.stub(:get_chef_zero_server_pid) { 1234 }
+      d.stub(:is_a_chef_zero_server?) { 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)
+      d.should have_received(:kill_process)
     end
 
   end # describe #stop_chef_zero

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -185,7 +185,6 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
-- lib/vagrant-chef-zero/action/default.rb
 - lib/vagrant-chef-zero/action/reconfig.rb
 - lib/vagrant-chef-zero/action/start.rb
 - lib/vagrant-chef-zero/action/stop.rb
@@ -200,6 +199,7 @@ files:
 - lib/vagrant-chef-zero.rb
 - LICENSE.txt
 - Makefile
+- pkg/vagrant-chef-zero-0.4.0.gem
 - Rakefile
 - README.md
 - spec/lib/config_spec.rb
@@ -245,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1000113792365389957
+      hash: 3074438575813103530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

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

@@ -1 +0,0 @@
-default.rb