berkshelf 5.2.0 → 8.0.15

data/spec/fixtures/cookbook-path-uploader/build-essential-1.4.2/metadata.rb

@@ -0,0 +1,2 @@
+name "build-essential"
+version "1.4.2"

data/spec/fixtures/cookbook-path-uploader/jenkins-2.0.3/metadata.rb

@@ -0,0 +1,5 @@
+name "jenkins"
+version "2.0.3"
+depends "apt", "~> 2.0"
+depends "runit", "~> 1.5"
+depends "yum", "~> 3.0"

data/spec/fixtures/cookbook-path-uploader/jenkins-config-0.1.0/metadata.rb

@@ -0,0 +1,4 @@
+name "jenkins-config"
+version "0.1.0"
+depends "jenkins", "~> 2.0"
+depends "yum", "~> 3.0"

data/spec/fixtures/cookbook-path-uploader/runit-1.5.8/metadata.rb

@@ -0,0 +1,5 @@
+name "runit"
+version "1.5.8"
+depends "build-essential"
+depends "yum", "~> 3.0"
+depends "yum-epel"

data/spec/fixtures/cookbook-path-uploader/yum-3.0.6/metadata.rb

@@ -0,0 +1,2 @@
+name "yum"
+version "3.0.6"

data/spec/fixtures/cookbook-path-uploader/yum-epel-0.2.0/metadata.rb

@@ -0,0 +1,3 @@
+name "yum-epel"
+version "0.2.0"
+depends "yum", "~> 3.0"

data/spec/fixtures/cookbook-store/jenkins-2.0.3/metadata.rb

@@ -1,6 +1,6 @@
-name 'jenkins'
-version '2.0.3'
+name "jenkins"
+version "2.0.3"
 
-depends 'apt', '~> 2.0'
-depends 'runit', '~> 1.5'
-depends 'yum', '~> 3.0'
+depends "apt", "~> 2.0"
+depends "runit", "~> 1.5"
+depends "yum", "~> 3.0"

data/spec/fixtures/cookbook-store/jenkins-2.0.4/metadata.rb

@@ -1,5 +1,5 @@
-name 'jenkins'
-version '2.0.4'
+name "jenkins"
+version "2.0.4"
 
-depends 'apt', '~> 2.0'
-depends 'runit', '~> 1.5'
+depends "apt", "~> 2.0"
+depends "runit", "~> 1.5"

data/spec/fixtures/cookbooks/example_cookbook/metadata.rb

@@ -1,3 +1,3 @@
-name       'example_cookbook'
-maintainer 'Berkshelf Core'
-version    '0.5.0'
+name       "example_cookbook"
+maintainer "Berkshelf Core"
+version    "0.5.0"

data/spec/fixtures/cookbooks/example_cookbook-0.5.0/metadata.rb

@@ -1,3 +1,3 @@
-name       'example_cookbook'
-maintainer 'Berkshelf Core'
-version    '0.5.0'
+name       "example_cookbook"
+maintainer "Berkshelf Core"
+version    "0.5.0"

data/spec/spec_helper.rb

@@ -1,87 +1,79 @@
-require 'spork'
-
 def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
-Spork.prefork do
-  require 'rspec'
-  require 'cleanroom/rspec'
-  require 'webmock/rspec'
-  require 'berkshelf/api/rspec' unless windows?
+BERKS_SPEC_DATA = File.expand_path("data", __dir__)
 
-  Dir['spec/support/**/*.rb'].each { |f| require File.expand_path(f) }
+require "rspec"
+require "cleanroom/rspec"
+require "webmock/rspec"
+require "rspec/its"
 
-  RSpec.configure do |config|
-    config.include Berkshelf::RSpec::FileSystemMatchers
-    config.include Berkshelf::RSpec::ChefAPI
-    config.include Berkshelf::RSpec::ChefServer
-    config.include Berkshelf::RSpec::Git
-    config.include Berkshelf::RSpec::PathHelpers
-    config.include Berkshelf::API::RSpec unless windows?
+Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
 
