halite 1.0.0.rc.1 → 1.0.0

data/spec/fixtures/cookbooks/test3/libraries/default.rb

@@ -0,0 +1,4 @@
+# coding: utf-8
+raise 'Halite is not compatible with no_lazy_load false, please set no_lazy_load true in your Chef configuration file.' unless Chef::Config[:no_lazy_load]
+$LOAD_PATH << File.expand_path('../../files/halite_gem', __FILE__)
+require "test3/dsl"

data/spec/fixtures/gems/test1/lib/test1.rb

@@ -0,0 +1,2 @@
+module Test1
+end

data/spec/fixtures/gems/test1/lib/test1/version.rb

@@ -0,0 +1,3 @@
+module Test1
+  VERSION = '1.2.3'
+end

data/spec/fixtures/gems/test2/lib/test2.rb

@@ -0,0 +1,4 @@
+require 'test2/resource'
+
+module Test2
+end

data/spec/{data/integration_cookbooks/test2/libraries/test2__resource.rb → fixtures/gems/test2/lib/test2/resource.rb}

@@ -1,7 +1,6 @@
-if ENV['HALITE_LOAD']; require 'chef/resource'
+require 'chef/resource'
 
 module Test2
   class Resource < Chef::Resource
   end
 end
-end

data/spec/fixtures/gems/test2/lib/test2/version.rb

@@ -0,0 +1,3 @@
+module Test2
+  VERSION = '4.5.6'
+end

data/spec/fixtures/gems/test3/lib/test3.rb

@@ -0,0 +1,4 @@
+require 'test3/dsl'
+
+module Test3
+end

data/spec/{data/integration_cookbooks/test3/libraries/test3__dsl.rb → fixtures/gems/test3/lib/test3/dsl.rb}

@@ -1,4 +1,4 @@
-if ENV['HALITE_LOAD']; require_relative '../../test2/libraries/test2__version'
+require 'test2/version'
 
 module Test3
   module DSL
@@ -13,4 +13,3 @@ class Chef
     include Test3::DSL
   end
 end
-end

data/spec/fixtures/gems/test3/lib/test3/version.rb

@@ -0,0 +1,3 @@
+module Test3
+  VERSION = '7.8.9'
+end

data/spec/{data → fixtures}/gems/test3/test3.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary = %q||
   spec.homepage = ''
   spec.license = 'Apache 2.0'
+  spec.metadata['halite_entry_point'] = 'test3/dsl'
 
   spec.files = `cd #{File.expand_path('..', __FILE__)} && git ls-files`.split($/)
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/spec/gem_spec.rb

@@ -1,3 +1,19 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'spec_helper'
 require 'halite/gem'
 require 'halite/version'
@@ -10,22 +26,20 @@ describe Halite::Gem do
   context 'when loading halite' do
     its(:name) { is_expected.to eq 'halite' }
     its(:version) { is_expected.to eq Halite::VERSION }
-    its(:description) { is_expected.to be_a String }
-    its(:files) { is_expected.to include 'halite.gemspec' }
-    its(:files) { is_expected.to include 'lib/halite/gem.rb' }
+    its(:spec) { is_expected.to be_a Gem::Specification }
   end
 
   context 'when loading halite with a version' do
     let(:gem_version) { Halite::VERSION }
     its(:name) { is_expected.to eq 'halite' }
     its(:version) { is_expected.to eq Halite::VERSION }
-    its(:description) { is_expected.to be_a String }
+    its(:spec) { is_expected.to be_a Gem::Specification }
   end
 
   context 'when loading rspec' do
     let(:gem_name) { 'rspec' }
     its(:name) { is_expected.to eq 'rspec' }
-    its(:description) { is_expected.to be_a String }
+    its(:spec) { is_expected.to be_a Gem::Specification }
     its(:is_halite_cookbook?) { is_expected.to be_falsey }
   end
 
@@ -34,12 +48,10 @@ describe Halite::Gem do
     its(:name) { is_expected.to eq 'test1' }
     its(:version) { is_expected.to eq '1.2.3' }
     its(:cookbook_name) { is_expected.to eq 'test1' }
-    its(:files) { is_expected.to include 'test1.gemspec' }
-    its(:files) { is_expected.to include 'lib/test1.rb' }
     its(:license_header) { is_expected.to eq "# coding: utf-8\n# Awesome license\n" }
     its(:each_library_file) { is_expected.to eq [
-      [File.expand_path('../data/gems/test1/lib/test1.rb', __FILE__), 'test1.rb'],
-      [File.expand_path('../data/gems/test1/lib/test1/version.rb', __FILE__), 'test1/version.rb'],
+      [File.expand_path('../fixtures/gems/test1/lib/test1.rb', __FILE__), 'test1.rb'],
+      [File.expand_path('../fixtures/gems/test1/lib/test1/version.rb', __FILE__), 'test1/version.rb'],
     ] }
     its(:cookbook_dependencies) { is_expected.to eq [] }
     its(:is_halite_cookbook?) { is_expected.to be_truthy }
@@ -48,10 +60,10 @@ describe Halite::Gem do
       context 'with no prefixes' do
         it 'returns all files' do
           expect(subject.each_file).to eq [
-            [File.expand_path('../data/gems/test1/Rakefile', __FILE__), 'Rakefile'],
-            [File.expand_path('../data/gems/test1/lib/test1.rb', __FILE__), 'lib/test1.rb'],
-            [File.expand_path('../data/gems/test1/lib/test1/version.rb', __FILE__), 'lib/test1/version.rb'],
-            [File.expand_path('../data/gems/test1/test1.gemspec', __FILE__), 'test1.gemspec'],
+            [File.expand_path('../fixtures/gems/test1/Rakefile', __FILE__), 'Rakefile'],
+            [File.expand_path('../fixtures/gems/test1/lib/test1.rb', __FILE__), 'lib/test1.rb'],
+            [File.expand_path('../fixtures/gems/test1/lib/test1/version.rb', __FILE__), 'lib/test1/version.rb'],
+            [File.expand_path('../fixtures/gems/test1/test1.gemspec', __FILE__), 'test1.gemspec'],
           ]
         end
       end
@@ -59,7 +71,7 @@ describe Halite::Gem do
       context 'with a prefix that overlaps a filename' do
         it 'returns only files in that folder' do
           expect(subject.each_file('lib/test1')).to eq [
-            [File.expand_path('../data/gems/test1/lib/test1/version.rb', __FILE__), 'version.rb'],
+            [File.expand_path('../fixtures/gems/test1/lib/test1/version.rb', __FILE__), 'version.rb'],
           ]
         end
       end
@@ -71,29 +83,27 @@ describe Halite::Gem do
     its(:name) { is_expected.to eq 'test2' }
     its(:version) { is_expected.to eq '4.5.6' }
     its(:cookbook_name) { is_expected.to eq 'test2' }
-    its(:files) { is_expected.to include 'test2.gemspec' }
-    its(:files) { is_expected.to include 'lib/test2.rb' }
     its(:license_header) { is_expected.to eq "# coding: utf-8\n" }
     its(:each_library_file) { is_expected.to eq [
-      [File.expand_path('../data/gems/test2/lib/test2.rb', __FILE__), 'test2.rb'],
-      [File.expand_path('../data/gems/test2/lib/test2/resource.rb', __FILE__), 'test2/resource.rb'],
-      [File.expand_path('../data/gems/test2/lib/test2/version.rb', __FILE__), 'test2/version.rb'],
+      [File.expand_path('../fixtures/gems/test2/lib/test2.rb', __FILE__), 'test2.rb'],
+      [File.expand_path('../fixtures/gems/test2/lib/test2/resource.rb', __FILE__), 'test2/resource.rb'],
+      [File.expand_path('../fixtures/gems/test2/lib/test2/version.rb', __FILE__), 'test2/version.rb'],
     ] }
-    its(:cookbook_dependencies) { is_expected.to eq [Halite::Dependencies::Dependency.new('testdep', '>= 0.0', :requirements)] }
+    its(:cookbook_dependencies) { is_expected.to eq [Halite::Dependencies::Dependency.new('testdep', '>= 0', :requirements)] }
     its(:is_halite_cookbook?) { is_expected.to be_truthy }
 
     describe '#each_file' do
       context 'with no prefixes' do
         it 'returns all files' do
           expect(subject.each_file).to eq [
-            [File.expand_path('../data/gems/test2/Rakefile', __FILE__), 'Rakefile'],
-            [File.expand_path('../data/gems/test2/chef/attributes.rb', __FILE__), 'chef/attributes.rb'],
-            [File.expand_path('../data/gems/test2/chef/recipes/default.rb', __FILE__), 'chef/recipes/default.rb'],
-            [File.expand_path('../data/gems/test2/chef/templates/default/conf.erb', __FILE__), 'chef/templates/default/conf.erb'],
-            [File.expand_path('../data/gems/test2/lib/test2.rb', __FILE__), 'lib/test2.rb'],
-            [File.expand_path('../data/gems/test2/lib/test2/resource.rb', __FILE__), 'lib/test2/resource.rb'],
-            [File.expand_path('../data/gems/test2/lib/test2/version.rb', __FILE__), 'lib/test2/version.rb'],
-            [File.expand_path('../data/gems/test2/test2.gemspec', __FILE__), 'test2.gemspec'],
+            [File.expand_path('../fixtures/gems/test2/Rakefile', __FILE__), 'Rakefile'],
+            [File.expand_path('../fixtures/gems/test2/chef/attributes.rb', __FILE__), 'chef/attributes.rb'],
+            [File.expand_path('../fixtures/gems/test2/chef/recipes/default.rb', __FILE__), 'chef/recipes/default.rb'],
+            [File.expand_path('../fixtures/gems/test2/chef/templates/default/conf.erb', __FILE__), 'chef/templates/default/conf.erb'],
+            [File.expand_path('../fixtures/gems/test2/lib/test2.rb', __FILE__), 'lib/test2.rb'],
+            [File.expand_path('../fixtures/gems/test2/lib/test2/resource.rb', __FILE__), 'lib/test2/resource.rb'],
+            [File.expand_path('../fixtures/gems/test2/lib/test2/version.rb', __FILE__), 'lib/test2/version.rb'],
+            [File.expand_path('../fixtures/gems/test2/test2.gemspec', __FILE__), 'test2.gemspec'],
           ]
         end
       end
@@ -101,9 +111,9 @@ describe Halite::Gem do
       context 'with a prefix of chef' do
         it 'returns only files in that folder' do
           expect(subject.each_file('chef')).to eq [
-            [File.expand_path('../data/gems/test2/chef/attributes.rb', __FILE__), 'attributes.rb'],
-            [File.expand_path('../data/gems/test2/chef/recipes/default.rb', __FILE__), 'recipes/default.rb'],
-            [File.expand_path('../data/gems/test2/chef/templates/default/conf.erb', __FILE__), 'templates/default/conf.erb'],
+            [File.expand_path('../fixtures/gems/test2/chef/attributes.rb', __FILE__), 'attributes.rb'],
+            [File.expand_path('../fixtures/gems/test2/chef/recipes/default.rb', __FILE__), 'recipes/default.rb'],
+            [File.expand_path('../fixtures/gems/test2/chef/templates/default/conf.erb', __FILE__), 'templates/default/conf.erb'],
           ]
         end
       end

data/spec/integration_spec.rb

@@ -1,104 +1,80 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'spec_helper'
-require 'tmpdir'
-require 'mixlib/shellout'
-require 'halite/converter'
+require 'rspec-command'
 
 describe 'integration tests' do
-  around do |example|
-    Dir.mktmpdir('halite_test') do |path|
-      example.metadata[:halite_temp_path] = path
-      example.run
-    end
-  end
-  let(:temp_path) do |example|
-    example.metadata[:halite_temp_path]
-  end
-  let(:gem_name) { '' }
-  let(:stub_cookbooks) { [] }
+  include RSpecCommand
+  include RSpecCommand::Rake
   let(:extra_gems) { [] }
   let(:recipes) { [] }
-  let(:fixture_path) { File.expand_path("../data/integration_cookbooks/#{gem_name}", __FILE__) }
-  let(:expect_output) { nil }
-
-  shared_examples 'an integration test' do
-    def directories_match(temp_path, fixture_path)
-      temp_files = Dir[File.join(temp_path, '**', '*')].sort
-      fixture_files = Dir[File.join(fixture_path, '**', '*')].sort
-      expect(temp_files.map {|path| path[temp_path.length..-1] }).to eq fixture_files.map {|path| path[fixture_path.length..-1] }
-      temp_files.zip(fixture_files).each do |temp_file, fixture_file|
-        next unless File.file?(temp_file)
-        expect(IO.read(temp_file)).to eq IO.read(fixture_file)
-      end
-    end
+  let(:expect_output) { }
 
-    it 'matches the fixture' do
-      # Convert gem
-      Halite.convert(gem_name, temp_path)
-      # Check that conversion matches the fixture
-      directories_match(temp_path, fixture_path)
-    end
+  shared_examples 'an integration test' do |gem_name, version, stub_cookbooks=[]|
+    describe 'Halite.convert' do
+      subject { Halite.convert(gem_name, temp_path) }
+      it { is_expected.to match_fixture("cookbooks/#{gem_name}") }
+    end # /describe Halite.convert
 
-    it 'is a valid cookbook', slow: true do
-      # Write out a solo config with the path
-      solo_rb = File.join(temp_path, 'solo.rb')
-      IO.write(solo_rb, "cookbook_path '#{temp_path}'")
-      # Write out a cookbook that depends on our gem cookbook
-      runner_path = File.join(temp_path, 'runner')
-      Dir.mkdir(runner_path)
-      IO.write(File.join(runner_path, 'metadata.rb'), "name 'runner'\ndepends '#{gem_name}'")
-      Dir.mkdir(File.join(runner_path, 'recipes'))
-      IO.write(File.join(runner_path, 'recipes', 'default.rb'), '')
-      # Write out a stub cookbooks for dependency testing
+    describe 'run it with chef-solo', slow: true do
+      file('solo.rb') { "cookbook_path '#{temp_path}'" }
+      file 'runner/metadata.rb', "name 'runner'\ndepends '#{gem_name}'"
+      file 'runner/recipes/default.rb', ''
+      # Write out a stub cookbooks for dependency testing.
       stub_cookbooks.each do |(stub_name, stub_version)|
-        stub_path = File.join(temp_path, stub_name)
-        Dir.mkdir(stub_path)
-        IO.write(File.join(stub_path, 'metadata.rb'), "name '#{stub_name}'\nversion '#{stub_version}'")
+        file "#{stub_name}/metadata.rb", "name '#{stub_name}'\nversion '#{stub_version}'"
       end
-      # Convert gems
-      ([gem_name] + extra_gems).each do |name|
-        cookbook_path = File.join(temp_path, name)
-        Dir.mkdir(cookbook_path)
-        Halite.convert(name, cookbook_path)
+      before do
+        ([gem_name] + extra_gems).each do |name|
+          cookbook_path = File.join(temp_path, name)
+          Dir.mkdir(cookbook_path)
+          Halite.convert(name, cookbook_path)
+        end
       end
-      # Run solo
-      cmd = Mixlib::ShellOut.new("bundle exec chef-solo -l debug -c #{solo_rb} -o #{(['runner']+recipes).map{|r| "recipe[#{r}]"}.join(',')}", cwd: temp_path)
-      cmd.run_command
-      expect(cmd.error?).to be_falsey, "Running #{cmd.command} failed (#{cmd.exitstatus} #{cmd.error?}):\n#{cmd.stderr.empty? ? cmd.stdout : cmd.stderr}"
-      Array(expect_output).each do |output|
-        expect(cmd.stdout).to include(output), "'#{output}' not found in the output of #{cmd.command}:\n#{cmd.stdout}"
+      command { "chef-solo -l debug -c solo.rb -o #{(['runner']+recipes).map{|r| "recipe[#{r}]"}.join(',')}" }
+
+      it do
+        # Force the command to run at least once.
+        subject
+        Array(expect_output).each do |output|
+          expect(subject.stdout).to include(output), "'#{output}' not found in the output of #{subject.command}:\n#{subject.stdout}"
+        end
       end
-    end
+    end # /describe run it with chef-solo
 
-    it 'can run rake chef:build', slow: true do
-      # Copy the test gem to the temp path
-      FileUtils.cp_r(File.join(File.expand_path(File.join('..', 'data', 'gems', gem_name), __FILE__), '.'), temp_path)
-      # Run rake build
-      cmd = Mixlib::ShellOut.new("bundle exec rake chef:build", cwd: temp_path)
-      cmd.run_command
-      expect(cmd.error?).to be_falsey, "Running #{cmd.command} failed (#{cmd.exitstatus} #{cmd.error?}):\n#{cmd.stderr.empty? ? cmd.stdout : cmd.stderr}"
-      # Check that conversion matches the fixture
-      directories_match(Dir[File.join(temp_path, 'pkg', '*')].first, fixture_path)
-    end
-  end
+    describe 'run rake chef:build' do
+      fixture_file "gems/#{gem_name}"
+      rake_task 'chef:build'
+      it { is_expected.to match_fixture("cookbooks/#{gem_name}", "pkg/#{gem_name}-#{version}") }
+    end # /describe run rake chef:build
+  end # /shared_examples an integration test
 
   context 'with test1 gem', integration: true do
-    let(:gem_name) { 'test1' }
-    it_should_behave_like 'an integration test'
-  end
+    it_should_behave_like 'an integration test', 'test1', '1.2.3'
+  end # /context with test1 gem
 
   context 'with test2 gem', integration: true do
-    let(:gem_name) { 'test2' }
-    let(:stub_cookbooks) { [['testdep', '1.0.0']] }
-    it_should_behave_like 'an integration test'
-  end
+    it_should_behave_like 'an integration test', 'test2', '4.5.6', [['testdep', '1.0.0']]
+  end # /context with test2 gem
 
   context 'with test3 gem', integration: true do
-    let(:gem_name) { 'test3' }
     let(:extra_gems) { ['test2'] }
-    let(:stub_cookbooks) { [['testdep', '1.0.0']] }
     let(:recipes) { ['test3'] }
     let(:expect_output) { '!!!!!!!!!!test34.5.6' }
-    it_should_behave_like 'an integration test'
-  end
-
+    it_should_behave_like 'an integration test', 'test3', '7.8.9', [['testdep', '1.0.0']]
+  end # /context with test3 gem
 end

data/spec/runner_spec.rb

@@ -0,0 +1,108 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This file is not named spec/spec_helper/runner_spec.rb because that seems confusing.
+
+require 'spec_helper'
+
+require 'halite/spec_helper/runner'
+
+describe Halite::SpecHelper::Runner do
+  let(:options) { Hash.new }
+  subject { described_class.new(options) }
+
+  describe 'Runner.converge' do
+    let(:instance) { double('Runner instance') }
+    before do
+      expect(described_class).to receive(:new).with(options).and_return(instance)
+    end
+
+    context 'with a block' do
+      it do
+        expect(instance).to receive(:converge) do |&block|
+          expect(block).to be_a(Proc)
+        end
+        described_class.converge { ruby_block 'test' }
+      end
+    end # /context with a block
+
+    context 'with a recipe' do
+      it do
+        expect(instance).to receive(:converge).with('test')
+        described_class.converge('test')
+      end
+    end # /context with a recipe
+
+    context 'with options' do
+      let(:options) { {dry_run: true} }
+      it do
+        expect(instance).to receive(:converge).with('test')
+        described_class.converge('test', dry_run: true)
+      end
+    end # /context with options
+  end # /describe Runner.converge
+
+  describe '#initialize' do
+
+    context 'with a simple option' do
+      let(:options) { {dry_run: true} }
+      its(:dry_run?) { is_expected.to be_truthy }
+    end # /context with a simple option
+
+    context 'with default_attributes' do
+      let(:options) { {default_attributes: {halite: 'test'}} }
+      it { expect(subject.node.default['halite']).to eq('test') }
+      it { expect(subject.node['halite']).to eq('test') }
+    end # /context with default_attributes
+
+    context 'with normal_attributes' do
+      let(:options) { {normal_attributes: {halite: 'test'}} }
+      it { expect(subject.node.normal['halite']).to eq('test') }
+      it { expect(subject.node['halite']).to eq('test') }
+    end # /context with normal_attributes
+
+    context 'with override_attributes' do
+      let(:options) { {override_attributes: {halite: 'test'}} }
+      it { expect(subject.node.override['halite']).to eq('test') }
+      it { expect(subject.node['halite']).to eq('test') }
+    end # /context with override_attributes
+  end # /describe #initialize
+
+  describe '#converge' do
+    context 'with a block' do
+      it do
+        sentinel = [false]
+        subject.converge { sentinel[0] = true }
+        expect(sentinel[0]).to eq(true)
+      end
+    end # /context with a block
+
+    context 'with a recipe' do
+      let(:options) { {dry_run: true} }
+
+      it do
+        expect(subject.node.run_list).to receive(:add).with('test')
+        subject.converge('test')
+      end
+    end # /context with a recipe
+
+    context 'with both a block and a recipe' do
+      it do
+        expect { subject.converge('test') { } }.to raise_error(Halite::Error)
+      end
+    end # /context with both a block and a recipe
+  end # /describe #converge
+end