chef-dk 0.8.0 → 0.9.0

data/spec/shared/fixture_cookbook_checksums.rb

@@ -1,47 +1,47 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# 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 'chef-dk/helpers'
-
-RSpec.shared_context "fixture cookbooks checksums" do
-
-  def id_to_dotted(sha1_id)
-    major = sha1_id[0...14]
-    minor = sha1_id[14...28]
-    patch = sha1_id[28..40]
-    decimal_integers =[major, minor, patch].map {|hex| hex.to_i(16) }
-    decimal_integers.join(".")
-  end
-
-  let(:cookbook_foo_cksum) { "467dc855408ce8b74f991c5dc2fd72a6aa369b60" }
-
-  let(:cookbook_foo_cksum_dotted) { id_to_dotted(cookbook_foo_cksum) }
-
-  let(:cookbook_bar_cksum) { "4c538def500b75e744a3af05df66afd04dc3b3c5" }
-
-  let(:cookbook_bar_cksum_dotted) { id_to_dotted(cookbook_bar_cksum) }
-
-  let(:cookbook_baz_cksum) { "5c9063efbc5b5d8acc37024d7383f7dd010ae728" }
-
-  let(:cookbook_baz_cksum_dotted) { id_to_dotted(cookbook_baz_cksum) }
-
-  let(:cookbook_dep_of_bar_cksum) { "a4a6a5e4c6d95a580d291f6415d55b010669feac" }
-
-  let(:cookbook_dep_of_bar_cksum_dotted) { id_to_dotted(cookbook_dep_of_bar_cksum) }
-
-end
-
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 'chef-dk/helpers'
+
+RSpec.shared_context "fixture cookbooks checksums" do
+
+  def id_to_dotted(sha1_id)
+    major = sha1_id[0...14]
+    minor = sha1_id[14...28]
+    patch = sha1_id[28..40]
+    decimal_integers =[major, minor, patch].map {|hex| hex.to_i(16) }
+    decimal_integers.join(".")
+  end
+
+  let(:cookbook_foo_cksum) { "467dc855408ce8b74f991c5dc2fd72a6aa369b60" }
+
+  let(:cookbook_foo_cksum_dotted) { id_to_dotted(cookbook_foo_cksum) }
+
+  let(:cookbook_bar_cksum) { "4c538def500b75e744a3af05df66afd04dc3b3c5" }
+
+  let(:cookbook_bar_cksum_dotted) { id_to_dotted(cookbook_bar_cksum) }
+
+  let(:cookbook_baz_cksum) { "5c9063efbc5b5d8acc37024d7383f7dd010ae728" }
+
+  let(:cookbook_baz_cksum_dotted) { id_to_dotted(cookbook_baz_cksum) }
+
+  let(:cookbook_dep_of_bar_cksum) { "a4a6a5e4c6d95a580d291f6415d55b010669feac" }
+
+  let(:cookbook_dep_of_bar_cksum_dotted) { id_to_dotted(cookbook_dep_of_bar_cksum) }
+
+end
+

data/spec/shared/setup_git_cookbooks.rb

@@ -1,53 +1,53 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# 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 'chef-dk/helpers'
-
-RSpec.shared_context "setup git cookbooks" do
-
-  include ChefDK::Helpers
-
-  let(:cookbook_pristine_path) do
-    File.expand_path("spec/unit/fixtures/dev_cookbooks/bar-cookbook.gitbundle", project_root)
-  end
-
-  let(:cookbook_path) { File.join(tempdir, "bar") }
-
-  let(:current_rev) { 'dfc68070c47cbf4267be14ea87f80680cb5dafb3' }
-
-  before do
-    reset_tempdir
-    system_command("git clone #{cookbook_pristine_path} #{cookbook_path}").error!
-    system_command("git reset --hard #{current_rev}", cwd: cookbook_path).error!
-    system_command("git remote remove origin", cwd: cookbook_path).error!
-  end
-
-  after do
-    clear_tempdir
-  end
-
-end
-
-RSpec.shared_context "setup git cookbook remote" do
-  let(:remote_url) { "file://#{tempdir}/bar-cookbook.git" }
-
-  before do
-    system_command("git init --bare #{tempdir}/bar-cookbook.git").error!
-    system_command("git remote add origin #{remote_url}", cwd: cookbook_path).error!
-    system_command("git push -u origin master", cwd: cookbook_path).error!
-  end
-end
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 'chef-dk/helpers'
+
+RSpec.shared_context "setup git cookbooks" do
+
+  include ChefDK::Helpers
+
+  let(:cookbook_pristine_path) do
+    File.expand_path("spec/unit/fixtures/dev_cookbooks/bar-cookbook.gitbundle", project_root)
+  end
+
+  let(:cookbook_path) { File.join(tempdir, "bar") }
+
+  let(:current_rev) { 'dfc68070c47cbf4267be14ea87f80680cb5dafb3' }
+
+  before do
+    reset_tempdir
+    system_command("git clone #{cookbook_pristine_path} #{cookbook_path}").error!
+    system_command("git reset --hard #{current_rev}", cwd: cookbook_path).error!
+    system_command("git remote remove origin", cwd: cookbook_path).error!
+  end
+
+  after do
+    clear_tempdir
+  end
+
+end
+
+RSpec.shared_context "setup git cookbook remote" do
+  let(:remote_url) { "file://#{tempdir}/bar-cookbook.git" }
+
+  before do
+    system_command("git init --bare #{tempdir}/bar-cookbook.git").error!
+    system_command("git remote add origin #{remote_url}", cwd: cookbook_path).error!
+    system_command("git push -u origin master", cwd: cookbook_path).error!
+  end
+end

data/spec/spec_helper.rb

@@ -1,48 +1,49 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# 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 'rubygems'
-require 'rspec/mocks'
-require 'test_helpers'
-
-# needed since we stub it for every test
-require 'chef/workstation_config_loader'
-
-RSpec.configure do |c|
-  running_on_windows = (RUBY_PLATFORM =~ /mswin|mingw|windows/)
-
-  c.include ChefDK
-  c.include TestHelpers
-
-  # Avoid loading config.rb/knife.rb unintentionally
-  c.before(:each) do
-    allow_any_instance_of(Chef::WorkstationConfigLoader).to receive(:load)
-  end
-
-  c.after(:all) { clear_tempdir }
-
-  c.filter_run :focus => true
-  c.run_all_when_everything_filtered = true
-  # Tests that randomly fail, but may have value.
-  c.filter_run_excluding :volatile => true
-  c.filter_run_excluding :skip_on_windows => true if running_on_windows
-
-  c.mock_with(:rspec) do |mocks|
-    mocks.verify_partial_doubles = true
-  end
-
-end
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 'rubygems'
+require 'rspec/mocks'
+require 'test_helpers'
+
+# needed since we stub it for every test
+require 'chef/workstation_config_loader'
+
+RSpec.configure do |c|
+  running_on_windows = (RUBY_PLATFORM =~ /mswin|mingw|windows/)
+
+  c.include ChefDK
+  c.include TestHelpers
+
+  # Avoid loading config.rb/knife.rb unintentionally
+  c.before(:each) do
+    Chef::Config.reset
+    allow_any_instance_of(Chef::WorkstationConfigLoader).to receive(:load)
+  end
+
+  c.after(:all) { clear_tempdir }
+
+  c.filter_run :focus => true
+  c.run_all_when_everything_filtered = true
+  # Tests that randomly fail, but may have value.
+  c.filter_run_excluding :volatile => true
+  c.filter_run_excluding :skip_on_windows => true if running_on_windows
+
+  c.mock_with(:rspec) do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+end

data/spec/test_helpers.rb

@@ -1,84 +1,84 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# 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 'fileutils'
-require 'tmpdir'
-
-module TestHelpers
-
-  # A globally accessible place where we can put some state to verify that a
-  # test performed a certain operation.
-  def self.test_state
-    @test_state ||= {}
-  end
-
-  def self.reset!
-    @test_state = nil
-  end
-
-  def test_state
-    TestHelpers.test_state
-  end
-
-  def fixtures_path
-    File.expand_path(File.dirname(__FILE__) + "/unit/fixtures/")
-  end
-
-  def project_root
-    File.expand_path("../..", __FILE__)
-  end
-
-  def reset_tempdir
-    clear_tempdir
-    FileUtils.mkdir_p(tempdir)
-  end
-
-  def clear_tempdir
-    FileUtils.rm_rf(tempdir)
-    @tmpdir = nil
-  end
-
-  def tempdir
-    @tmpdir ||= Dir.mktmpdir("chef-dk")
-    File.realpath(@tmpdir)
-  end
-
-  class TestUI
-
-    attr_reader :output_stream
-
-    def initialize
-      @output_stream = StringIO.new
-    end
-
-    def err(message)
-      @output_stream.puts(message)
-    end
-
-    def msg(message)
-      @output_stream.puts(message)
-    end
-
-    def print(message)
-      @output_stream.print(message)
-    end
-
-    def output
-      @output_stream.string
-    end
-  end
-end
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 'fileutils'
+require 'tmpdir'
+
+module TestHelpers
+
+  # A globally accessible place where we can put some state to verify that a
+  # test performed a certain operation.
+  def self.test_state
+    @test_state ||= {}
+  end
+
+  def self.reset!
+    @test_state = nil
+  end
+
+  def test_state
+    TestHelpers.test_state
+  end
+
+  def fixtures_path
+    File.expand_path(File.dirname(__FILE__) + "/unit/fixtures/")
+  end
+
+  def project_root
+    File.expand_path("../..", __FILE__)
+  end
+
+  def reset_tempdir
+    clear_tempdir
+    FileUtils.mkdir_p(tempdir)
+  end
+
+  def clear_tempdir
+    FileUtils.rm_rf(tempdir)
+    @tmpdir = nil
+  end
+
+  def tempdir
+    @tmpdir ||= Dir.mktmpdir("chef-dk")
+    File.realpath(@tmpdir)
+  end
+
+  class TestUI
+
+    attr_reader :output_stream
+
+    def initialize
+      @output_stream = StringIO.new
+    end
+
+    def err(message)
+      @output_stream.puts(message)
+    end
+
+    def msg(message)
+      @output_stream.puts(message)
+    end
+
+    def print(message)
+      @output_stream.print(message)
+    end
+
+    def output
+      @output_stream.string
+    end
+  end
+end