vagrant-chef-zero 0.4.1 → 0.5.1

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+## 0.5.1
+
+Minor bugfixes (hopefully) to fix installation behavior and berkshelf issues.
+
+* Back out change adding ||= to berkshelf key replacement as it was causing issues.
+
+* Attempt to match the Chef dependency order more closely to avoid ruby gem installation issues
+
+## 0.5.0
+
+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.  
+
+## 0.4.2
+
+* Keep existing Berkshelf client key if one is already defined. Thanks to [Greg Symons](https://github.com/gregsymons) for the PR. 
+
+## 0.4.1
+
+* This is a belated changelog, as I apparently did not push one with this version in the past
+
+* Fix issues with Chef-Zero and Vagrant reload action.  See commit 2a2c6673d303f0768aec2909f19713a9f1ebb14e for more details
+
+
 ## 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.

data/README.md

@@ -1,3 +1,7 @@
+
+NOTE: This version (`0.5.0`) 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)
+
+
 # Vagrant-Chef-Zero
 [![Build Status](https://travis-ci.org/andrewgross/vagrant-chef-zero.png)](https://travis-ci.org/andrewgross/vagrant-chef-zero)
 [![Code Climate](https://codeclimate.com/repos/51e419cc89af7e3a2a003663/badges/c7a21cef56cddb54ab12/gpa.png)](https://codeclimate.com/repos/51e419cc89af7e3a2a003663/feed)

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

@@ -1,3 +1,5 @@
+require 'chef'
+
 module VagrantPlugins
   module ChefZero
     module Action
@@ -64,7 +66,13 @@ module VagrantPlugins
 
           environments = select_items(path)
           environments.each do |e|
-            environment = JSON.parse(IO.read(e)).to_hash
+            if e =~ /.rb$/
+              envrb = ::Chef::Environment.new
+              envrb.from_file(e)
+              environment = envrb.to_hash
+            else
+              environment = JSON.parse(IO.read(e)).to_hash
+            end
             if ! existing_envs.any?{ |ee| ee['name'] == environment['name'] }
               env[:chef_zero].ui.info("Creating Environment #{environment['name']}")
               @conn.environment.create(environment)
@@ -81,7 +89,13 @@ module VagrantPlugins
 
           roles = select_items(path)
           roles.each do |r|
-          role = JSON.parse(IO.read(r)).to_hash
+            if r =~ /.rb$/
+              rrb = ::Chef::Role.new
+              rrb.from_file(r)
+              role = rrb.to_hash
+            else
+              role = JSON.parse(IO.read(r)).to_hash
+            end
             if ! existing_roles.any?{ |er| er['name'] == role['name'] }
               env[:chef_zero].ui.info("Creating role #{role['name']}")
               @conn.role.create(role)
@@ -127,7 +141,7 @@ module VagrantPlugins
           elsif path.is_a?(Array)
             path
           elsif path.is_a?(String) && File.directory?(path)
-            path = Dir.glob("#{path}/*.json")
+            path = Dir.glob("#{path}/*.json")+Dir.glob("#{path}/*.rb")
           elsif path.is_a?(String) && File.exists?(path)
             path = [path]
           else
@@ -151,4 +165,4 @@ module VagrantPlugins
 
     end
   end
-end
+end

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

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

data/vagrant-chef-zero.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "vagrant-chef-zero"
   s.license = "MIT"
 
+  s.add_dependency "json", ">= 1.4.4", "<=  1.7.7"
   s.add_dependency "chef-zero", "~> 1.3"
   s.add_dependency "ridley", ">= 1.0.0"
-
+  s.add_dependency "chef", "~> 11.0"
 
   # Stolen from Vagrant Berkshelf because Ruby hates dependency resolution
   # activesupport 3.2.13 contains an incompatible hard lock on i18n (= 0.6.1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +65,22 @@ dependencies:
     - - ! '>='
       - !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
+        version: '11.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +237,8 @@ files:
 - lib/vagrant-chef-zero.rb
 - LICENSE.txt
 - Makefile
-- pkg/vagrant-chef-zero-0.4.0.gem
+- pkg/vagrant-chef-zero-0.4.2.gem
+- pkg/vagrant-chef-zero-0.5.0.gem
 - Rakefile
 - README.md
 - spec/lib/config_spec.rb
@@ -245,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3074438575813103530
+      hash: 3035003433799121851
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: