chef-config 12.6.0 → 12.7.2

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'chef-config/windows'
+require "chef-config/windows"
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
@@ -53,7 +53,7 @@ RSpec.configure do |config|
     # Use the documentation formatter for detailed output,
     # unless a formatter has already been configured
     # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
+    config.default_formatter = "doc"
   end
 
   # Print the 10 slowest examples and example groups at the

data/spec/unit/config_spec.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-config/config'
+require "spec_helper"
+require "chef-config/config"
 
 RSpec.describe ChefConfig::Config do
   before(:each) do
@@ -28,7 +28,7 @@ RSpec.describe ChefConfig::Config do
     ChefConfig::Config.treat_deprecation_warnings_as_errors(true)
 
     # Set environment variable so the setting persists in child processes
-    ENV['CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS'] = "1"
+    ENV["CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS"] = "1"
   end
 
   describe "config attribute writer: chef_server_url" do
@@ -123,7 +123,7 @@ RSpec.describe ChefConfig::Config do
         if is_windows
           it "should return a windows path on windows systems" do
             path = "/etc/chef/cookbooks"
-            allow(ChefConfig::Config).to receive(:env).and_return({ 'SYSTEMDRIVE' => 'C:' })
+            allow(ChefConfig::Config).to receive(:env).and_return({ "SYSTEMDRIVE" => "C:" })
             # match on a regex that looks for the base path with an optional
             # system drive at the beginning (c:)
             # system drive is not hardcoded b/c it can change and b/c it is not present on linux systems
@@ -156,10 +156,10 @@ RSpec.describe ChefConfig::Config do
 
         before do
           if is_windows
-            allow(ChefConfig::Config).to receive(:env).and_return({ 'SYSTEMDRIVE' => 'C:' })
+            allow(ChefConfig::Config).to receive(:env).and_return({ "SYSTEMDRIVE" => "C:" })
             ChefConfig::Config[:user_home] = 'C:\Users\charlie'
           else
-            ChefConfig::Config[:user_home] = '/Users/charlie'
+            ChefConfig::Config[:user_home] = "/Users/charlie"
           end
 
           allow(ChefConfig::Config).to receive(:path_accessible?).and_return(false)
@@ -250,21 +250,21 @@ RSpec.describe ChefConfig::Config do
 
             context "and config_dir is /a/b/c" do
               before do
-                ChefConfig::Config.config_dir to_platform('/a/b/c')
+                ChefConfig::Config.config_dir to_platform("/a/b/c")
               end
 
               it "cache_path is /a/b/c/local-mode-cache" do
-                expect(ChefConfig::Config.cache_path).to eq(to_platform('/a/b/c/local-mode-cache'))
+                expect(ChefConfig::Config.cache_path).to eq(to_platform("/a/b/c/local-mode-cache"))
               end
             end
 
             context "and config_dir is /a/b/c/" do
               before do
-                ChefConfig::Config.config_dir to_platform('/a/b/c/')
+                ChefConfig::Config.config_dir to_platform("/a/b/c/")
               end
 
               it "cache_path is /a/b/c/local-mode-cache" do
-                expect(ChefConfig::Config.cache_path).to eq(to_platform('/a/b/c/local-mode-cache'))
+                expect(ChefConfig::Config.cache_path).to eq(to_platform("/a/b/c/local-mode-cache"))
               end
             end
           end
@@ -288,6 +288,104 @@ RSpec.describe ChefConfig::Config do
           expect(ChefConfig::Config[:ssl_ca_path]).to be_nil
         end
 
+        describe "ChefConfig::Config[:repo_mode]" do
+
+          context "when local mode is enabled" do
+
+            before { ChefConfig::Config[:local_mode] = true }
+
+            it "defaults to 'hosted_everything'" do
+              expect(ChefConfig::Config[:repo_mode]).to eq("hosted_everything")
+            end
+
+            context "and osc_compat is enabled" do
+
+              before { ChefConfig::Config.chef_zero.osc_compat = true }
+
+              it "defaults to 'everything'" do
+                expect(ChefConfig::Config[:repo_mode]).to eq("everything")
+              end
+            end
+          end
+
+          context "when local mode is not enabled" do
+
+            context "and the chef_server_url is multi-tenant" do
+
+              before { ChefConfig::Config[:chef_server_url] = "https://chef.example/organizations/example" }
+
+              it "defaults to 'hosted_everything'" do
+                expect(ChefConfig::Config[:repo_mode]).to eq("hosted_everything")
+              end
+
+            end
+
+            context "and the chef_server_url is not multi-tenant" do
+
+              before { ChefConfig::Config[:chef_server_url] = "https://chef.example/" }
+
+              it "defaults to 'everything'" do
+                expect(ChefConfig::Config[:repo_mode]).to eq("everything")
+              end
+            end
+          end
+        end
+
+        describe "ChefConfig::Config[:chef_repo_path]" do
+
+          context "when cookbook_path is set to a single path" do
+
+            before { ChefConfig::Config[:cookbook_path] = "/home/anne/repo/cookbooks" }
+
+            it "is set to a path one directory up from the cookbook_path" do
+              expected = File.expand_path("/home/anne/repo")
+              expect(ChefConfig::Config[:chef_repo_path]).to eq(expected)
+            end
+
+          end
+
+          context "when cookbook_path is set to multiple paths" do
+
+            before do
+              ChefConfig::Config[:cookbook_path] = [
+                "/home/anne/repo/cookbooks",
+                "/home/anne/other_repo/cookbooks",
+              ]
+            end
+
+            it "is set to an Array of paths one directory up from the cookbook_paths" do
+              expected = [ "/home/anne/repo", "/home/anne/other_repo"].map { |p| File.expand_path(p) }
+              expect(ChefConfig::Config[:chef_repo_path]).to eq(expected)
+            end
+
+          end
+
+          context "when cookbook_path is not set but cookbook_artifact_path is set" do
+
+            before do
+              ChefConfig::Config[:cookbook_path] = nil
+              ChefConfig::Config[:cookbook_artifact_path] = "/home/roxie/repo/cookbook_artifacts"
+            end
+
+            it "is set to a path one directory up from the cookbook_artifact_path" do
+              expected = File.expand_path("/home/roxie/repo")
+              expect(ChefConfig::Config[:chef_repo_path]).to eq(expected)
+            end
+
+          end
+
+          context "when cookbook_path is not set" do
+
+            before { ChefConfig::Config[:cookbook_path] = nil }
+
+            it "is set to the cache_path" do
+              expect(ChefConfig::Config[:chef_repo_path]).to eq(ChefConfig::Config[:cache_path])
+            end
+
+          end
+
+        end
+
         # On Windows, we'll detect an omnibus build and set this to the
         # cacert.pem included in the package, but it's nil if you're on Windows
         # w/o omnibus (e.g., doing development on Windows, custom build, etc.)
@@ -309,6 +407,12 @@ RSpec.describe ChefConfig::Config do
           expect(ChefConfig::Config[:environment_path]).to eq(environment_path)
         end
 
+        it "ChefConfig::Config[:cookbook_artifact_path] defaults to /var/chef/cookbook_artifacts" do
+          allow(ChefConfig::Config).to receive(:cache_path).and_return(primary_cache_path)
+          environment_path = is_windows ? "#{primary_cache_path}\\cookbook_artifacts" : "#{primary_cache_path}/cookbook_artifacts"
+          expect(ChefConfig::Config[:cookbook_artifact_path]).to eq(environment_path)
+        end
+
         describe "setting the config dir" do
 
           context "when the config file is given with a relative path" do
@@ -326,7 +430,7 @@ RSpec.describe ChefConfig::Config do
 
             it "does not set derived paths at FS root" do
               ChefConfig::Config.local_mode = true
-              expect(ChefConfig::Config.cache_path.downcase).to eq(to_platform(File.join(Dir.pwd, 'local-mode-cache')).downcase)
+              expect(ChefConfig::Config.cache_path.downcase).to eq(to_platform(File.join(Dir.pwd, "local-mode-cache")).downcase)
             end
 
           end
@@ -371,7 +475,7 @@ RSpec.describe ChefConfig::Config do
             end
 
             it "config_dir is /home/charlie/.chef/" do
-              expect(ChefConfig::Config.config_dir).to eq(ChefConfig::PathHelper.join(to_platform("/home/charlie/.chef"), ''))
+              expect(ChefConfig::Config.config_dir).to eq(ChefConfig::PathHelper.join(to_platform("/home/charlie/.chef"), ""))
             end
 
             context "and chef is running in local mode" do
@@ -380,7 +484,7 @@ RSpec.describe ChefConfig::Config do
               end
 
               it "config_dir is /home/charlie/.chef/" do
-                expect(ChefConfig::Config.config_dir).to eq(ChefConfig::PathHelper.join(to_platform("/home/charlie/.chef"), ''))
+                expect(ChefConfig::Config.config_dir).to eq(ChefConfig::PathHelper.join(to_platform("/home/charlie/.chef"), ""))
               end
             end
           end
@@ -433,7 +537,7 @@ RSpec.describe ChefConfig::Config do
       end
 
       describe "ChefConfig::Config[:encrypted_data_bag_secret]" do
-        let(:db_secret_default_path){ to_platform("/etc/chef/encrypted_data_bag_secret") }
+        let(:db_secret_default_path) { to_platform("/etc/chef/encrypted_data_bag_secret") }
 
         before do
           allow(File).to receive(:exist?).with(db_secret_default_path).and_return(secret_exists)
@@ -468,7 +572,7 @@ RSpec.describe ChefConfig::Config do
       describe "ChefConfig::Config[:user_valid_regex]" do
         context "on a platform that is not Windows" do
           it "allows one letter usernames" do
-            any_match = ChefConfig::Config[:user_valid_regex].any? { |regex| regex.match('a') }
+            any_match = ChefConfig::Config[:user_valid_regex].any? { |regex| regex.match("a") }
             expect(any_match).to be_truthy
           end
         end
@@ -543,7 +647,7 @@ RSpec.describe ChefConfig::Config do
 
           it "should fall back to C locale" do
             expect(ChefConfig.logger).to receive(:warn).with("Please install an English UTF-8 locale for Chef to use, falling back to C locale and disabling UTF-8 support.")
-            expect(ChefConfig::Config.guess_internal_locale).to eq 'C'
+            expect(ChefConfig::Config.guess_internal_locale).to eq "C"
           end
         end
 
@@ -585,8 +689,8 @@ RSpec.describe ChefConfig::Config do
         ChefConfig::Config.http_proxy_pass = proxy_pass
       end
       it "exports ENV['http_proxy']" do
-        expect(ENV).to receive(:[]=).with('http_proxy', "http://http_user:http_pass@localhost:7979")
-        expect(ENV).to receive(:[]=).with('HTTP_PROXY', "http://http_user:http_pass@localhost:7979")
+        expect(ENV).to receive(:[]=).with("http_proxy", "http://http_user:http_pass@localhost:7979")
+        expect(ENV).to receive(:[]=).with("HTTP_PROXY", "http://http_user:http_pass@localhost:7979")
         ChefConfig::Config.export_proxies
       end
     end
@@ -598,8 +702,8 @@ RSpec.describe ChefConfig::Config do
         ChefConfig::Config.https_proxy_pass = proxy_pass
       end
       it "exports ENV['https_proxy']" do
-        expect(ENV).to receive(:[]=).with('https_proxy', "https://http_user:http_pass@localhost:7979")
-        expect(ENV).to receive(:[]=).with('HTTPS_PROXY', "https://http_user:http_pass@localhost:7979")
+        expect(ENV).to receive(:[]=).with("https_proxy", "https://http_user:http_pass@localhost:7979")
+        expect(ENV).to receive(:[]=).with("HTTPS_PROXY", "https://http_user:http_pass@localhost:7979")
         ChefConfig::Config.export_proxies
       end
     end
@@ -611,16 +715,16 @@ RSpec.describe ChefConfig::Config do
         ChefConfig::Config.ftp_proxy_pass = proxy_pass
       end
       it "exports ENV['ftp_proxy']" do
-        expect(ENV).to receive(:[]=).with('ftp_proxy', "ftp://http_user:http_pass@localhost:7979")
-        expect(ENV).to receive(:[]=).with('FTP_PROXY', "ftp://http_user:http_pass@localhost:7979")
+        expect(ENV).to receive(:[]=).with("ftp_proxy", "ftp://http_user:http_pass@localhost:7979")
+        expect(ENV).to receive(:[]=).with("FTP_PROXY", "ftp://http_user:http_pass@localhost:7979")
         ChefConfig::Config.export_proxies
       end
     end
 
     shared_examples "no user pass" do
       it "does not populate the user or password" do
-        expect(ENV).to receive(:[]=).with('http_proxy', "http://localhost:7979")
-        expect(ENV).to receive(:[]=).with('HTTP_PROXY', "http://localhost:7979")
+        expect(ENV).to receive(:[]=).with("http_proxy", "http://localhost:7979")
+        expect(ENV).to receive(:[]=).with("HTTP_PROXY", "http://localhost:7979")
         ChefConfig::Config.export_proxies
       end
     end
@@ -646,8 +750,8 @@ RSpec.describe ChefConfig::Config do
         ChefConfig::Config.http_proxy = "localhost:1111"
       end
       it "automatically adds the scheme to the proxy url" do
-        expect(ENV).to receive(:[]=).with('http_proxy', "http://localhost:1111")
-        expect(ENV).to receive(:[]=).with('HTTP_PROXY', "http://localhost:1111")
+        expect(ENV).to receive(:[]=).with("http_proxy", "http://localhost:1111")
+        expect(ENV).to receive(:[]=).with("HTTP_PROXY", "http://localhost:1111")
         ChefConfig::Config.export_proxies
       end
     end
@@ -655,10 +759,10 @@ RSpec.describe ChefConfig::Config do
     shared_examples "no export" do
       it "does not export any proxy settings" do
         ChefConfig::Config.export_proxies
-        expect(ENV['http_proxy']).to eq(nil)
-        expect(ENV['https_proxy']).to eq(nil)
-        expect(ENV['ftp_proxy']).to eq(nil)
-        expect(ENV['no_proxy']).to eq(nil)
+        expect(ENV["http_proxy"]).to eq(nil)
+        expect(ENV["https_proxy"]).to eq(nil)
+        expect(ENV["ftp_proxy"]).to eq(nil)
+        expect(ENV["no_proxy"]).to eq(nil)
       end
     end
 
@@ -683,8 +787,8 @@ RSpec.describe ChefConfig::Config do
         ChefConfig::Config.no_proxy = "localhost"
       end
       it "exports ENV['no_proxy']" do
-        expect(ENV).to receive(:[]=).with('no_proxy', "localhost")
-        expect(ENV).to receive(:[]=).with('NO_PROXY', "localhost")
+        expect(ENV).to receive(:[]=).with("no_proxy", "localhost")
+        expect(ENV).to receive(:[]=).with("NO_PROXY", "localhost")
         ChefConfig::Config.export_proxies
       end
     end
@@ -707,7 +811,7 @@ RSpec.describe ChefConfig::Config do
       end
 
       it "sets CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS environment variable" do
-        expect(ENV['CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS']).to eq("1")
+        expect(ENV["CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS"]).to eq("1")
       end
 
       it "treats deprecation warnings as errors in child processes when testing" do
@@ -725,7 +829,7 @@ RSpec.describe ChefConfig::Config do
     context "outside of our test environment" do
 
       before do
-        ENV.delete('CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS')
+        ENV.delete("CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS")
         ChefConfig::Config.reset
       end
 
@@ -734,7 +838,6 @@ RSpec.describe ChefConfig::Config do
       end
     end
 
-
   end
 
 end

data/spec/unit/path_helper_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'chef-config/path_helper'
-require 'spec_helper'
+require "chef-config/path_helper"
+require "spec_helper"
 
 RSpec.describe ChefConfig::PathHelper do
 
@@ -27,30 +27,30 @@ RSpec.describe ChefConfig::PathHelper do
     describe "join" do
 
       it "joins starting with '' resolve to absolute paths" do
-        expect(path_helper.join('', 'a', 'b')).to eq("#{path_helper.path_separator}a#{path_helper.path_separator}b")
+        expect(path_helper.join("", "a", "b")).to eq("#{path_helper.path_separator}a#{path_helper.path_separator}b")
       end
 
       it "joins ending with '' add a / to the end" do
-        expect(path_helper.join('a', 'b', '')).to eq("a#{path_helper.path_separator}b#{path_helper.path_separator}")
+        expect(path_helper.join("a", "b", "")).to eq("a#{path_helper.path_separator}b#{path_helper.path_separator}")
       end
 
     end
 
     describe "dirname" do
       it "dirname('abc') is '.'" do
-        expect(path_helper.dirname('abc')).to eq('.')
+        expect(path_helper.dirname("abc")).to eq(".")
       end
       it "dirname('/') is '/'" do
         expect(path_helper.dirname(path_helper.path_separator)).to eq(path_helper.path_separator)
       end
       it "dirname('a/b/c') is 'a/b'" do
-        expect(path_helper.dirname(path_helper.join('a', 'b', 'c'))).to eq(path_helper.join('a', 'b'))
+        expect(path_helper.dirname(path_helper.join("a", "b", "c"))).to eq(path_helper.join("a", "b"))
       end
       it "dirname('a/b/c/') is 'a/b'" do
-        expect(path_helper.dirname(path_helper.join('a', 'b', 'c', ''))).to eq(path_helper.join('a', 'b'))
+        expect(path_helper.dirname(path_helper.join("a", "b", "c", ""))).to eq(path_helper.join("a", "b"))
       end
       it "dirname('/a/b/c') is '/a/b'" do
-        expect(path_helper.dirname(path_helper.join('', 'a', 'b', 'c'))).to eq(path_helper.join('', 'a', 'b'))
+        expect(path_helper.dirname(path_helper.join("", "a", "b", "c"))).to eq(path_helper.join("", "a", "b"))
       end
     end
   end
@@ -93,7 +93,6 @@ RSpec.describe ChefConfig::PathHelper do
 
     end
 
-
     it "cleanpath changes slashes into backslashes and leaves backslashes alone" do
       expect(path_helper.cleanpath('/a/b\\c/d/')).to eq('\\a\\b\\c\\d')
     end
@@ -113,11 +112,11 @@ RSpec.describe ChefConfig::PathHelper do
     include_examples("common_functionality")
 
     it "path_separator is /" do
-      expect(path_helper.path_separator).to eq('/')
+      expect(path_helper.path_separator).to eq("/")
     end
 
     it "cleanpath removes extra slashes alone" do
-      expect(path_helper.cleanpath('/a///b/c/d/')).to eq('/a/b/c/d')
+      expect(path_helper.cleanpath("/a///b/c/d/")).to eq("/a/b/c/d")
     end
 
     describe "platform-specific #join behavior" do
@@ -224,7 +223,7 @@ RSpec.describe ChefConfig::PathHelper do
       end
     end
 
-    context "not on windows", :unix_only  do
+    context "not on windows", :unix_only do
       it "returns a canonical path" do
         expect(path_helper.canonical_path("/etc//apache.d/sites-enabled/../sites-available/default")).to eq("/etc/apache.d/sites-available/default")
       end
@@ -256,10 +255,10 @@ RSpec.describe ChefConfig::PathHelper do
       it "joins, cleanpaths, and escapes characters reserved by glob" do
         args = ["this/*path", "[needs]", "escaping?"]
         escaped_path = if ChefConfig.windows?
-          "this\\\\\\*path\\\\\\[needs\\]\\\\escaping\\?"
-        else
-          "this/\\*path/\\[needs\\]/escaping\\?"
-        end
+                         "this\\\\\\*path\\\\\\[needs\\]\\\\escaping\\?"
+                       else
+                         "this/\\*path/\\[needs\\]/escaping\\?"
+                       end
         expect(path_helper).to receive(:join).with(*args).and_call_original
         expect(path_helper).to receive(:cleanpath).and_call_original
         expect(path_helper.escape_glob(*args)).to eq(escaped_path)
@@ -269,7 +268,7 @@ RSpec.describe ChefConfig::PathHelper do
 
   describe "all_homes" do
     before do
-      stub_const('ENV', env)
+      stub_const("ENV", env)
       allow(ChefConfig).to receive(:windows?).and_return(is_windows)
     end