chefspec 7.4.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 811f21e393d16be39c8162bbe17c1157d214ce0eb378e8d19e686683fad4160b
-  data.tar.gz: 764db71993cd015961d195d39dc1c99a74bda29311a3fc69210961e4482d6ba9
+  metadata.gz: 888dff160c4e09262e47271fc25e19e24dfa5415f9c17566d5fab2c3b07d3f38
+  data.tar.gz: a79eacde94a5abdad1ab8e4530ed95d46255323927fbfe9706873aa7d6d99545
 SHA512:
-  metadata.gz: b7b68c00204307439f31270eb1ae14360d1750aabc7e7f87c2128337331fb29b6041858132f218fee76fd65c8d2903739816c1be4a8f268646c66fd10449b5a9
-  data.tar.gz: d25a404af72648245718dc0ee6519023754c0c6f111f87746edb611e6c17856571bc183e17fd1284b33709ddebd8a0ba36c91a0f4245403db49bbd0d7e2a09b3
+  metadata.gz: 76b576b0e8fd51f067bda1eaca73ebb3bd5f49f0ce366ac4c59d84942b2d1437cead58afc7fd1b0c96e7051e656342e2b2ac9e1d2d3c183953ed8fefba15b79f
+  data.tar.gz: f5ba63555cde2fb189c53ceedfffd46491744605ea50f8927f85502c8ba480455a69ba397cdc27d1ace387509e95b8c5442b10b411ea50b3d18aaf075c0a5b3d

data/chefspec.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
   s.files         = %w{LICENSE Rakefile Gemfile chefspec.gemspec} + Dir.glob("{lib,templates,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.3'
+  s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency 'chef',    '>= 13'
+  s.add_dependency 'chef',    '>= 14'
+  s.add_dependency 'chef-cli'
   s.add_dependency 'fauxhai', '>= 6.11'
   s.add_dependency 'rspec',   '~> 3.0'
 end

data/lib/chefspec/coverage.rb

@@ -90,26 +90,6 @@ module ChefSpec
       @outputs << block
     end
 
-    #
-    # Change the template for reporting of converage analysis.
-    #
-    # @param [string] path
-    #   The template file to use for the output of the report
-    #
-    # @return [true]
-    #
-    def set_template(file = 'human.erb')
-      [
-        ChefSpec.root.join('templates', 'coverage', file),
-        File.expand_path(file, Dir.pwd)
-      ].each do |temp|
-        if File.exist?(temp)
-          @template = temp
-          return
-        end
-      end
-      raise Error::TemplateNotFound.new(path: file)
-    end
     #
     # Add a resource to the resource collection. Only new resources are added
     # and only resources that match the given filter are covered (which is *

data/lib/chefspec/extensions/chef/cookbook/gem_installer.rb

@@ -25,7 +25,7 @@ Chef::Cookbook::GemInstaller.prepend(Module.new do
     gem_cmd = "gem install #{gem_name} --version '#{gem_requirements.join(', ')}'"
     gemfile_line = "gem '#{[gem_name, *gem_requirements].join('\', \'')}'"
     warn "No matching version found for '#{gem_name}' in your gem environment.\n" \
-         " - if you are using ChefDK, run the following command: \"chef #{gem_cmd}\"\n" \
+         " - if you are using Chef Workstation, run the following command: \"chef #{gem_cmd}\"\n" \
          " - if you are using bundler, append \"#{gemfile_line}\" to your Gemfile and run \"bundle install\"\n" \
          " - otherwise run: \"#{gem_cmd}\""
   end

data/lib/chefspec/policyfile.rb

@@ -1,8 +1,8 @@
 begin
-  require 'chef-dk/policyfile_services/export_repo'
-  require 'chef-dk/policyfile_services/install'
+  require 'chef-cli/policyfile_services/export_repo'
+  require 'chef-cli/policyfile_services/install'
 rescue LoadError
-  raise ChefSpec::Error::GemLoadError.new(gem: 'chef-dk', name: 'ChefDK')
+  raise ChefSpec::Error::GemLoadError.new(gem: 'chef-cli', name: 'ChefCLI')
 end
 
 module ChefSpec
@@ -27,14 +27,14 @@ module ChefSpec
         policyfile_path = File.join(Dir.pwd, 'Policyfile.rb')
       end
 
-      installer = ChefDK::PolicyfileServices::Install.new(
+      installer = ChefCLI::PolicyfileServices::Install.new(
         policyfile: policyfile_path,
-        ui: ChefDK::UI.null
+        ui: ChefCLI::UI.null
       )
 
       installer.run
 
-      exporter = ChefDK::PolicyfileServices::ExportRepo.new(
+      exporter = ChefCLI::PolicyfileServices::ExportRepo.new(
         policyfile: policyfile_path,
         export_dir: @tmpdir
       )

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '7.4.0'
+  VERSION = '8.0.0'
 end

data/spec/spec_helper.rb

@@ -1,11 +1,6 @@
 require 'chefspec'
 require 'support/hash'
 
-
-ChefSpec::Coverage.start! do
-  set_template 'table.erb'
-end
-
 RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = :expect }
   config.filter_run(focus: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -17,14 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
+- !ruby/object:Gem::Dependency
+  name: chef-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fauxhai
   requirement: !ruby/object:Gem::Requirement
@@ -167,9 +181,6 @@ files:
 - spec/unit/stubs/search_registry_spec.rb
 - spec/unit/stubs/search_stub_spec.rb
 - spec/unit/stubs/stub_spec.rb
-- templates/coverage/human.erb
-- templates/coverage/json.erb
-- templates/coverage/table.erb
 - templates/errors/cookbook_path_not_found.erb
 - templates/errors/erb_template_parse_error.erb
 - templates/errors/gem_load_error.erb
@@ -191,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/templates/coverage/human.erb

@@ -1,22 +0,0 @@
-
-<% if @total == 0 %>
-  No Chef resources found, skipping coverage calculation...
-<% else %>
-ChefSpec Coverage report generated...
-
-  Total Resources:   <%= @total %>
-  Touched Resources: <%= @touched %>
-  Touch Coverage:    <%= @coverage %>%
-
-<% if @untouched_resources.empty? %>
-You are awesome and so is your test coverage! Have a fantastic day!
-
-<% else %>
-Untouched Resources:
-
-<% @untouched_resources.each do |resource| %>
-  <%= resource.to_s.ljust(32) %>   <%= resource.source_file %>:<%= resource.source_line %>
-<% end %>
-
-<% end %>
-<% end %>

data/templates/coverage/json.erb

@@ -1,8 +0,0 @@
-{ "resources":[
-  <%= @all_resources.map { |resource| resource.to_json }.join(",\n") %>
-  ],
-  "resource_count": <%= @total %>,
-  "resources_touched": <%= @touched %>,
-  "resource_coverage":    <%= @coverage %>
-
-}

data/templates/coverage/table.erb

@@ -1,14 +0,0 @@
-<%='Touched'.to_s.ljust(8) %> <%='Resource'.to_s.ljust(48) %>   File:Line
-<% @all_resources.each do |resource| %>
-<%=resource.touched?.to_s.ljust(8) %> <%= resource.to_s.ljust(48) %>   <%= resource.source_file %>:<%= resource.source_line %>
-<% end %>
-
-<% if @total == 0 %>
-  No Chef resources found, skipping coverage calculation...
-<% else %>
-ChefSpec Coverage report generated...
-
-  Total Resources:   <%= @total %>
-  Touched Resources: <%= @touched %>
-  Touch Coverage:    <%= @coverage %>%
-<% end %>