chef-dk 1.2.22 → 1.3.40

data/spec/unit/commands_map_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/commands_map'
-require 'stringio'
+require "spec_helper"
+require "chef-dk/commands_map"
+require "stringio"
 
 describe ChefDK::CommandsMap do
 
@@ -43,7 +43,7 @@ describe ChefDK::CommandsMap do
   end
 
   it "lists the available commands" do
-    expect(mapping.command_names).to match_array(%w[example hypenated-example explicit-path-example documented-example])
+    expect(mapping.command_names).to match_array(%w{example hypenated-example explicit-path-example documented-example})
   end
 
   it "keeps the docstring of a command" do

data/spec/unit/component_test_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/component_test'
-require 'pathname'
+require "spec_helper"
+require "chef-dk/component_test"
+require "pathname"
 
 describe ChefDK::ComponentTest do
 

data/spec/unit/configurable_spec.rb

@@ -15,27 +15,27 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/configurable'
-require 'unit/fixtures/configurable/test_configurable'
+require "spec_helper"
+require "chef-dk/configurable"
+require "unit/fixtures/configurable/test_configurable"
 
 describe ChefDK::Configurable do
 
   let(:includer) { TestConfigurable.new }
 
-  it 'provides chef_config' do
+  it "provides chef_config" do
     expect(includer.chef_config).to eq Chef::Config
   end
 
-  it 'provides chefdk_config' do
+  it "provides chefdk_config" do
     expect(includer.chefdk_config).to eq Chef::Config.chefdk
   end
 
-  it 'provides knife_config' do
+  it "provides knife_config" do
     expect(includer.knife_config).to eq Chef::Config.knife
   end
 
-  it 'provides generator_config' do
+  it "provides generator_config" do
     expect(includer.generator_config).to eq Chef::Config.chefdk.generator
   end
 end

data/spec/unit/cookbook_metadata_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/cookbook_metadata'
+require "spec_helper"
+require "chef-dk/cookbook_metadata"
 
 describe ChefDK::CookbookMetadata do
 
@@ -40,12 +40,11 @@ describe ChefDK::CookbookMetadata do
 
   describe "when a cookbook is loaded" do
 
-
     let(:cookbook) { described_class.from_path(cookbook_root) }
 
     context "and the cookbook has only a metadata.rb" do
 
-      let(:cookbook_root) { File.join(fixtures_path, 'example_cookbook') }
+      let(:cookbook_root) { File.join(fixtures_path, "example_cookbook") }
 
       it "has a name" do
         expect(cookbook.name).to eq("example_cookbook")
@@ -64,7 +63,7 @@ describe ChefDK::CookbookMetadata do
 
     context "and the cookbook has only a metadata.json" do
 
-      let(:cookbook_root) { File.join(fixtures_path, 'example_cookbook_metadata_json_only') }
+      let(:cookbook_root) { File.join(fixtures_path, "example_cookbook_metadata_json_only") }
 
       it "has a name" do
         expect(cookbook.name).to eq("example_cookbook")
@@ -83,7 +82,7 @@ describe ChefDK::CookbookMetadata do
 
     context "and the cookbook has no metadata" do
 
-      let(:cookbook_root) { File.join(fixtures_path, 'example_cookbook_no_metadata') }
+      let(:cookbook_root) { File.join(fixtures_path, "example_cookbook_no_metadata") }
 
       it "raises a MalformedCookbook error" do
         msg = "Cookbook at #{cookbook_root} has neither metadata.json or metadata.rb"
@@ -95,4 +94,3 @@ describe ChefDK::CookbookMetadata do
 
   end
 end
-

data/spec/unit/cookbook_profiler/git_spec.rb

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/setup_git_cookbooks'
-require 'fileutils'
-require 'chef-dk/helpers'
-require 'chef-dk/cookbook_profiler/git'
+require "spec_helper"
+require "shared/setup_git_cookbooks"
+require "fileutils"
+require "chef-dk/helpers"
+require "chef-dk/cookbook_profiler/git"
 
 describe ChefDK::CookbookProfiler::Git do
 
@@ -96,7 +96,7 @@ describe ChefDK::CookbookProfiler::Git do
         end
 
         it "lists the remotes that commits are published to" do
-          expect(git_profiler.synchronized_remotes).to eq(%w[origin/master])
+          expect(git_profiler.synchronized_remotes).to eq(%w{origin/master})
         end
 
       end
@@ -173,4 +173,3 @@ describe ChefDK::CookbookProfiler::Git do
   end
 
 end
-

data/spec/unit/cookbook_profiler/identifiers_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/cookbook_profiler/identifiers'
-require 'chef-dk/policyfile/read_cookbook_for_compat_mode_upload'
+require "spec_helper"
+require "chef-dk/cookbook_profiler/identifiers"
+require "chef-dk/policyfile/read_cookbook_for_compat_mode_upload"
 
 describe ChefDK::CookbookProfiler::Identifiers do
 
