vagrant-chef-zero 0.5.1 → 0.5.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.2
+
+Update `net-ssh` dependency to work with the newest version of Vagrant 1.4.  Thanks to @paulczar
+
+* Search for the Chef-Zero gem inside of Vagrant first, then fall back to searching other gem paths.  Mostly a fix to make testing easier.
+
 ## 0.5.1
 
 Minor bugfixes (hopefully) to fix installation behavior and berkshelf issues.

data/Vagrantfile

@@ -1,8 +1,8 @@
 Vagrant.require_plugin "vagrant-chef-zero"
-Vagrant.require_plugin "vagrant-berkshelf"
+#Vagrant.require_plugin "vagrant-berkshelf"
 
 Vagrant.configure("2") do |config|
-  config.berkshelf.enabled = true
+ # config.berkshelf.enabled = true
   config.chef_zero.chef_repo_path = "spec/vagrant-chef-zero/fixtures/"
   #config.chef_zero.nodes =        "spec/vagrant-chef-zero/fixtures/nodes"
   #config.chef_zero.environments = "spec/vagrant-chef-zero/fixtures/environments"
@@ -11,17 +11,10 @@ Vagrant.configure("2") do |config|
   #config.chef_zero.roles = "foobar"
 
   # Single Box Config
-  config.vm.box = ENV['YIPIT_VAGRANT_BOX']
+  config.vm.box = "precise64"
   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/lib/vagrant-chef-zero/server_helpers.rb

@@ -9,13 +9,50 @@ module VagrantPlugins
         host = get_host(env)
 
         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")
+          chef_zero_binary = get_chef_zero_binary(env)
           fork_process(chef_zero_binary, host, port, env)
           wait_for_server_to_start(host, port, env)
         end
       end
 
+      def get_chef_zero_binary(env)
+        # We want to prefer the vagrant.d path, but for development
+        # we want to find any valid path that has chef-zero
+        paths = Gem.path
+        vagrant_path = paths.select { |gp| gp.include?('vagrant.d')}.first
+        if has_chef_zero_binary?(vagrant_path)
+          return find_chef_zero_binary(vagrant_path)
+        end
+        paths.each do |path|
+          if has_chef_zero_binary?(path)
+            return find_chef_zero_binary(path)
+          end
+        end
+        env[:chef_zero].ui.warn("Could not find Chef Zero binary in any path in #{Gem.path}")
+        raise 
+      end
+
+      def has_chef_zero_binary?(path)
+        potential_binary = find_chef_zero_binary(path)
+        if potential_binary
+          return ::File.exists?(potential_binary)
+        else
+          return false
+        end
+      end
+
+      def find_chef_zero_binary(path)
+        # Assuming a path from Gem.path
+        #potential_binary = ::File.join(path, "bin", "chef-zero")
+        gems_path = ::File.join(path, "gems")
+        chef_zero_gem = Dir["#{gems_path}/*"].select { |gp| gp.include?('chef-zero')}.first
+        if chef_zero_gem
+          return ::File.join(chef_zero_gem, "bin", "chef-zero")
+        else
+          return nil
+        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}")

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ChefZero
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

data/vagrant-chef-zero.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   # Explicit locks to ensure we activate the proper gem versions for Vagrant
   s.add_dependency 'i18n', '~> 0.6.0'
-  s.add_dependency 'net-ssh', '~> 2.6.6'
+  s.add_dependency "net-ssh", ">= 2.6.6", "< 2.8.0"
   s.add_dependency 'net-scp', '~> 1.1.0'
 
   s.add_development_dependency "mocha"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -124,17 +124,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.6
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.6
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -237,8 +243,7 @@ files:
 - lib/vagrant-chef-zero.rb
 - LICENSE.txt
 - Makefile
-- pkg/vagrant-chef-zero-0.4.2.gem
-- pkg/vagrant-chef-zero-0.5.0.gem
+- pkg/vagrant-chef-zero-0.5.2.gem
 - Rakefile
 - README.md
 - spec/lib/config_spec.rb
@@ -267,8 +272,6 @@ files:
 - Vagrantfile
 - .gitignore
 - .travis.yml
-- coverage/.last_run.json
-- coverage/.resultset.json
 homepage: http://github.com/andrewgross/vagrant-chef-zero
 licenses:
 - MIT
@@ -284,7 +287,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3035003433799121851
+      hash: 1041665802502836510
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: