poise-profiler 1.0.1 → 1.1.0

data/test/gemfiles/chef-12.5.gemfile

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

data/test/gemfiles/chef-12.6.gemfile

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

data/test/gemfiles/chef-12.7.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.7.2'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.8.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.8.1'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.9.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.9.41'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'
+gem 'chefspec', '< 6'

data/test/gemfiles/chef-12.gemfile

@@ -16,4 +16,4 @@
 
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-gem 'chef', '~> 12.6'
+gem 'chef', '~> 12.19'

data/test/gemfiles/chef-13.0.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', '~> 13.0.113'

data/test/gemfiles/chef-13.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', '~> 13.0'

data/test/gemfiles/master.gemfile

@@ -18,4 +18,5 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', github: 'chef/chef'
 gem 'halite', github: 'poise/halite'
+gem 'ohai', github: 'chef/ohai'
 # gem 'poise-boiler', github: 'poise/poise-boiler'

data/test/spec/config_spec.rb

@@ -0,0 +1,61 @@
+#
+# Copyright 2015, 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 'spec_helper'
+
+describe PoiseProfiler::Config do
+  subject { described_class.new }
+  around do |ex|
+    old_env = ENV.to_h
+    ENV.delete_if {|key, value| key.downcase.start_with?('poise') }
+    begin
+      ex.run
+    ensure
+      ENV.clear
+      ENV.update(old_env)
+    end
+  end
+  before do
+    if defined?(Chef.node)
+      Chef.set_node(chef_run.node)
+    end
+  end
+
+  context 'with $POISE_PROFILER_OPTION' do
+    before { ENV['POISE_PROFILER_OPTION'] = 'value' }
+    its([:option]) { is_expected.to eq 'value' }
+  end # /context with $POISE_PROFILER_OPTION
+
+  context 'with $POISE_PROFILER_OPTION=true' do
+    before { ENV['POISE_PROFILER_OPTION'] = 'true' }
+    its([:option]) { is_expected.to be true }
+  end # /context with $POISE_PROFILER_OPTION=true
+
+  context 'with $POISE_PROFILER_OPTION=1' do
+    before { ENV['POISE_PROFILER_OPTION'] = '1' }
+    its([:option]) { is_expected.to eq 1 }
+  end # /context with $POISE_PROFILER_OPTION=1
+
+  # Attribute config is only supported when the global node is available.
+  if defined?(Chef.node)
+    context 'with node attributes' do
+      let(:default_attributes) do
+        {'poise-profiler' => {'option' => 'value'}}
+      end
+      its([:option]) { is_expected.to eq 'value' }
+    end # /context with node attributes
+  end
+end

data/test/spec/integration_spec.rb

@@ -26,6 +26,6 @@ describe 'integration', if: ENV['TRAVIS_SECURE_ENV_VARS'] do
   it do
     # Don't run this extra times.
     expect(subject.exitstatus).to eq 0
-    expect(subject.stdout).to include 'Poise Profiler:'
+    expect(subject.stdout).to include 'Poise Profiler Timing:'
   end
 end

data/test/spec/{default_spec.rb → timing_spec.rb}

@@ -26,7 +26,7 @@ end
 class DummyError < RuntimeError
 end
 
-describe 'cheftie' do
+describe PoiseProfiler::Timing do
   step_into(:ruby_block)
   let(:output) { [] }
   let(:events) { chef_runner.send(:client).events }
@@ -48,14 +48,21 @@ describe 'cheftie' do
     # Divert log output for analysis.
     _output = output
     allow(events).to receive(:stream_output) {|tag, line| _output << line }
-    # Clear the handler's internal state.
-    PoiseProfiler::Handler.instance.reset!
-    if Gem::Version.create(Chef::VERSION) <= Gem::Version.create('12.2.1')
-      PoiseProfiler::Handler.instance.monkey_patch_old_chef!
+    # Re-set-up the handler. Also clears internal state to be safe.
+    described_class.install!
+  end
+  around do |ex|
+    old_env = ENV.to_h
+    begin
+      ex.run
+    ensure
+      ENV.clear
+      ENV.update(old_env)
     end
   end
 
   context 'with a single resource' do
+    before { ENV['CI'] = 'true' }
     recipe(subject: false) do
       ruby_block 'test' do
         block { }