@@ -36,7 +36,6 @@ describe ChefDK::CookbookProfiler::Identifiers do
     cbvl.cookbook_version
   end
 
-
   let(:identifiers) do
     ChefDK::CookbookProfiler::Identifiers.new(cookbook_version)
   end
@@ -48,7 +47,7 @@ describe ChefDK::CookbookProfiler::Identifiers do
       "README.md" => "0f15038071e5a131bef176cbe2a956d1",
       "chefignore" => "03485640b005eb1083c76518764053dd",
       "metadata.rb" => "4879d0004b177546cfbcfb2fd26df7c8",
-      "recipes/default.rb" => "9a0f27d741deaca21461073f7452474f"
+      "recipes/default.rb" => "9a0f27d741deaca21461073f7452474f",
     }
   end
 
@@ -67,7 +66,7 @@ describe ChefDK::CookbookProfiler::Identifiers do
     # Verify that the keys are sorted in our expected data, otherwise our test
     # is wrong.
     expect(cookbook_files_with_cksums.keys).to eq(cookbook_files_with_cksums.keys.sort)
-    expected = cookbook_files_with_cksums.map { |path,cksum| "#{path}:#{cksum}\n" }.join("")
+    expected = cookbook_files_with_cksums.map { |path, cksum| "#{path}:#{cksum}\n" }.join("")
     expect(identifiers.fingerprint_text).to eq(expected)
   end
 
@@ -80,4 +79,3 @@ describe ChefDK::CookbookProfiler::Identifiers do
   end
 
 end
-

data/spec/unit/fixtures/command/cli_test_command.rb

@@ -1,4 +1,4 @@
-require 'chef-dk/command/base'
+require "chef-dk/command/base"
 
 module ChefDK
   module Command
@@ -17,7 +17,7 @@ module ChefDK
       end
 
       def run(params)
-        self.class.test_result = {:status => :success, :params => params}
+        self.class.test_result = { :status => :success, :params => params }
         23
       end
 

data/spec/unit/fixtures/configurable/test_configurable.rb

@@ -1,4 +1,4 @@
-require 'unit/fixtures/configurable/test_config_loader'
+require "unit/fixtures/configurable/test_config_loader"
 
 class TestConfigurable
   include ChefDK::Configurable

data/spec/unit/fixtures/cookbooks_api/update_fixtures.rb

@@ -1,16 +1,16 @@
-require 'openssl'
-require 'net/https'
-require 'json'
-require 'pp'
-require 'uri'
+require "openssl"
+require "net/https"
+require "json"
+require "pp"
+require "uri"
 
 THIS_DIR = File.expand_path(File.dirname(__FILE__))
 
-UNIVERSE_JSON_PATH = File.join(THIS_DIR, 'universe.json')
-SMALL_UNIVERSE_JSON_PATH = File.join(THIS_DIR, 'small_universe.json')
-PRUNED_UNIVERSE_PATH = File.join(THIS_DIR, 'pruned_small_universe.json')
+UNIVERSE_JSON_PATH = File.join(THIS_DIR, "universe.json")
+SMALL_UNIVERSE_JSON_PATH = File.join(THIS_DIR, "small_universe.json")
+PRUNED_UNIVERSE_PATH = File.join(THIS_DIR, "pruned_small_universe.json")
 
-COOKBOOKS_IN_SMALL_UNIVERSE = ["apache2", "application", "apt", "database", "mysql", "nginx", "postgresql", "yum"].freeze
+COOKBOOKS_IN_SMALL_UNIVERSE = %w{apache2 application apt database mysql nginx postgresql yum}.freeze
 
 universe = URI("https://supermarket.chef.io/universe")
 
@@ -18,7 +18,7 @@ universe_serialized = Net::HTTP.get(universe)
 
 universe = JSON.parse(universe_serialized)
 
-smaller_universe = universe.keep_if {|k,v| COOKBOOKS_IN_SMALL_UNIVERSE.include?(k) }
+smaller_universe = universe.keep_if { |k, v| COOKBOOKS_IN_SMALL_UNIVERSE.include?(k) }
 
 pruned_universe = smaller_universe.inject({}) do |pruned_graph, (cookbook_name, graph_info)|
   pruned_graph[cookbook_name] = graph_info.inject({}) do |per_version_graph, (version_number, version_info)|
