chefspec 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f7f37a530acbb9dff67aed530b585d77fdd0775
-  data.tar.gz: 33079e8115211a7bb28392ea9aa26a584f2b8e43
+  metadata.gz: 2b27856f904afc7828e2ebd18d3b0d6cf445df4c
+  data.tar.gz: c044c2653ce2dd4edea1a9af3be1a279bd10464b
 SHA512:
-  metadata.gz: 62f881a2f5ca9f7438399dfba1925ea5226c742c6e3d7da85facf1df9be28a8444d799c18428af6e0d9e12288a259a64fe3af47905733ca83572b28b33c92ac2
-  data.tar.gz: 4ee3f4f55710eca0bc4bf036ec683306a1d9312583ebe9edbfd3dfef892d5224813586c6109be50e0af4b89d0a393095b8e263d1fc46ab5e108319989f6c445b
+  metadata.gz: b990fc3a58d92ab8a308ae89fe1f4c354f513d3af9054dc2e328df7fb88313c7a539117ab58ece8775d39f3aff296de8c4c20a6b36e94f6a6a1ad6d4f9832dec
+  data.tar.gz: b4fa0c0393da51a776b26b7c2da7b55cedda9d6c5f27747475feb229797c3d6eaaaf1abf79d70991ff7f6f00256761b91cdb9eff17ef5626db9e2440b29c5670

data/.travis.yml

@@ -27,4 +27,5 @@ gemfile:
 matrix:
   fast_finish: true
   allow_failures:
+    - gemfile: gemfiles/chef-12.0.0.alpha.gemfile
     - gemfile: gemfiles/chef-master.gemfile

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG for ChefSpec
 ======================
 
+## 4.1.1 (October 13, 2014)
+Bugfixes:
+  - Fix total fail on my part with deprecations and add test coverage
+  - Do not validate cookbooks on upload (speed)
+
 ## 4.1.0 (October 12, 2014)
 Bugfixes:
   - Bump the minimum required version of Chef to 11.14

data/lib/chefspec.rb

@@ -44,6 +44,7 @@ end
 
 require_relative 'chefspec/extensions/chef/client'
 require_relative 'chefspec/extensions/chef/conditional'
+require_relative 'chefspec/extensions/chef/cookbook_uploader'
 require_relative 'chefspec/extensions/chef/data_query'
 require_relative 'chefspec/extensions/chef/lwrp_base'
 require_relative 'chefspec/extensions/chef/resource'

data/lib/chefspec/deprecations.rb

@@ -19,8 +19,8 @@ module ChefSpec
     # @deprecated {ChefSpec.define_runner_method} is deprecated. Please
     #   use {ChefSpec.define_runner_method} instead.
     def self.define_runner_method(resource_name)
-      deprecated "`ChefSpec.define_runner_method' is deprecated. " \
-        "Please use `ChefSpec.define_runner_method' instead."
+      deprecated "`ChefSpec::Runner.define_runner_method' is deprecated. " \
+        "Please use `ChefSpec.define_matcher' instead."
 
       ChefSpec.define_matcher(resource_name)
     end
@@ -31,7 +31,7 @@ module ChefSpec
       deprecated "`ChefSpec::Runner' is deprecated. Please use" \
         " `ChefSpec::SoloRunner' or `ChefSpec::ServerRunner' instead."
 
-      ChefSpec::SoloRuner.new(*args, &block)
+      ChefSpec::SoloRunner.new(*args, &block)
     end
   end
 
@@ -40,7 +40,7 @@ module ChefSpec
       deprecated "`ChefSpec::Server.#{m}' is deprecated. There is no longer" \
         " a global Chef Server instance. Please use a ChefSpec::ServerRunner" \
         " instead. More documentation can be found in the ChefSpec README."
-      raise NoConversionError
+      raise ChefSpec::Error::NoConversionError
     end
   end
 end

data/lib/chefspec/extensions/chef/cookbook_uploader.rb

@@ -0,0 +1,11 @@
+require 'chef/cookbook_uploader'
+
+class Chef::CookbookUploader
+  #
+  # Don't validate uploaded cookbooks. Validating a cookbook takes *forever*
+  # to complete. It's just not worth it...
+  #
+  def validate_cookbooks
+    # noop
+  end
+end

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/spec/unit/deprecations_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe ChefSpec::Runner do
+  before do
+    allow_any_instance_of(ChefSpec::SoloRunner)
+      .to receive(:dry_run?)
+      .and_return(true)
+    allow(ChefSpec::Runner).to receive(:deprecated)
+  end
+
+  describe '#define_runner_method' do
+    before do
+      allow(ChefSpec).to receive(:define_matcher)
+    end
+
+    it 'prints a deprecation' do
+      expect(ChefSpec::Runner).to receive(:deprecated)
+        .with("`ChefSpec::Runner.define_runner_method' is deprecated. "\
+          "Please use `ChefSpec.define_matcher' instead.")
+      ChefSpec::Runner.define_runner_method(:my_custom_resource)
+    end
+
+    it 'calls ChefSpec#define_matcher' do
+      expect(ChefSpec).to receive(:define_matcher).with(:my_custom_resource).once
+      ChefSpec::Runner.define_runner_method(:my_custom_resource)
+    end
+
+  end
+
+  describe '#new' do
+    before do
+      allow(ChefSpec::SoloRunner).to receive(:new)
+    end
+
+    it 'prints a deprecation' do
+      expect(ChefSpec::Runner).to receive(:deprecated)
+        .with("`ChefSpec::Runner' is deprecated. Please use" \
+        " `ChefSpec::SoloRunner' or `ChefSpec::ServerRunner' instead.")
+      ChefSpec::Runner.new
+    end
+
+    it 'calls SoloRunner#new with no args' do
+      expect(ChefSpec::SoloRunner).to receive(:new).with(no_args()).once
+      ChefSpec::Runner.new
+    end
+
+    it 'calls SoloRunner#new with args' do
+      args = [ 'args' ]
+      expect(ChefSpec::SoloRunner).to receive(:new).with(*args).once
+      ChefSpec::Runner.new(*args)
+    end
+
+  end
+end
+
+describe ChefSpec::Server do
+  before do
+    allow(ChefSpec::Server).to receive(:deprecated)
+  end
+
+  it 'prints a deprecation for any method called' do
+    expect(ChefSpec::Server).to receive(:deprecated)
+      .with("`ChefSpec::Server.any_method' is deprecated. There is no longer" \
+        " a global Chef Server instance. Please use a ChefSpec::ServerRunner" \
+        " instead. More documentation can be found in the ChefSpec README."
+      )
+    expect{ChefSpec::Server.any_method}.to raise_error
+  end
+
+  it 'raises non-conversion error for any method called' do
+    expect{ChefSpec::Server.any_method}
+      .to raise_error(ChefSpec::Error::NoConversionError)
+  end
+
+end

data/templates/errors/no_conversion_error.erb

@@ -0,0 +1 @@
+You called a deprecated method without a backwards compatible replacement.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -669,6 +669,7 @@ files:
 - lib/chefspec/expect_exception.rb
 - lib/chefspec/extensions/chef/client.rb
 - lib/chefspec/extensions/chef/conditional.rb
+- lib/chefspec/extensions/chef/cookbook_uploader.rb
 - lib/chefspec/extensions/chef/data_query.rb
 - lib/chefspec/extensions/chef/lwrp_base.rb
 - lib/chefspec/extensions/chef/resource.rb
@@ -709,6 +710,7 @@ files:
 - spec/support/hash.rb
 - spec/unit/api_spec.rb
 - spec/unit/cacher_spec.rb
+- spec/unit/deprecations_spec.rb
 - spec/unit/errors_spec.rb
 - spec/unit/expect_exception_spec.rb
 - spec/unit/extensions/lwrp_base_spec.rb
@@ -736,6 +738,7 @@ files:
 - templates/coverage/human.erb
 - templates/errors/cookbook_path_not_found.erb
 - templates/errors/gem_load_error.erb
+- templates/errors/no_conversion_error.erb
 - templates/errors/not_stubbed.erb
 homepage: http://code.sethvargo.com/chefspec
 licenses:
@@ -838,6 +841,7 @@ test_files:
 - spec/support/hash.rb
 - spec/unit/api_spec.rb
 - spec/unit/cacher_spec.rb
+- spec/unit/deprecations_spec.rb
 - spec/unit/errors_spec.rb
 - spec/unit/expect_exception_spec.rb
 - spec/unit/extensions/lwrp_base_spec.rb