@@ -64,7 +71,7 @@ describe 'cheftie' do
 
     it do
       is_expected.to match(
-%r{\APoise Profiler:
+%r{\APoise Profiler Timing:
 Time          Resource
 ------------  -------------
 \s*([\d.]+)  ruby_block\[test\]
@@ -79,6 +86,7 @@ Profiler JSON: \{.*?\}
   end # /context with a single resource
 
   context 'with a failed run' do
+    before { ENV['CI'] = 'true' }
     recipe(subject: false) do
       ruby_block 'test' do
         block { raise DummyError }
@@ -94,7 +102,7 @@ Profiler JSON: \{.*?\}
 
     it do
       is_expected.to match(
-%r{\APoise Profiler:
+%r{\APoise Profiler Timing:
 Time          Resource
 ------------  -------------
 \s*([\d.]+)  ruby_block\[test\]
@@ -109,6 +117,7 @@ Profiler JSON: \{.*?\}
   end # /context with a failed run
 
   context 'with two resources' do
+    before { ENV['CI'] = 'true' }
     recipe(subject: false) do
       ruby_block 'test' do
         block { }
@@ -120,7 +129,7 @@ Profiler JSON: \{.*?\}
 
     it do
       is_expected.to match(
-%r{\APoise Profiler:
+%r{\APoise Profiler Timing:
 Time          Resource
 ------------  -------------
 \s*([\d.]+)  ruby_block\[test2\]
@@ -137,6 +146,7 @@ Profiler JSON: \{.*?\}
   end # /context with two resources
 
   context 'with inner resources' do
+    before { ENV['CI'] = 'true' }
     resource(:my_resource, unwrap_notifying_block: false)
     provider(:my_resource) do
       include Poise
@@ -155,7 +165,7 @@ Profiler JSON: \{.*?\}
 
     it do
       is_expected.to match(
-%r{\APoise Profiler:
+%r{\APoise Profiler Timing:
 Time          Resource
 ------------  -------------
 \s*([\d.]+)  my_resource\[test\]
@@ -174,6 +184,7 @@ Profiler JSON: \{.*?\}
   end # /context with inner resources
 
   context 'with test resources' do
+    before { ENV['CI'] = 'true' }
     resource(:poise_test, unwrap_notifying_block: false)
     provider(:poise_test) do
       include Poise
@@ -192,7 +203,7 @@ Profiler JSON: \{.*?\}
 
     it do
       is_expected.to match(
-%r{\APoise Profiler:
+%r{\APoise Profiler Timing:
 Time          Resource
 ------------  -------------
 \s*([\d.]+)  ruby_block\[test\]
@@ -212,4 +223,27 @@ Profiler JSON: \{.*?\}
       expect($2).to eq $3
     end
   end # /context with test resources
+
+  context 'without $CI' do
+    before { ENV.delete('CI') }
+    recipe(subject: false) do
+      ruby_block 'test' do
+        block { }
+      end
+    end
+
+    it do
+      is_expected.to match(
+%r{\APoise Profiler Timing:
+Time          Resource
+------------  -------------
+\s*([\d.]+)  ruby_block\[test\]
+
+Time          Class
+------------  -------------
+\s*([\d.]+)  Chef::Resource::RubyBlock
+
+\Z})
+    end
+  end # /context without $CI
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-profiler
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -83,8 +83,15 @@ files:
 - Rakefile
 - chef/recipes/default.rb
 - lib/poise_profiler.rb
+- lib/poise_profiler/base.rb
 - lib/poise_profiler/cheftie.rb
-- lib/poise_profiler/handler.rb
+- lib/poise_profiler/config.rb
+- lib/poise_profiler/core_ext.rb
+- lib/poise_profiler/core_ext/cookbook_version.rb
+- lib/poise_profiler/core_ext/dispatcher.rb
+- lib/poise_profiler/core_ext/event_base.rb
+- lib/poise_profiler/core_ext/run_context.rb
+- lib/poise_profiler/timing.rb
 - lib/poise_profiler/version.rb
 - poise-profiler.gemspec
 - test/cookbook/metadata.rb
@@ -93,16 +100,32 @@ files:
 - test/docker/docker.pem
 - test/gemfiles/chef-12.0.gemfile
 - test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.10.gemfile
+- test/gemfiles/chef-12.11.gemfile
+- test/gemfiles/chef-12.12.gemfile
+- test/gemfiles/chef-12.13.gemfile
+- test/gemfiles/chef-12.14.gemfile
+- test/gemfiles/chef-12.15.gemfile
+- test/gemfiles/chef-12.16.gemfile
+- test/gemfiles/chef-12.17.gemfile
+- test/gemfiles/chef-12.18.gemfile
+- test/gemfiles/chef-12.19.gemfile
 - test/gemfiles/chef-12.2.gemfile
 - test/gemfiles/chef-12.3.gemfile
 - test/gemfiles/chef-12.4.gemfile
 - test/gemfiles/chef-12.5.gemfile
 - test/gemfiles/chef-12.6.gemfile
+- test/gemfiles/chef-12.7.gemfile
+- test/gemfiles/chef-12.8.gemfile
+- test/gemfiles/chef-12.9.gemfile
 - test/gemfiles/chef-12.gemfile
+- test/gemfiles/chef-13.0.gemfile
+- test/gemfiles/chef-13.gemfile
 - test/gemfiles/master.gemfile
-- test/spec/default_spec.rb
+- test/spec/config_spec.rb
 - test/spec/integration_spec.rb
 - test/spec/spec_helper.rb
+- test/spec/timing_spec.rb
 homepage: https://github.com/poise/poise-profiler
 licenses:
 - Apache 2.0
@@ -123,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Chef cookbook for profiling performance in CI.
@@ -134,14 +157,29 @@ test_files:
 - test/docker/docker.pem
 - test/gemfiles/chef-12.0.gemfile
 - test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.10.gemfile
+- test/gemfiles/chef-12.11.gemfile
+- test/gemfiles/chef-12.12.gemfile
+- test/gemfiles/chef-12.13.gemfile
+- test/gemfiles/chef-12.14.gemfile
+- test/gemfiles/chef-12.15.gemfile
+- test/gemfiles/chef-12.16.gemfile
+- test/gemfiles/chef-12.17.gemfile
+- test/gemfiles/chef-12.18.gemfile
+- test/gemfiles/chef-12.19.gemfile
 - test/gemfiles/chef-12.2.gemfile
 - test/gemfiles/chef-12.3.gemfile
 - test/gemfiles/chef-12.4.gemfile
 - test/gemfiles/chef-12.5.gemfile
 - test/gemfiles/chef-12.6.gemfile
+- test/gemfiles/chef-12.7.gemfile
+- test/gemfiles/chef-12.8.gemfile
+- test/gemfiles/chef-12.9.gemfile
 - test/gemfiles/chef-12.gemfile
+- test/gemfiles/chef-13.0.gemfile
+- test/gemfiles/chef-13.gemfile
 - test/gemfiles/master.gemfile
-- test/spec/default_spec.rb
+- test/spec/config_spec.rb
 - test/spec/integration_spec.rb
 - test/spec/spec_helper.rb
-has_rdoc: 
+- test/spec/timing_spec.rb