@@ -28,9 +28,6 @@ pruned_universe = smaller_universe.inject({}) do |pruned_graph, (cookbook_name,
   pruned_graph
 end
 
-
-File.open(UNIVERSE_JSON_PATH, 'w+') { |f| f.print(universe_serialized) }
-File.open(SMALL_UNIVERSE_JSON_PATH, 'w+') { |f| f.print(JSON.pretty_generate(smaller_universe)) }
-File.open(PRUNED_UNIVERSE_PATH, 'w+') { |f| f.print(JSON.pretty_generate(pruned_universe)) }
-
-
+File.open(UNIVERSE_JSON_PATH, "w+") { |f| f.print(universe_serialized) }
+File.open(SMALL_UNIVERSE_JSON_PATH, "w+") { |f| f.print(JSON.pretty_generate(smaller_universe)) }
+File.open(PRUNED_UNIVERSE_PATH, "w+") { |f| f.print(JSON.pretty_generate(pruned_universe)) }

data/spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/berkshelf/verify_me

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-puts ENV['PATH']
+puts ENV["PATH"]
 
 puts "you are good to go..."
 exit 0

data/spec/unit/gemfile_util_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require_relative '../../tasks/gemfile_util'
+require "spec_helper"
+require_relative "../../tasks/gemfile_util"
 
 class GemfileSuper
   def gem(*args)
@@ -31,11 +31,11 @@ describe GemfileUtil do
     it "overrides gems with :override" do
       expect(gemfile_util).to receive(:warn_if_replacing)
       expect(gemfile_util.gem(gem_name, override: true)).to be_nil
-      expect(gemfile_util.overridden_gems).to eq({ gem_name => [{ }] })
+      expect(gemfile_util.overridden_gems).to eq({ gem_name => [{}] })
     end
 
     it "does not override gems with :overrideable" do
       expect(gemfile_util.gem(gem_name, override: true)).to be_nil
     end
   end
-end
+end

data/spec/unit/generator_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/generator'
+require "spec_helper"
+require "chef-dk/generator"
 
 describe ChefDK::Generator do
 
@@ -49,17 +49,17 @@ class TmplTest
 end
 
 describe ChefDK::Generator::TemplateHelper do
-  let(:license) { 'all_rights' }
-  let(:copyright_holder) { 'Adam Jacob' }
+  let(:license) { "all_rights" }
+  let(:copyright_holder) { "Adam Jacob" }
   let(:helper) { TmplTest.new }
 
   before(:each) do
     ChefDK::Generator.reset
     ChefDK::Generator.add_attr_to_context(:license, license)
-    ChefDK::Generator.add_attr_to_context(:copyright_holder, 'Adam Jacob')
+    ChefDK::Generator.add_attr_to_context(:copyright_holder, "Adam Jacob")
   end
 
-  describe 'license_description' do
+  describe "license_description" do
     let(:license) { "all_rights" }
     context "all_rights" do
       it "should match the license" do
@@ -72,7 +72,7 @@ describe ChefDK::Generator::TemplateHelper do
     end
 
     context "apachev2" do
-      let(:license) { 'apachev2' }
+      let(:license) { "apachev2" }
       it "should match the license" do
         expect(helper.license_description).to match(/Licensed under the Apache/)
       end
@@ -83,7 +83,7 @@ describe ChefDK::Generator::TemplateHelper do
     end
 
     context "mit" do
-      let(:license) { 'mit' }
+      let(:license) { "mit" }
       it "should match the license" do
         expect(helper.license_description).to match(/Permission is hereby granted/)
       end
@@ -94,7 +94,7 @@ describe ChefDK::Generator::TemplateHelper do
     end
 
     context "gplv2" do
-      let(:license) { 'gplv2' }
+      let(:license) { "gplv2" }
       it "should match the license" do
         expect(helper.license_description).to match(/This program is free software;/)
       end
@@ -105,7 +105,7 @@ describe ChefDK::Generator::TemplateHelper do
     end
 
     context "gplv3" do
-      let(:license) { 'gplv3' }
+      let(:license) { "gplv3" }
       it "should match the license" do
         expect(helper.license_description).to match(/This program is free software:/)
       end

data/spec/unit/helpers_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/helpers'
+require "spec_helper"
+require "chef-dk/helpers"
 
 describe ChefDK::Helpers do
 
@@ -35,55 +35,55 @@ describe ChefDK::Helpers do
       allow(Chef::Platform).to receive(:windows?).and_return(false)
     end
 
-    context 'when CHEFDK_HOME is set' do
-      let(:env) { {'CHEFDK_HOME' => 'foo' } }
+    context "when CHEFDK_HOME is set" do
+      let(:env) { { "CHEFDK_HOME" => "foo" } }
       it "returns CHEFDK_HOME" do
-        expect(helpers.chefdk_home).to eq(env['CHEFDK_HOME'])
+        expect(helpers.chefdk_home).to eq(env["CHEFDK_HOME"])
       end
     end
 
-    context 'when CHEFDK_HOME is not set' do
-      context 'on windows' do
+    context "when CHEFDK_HOME is not set" do
+      context "on windows" do
         before do
           allow(Chef::Platform).to receive(:windows?).and_return(true)
         end
 
-        let(:env) { { 'LOCALAPPDATA' => 'C:\\foo' } }
+        let(:env) { { "LOCALAPPDATA" => 'C:\\foo' } }
 
-        it 'uses LOCALAPPDATA' do
-          expect(File).to receive(:join).with(env['LOCALAPPDATA'], 'chefdk').and_return('chefdkdefaulthome')
-          expect(helpers.chefdk_home).to eq('chefdkdefaulthome')
+        it "uses LOCALAPPDATA" do
+          expect(File).to receive(:join).with(env["LOCALAPPDATA"], "chefdk").and_return("chefdkdefaulthome")
+          expect(helpers.chefdk_home).to eq("chefdkdefaulthome")
         end
       end
 
-      context 'on *nix' do
-        it 'uses LOCALAPPDATA' do
-          expect(File).to receive(:expand_path).with('~/.chefdk').and_return('chefdkdefaulthome')
-          expect(helpers.chefdk_home).to eq('chefdkdefaulthome')
+      context "on *nix" do
+        it "uses LOCALAPPDATA" do
+          expect(File).to receive(:expand_path).with("~/.chefdk").and_return("chefdkdefaulthome")
+          expect(helpers.chefdk_home).to eq("chefdkdefaulthome")
         end
       end
     end
 
-    context 'using usr_bin_prefix' do
+    context "using usr_bin_prefix" do
       before do
-        stub_const('RUBY_PLATFORM', ruby_platform_string)
+        stub_const("RUBY_PLATFORM", ruby_platform_string)
       end
 
-      context 'on Mac' do
-        let(:ruby_platform_string) { 'x86_64-darwin12.0' }
+      context "on Mac" do
+        let(:ruby_platform_string) { "x86_64-darwin12.0" }
 
-        it 'uses /usr/local/bin' do
-          expect(helpers.usr_bin_prefix).to eq('/usr/local/bin')
-          expect(helpers.usr_bin_path('berks')).to eq('/usr/local/bin/berks')
+        it "uses /usr/local/bin" do
+          expect(helpers.usr_bin_prefix).to eq("/usr/local/bin")
+          expect(helpers.usr_bin_path("berks")).to eq("/usr/local/bin/berks")
         end
       end
 
-      context 'on other systems' do
-        let(:ruby_platform_string) { 'x86_64-linux' }
+      context "on other systems" do
+        let(:ruby_platform_string) { "x86_64-linux" }
 
-        it 'uses /usr/bin' do
-          expect(helpers.usr_bin_prefix).to eq('/usr/bin')
-          expect(helpers.usr_bin_path('berks')).to eq('/usr/bin/berks')
+        it "uses /usr/bin" do
+          expect(helpers.usr_bin_prefix).to eq("/usr/bin")
+          expect(helpers.usr_bin_path("berks")).to eq("/usr/bin/berks")
         end
       end
     end
@@ -94,26 +94,26 @@ describe ChefDK::Helpers do
     let(:git_tools_path) { File.join("embedded", "git", "usr", "bin") }
     let(:custom_gitbin_path) { File.join("gitbin") }
     before do
-      allow(helpers).to receive(:omnibus_expand_path) {|*paths| File.expand_path(File.join(paths)) }
+      allow(helpers).to receive(:omnibus_expand_path) { |*paths| File.expand_path(File.join(paths)) }
       allow(Dir).to receive(:exists?).with(/#{custom_gitbin_path}/).and_return false
       allow(Dir).to receive(:exists?).with(/#{git_tools_path}/).and_return false
     end
 
     it "does not include the git tools in the path" do
-      expect(helpers.omnibus_env['PATH']).to_not match(/#{git_tools_path}/)
+      expect(helpers.omnibus_env["PATH"]).to_not match(/#{git_tools_path}/)
     end
 
     context "when the custom gitbin directory exists" do
       it "includes them in the path" do
         expect(Dir).to receive(:exists?).with(/#{custom_gitbin_path}/).and_return true
-        expect(helpers.omnibus_env['PATH']).to match(/#{custom_gitbin_path}$/)
+        expect(helpers.omnibus_env["PATH"]).to match(/#{custom_gitbin_path}$/)
       end
     end
 
     context "when the git tools directory exists" do
       it "includes them in the path" do
         expect(Dir).to receive(:exists?).with(/#{git_tools_path}/).and_return true
-        expect(helpers.omnibus_env['PATH']).to match(/#{git_tools_path}$/)
+        expect(helpers.omnibus_env["PATH"]).to match(/#{git_tools_path}$/)
       end
     end
   end