poise-profiler 1.0.1 → 1.1.0

data/lib/poise_profiler/core_ext/event_base.rb

@@ -0,0 +1,41 @@
+#
+# Copyright 2016, Noah Kantrowitz
+#
+# 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.
+#
+
+require 'chef/event_dispatch/base'
+require 'chef/version'
+
+
+module PoiseProfiler
+  module CoreExt
+    # Monkeypatch extensions for Chef::EventDispatch::Base to support the
+    # new recipe_loaded event.
+    #
+    # @since 1.1.0
+    # @api private
+    module EventBase
+      def recipe_loaded(recipe_name)
+        # This space left intentionally blank.
+      end
+
+      # Monkeypatch us in for ?. TODO THIS
+      if Gem::Version.create(Chef::VERSION) < Gem::Version.create('14')
+        Chef::EventDispatch::Base.include(self)
+      end
+
+    end
+  end
+end
+

data/lib/poise_profiler/core_ext/run_context.rb

@@ -0,0 +1,53 @@
+#
+# Copyright 2016, Noah Kantrowitz
+#
+# 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.
+#
+
+require 'chef/run_context'
+require 'chef/version'
+
+
+module PoiseProfiler
+  module CoreExt
+    # Monkeypatch extensions for Chef::RunContext to add support for the
+    # recipe_file_loaded event on older Chef.
+    #
+    # @since 1.1.0
+    # @api private
+    module RunContext
+      PRE_MAGIC_EVENTS = Gem::Version.create(Chef::VERSION) < Gem::Version.create('12.5.1')
+
+      def load_recipe(recipe_name, current_cookbook: nil)
+        super.tap do |ret|
+          cookbook_name, recipe_short_name = Chef::Recipe.parse_recipe_name(recipe_name, current_cookbook: current_cookbook)
+          cookbook = cookbook_collection[cookbook_name]
+          recipe_path = cookbook.recipe_filenames_by_name[recipe_short_name]
+          if PRE_MAGIC_EVENTS
+            events.recipe_file_loaded(recipe_path)
+          else
+            events.recipe_file_loaded(recipe_path, recipe_name)
+          end
+        end
+      end
+
+      # Monkeypatch us in for <12.14.53, which was the first build after
+      # https://github.com/chef/chef/commit/1c990a11ebe360f5e85ac13626ce1e09e295f919.
+      if Gem::Version.create(Chef::VERSION) < Gem::Version.create('12.14.53')
+        Chef::RunContext.prepend(self)
+      end
+
+    end
+  end
+end
+

data/lib/poise_profiler/{handler.rb → timing.rb}

@@ -14,23 +14,13 @@
 # limitations under the License.
 #
 
-begin
-  require 'chef/chef_class'
-rescue LoadError
-  # ¯\_(ツ)_/¯ Chef < 12.3.
-end
-require 'chef/event_dispatch/base'
 require 'chef/json_compat'
 
+require 'poise_profiler/base'
 
-module PoiseProfiler
-  class Handler < Chef::EventDispatch::Base
-    include Singleton
-
-    # Used in {#monkey_patch_old_chef}
-    # @api private
-    attr_writer :events, :monkey_patched
 
+module PoiseProfiler
+  class Timing < PoiseProfiler::Base
     def resource_completed(resource)
       key = resource.resource_name.to_s.end_with?('_test') ? :test_resources : :resources
       timers[key]["#{resource.resource_name}[#{resource.name}]"] += resource.elapsed_time
@@ -38,12 +28,12 @@ module PoiseProfiler
     end
 
     def run_completed(node)
-      Chef::Log.debug('Processing poise-profiler data')
-      puts('Poise Profiler:')
+      Chef::Log.debug('Processing poise-profiler timing data')
+      puts('Poise Profiler Timing:')
       puts_timer(:resources, 'Resource')
       puts_timer(:test_resources, 'Test Resource') unless timers[:test_resources].empty?
       puts_timer(:classes, 'Class')
-      puts("Profiler JSON: #{Chef::JSONCompat.to_json(timers)}") if ENV['CI'] || node['CI']
+      puts("Profiler JSON: #{Chef::JSONCompat.to_json(timers)}") if config.fetch('timing_json', ENV['CI'] || node['CI'])
       puts('')
     end
 
@@ -53,23 +43,7 @@ module PoiseProfiler
 
     def reset!
       timers.clear
-      @events = nil
-    end
-
-    # Inject this instance for Chef < 12.3. Don't call this on newer Chef.
-    def monkey_patch_old_chef!
-      return if @monkey_patched
-      require 'chef/event_dispatch/dispatcher'
-      instance = self
-      orig_method = Chef::EventDispatch::Dispatcher.instance_method(:library_file_loaded)
-      Chef::EventDispatch::Dispatcher.send(:define_method, :library_file_loaded) do |filename|
-        instance.events = self
-        instance.monkey_patched = false
-        @subscribers << instance
-        Chef::EventDispatch::Dispatcher.send(:define_method, :library_file_loaded, orig_method)
-        orig_method.bind(self).call(filename)
-      end
-      @monkey_patched = true
+      super
     end
 
     private
@@ -87,13 +61,5 @@ module PoiseProfiler
       puts ""
     end
 
-    def puts(line)
-      events.stream_output(:profiler, line+"\n")
-    end
-
-    def events
-      @events ||= Chef.run_context.events
-    end
-
   end
 end

data/lib/poise_profiler/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseProfiler
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/test/gemfiles/chef-12.0.gemfile

@@ -17,3 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.0.3'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.1.gemfile

@@ -17,3 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.1.2'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.10.gemfile

@@ -0,0 +1,23 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.10.24'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.11.gemfile

@@ -0,0 +1,23 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.11.18'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.12.gemfile

@@ -0,0 +1,22 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.12.15'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.13.gemfile

@@ -0,0 +1,22 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.13.37'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.14.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.14.89'

data/test/gemfiles/chef-12.15.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.15.19'

data/test/gemfiles/chef-12.16.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.16.42'

data/test/gemfiles/chef-12.17.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.17.44'

data/test/gemfiles/chef-12.18.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.18.31'

data/test/gemfiles/chef-12.19.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2017, Noah Kantrowitz
+#
+# 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.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.19.36'

data/test/gemfiles/chef-12.2.gemfile

@@ -17,3 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.2.1'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.3.gemfile

@@ -17,3 +17,7 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.3.0'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.4.gemfile

@@ -17,5 +17,8 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.4.3'
-# Pending https://github.com/berkshelf/ridley/pull/335
-gem 'ridley', '4.4.1'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'
+gem 'gh', '0.14.0'