poise 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59e1a4b84effd92c53b370ae6e5ad4330ac48672
-  data.tar.gz: 8ed9df5c50afd344e838bf637c875cae8c1765f0
+  metadata.gz: 1545650809810c8ee25795e7b56b933568de0914
+  data.tar.gz: f5a89f28a4da2042b4bd722a2a7b334079535d6d
 SHA512:
-  metadata.gz: 2f924807105ed9ba4b41616df467768d4a5fc2f0259c8f83d8b6fba5b64d744e4cff6fa38ff66e1ab781f94dd6ed3c4f196aadae0733727cbe384569fc367a7b
-  data.tar.gz: ad8775e6a9e0c924e7633f390ca82f7982a4eddb32ca058e3b0e0e988da4766fd074c40022977899012571bacee33c882146f27bff3ae940483cb0f6057c8515
+  metadata.gz: c5d033b6598795b685e866618581578ee0799710f8297ba43fef51540932d9a3d4e03a509b4c07effcf991a1da613164fb1e4c38a32b0dc7945c79f901909456
+  data.tar.gz: ab4f538ab3c09fcbfa5a9950a70c73bde93fb787f070cdcb3c059c00761a73e54eb44c1013ce17ea15af6736616997c99498c2ae5ded3c00d83265ec4584c89c

data/.kitchen.yml

@@ -1,18 +1,3 @@
 ---
 #<% require 'poise_boiler' %>
-<%= PoiseBoiler.kitchen %>
-
-chef_versions:
-- '12.0'
-- '12.1'
-- '12.2'
-- '12'
-
-platforms:
-- name: ubuntu-12.04
-
-suites:
-- name: default
-  run_list:
-  - recipe[poise_test]
-  - recipe[poise_test::inversion]
+<%= PoiseBoiler.kitchen(platforms: 'ubuntu-14.04') %>

data/.travis.yml

@@ -1,16 +1,10 @@
 sudo: false
 cache: bundler
 language: ruby
-addons:
-  apt:
-    packages:
-    - libgecode-dev
 rvm:
 - '2.2'
 env:
   global:
-  - USE_SYSTEM_GECODE=true
-  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml
   - secure: ax5czUwK8PVHXu/B3qbRZ8AACqXW4scIElQbn4sBuLp+VyTeutGax1uO6yTi7yv3xJUbEL3Z6gdZD/sOZpSKm8SL0YhkijoSs68HJCsau8cl7fvPJ0+JIlKqWazKEA1PaCmJHQv5J9TEyPyeSxZaIyacqOwOcUTyOkRDGyC+im8=
   - secure: jEiZqcy6E5WC1nBmfJBSLPpYOUBFdpoo7DsLrvIpKVRpOw7slb+VgIru5AzbONvVD/8CYstgqiVVoGaCP/ywWWqakOQ2thp0BqWN/OVlsuPiemAdLRMMsmekkaFUdAa5l8QUUI0YiTSpSLUXQFWZrXbiARCALGAvDBbsqF1JhgA=
   - secure: e3TH/N8tcx54wShV7s96OXDXuDbo9YnekLK3L3WrYrCK12gHVcW7xlMxPctGy14h6VaP1PBXJfUjd7cdzmHgudTo8HlR4Ui0kpjp85XrohPsLmVaFDxjAstLFm4VKMpsoKUZoPZY5J8bO9b606p872M5yO4rwKy3bVK/CP6mTBY=
@@ -25,4 +19,5 @@ 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/master.gemfile

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v2.6.0
+
+* New backwards-compatibility helper: `Poise::Backports::VERIFY_PATH`. Use it
+  like `verify "myapp -t #{Poise::Backports::VERIFY_PATH}" if defined?(verify)`
+  for backwards-compatible usage of file verifications.
+* Fixed Poise's implementation of lazy defaults to more closely match Chef's
+  even when both are used in conjunction. Lazy defaults will no longer be
+  evaluated when setting a value or getting an existing non-default value.
+
 ## v2.5.0
 
 * New property for inversion resources: `provider_no_auto`. Set one or more

data/Gemfile

@@ -29,3 +29,4 @@ end
 
 dev_gem 'halite'
 dev_gem 'poise-boiler'
+dev_gem 'poise-profiler'

data/lib/poise/backports.rb

@@ -21,6 +21,7 @@ module Poise
   # @since 2.3.0
   module Backports
     autoload :NOT_PASSED, 'poise/backports/not_passed'
+    autoload :VERIFY_PATH, 'poise/backports/verify_path'
   end
 
   autoload :NOT_PASSED, 'poise/backports/not_passed'

data/lib/poise/backports/verify_path.rb

@@ -0,0 +1,33 @@
+#
+# 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.
+#
+
+
+module Poise
+  module Backports
+    # The correct interpolation key for any version of Chef.
+    # @since 2.6.0
+    # @example
+    #   file '/path' do
+    #     content my_content
+    #     verify "myapp -t #{Poise::Backports::VERIFY_PATH}"
+    #   end
+    VERIFY_PATH = if Gem::Version.create(Chef::VERSION) < Gem::Version.create('12.5.0')
+      '%{file}'
+    else
+      '%{path}'
+    end
+  end
+end

data/lib/poise/helpers/lazy_default.rb

@@ -47,7 +47,12 @@ module Poise
       def set_or_return(symbol, arg, validation)
         if LazyDefault.needs_polyfill? && validation && validation[:default].is_a?(Chef::DelayedEvaluator)
           validation = validation.dup
-          validation[:default] = instance_eval(&validation[:default])
+          if (arg.nil? || arg == Poise::NOT_PASSED) && (!instance_variable_defined?(:"@#{symbol}") || instance_variable_get(:"@#{symbol}").nil?)
+            validation[:default] = instance_eval(&validation[:default])
+          else
+            # Clear the default.
+            validation.delete(:default)
+          end
         end
         super(symbol, arg, validation)
       end

data/lib/poise/version.rb

@@ -16,5 +16,5 @@
 
 
 module Poise
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/test/{cookbooks/poise_test → cookbook}/recipes/default.rb

@@ -23,3 +23,5 @@ end
 app_config 'user' do
   content 'user config'
 end
+
+include_recipe 'poise_test::inversion'

data/{Berksfile → test/gemfiles/chef-12.6.gemfile}

@@ -1,7 +1,5 @@
 #
-# Author:: Noah Kantrowitz <noah@coderanger.net>
-#
-# Copyright 2013, Balanced, Inc.
+# 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.
@@ -16,11 +14,6 @@
 # limitations under the License.
 #
 
-source 'https://supermarket.chef.io/'
-extension 'halite'
-
-cookbook 'poise', gem: 'poise'
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-group :test do
-  cookbook 'poise_test', path: 'test/cookbooks/poise_test'
-end
+gem 'chef', '~> 12.6.0'

data/test/gemfiles/chef-12.gemfile

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

data/test/gemfiles/master.gemfile

@@ -19,3 +19,4 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 gem 'chef', github: 'chef/chef'
 gem 'halite', github: 'poise/halite'
 gem 'poise-boiler', github: 'poise/poise-boiler'
+gem 'poise-profiler', github: 'poise/poise-profiler'

data/test/spec/backports/verify_path_spec.rb

@@ -0,0 +1,27 @@
+#
+# 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'
+
+# Disable this test if Chef::Resource::File::Verification doesn't exist because
+# it doesn't matter anyway.
+describe Poise::Backports::VERIFY_PATH, if: defined?(Chef::Resource::File::Verification) do
+  it do
+    verifier = Chef::Resource::File::Verification.new(nil, "mycmd #{subject}", nil)
+    expect(Chef::GuardInterpreter).to receive(:for_resource).with(nil, 'mycmd /path', nil).and_return(double(evaluate: nil))
+    verifier.verify_command('/path', nil)
+  end
+end

data/test/spec/helpers/lazy_default_spec.rb

@@ -87,4 +87,45 @@ describe Poise::Helpers::LazyDefault do
 
     it { is_expected.to run_poise_test('test').with(value: [1, 2]) }
   end # /context with a mutable value