-    config.expect_with :rspec do |c|
-      c.syntax = :expect
-    end
+RSpec.configure do |config|
+  config.include Berkshelf::RSpec::FileSystemMatchers
+  config.include Berkshelf::RSpec::ChefAPI
+  config.include Berkshelf::RSpec::ChefServer
+  config.include Berkshelf::RSpec::Git
+  config.include Berkshelf::RSpec::PathHelpers
 
-    config.mock_with :rspec
-    config.filter_run focus: true
-    config.filter_run_excluding not_supported_on_windows: windows?
-    config.run_all_when_everything_filtered = true
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 
-    config.before(:each) do
-      Berkshelf.logger = Berkshelf::Logger.new(nil)
-      Berkshelf.set_format(:null)
-      Berkshelf.ui.mute!
-    end
+  config.mock_with :rspec
+  config.filter_run focus: true
+  config.filter_run_excluding not_supported_on_windows: windows?
+  config.run_all_when_everything_filtered = true
 
-    config.before(:suite) do
-      WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
-      Berkshelf::RSpec::ChefServer.start
-      Berkshelf::API::RSpec::Server.start unless windows?
-    end
+  config.before(:each) do
+    Berkshelf.logger = Berkshelf::Logger.new(nil)
+    Berkshelf.set_format(:null)
+    Berkshelf.ui.mute!
+  end
 
-    config.before(:all) do
-      ENV['BERKSHELF_PATH'] = berkshelf_path.to_s
-    end
+  config.before(:suite) do
+    WebMock.disable_net_connect!(allow_localhost: false, net_http_connect_on_start: true)
+    Berkshelf::RSpec::ChefServer.start
+  end
 
-    config.before(:each) do
-      Berkshelf::API::RSpec::Server.clear_cache unless windows?
-      clean_tmp_path
-      Berkshelf.initialize_filesystem
-      Berkshelf::CookbookStore.instance.initialize_filesystem
-      reload_configs
-    end
+  config.before(:all) do
+    ENV["BERKSHELF_PATH"] = berkshelf_path.to_s
   end
 
-  def capture(stream)
-    begin
-      stream = stream.to_s
-      eval "$#{stream} = StringIO.new"
-      yield
-      result = eval("$#{stream}").string
-    ensure
-      eval("$#{stream} = #{stream.upcase}")
-    end
+  config.before(:each) do
+    clean_tmp_path
+    Berkshelf.initialize_filesystem
+    Berkshelf::CookbookStore.instance.initialize_filesystem
+    reload_configs
+  end
+end
 
-    result
+def capture(stream)
+  begin
+    stream = stream.to_s
+    eval "$#{stream} = StringIO.new"
+    yield
+    result = eval("$#{stream}").string
+  ensure
+    eval("$#{stream} = #{stream.upcase}")
   end
+
+  result
 end
 
-Spork.each_run do
-  require 'berkshelf'
+require "berkshelf"
 
-  module Berkshelf
-    class GitLocation
-      include Berkshelf::RSpec::Git
+module Berkshelf
+  class GitLocation
+    include Berkshelf::RSpec::Git
 
-      alias :real_clone :clone
-      def clone
-        fake_remote = generate_fake_git_remote(uri, tags: @branch ? [@branch] : [])
-        tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/,'-'))
-        @uri = "file://#{fake_remote}"
-        real_clone
-      end
+    alias :real_clone :clone
+    def clone
+      fake_remote = generate_fake_git_remote(uri, tags: @branch ? [@branch] : [])
+      @uri = "file://#{fake_remote}"
+      real_clone
     end
   end
 end

data/spec/support/chef_api.rb

@@ -58,13 +58,13 @@ module Berkshelf
           "files/default",
           "attributes",
           "providers",
-          "resources"
+          "resources",
         ]
         files = [
           "recipes/default.rb",
           "templates/default/template.erb",
           "files/default/file.h",
-          "attributes/default.rb"
+          "attributes/default.rb",
         ]
 
         directories.each do |directory|
@@ -82,20 +82,19 @@ module Berkshelf
           a << "" # ensure newline
         end.join("\n")
 
