berkshelf 0.6.0.beta2 → 0.6.0.beta3

data/spec/unit/berkshelf/config_validator_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Berkshelf::ConfigValidator do
+  let(:config) { Berkshelf::Config.from_json json }
+  let(:config_validator) { klass.new Hash.new }
+  let(:json) { '{}' }
+  let(:klass) { described_class }
+  let(:structure) { Hash.new }
+
+  before :each do
+    klass.any_instance.stub structure: structure
+  end
+
+  describe "#validate" do
+    subject { config_validator.validate config }
+
+    it { should be_true }
+    it { config.should be_valid }
+
+    context "with a top-level key" do
+      let(:json) { '{ "a": 1 }' }
+      let(:structure) { { a: Object } }
+
+      it { should be_true }
+      it { config.should be_valid }
+    end
+
+    context "with a nested key" do
+      let(:json) { '{ "a": { "b": 1 } }' }
+      let(:structure) { { a: { b: Object } } }
+
+      it { should be_true }
+      it { config.should be_valid }
+    end
+
+    context "with a top-level nonsense key" do
+      let(:json) { '{ "nonsense": null }' }
+      let(:structure) { { a: Object } }
+
+      it { should be_false }
+      it { config.should_not be_valid }
+    end
+
+    context "with a nested nonsense key" do
+      let(:json) { '{ "a": { "nonsense": 1 } }' }
+      let(:structure) { { a: { b: Object } } }
+
+      it { should be_false }
+      it { config.should_not be_valid }
+    end
+
+    context "with a top-level key that doesn't match the expected type" do
+      let(:json) { '{ "a": 1 }' }
+      let(:structure) { { a: String } }
+
+      it { should be_false }
+      it { config.should_not be_valid }
+    end
+
+    context "with a nested key that doesn't match the expected type" do
+      let(:json) { '{ "a": { "b": 1 } }' }
+      let(:structure) { { a: { b: String } } }
+
+      it { should be_false }
+      it { config.should_not be_valid }
+    end
+  end
+end

data/spec/unit/berkshelf/cookbook_source_spec.rb

@@ -190,24 +190,24 @@ module Berkshelf
     describe '#add_group' do
       it "should store strings as symbols" do
         subject.add_group "foo"
-        subject.groups.should == [:default, :foo]
+        subject.groups.should =~ [:default, :foo]
       end
 
       it "should not store duplicate groups" do
         subject.add_group "bar"
         subject.add_group "bar"
         subject.add_group :bar
-        subject.groups.should == [:default, :bar]
+        subject.groups.should =~ [:default, :bar]
       end
 
       it "should add multiple groups" do
         subject.add_group "baz", "quux"
-        subject.groups.should == [:default, :baz, :quux]
+        subject.groups.should =~ [:default, :baz, :quux]
       end
 
       it "should handle multiple groups as an array" do
         subject.add_group ["baz", "quux"]
-        subject.groups.should == [:default, :baz, :quux]
+        subject.groups.should =~ [:default, :baz, :quux]
       end
     end
 

data/spec/unit/berkshelf/core_ext/file_utils_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe FileUtils do
+  describe "#mv" do
+    let(:src) { double('src') }
+    let(:dest) { double('dest') }
+    let(:options) { double('options') }
+
+    it "delegates to #safe_mv if on Windows" do
+      subject.stub(:windows?) { true }
+      FileUtils.should_receive(:safe_mv).with(src, dest, options)
+
+      FileUtils.mv(src, dest, options)
+    end
+
+    it "delegates to #old_mv if not on Windows" do
+      subject.stub(:windows?) { false }
+      FileUtils.should_receive(:old_mv).with(src, dest, options)
+
+      FileUtils.mv(src, dest, options)
+    end
+  end
+end

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -14,9 +14,15 @@ module Berkshelf
 
       specify do
         target.should have_structure {
+          file ".gitignore"
           file "Berksfile"
           file "Gemfile" do
             contains "gem 'berkshelf'"
+            contains "gem 'vagrant'"
+          end
+          file "Vagrantfile" do
+            contains "require 'berkshelf/vagrant'"
+            contains "recipe[some_cookbook::default]"
           end
           no_file "chefignore"
         }
@@ -39,6 +45,8 @@ module Berkshelf
 
     context "with a metadata entry in the Berksfile" do
       before do
+        Dir.mkdir target
+        File.write target.join("metadata.rb"), ""
         generator = subject.new([target], metadata_entry: true)
         capture(:stdout) { generator.invoke_all }
       end
@@ -52,38 +60,6 @@ module Berkshelf
       end
     end
 
-    context "with the vagrant option true" do
-      before do
-        generator = subject.new([target], vagrant: true)
-        quietly { generator.invoke_all }
-      end
-
-      specify do
-        target.should have_structure {
-          file "Vagrantfile" do
-            contains "require 'berkshelf/vagrant'"
-            contains "recipe[some_cookbook::default]"
-          end
-          file "Gemfile" do
-            contains "gem 'vagrant'"
-          end
-        }
-      end
-    end
-
-    context "with the git option true" do
-      before do
-        generator = subject.new([target], git: true)
-        capture(:stdout) { generator.invoke_all }
-      end
-
-      specify do
-        target.should have_structure {
-          file ".gitignore"
-        }
-      end
-    end
-
     context "with the foodcritic option true" do
       before do
         generator = subject.new([target], foodcritic: true)
@@ -148,5 +124,31 @@ module Berkshelf
         generator.send(:cookbook_name).should eql("some_cookbook")
       end
     end
