vagrant-chef-zero 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a855950d1b47118cf406a8641938bc3745b0ed2a
+  data.tar.gz: 580a97a81fb50937260d191847d0320968258724
+SHA512:
+  metadata.gz: 71a22e96dc42ea5c237429ab40499a73fd5eed0fea13ce24b600ba7b8e2697664baa212a41f4538109cf0973a2780a382984e66cc9cbf8c938cdc1827fa4a3f9
+  data.tar.gz: e985ec7b36e0ff37832992ab8ea5d62f4c0f90dff0d88a8125efffe3006e486d24c88ef50197c2a8a88e4bce0f0818fb1c9ca18301ef060fc9a191a11192b3f5

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.7.0
+
+* Allow using the latest version of `Chef-Zero`
+* Compatability fix to work with Vagrant 1.5, thanks to @andrewhavens and @sysbot for fixes.
+
+NOTE: Attempting to work on migrating to `chef-api` instead of `ridley` to help with dependency issues.
+
+NOTE: May be an issue if we do not constrain `ridley` to an upper bound so that `vagrant` doesn't grab a broken version. Candidate version `'ridley', '~> 1.2.1'`.
+
+
+## 0.6.0
+
+Remove some dependency cruft, add better cookbook searching.
+
+* Remove custom dependencies for `i18n`, `json`, `net-ssh`, `net-scp` and `activesupport`.  Still depend on Chef, but no longer force specific gem versions. Seems to install properly on Vagrant 1.4.
+
+* Add better cookbook searching algorithm
+
 ## 0.5.2
 
 Update `net-ssh` dependency to work with the newest version of Vagrant 1.4.  Thanks to @paulczar
@@ -16,11 +34,11 @@ Minor bugfixes (hopefully) to fix installation behavior and berkshelf issues.
 
 NOTE: This version is in beta status as I have not had time to fully test it due to issues with my Vagrant environment (old versions will still be availabe in the `0.4.X` series)
 
-* Add support for `.rb` files by using the Chef Gem, thanks to @mattray for the PR.  
+* Add support for `.rb` files by using the Chef Gem, thanks to @mattray for the PR.
 
 ## 0.4.2
 
-* Keep existing Berkshelf client key if one is already defined. Thanks to [Greg Symons](https://github.com/gregsymons) for the PR. 
+* Keep existing Berkshelf client key if one is already defined. Thanks to [Greg Symons](https://github.com/gregsymons) for the PR.
 
 ## 0.4.1
 

data/Gemfile

@@ -1,14 +1,17 @@
 source "https://rubygems.org"
 
-#gem 'json', '~> 1.7.7'
-
 gemspec
 
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.3.5"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.5.4"
   gem "debugger"
   gem "vagrant-berkshelf", ">= 1.3.3"
 end
+
+# Force Vagrant to load our plugin during development
+group :plugins do
+    gem "vagrant-chef-zero", :path => "/Users/awgross/dev/andrew/vagrant-chef-zero"
+end

data/Makefile

@@ -9,7 +9,11 @@ test:
 	@bundle exec rake rspec_test
 
 vagrant:
-	@bundle exec vagrant up
+	@if [ -a .vagrant ]; then\
+		bundle exec vagrant provision;\
+	else\
+		bundle exec vagrant up;\
+	fi
 
 release:
 	@bundle exec rake release

data/Vagrantfile

@@ -13,8 +13,7 @@ Vagrant.configure("2") do |config|
   # Single Box Config
   config.vm.box = "precise64"
   config.vm.provision :chef_client do |chef|
-    chef.run_list = [
-    ]
+    chef.run_list = []
   end
 
 end

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

@@ -23,10 +23,10 @@ module VagrantPlugins
             write_knife_config(env)
           end
 
-          if berkshelf_enabled?(env)
-            @key = get_key_path(env)
-            set_berkshelf_client_key(@key)
-          end
+          # if berkshelf_enabled?(env)
+          #   @key = get_key_path(env)
+          #   set_berkshelf_client_key(@key)
+          # end
         end
 
         def call(env)

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

@@ -10,7 +10,13 @@ module VagrantPlugins
       attr_accessor :server
 
       def initialize
-        @ui = ::Vagrant::UI::Colored.new.scope('Chef Zero')
+        vagrant_version = Gem::Version.new(::Vagrant::VERSION)
+        if vagrant_version >= Gem::Version.new("1.5")
+          @ui = ::Vagrant::UI::Colored.new
+          @ui.opts[:target] = 'Butcher'
+        elsif vagrant_version >= Gem::Version.new("1.2")
+          @ui = ::Vagrant::UI::Colored.new.scope('Chef Zero')
+        end
       end
     end
   end

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

@@ -102,11 +102,11 @@ module VagrantPlugins
       end
 
       def chef_zero_enabled?(env)
-        env[:global_config].chef_zero.enabled && chef_client?(env)
+        env[:machine].config.chef_zero.enabled && chef_client?(env)
       end
 
       def berkshelf_enabled?(env)
-        env[:global_config].berkshelf.enabled == true && chef_client?(env)
+        env[:machine].config.berkshelf.enabled == true && chef_client?(env)
       end
 
       def set_berkshelf_client_key(value)

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

@@ -29,7 +29,7 @@ module VagrantPlugins
           end
         end
         env[:chef_zero].ui.warn("Could not find Chef Zero binary in any path in #{Gem.path}")
-        raise 
+        raise
       end
 
       def has_chef_zero_binary?(path)
@@ -43,7 +43,9 @@ module VagrantPlugins
 
       def find_chef_zero_binary(path)
         # Assuming a path from Gem.path
-        #potential_binary = ::File.join(path, "bin", "chef-zero")
+        if path == nil
+          return nil
+        end
         gems_path = ::File.join(path, "gems")
         chef_zero_gem = Dir["#{gems_path}/*"].select { |gp| gp.include?('/chef-zero-')}.first
         if chef_zero_gem
@@ -110,7 +112,7 @@ module VagrantPlugins
 
       def kill_process(env, pid)
         env[:chef_zero].ui.info("Stopping Chef Zero")
-        system("kill -s SIGTERM #{pid}")
+        system("kill -s TERM #{pid}")
       end
 
       def get_chef_zero_server_pid(port)

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ChefZero
-    VERSION = "0.6.0"
+    VERSION = "0.7.0"
   end
 end

data/vagrant-chef-zero.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "vagrant-chef-zero"
   s.license = "MIT"
 
-  s.add_dependency "chef-zero", "~> 1.3"
+  s.add_dependency "chef-zero", ">= 1.3"
   s.add_dependency "ridley", ">= 1.0.0"
   s.add_dependency "chef", "~> 11.0"
 

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Andrew Gross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,65 +55,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   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: simplecov
   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: rake
   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: rspec
   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'
 description: Enables Vagrant to interact with Chef Zero
@@ -145,7 +130,7 @@ files:
 - lib/vagrant-chef-zero.rb
 - LICENSE.txt
 - Makefile
-- pkg/vagrant-chef-zero-0.5.2.gem
+- pkg/vagrant-chef-zero-0.7.0.gem
 - Rakefile
 - README.md
 - spec/lib/action/upload_spec.rb
@@ -175,34 +160,28 @@ files:
 - Vagrantfile
 - .gitignore
 - .travis.yml
-- coverage/.last_run.json
-- coverage/.resultset.json
 homepage: http://github.com/andrewgross/vagrant-chef-zero
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4477384969117340887
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-chef-zero
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enables Vagrant to interact with Chef Zero.
 test_files: []