-
         if options[:dependencies]
-          options[:dependencies].each do |name, constraint|
-            metadata << "depends '#{name}', '#{constraint}'\n"
+          options[:dependencies].each do |dep_name, constraint|
+            metadata << "depends '#{dep_name}', '#{constraint}'\n"
           end
         end
 
         if options[:recommendations]
-          options[:recommendations].each do |name, constraint|
-            metadata << "recommends '#{name}', '#{constraint}'\n"
+          options[:recommendations].each do |rec_name, constraint|
+            metadata << "recommends '#{rec_name}', '#{constraint}'\n"
           end
         end
 
-        File.open(cookbook_path.join("metadata.rb"), 'w+') do |f|
+        File.open(cookbook_path.join("metadata.rb"), "w+") do |f|
           f.write metadata
         end
 
@@ -120,14 +119,14 @@ module Berkshelf
 
       private
 
-        def ridley
-          @ridley ||= Ridley.new(
-            server_url: Berkshelf::RSpec::ChefServer.server_url,
-            client_name: Berkshelf.chef_config[:node_name],
-            client_key: Berkshelf.chef_config[:client_key],
-            ssl: { verify: false }
-          )
-        end
+      def ridley
+        @ridley ||= Ridley.new(
+          server_url: Berkshelf::RSpec::ChefServer.server_url,
+          client_name: Berkshelf.chef_config[:node_name],
+          client_key: Berkshelf.chef_config[:client_key],
+          ssl: { verify: false }
+        )
+      end
     end
   end
 end

data/spec/support/chef_server.rb

@@ -1,99 +1,101 @@
-require 'chef_zero/server'
-require 'json'
+require "chef_zero/server"
+require "json"
 
-module Berkshelf::RSpec
-  module ChefServer
-    PORT = 4000
+module Berkshelf
+  module RSpec
+    module ChefServer
+      PORT = 4000
 
-    class << self
-      attr_reader :server
+      class << self
+        attr_reader :server
 
-      def clear_request_log
-        @request_log = Array.new
-      end
+        def clear_request_log
+          @request_log = []
+        end
 
-      def request_log
-        @request_log ||= Array.new
-      end
+        def request_log
+          @request_log ||= []
+        end
 
-      def server_url
-        @server && @server.url
-      end
+        def server_url
+          @server && @server.url
+        end
 
-      def start(options = {})
-        return @server if @server
+        def start(options = {})
+          return @server if @server
 
-        options = options.reverse_merge(port: PORT)
-        options[:generate_real_keys] = false
+          options = { port: PORT }.merge(options)
+          options[:generate_real_keys] = false
 
-        @server = ChefZero::Server.new(options)
-        @server.start_background
-        @server.on_response do |request, response|
-          request_log << [ request, response ]
+          @server = ChefZero::Server.new(options)
+          @server.start_background
+          @server.on_response do |request, response|
+            request_log << [ request, response ]
+          end
+          clear_request_log
+
+          @server
         end
-        clear_request_log
 
-        @server
-      end
+        def stop
+          @server.stop if running?
+        end
 
-      def stop
-        @server.stop if running?
-      end
+        def running?
+          @server && @server.running?
+        end
 
-      def running?
-        @server && @server.running?
+        def reset!
+          @server && @server.clear_data
+        end
       end
 
-      def reset!
-        @server && @server.clear_data
+      def chef_server
+        ChefServer.server
       end
-    end
-
-    def chef_server
-      ChefServer.server
-    end
 
-    def chef_client(name, hash = {})
-      load_data(:clients, name, hash)
-    end
+      def chef_client(name, hash = {})
+        load_data(:clients, name, hash)
+      end
 
-    def chef_cookbook(name, hash = {})
-      chef_server.load_data({ 'cookbooks' => { name => hash }})
-    end
+      def chef_cookbook(name, hash = {})
+        chef_server.load_data({ "cookbooks" => { name => hash } })
+      end
 
-    def chef_cookbooks
-      chef_server.data_store.list(['organizations', 'chef', 'cookbooks']).inject({}) do |hash, name|
-        hash[name] = chef_server.data_store.list(['organizations', 'chef', 'cookbooks', name])
-        hash
+      def chef_cookbooks
+        chef_server.data_store.list(%w{organizations chef cookbooks}).inject({}) do |hash, name|
+          hash[name] = chef_server.data_store.list(["organizations", "chef", "cookbooks", name])
+          hash
+        end
       end
-    end
 
-    def chef_data_bag(name, hash = {})
-      chef_server.load_data({ 'data' => { name => hash }})
-    end
+      def chef_data_bag(name, hash = {})
+        chef_server.load_data({ "data" => { name => hash } })
+      end
 
-    def chef_environment(name, hash = {})
-      load_data(:environments, name, hash)
-    end
+      def chef_environment(name, hash = {})
+        load_data(:environments, name, hash)
+      end
 
-    def chef_environment_locks(name)
-      JSON.parse(chef_server.data_store.get(['organizations', 'chef', 'environments', name]))['cookbook_versions']
-    rescue ChefZero::DataStore::DataNotFoundError
-      {}
-    end
+      def chef_environment_locks(name)
+        JSON.parse(chef_server.data_store.get(["organizations", "chef", "environments", name]))["cookbook_versions"]
+      rescue ChefZero::DataStore::DataNotFoundError
+        {}
+      end
 
-    def chef_node(name, hash = {})
-      load_data(:nodes, name, hash)
-    end
+      def chef_node(name, hash = {})
+        load_data(:nodes, name, hash)
+      end
 
-    def chef_role(name, hash = {})
-      load_data(:roles, name, hash)
-    end
+      def chef_role(name, hash = {})
+        load_data(:roles, name, hash)
+      end
 
-    private
+      private
 
       def load_data(key, name, hash)
-        chef_server.load_data({ key.to_s => { name => JSON.generate(hash) }})
+        chef_server.load_data({ key.to_s => { name => JSON.generate(hash) } })
       end
+    end
   end
 end

data/spec/support/git.rb

@@ -1,19 +1,16 @@
 module Berkshelf
   module RSpec
     module Git
-      require 'buff/shell_out'
-      include Buff::ShellOut
-
-      require_relative 'path_helpers'
+      require_relative "path_helpers"
       include Berkshelf::RSpec::PathHelpers
 
       def git_origin_for(repo, options = {})
-        "file://#{generate_fake_git_remote("git@github.com/RiotGames/#{repo}.git", options)}/.git"
+        "file://#{generate_fake_git_remote("git@github.com/chef/#{repo}.git", options)}/.git"
       end
 
       def generate_fake_git_remote(uri, options = {})
-        name = uri.split('/').last || 'rspec_cookbook'
-        name = name.gsub('.git', '')
+        name = uri.split("/").last || "rspec_cookbook"
+        name = name.gsub(".git", "")
         path = remotes.join(name)
 
         capture(:stdout) do
@@ -25,20 +22,24 @@ module Berkshelf
             shell_out "git add ."
             shell_out "git commit -am \"A commit.\""
 
-            options[:tags].each do |tag|
-              shell_out "echo \"#{tag}\" > content_file"
-              shell_out "git add content_file"
-              shell_out "git commit -am \"#{tag} content\""
-              shell_out "git tag \"#{tag}\""
-            end if options[:tags]
-
-            options[:branches].each do |branch|
-              shell_out "git checkout -b #{branch} master"
-              shell_out "echo \"#{branch}\" > content_file"
-              shell_out "git add content_file"
-              shell_out "git commit -am \"#{branch} content\""
-              shell_out "git checkout master"
-            end if options[:branches]
+            if options[:tags]
+              options[:tags].each do |tag|
+                shell_out "echo \"#{tag}\" > content_file"
+                shell_out "git add content_file"
+                shell_out "git commit -am \"#{tag} content\""
+                shell_out "git tag \"#{tag}\""
+              end
+            end
+
+            if options[:branches]
+              options[:branches].each do |branch|
+                shell_out "git checkout -b #{branch} master"
+                shell_out "echo \"#{branch}\" > content_file"
+                shell_out "git add content_file"
+                shell_out "git commit -am \"#{branch} content\""
+                shell_out "git checkout master"
+              end
+            end
           end
         end
 
