vagrant-chef-zero 0.5.2 → 0.6.0

data/.gitignore

@@ -1,6 +1,7 @@
 *.lock
 .zero-knife.rb
 .vagrant
+.bundle
 pkg
 coverage
 Berksfile

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'json', '~> 1.7.7'
+#gem 'json', '~> 1.7.7'
 
 gemspec
 
@@ -8,7 +8,7 @@ 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"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.3.5"
   gem "debugger"
   gem "vagrant-berkshelf", ">= 1.3.3"
 end

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

@@ -34,7 +34,7 @@ module VagrantPlugins
 
         def upload_cookbooks(env)
           path = env[:machine].config.chef_zero.cookbooks
-          cookbooks = select_items(path)
+          cookbooks = select_cookbooks(path)
           env[:chef_zero].ui.info("Loading cookbooks from #{path}") unless cookbooks.empty?
           cookbooks.each do |cookbook|
             name = File.basename(cookbook)
@@ -133,6 +133,38 @@ module VagrantPlugins
           end
         end
 
+        def select_cookbooks(path)
+          cookbook_paths = []
+          if path.nil?
+            cookbook_paths = []
+          elsif path.respond_to?('empty?') && path.empty?
+            cookbook_paths = []
+          elsif path.is_a?(Array)
+            cookbook_paths = path
+          elsif path.is_a?(String) && is_valid_cookbook?(path)
+            cookbook_paths = [path]
+          elsif path.is_a?(String) && File.directory?(path) && is_valid_cookbook_directory?(path)
+            cookbook_paths = select_valid_cookbooks(path)
+          else
+            @env[:chef_zero].ui.warn("Warning: Unable to normalize #{path}, skipping")
+            cookbook_paths = []
+          end
+          cookbook_paths
+        end
+
+        def is_valid_cookbook_directory?(path)
+          return ! select_valid_cookbooks(path).empty?
+        end
+
+        def select_valid_cookbooks(path)
+          directories = Dir.glob("#{path}/*")
+          directories.select{ |s| is_valid_cookbook?(s) }
+        end
+
+        def is_valid_cookbook?(path)
+          File.exists?("#{path}/metadata.rb") || File.exists?("#{path}/metadata.json")
+        end
+
         def select_items(path)
           if path.nil?
             path = []
@@ -141,7 +173,7 @@ module VagrantPlugins
           elsif path.is_a?(Array)
             path
           elsif path.is_a?(String) && File.directory?(path)
-            path = Dir.glob("#{path}/*.json")+Dir.glob("#{path}/*.rb")
+            path = Dir.glob("#{path}/*.json") + Dir.glob("#{path}/*.rb")
           elsif path.is_a?(String) && File.exists?(path)
             path = [path]
           else

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

@@ -45,7 +45,7 @@ module VagrantPlugins
         # 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
+        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

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

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

data/spec/lib/action/upload_spec.rb

@@ -0,0 +1,112 @@
+require_relative '../../spec_helper'
+
+describe "VagrantPlugins::ChefZero::Action::Upload" do
+
+  before(:each) do
+
+    # For now a silly helper to create fake nested env objects
+    ui = double("bar")
+    ui.stub(:warn).and_return(nil)
+    $fake_chef_zero = double("foo")
+    $fake_chef_zero.stub(:ui).and_return(ui)
+
+    class DummyUpload < VagrantPlugins::ChefZero::Action::Upload
+
+      def initialize(app, env)
+        @env = {:chef_zero => $fake_chef_zero}
+      end
+
+    end
+  end
+
+  describe "Normalizing Cookbook Path" do
+
+    describe "with a nil path" do
+
+      it "should return an empty array" do
+        path = nil
+        d = DummyUpload.new("foo", "bar")
+        d.select_cookbooks(path).should eql []
+      end
+
+    end
+
+    describe "with an empty array" do
+
+      it "should return an empty array" do
+        path = []
+        d = DummyUpload.new("foo", "bar")
+        d.select_cookbooks(path).should eql []
+      end
+
+    end
+
+    describe "with a non-empty array" do
+
+      it "should return the given array" do
+        path = ["foo"]
+        d = DummyUpload.new("foo", "bar")
+        d.select_cookbooks(path).should eql path
+      end
+
+    end
+
+    describe "with a string that is a path to valid cookbook with metadata.rb" do
+
+      it "should return the given path in an array" do
+        path = "foo"
+        File.stub(:exists?).with("#{path}/metadata.rb").and_return(true)
+        File.stub(:exists?).with("#{path}/metadata.json").and_return(false)
+
+        d = DummyUpload.new("foo", "bar")
+        d.select_cookbooks(path).should eql [path]
+      end
+
+    end
+
+    describe "with a string that is a path to valid cookbook with metadata.json" do
+
+      it "should return the given path in an array" do
+        path = "foo"
+        File.stub(:exists?).with("#{path}/metadata.rb").and_return(false)
+        File.stub(:exists?).with("#{path}/metadata.json").and_return(true)
+
+        d = DummyUpload.new("foo", "bar")
+        d.select_cookbooks(path).should eql [path]
+      end
+
+    end
+
+    describe "with a string that is a path to valid cookbooks directory" do
+
+      it "should return the given path in an array" do
+        path = "./foo/cookbooks"
+        File.stub(:directory?).with(path).and_return(true)
+        Dir.stub(:glob).with("#{path}/*").and_return(["#{path}/bar", "#{path}/baz"])
+
+        File.stub(:exists?).and_return(false)
+        File.stub(:exists?).with("#{path}/bar/metadata.rb").and_return(true)
+        File.stub(:exists?).with("#{path}/baz/metadata.json").and_return(true)
+
+        d = DummyUpload.new("foo", "bar")
+        d.select_cookbooks(path).should eql ["#{path}/bar", "#{path}/baz"]
+      end
+
+    end
+
+    describe "with a string that not a valid path" do
+
+      it "should send a UI warning and return an empty array" do
+        path = "foo"
+        File.stub(:exists?).and_return(false)
+        File.stub(:directory?).and_return(false)
+
+        d = DummyUpload.new("foo", "bar")
+        d.select_cookbooks(path).should eql []
+      end
+
+    end
+
+  end
+
+end

data/vagrant-chef-zero.gemspec

@@ -15,20 +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)
-  s.add_dependency 'activesupport', '>= 3.2.0', '< 3.2.13'
-
-  # 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", "< 2.8.0"
-  s.add_dependency 'net-scp', '~> 1.1.0'
-
   s.add_development_dependency "mocha"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-01-09 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
@@ -81,82 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '11.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  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
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +148,7 @@ files:
 - pkg/vagrant-chef-zero-0.5.2.gem
 - Rakefile
 - README.md
+- spec/lib/action/upload_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/server_helpers_spec.rb
 - spec/spec_helper.rb
@@ -272,6 +175,8 @@ files:
 - Vagrantfile
 - .gitignore
 - .travis.yml
+- coverage/.last_run.json
+- coverage/.resultset.json
 homepage: http://github.com/andrewgross/vagrant-chef-zero
 licenses:
 - MIT
@@ -287,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1041665802502836510
+      hash: 4477384969117340887
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: