compat_resource 12.5.25 → 12.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5dfb347c43cb92ce7d991d612a9f16618745b64
-  data.tar.gz: 2d06d99a83ba561c9fcadff17337efe3cd7ba02f
+  metadata.gz: ea7089f93018397f0b5c46a78d8dc7003bd78941
+  data.tar.gz: ba7c3dd73c1f86be86475a737d8a9fdb0946e9ee
 SHA512:
-  metadata.gz: 9d0cdfe5d8e82073a7b37672b976c98746b235cf691faacdfd5cb098e5e3578850efa0e1f6c30f49ffec3039d15f69b5eb2764dbe139573f25ecc538e834ef22
-  data.tar.gz: b5ed330998b09e77a3bb0f2d5004fc10411ece0d25e4fc6647f696e240b6ed908c1ed468631be5476716b320bfc42bec87be76d6419b8ba91d5acc41eb1c222f
+  metadata.gz: 52a459b48397a9d3e942aa4d1f9680aff68a655026c402a85edcc14deb85791659871cc143fdeed83df47f7c86b2c77a6150fdaf57aa23b8fd15c9c98f8e708e
+  data.tar.gz: 349fc6e3b360941539629a8f5b2252dc2e64addebe0ee9c8f6fa86f5649b84077d8baaf095d380450d6a91e6f71294fb494ed7ccff75045d56062cacac7e790b

data/Rakefile

@@ -25,7 +25,6 @@ CHEF_FILES = %w(
                 chef/resource
                 chef/resource_builder
                 chef/resource/action_class
-                chef/log
               )
 SPEC_FILES = %w(
                 unit/mixin/properties_spec.rb

data/files/lib/chef_compat/copied_from_chef/chef/property.rb

@@ -21,7 +21,6 @@ module CopiedFromChef
 #
 
 require 'chef_compat/copied_from_chef/chef/delayed_evaluator'
-require 'chef_compat/copied_from_chef/chef/log'
 
 class Chef < (defined?(::Chef) ? ::Chef : Object)
   #

data/files/lib/chef_compat/copied_from_chef/chef/resource_builder.rb

@@ -152,7 +152,6 @@ super if defined?(::Chef::ResourceBuilder)
 end
 
 require 'chef_compat/copied_from_chef/chef/resource'
-require 'chef_compat/copied_from_chef/chef/log'
 end
 end
 end

data/files/lib/chef_compat/monkeypatches.rb

@@ -1,4 +1,5 @@
 require 'chef_compat/monkeypatches/chef'
+require 'chef_compat/monkeypatches/chef/log'
 require 'chef_compat/monkeypatches/chef/recipe'
 require 'chef_compat/monkeypatches/chef/resource'
 require 'chef_compat/monkeypatches/chef/provider'

data/files/lib/chef_compat/monkeypatches/chef/log.rb

@@ -0,0 +1,22 @@
+require 'chef/log'
+
+module ChefCompat
+  module Monkeypatches
+    module Log
+      def caller_location
+        # Pick the first caller that is *not* part of the Chef gem, that's the
+        # thing the user wrote.
+        @compat_resource_filter_paths ||=
+          Gem.loaded_specs['chef'].require_paths.map { |p| File.join(Gem.loaded_specs['chef'].full_gem_path, p) } +
+          Gem.loaded_specs['compat_resource'].require_paths.map { |p| File.join(Gem.loaded_specs['compat_resource'].full_gem_path, p) }
+        puts caller.select { |c| !@compat_resource_filter_paths.any? { |path| c.start_with?(path) } }
+
+        caller.select { |c| !@compat_resource_filter_paths.any? { |path| c.start_with?(path) } }.first
+      end
+    end
+  end
+end
+
+class<<::Chef::Log
+  prepend ChefCompat::Monkeypatches::Log
+end

data/files/lib/compat_resource/version.rb

@@ -1,3 +1,3 @@
 module CompatResource
-  VERSION = '12.5.25'
+  VERSION = '12.5.26'
 end

data/files/spec/data/Gemfile.lock

@@ -1,9 +1,10 @@
-GEM
+GIT
+  remote: git://github.com/chef/chef.git
+  revision: 5f51f93f71cdee3ed598b38cecd8f5fa1a585f49
   specs:
-    builder (3.2.2)
-    chef (12.4.3)
-      chef-config (= 12.4.3)
-      chef-zero (~> 4.2, >= 4.2.2, < 4.3.0)
+    chef (12.6.0)
+      chef-config (= 12.6.0)
+      chef-zero (~> 4.4.0, >= 4.2.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 2.2)
@@ -11,25 +12,30 @@ GEM
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
       mixlib-log (~> 1.3)
-      mixlib-shellout (>= 2.0.0.rc.0, < 2.2)
+      mixlib-shellout (~> 2.0)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
-      ohai (~> 8.0, < 8.6)
+      ohai (>= 8.6.0.alpha.1, < 9)
       plist (~> 3.1.0)
+      proxifier (~> 1.0)
       pry (~> 0.9)
-      rspec-core (~> 3.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
+      rspec-core (~> 3.4)
+      rspec-expectations (~> 3.4)
+      rspec-mocks (~> 3.4)
       rspec_junit_formatter (~> 0.2.0)
       serverspec (~> 2.7)
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
-    chef-config (12.4.3)
+    chef-config (12.6.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (4.2.3)
-      ffi-yajl (>= 1.1, < 3.0)
-      hashie (~> 2.0)
+
+GEM
+  specs:
+    builder (3.2.2)
+    chef-zero (4.4.0)
+      ffi-yajl (~> 2.2)
+      hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
       rack
       uuidtools (~> 2.1)
@@ -39,18 +45,17 @@ GEM
     ffi (1.9.10)
     ffi-yajl (2.2.2)
       libyajl2 (~> 1.2)
-    hashie (2.1.2)
+    hashie (3.4.3)
     highline (1.7.8)
     ipaddress (0.8.0)
     libyajl2 (1.2.0)
     method_source (0.8.2)
-    mime-types (2.99)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.5.0)
     mixlib-config (2.2.1)
     mixlib-log (1.6.0)
-    mixlib-shellout (2.1.0)
+    mixlib-shellout (2.2.5)
     multi_json (1.11.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -61,11 +66,11 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
-    ohai (8.5.1)
+    ohai (8.8.1)
+      chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
-      mime-types (~> 2.0)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
@@ -74,6 +79,7 @@ GEM
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
     plist (3.1.0)
+    proxifier (1.0.3)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -120,7 +126,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  chef (~> 12.4.0)
+  chef!
 
 BUNDLED WITH
    1.10.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compat_resource
 version: !ruby/object:Gem::Version
-  version: 12.5.25
+  version: 12.5.26
 platform: ruby
 authors:
 - John Keiser
@@ -96,7 +96,6 @@ files:
 - files/lib/chef_compat/copied_from_chef/chef/delayed_evaluator.rb
 - files/lib/chef_compat/copied_from_chef/chef/dsl/declare_resource.rb
 - files/lib/chef_compat/copied_from_chef/chef/dsl/recipe.rb
-- files/lib/chef_compat/copied_from_chef/chef/log.rb
 - files/lib/chef_compat/copied_from_chef/chef/mixin/params_validate.rb
 - files/lib/chef_compat/copied_from_chef/chef/mixin/properties.rb
 - files/lib/chef_compat/copied_from_chef/chef/property.rb
@@ -108,6 +107,7 @@ files:
 - files/lib/chef_compat/monkeypatches.rb
 - files/lib/chef_compat/monkeypatches/chef.rb
 - files/lib/chef_compat/monkeypatches/chef/exceptions.rb
+- files/lib/chef_compat/monkeypatches/chef/log.rb
 - files/lib/chef_compat/monkeypatches/chef/provider.rb
 - files/lib/chef_compat/monkeypatches/chef/recipe.rb
 - files/lib/chef_compat/monkeypatches/chef/resource.rb

data/files/lib/chef_compat/copied_from_chef/chef/log.rb

@@ -1,69 +0,0 @@
-require 'chef_compat/copied_from_chef'
-class Chef
-module ::ChefCompat
-module CopiedFromChef
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: AJ Christensen (<@aj@opscode.com>)
-# Author:: Christopher Brown (<cb@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-class Chef < (defined?(::Chef) ? ::Chef : Object)
-  class Log < (defined?(::Chef::Log) ? ::Chef::Log : Object)
-    extend Mixlib::Log
-
-    # Force initialization of the primary log device (@logger)
-    init(MonoLogger.new(STDOUT))
-
-    class Formatter < (defined?(::Chef::Log::Formatter) ? ::Chef::Log::Formatter : Object)
-      def self.show_time=(*args)
-        Mixlib::Log::Formatter.show_time = *args
-      end
-    end
-
-    #
-    # Get the location of the caller (from the recipe). Grabs the first caller
-    # that is *not* in the chef gem proper (allowing us to weed out internal
-    # calls and give the user a more useful perspective).
-    #
-    # @return [String] The location of the caller (file:line#) from caller(0..20), or nil if no non-chef caller is found.
-    #
-    def self.caller_location
-      # Pick the first caller that is *not* part of the Chef gem, that's the
-      # thing the user wrote.
-      chef_gem_path = File.expand_path("../..", __FILE__)
-      caller(0..20).select { |c| !c.start_with?(chef_gem_path) }.first
-    end
-
-    def self.deprecation(msg=nil, location=caller(2..2)[0], &block)
-      if msg
-        msg << " at #{Array(location).join("\n")}"
-        msg = msg.join("") if msg.respond_to?(:join)
-      end
-      if Chef::Config[:treat_deprecation_warnings_as_errors]
-        error(msg, &block)
-        raise Chef::Exceptions::DeprecatedFeatureError.new(msg)
-      else
-        warn(msg, &block)
-      end
-    end
-
-  end
-end
-end
-end
-end