@@ -83,46 +84,46 @@ module Berkshelf
 
       private
 
-        # The path to store the local git clones.
-        #
-        # @return [Pathname]
-        def clones
-          ensure_and_return(tmp_path.join('clones'))
-        end
+      # The path to store the local git clones.
+      #
+      # @return [Pathname]
+      def clones
+        ensure_and_return(tmp_path.join("clones"))
+      end
 
-        # The path to store the git remotes.
-        #
-        # @return [Pathname]
-        def remotes
-          ensure_and_return(tmp_path.join('remotes'))
-        end
+      # The path to store the git remotes.
+      #
+      # @return [Pathname]
+      def remotes
+        ensure_and_return(tmp_path.join("remotes"))
+      end
 
-        # Generate a cookbook by the given name.
-        #
-        # @param [#to_s] name
-        #   the name of the cookbook to create
-        # @param [Hash] options
-        #   the list ooptions to pass to the generator
-        def generate_git_cookbook(name, options = {})
-          options = {
-            skip_vagrant: true,
-            skip_test_kitchen: true,
-            force: true,
-          }.merge(options)
-
-          Berkshelf::Cli.new.invoke(:cookbook, [name.to_s], options)
-        end
+      # Generate a cookbook by the given name.
+      #
+      # @param [#to_s] name
+      #   the name of the cookbook to create
+      # @param [Hash] options
+      #   the list ooptions to pass to the generator
+      def generate_git_cookbook(name, options = {})
+        options = {
+          skip_vagrant: true,
+          skip_test_kitchen: true,
+          force: true,
+        }.merge(options)
+
+        Berkshelf::Cli.new.invoke(:cookbook, [name.to_s], options)
+      end
 
-        # Make sure the given path exists and return the path
-        #
-        # @param [#to_s] path
-        #   the path to create and return
-        #
-        # @return [Pathname]
-        def ensure_and_return(path)
-          FileUtils.mkdir(path) unless File.exist?(path)
-          return Pathname.new(path).expand_path
-        end
+      # Make sure the given path exists and return the path
+      #
+      # @param [#to_s] path
+      #   the path to create and return
+      #
+      # @return [Pathname]
+      def ensure_and_return(path)
+        FileUtils.mkdir(path) unless File.exist?(path)
+        Pathname.new(path).expand_path
+      end
     end
   end
 end

data/spec/support/kitchen.rb

@@ -1,14 +0,0 @@
-module Berkshelf
-  module RSpec
-    module Kitchen
-      require 'kitchen/generator/init'
-
-      def stub_kitchen!
-        generator = double('kitchen-generator', invoke_all: nil)
-        allow(::Kitchen::Generator::Init).to receive(:new)
-          .with(any_args())
-          .and_return(generator)
-      end
-    end
-  end
-end

data/spec/support/matchers/file_system_matchers.rb

@@ -23,11 +23,12 @@ module Berkshelf
         end
 
         def matches?(root)
-          unless root.join(@name).exist?
+          path = Pathname.glob(root.join(@name)).first
+          unless path.exist?
             throw :failure, root.join(@name)
           end
 
-          contents = File.read(root.join(@name))
+          contents = File.read(path)
 
           @contents.each do |string|
             unless contents.include?(string)
@@ -58,9 +59,7 @@ module Berkshelf
         end
 
         def file(name, &block)
-          silence_warnings do
-            @tree[name] = FileMatcher.new(location(name), &block)
-          end
+          @tree[name] = FileMatcher.new(location(name), &block)
         end
 
         def no_file(name)

data/spec/support/matchers/filepath_matchers.rb

@@ -1,5 +1,5 @@
-require 'rspec/expectations'
-require 'pathname'
+require "rspec/expectations"
+require "pathname"
 
 RSpec::Matchers.define :be_relative_path do
   match do |given|