+
+  context 'with a broken default' do
+    resource(:poise_test) do
+      include Poise::Helpers::LWRPPolyfill
+      include described_class
+      attribute(:value, default: lazy { raise RuntimeError })
+    end
+    provider(:poise_test) do
+      def action_run
+        new_resource.value
+      end
+    end
+
+    context 'with no value' do
+      recipe do
+        poise_test 'test'
+      end
+
+      it { expect { subject }.to raise_error RuntimeError }
+    end # /context with no value
+
+    context 'with true' do
+      recipe do
+        poise_test 'test' do
+          value true
+        end
+      end
+
+      it { is_expected.to run_poise_test('test') }
+    end # /context with true
+
+    context 'with false' do
+      recipe do
+        poise_test 'test' do
+          value false
+        end
+      end
+
+      it { is_expected.to run_poise_test('test') }
+    end # /context with false
+  end # /context with a broken default
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -46,12 +46,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".kitchen.travis.yml"
 - ".kitchen.yml"
 - ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
-- Berksfile
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -60,6 +58,7 @@ files:
 - lib/poise.rb
 - lib/poise/backports.rb
 - lib/poise/backports/not_passed.rb
+- lib/poise/backports/verify_path.rb
 - lib/poise/error.rb
 - lib/poise/helpers.rb
 - lib/poise/helpers/chefspec_matchers.rb
@@ -92,13 +91,13 @@ files:
 - lib/poise/utils/shell_out.rb
 - lib/poise/version.rb
 - poise.gemspec
-- test/cookbooks/poise_test/attributes/default.rb
-- test/cookbooks/poise_test/libraries/app.rb
-- test/cookbooks/poise_test/libraries/app_config.rb
-- test/cookbooks/poise_test/libraries/inversion.rb
-- test/cookbooks/poise_test/metadata.rb
-- test/cookbooks/poise_test/recipes/default.rb
-- test/cookbooks/poise_test/recipes/inversion.rb
+- test/cookbook/attributes/default.rb
+- test/cookbook/libraries/app.rb
+- test/cookbook/libraries/app_config.rb
+- test/cookbook/libraries/inversion.rb
+- test/cookbook/metadata.rb
+- test/cookbook/recipes/default.rb
+- test/cookbook/recipes/inversion.rb
 - test/docker/docker.ca
 - test/docker/docker.pem
 - test/gemfiles/chef-12.0.gemfile
@@ -107,11 +106,13 @@ files:
 - 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.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/default_spec.rb
 - test/integration/default/serverspec/inversion_spec.rb
 - test/spec/backports/not_passed_spec.rb
+- test/spec/backports/verify_path_spec.rb
 - test/spec/helpers/chefspec_matchers_spec.rb
 - test/spec/helpers/defined_in_spec.rb
 - test/spec/helpers/fused_spec.rb
@@ -162,13 +163,13 @@ signing_key:
 specification_version: 4
 summary: Helpers for writing extensible Chef cookbooks.
 test_files:
-- test/cookbooks/poise_test/attributes/default.rb
-- test/cookbooks/poise_test/libraries/app.rb
-- test/cookbooks/poise_test/libraries/app_config.rb
-- test/cookbooks/poise_test/libraries/inversion.rb
-- test/cookbooks/poise_test/metadata.rb
-- test/cookbooks/poise_test/recipes/default.rb
-- test/cookbooks/poise_test/recipes/inversion.rb
+- test/cookbook/attributes/default.rb
+- test/cookbook/libraries/app.rb
+- test/cookbook/libraries/app_config.rb
+- test/cookbook/libraries/inversion.rb
+- test/cookbook/metadata.rb
+- test/cookbook/recipes/default.rb
+- test/cookbook/recipes/inversion.rb
 - test/docker/docker.ca
 - test/docker/docker.pem
 - test/gemfiles/chef-12.0.gemfile
@@ -177,11 +178,13 @@ test_files:
 - 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.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/default_spec.rb
 - test/integration/default/serverspec/inversion_spec.rb
 - test/spec/backports/not_passed_spec.rb
+- test/spec/backports/verify_path_spec.rb
 - test/spec/helpers/chefspec_matchers_spec.rb
 - test/spec/helpers/defined_in_spec.rb
 - test/spec/helpers/fused_spec.rb

data/.kitchen.travis.yml

@@ -1,9 +0,0 @@
----
-driver:
-  name: docker
-  binary: "./docker"
-  socket: tcp://docker.poise.io:443
-  tls_verify: true
-  tls_cacert: test/docker/docker.ca
-  tls_cert: test/docker/docker.pem
-  tls_key: test/docker/docker.key