+
+    context "when skipping git" do
+      before do
+        generator = subject.new([target], skip_git: true)
+        capture(:stdout) { generator.invoke_all }
+      end
+
+      it "should not have a .git directory" do
+        target.should_not have_structure {
+          directory ".git"
+        }
+      end
+    end
+
+    context "when skipping vagrant" do
+      before do
+        generator = subject.new([target], skip_vagrant: true)
+        capture(:stdout) { generator.invoke_all }
+      end
+
+      it "should not have a Vagrantfile" do
+        target.should have_structure {
+          no_file "Vagrantfile"
+        }
+      end
+    end
   end
 end

data/spec/unit/berkshelf/locations/chef_api_location_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Berkshelf
-  describe ChefAPILocation do
+  describe ChefAPILocation, :chef_server do
     let(:test_chef_api) { "https://chefserver:8081" }
 
     describe "ClassMethods" do

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -21,9 +21,9 @@ module Berkshelf
 
         Lockfile.new(resolver.sources).write
 
-        File.read('Berksfile.lock').split(/\r?\n/).sort.should == [
+        File.read('Berksfile.lock').split(/\r?\n/).should =~ [
           "cookbook 'bluepill', :locked_version => '1.1.0'",
-          "cookbook 'build-essential', :locked_version => '1.1.0'",
+          "cookbook 'build-essential', :locked_version => '1.1.2'",
           "cookbook 'nginx', :locked_version => '0.101.0'",
           "cookbook 'ohai', :locked_version => '1.0.2'",
           "cookbook 'runit', :locked_version => '0.15.0'"

data/spec/unit/berkshelf/resolver_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Berkshelf
-  describe Resolver do
+  describe Resolver, :chef_server do
     let(:source) do
       double('source',
         name: 'mysql',

data/spec/unit/berkshelf/uploader_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Berkshelf
-  describe Uploader do
+  describe Uploader, :chef_server do
     subject { Uploader.new(server_url: Chef::Config[:chef_server_url], client_key: Chef::Config[:client_key], client_name: Chef::Config[:node_name]) }
 
     describe "#upload" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta2
+  version: 0.6.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -12,8 +12,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chozo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
@@ -37,7 +53,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +61,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +158,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -443,6 +491,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rbenv-version
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE
@@ -450,6 +499,8 @@ files:
 - Thorfile
 - berkshelf.gemspec
 - bin/berks
+- features/config.feature
+- features/config_command.feature
 - features/cookbook_command.feature
 - features/default_locations.feature
 - features/groups_install.feature
@@ -472,6 +523,7 @@ files:
 - generator_files/Thorfile.erb
 - generator_files/Vagrantfile.erb
 - generator_files/chefignore
+- generator_files/config.json
 - generator_files/default_recipe.erb
 - generator_files/gitignore.erb
 - generator_files/licenses/apachev2.erb
@@ -485,11 +537,15 @@ files:
 - lib/berkshelf/berksfile.rb
 - lib/berkshelf/cached_cookbook.rb
 - lib/berkshelf/cli.rb
+- lib/berkshelf/config.rb
+- lib/berkshelf/config_generator.rb
+- lib/berkshelf/config_validator.rb
 - lib/berkshelf/cookbook_generator.rb
 - lib/berkshelf/cookbook_source.rb
 - lib/berkshelf/cookbook_store.rb
 - lib/berkshelf/core_ext.rb
 - lib/berkshelf/core_ext/file.rb
+- lib/berkshelf/core_ext/file_utils.rb
 - lib/berkshelf/core_ext/pathname.rb
 - lib/berkshelf/core_ext/string.rb
 - lib/berkshelf/downloader.rb
@@ -520,7 +576,6 @@ files:
 - lib/berkshelf/version.rb
 - lib/thor/monkies.rb
 - lib/thor/monkies/hash_with_indifferent_access.rb
-- lib/vagrant_init.rb
 - spec/fixtures/Berksfile
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/README.md
 - spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb
@@ -555,9 +610,12 @@ files:
 - spec/support/matchers/filepath_matchers.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
+- spec/unit/berkshelf/config_spec.rb
+- spec/unit/berkshelf/config_validator_spec.rb
 - spec/unit/berkshelf/cookbook_generator_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
+- spec/unit/berkshelf/core_ext/file_utils_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/formatters_spec.rb
 - spec/unit/berkshelf/git_spec.rb
@@ -596,6 +654,8 @@ signing_key:
 specification_version: 3
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
 test_files:
+- features/config.feature
+- features/config_command.feature
 - features/cookbook_command.feature
 - features/default_locations.feature
 - features/groups_install.feature
@@ -646,9 +706,12 @@ test_files:
 - spec/support/matchers/filepath_matchers.rb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/cached_cookbook_spec.rb
+- spec/unit/berkshelf/config_spec.rb
+- spec/unit/berkshelf/config_validator_spec.rb
 - spec/unit/berkshelf/cookbook_generator_spec.rb
 - spec/unit/berkshelf/cookbook_source_spec.rb
 - spec/unit/berkshelf/cookbook_store_spec.rb
+- spec/unit/berkshelf/core_ext/file_utils_spec.rb
 - spec/unit/berkshelf/downloader_spec.rb
 - spec/unit/berkshelf/formatters_spec.rb
 - spec/unit/berkshelf/git_spec.rb

data/lib/vagrant_init.rb

@@ -1,2 +0,0 @@
-# This file is automatically loaded by Vagrant
-require 'berkshelf/vagrant'