chef-sugar 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29b7d7e12e7d9ae4b0723f877983a5d42505ae3e
-  data.tar.gz: 1e16639547341f9b8e873e84866c5dc040003a48
+  metadata.gz: acce8120b89eabad574e8afe880736aa6572ab29
+  data.tar.gz: b4dd4b9ceefc85177ffd4145fbd2115d57ccf7ad
 SHA512:
-  metadata.gz: 7f3cc8734d0598fc2647b67f8e3d98660a8fa7f0c303697bf60c2dce5afcbfeca15a9952a6b535882ca59156b26ad3432f40710e8e46edac2ee29d9d614b1b20
-  data.tar.gz: 0e117f83f0dbd560a9bb16c5bfea6a61a01f99bc544d27aa267bddd008680aa02ff5a51557c50c407d9a380b4d374117f4fa203b8c31c28d88d941a8a6f58458
+  metadata.gz: 9af75355be12499e6b7093fa8fe1151a698586b9e57cabdeb50549850cef5c1e6e2b76d578434be87d66c4624a9e0eb7336be42abff62349fc926e35d6a31e46
+  data.tar.gz: ef252c8288b7b6e54ea777651f661e4c3e3f733fc790c4820719f912cdc303e9df58951ba1cd44028a55690ccee30cd2f6611a9eb4ea0190e17ebcce7b4eb2cc

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Chef Sugar Changelog
 =========================
 This file is used to list changes made in each version of the chef-sugar cookbook and gem.
 
+v2.4.0 (2014-10-12)
+-------------------
+### Improvements
+- Add `docker?` matcher
+
 v2.3.2 (2014-10-07)
 -------------------
 ### Big Fixues

data/README.md

@@ -152,6 +152,18 @@ encrypted_data_bag_item('accounts', 'hipchat')
 encrypted_data_bag_item_for_environment('accounts', 'github')
 ```
 
+### Docker
+Chef Sugar looks for hints to see if the node being converged is a Docker container. When [Ohai supports checking other nodes](https://github.com/opscode/ohai/pull/428), Chef Sugar will automatically pick up the information.
+
+- `docker?`
+
+#### Examples
+```ruby
+template '/runme' do
+  only_if { docker?(node) }
+end
+```
+
 ### Attributes
 Chef Sugar adds more Chef-like DSL to attribute definitions. Instead of using the Ruby hash syntax, you can define attributes using nested namespaces. This DSL may be more friendly to non-Ruby developers. It can safely be mixed-and-matched with the standard syntax.
 

data/lib/chef/sugar.rb

@@ -24,6 +24,7 @@ class Chef
     require_relative 'sugar/cloud'
     require_relative 'sugar/constraints'
     require_relative 'sugar/data_bag'
+    require_relative 'sugar/docker'
     require_relative 'sugar/filters'
     require_relative 'sugar/ip'
     require_relative 'sugar/kernel'

data/lib/chef/sugar/docker.rb

@@ -0,0 +1,40 @@
+#
+# Copyright 2013-2014, Seth Vargo <sethvargo@gmail.com>
+#
+# 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
+  module Sugar
+    module Docker
+      extend self
+
+      #
+      # Returns true if the current node is a docker container.
+      #
+      # @param [Chef::Node] node
+      #   the node to check
+      #
+      # @return [Boolean]
+      #
+      def docker?(node)
+        File.exist?('/.dockerinit') || File.exist?('/.dockerenv')
+      end
+    end
+
+    module DSL
+      # @see Chef::Sugar::Docker#docker?
+      def docker?; Chef::Sugar::Docker.docker?(node); end
+    end
+  end
+end

data/lib/chef/sugar/version.rb

@@ -16,6 +16,6 @@
 
 class Chef
   module Sugar
-    VERSION = '2.3.2'
+    VERSION = '2.4.0'
   end
 end

data/metadata.rb

@@ -14,4 +14,5 @@ For the most up-to-date information and documentation, please visit the [Chef
 Sugar project page on GitHub](https://github.com/sethvargo/chef-sugar).
 EOH
 
-version          '2.3.2'
+require_relative 'lib/chef/sugar/version'
+version          Chef::Sugar::VERSION

data/recipes/default.rb

@@ -17,8 +17,10 @@
 # limitations under the License.
 #
 
+gem_version = run_context.cookbook_collection[cookbook_name].metadata.version
+
 chef_gem('chef-sugar') do
-  version '2.3.2'
+  version gem_version
   action  :nothing
 end.run_action(:install)
 

data/spec/unit/chef/sugar/docker_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Chef::Sugar::Docker do
+  it_behaves_like 'a chef sugar'
+
+  before(:each) do
+    allow(File).to receive(:exist?)
+      .with("/.dockerenv")
+      .and_return(false)
+    allow(File).to receive(:exist?)
+      .with("/.dockerinit")
+      .and_return(false)
+  end
+
+  describe '#docker?' do
+    it 'is true when the file /.dockerenv is present' do
+      allow(File).to receive(:exist?)
+        .with("/.dockerenv")
+        .and_return(true)
+
+      node = { 'docker' => nil }
+      expect(described_class.docker?(node)).to be true
+    end
+
+    it 'is true when the file /.dockerinit is present' do
+      allow(File).to receive(:exist?)
+        .with("/.dockerinit")
+        .and_return(true)
+
+      node = { 'docker' => nil }
+      expect(described_class.docker?(node)).to be true
+    end
+
+    it 'is false when the node is not on cloud' do
+      node = { 'docker' => nil }
+      expect(described_class.docker?(node)).to be false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- chef-sugar-2.3.2.gem
 - chef-sugar.gemspec
 - lib/chef/sugar.rb
 - lib/chef/sugar/architecture.rb
@@ -109,6 +110,7 @@ files:
 - lib/chef/sugar/core_extensions/object.rb
 - lib/chef/sugar/core_extensions/string.rb
 - lib/chef/sugar/data_bag.rb
+- lib/chef/sugar/docker.rb
 - lib/chef/sugar/filters.rb
 - lib/chef/sugar/ip.rb
 - lib/chef/sugar/kernel.rb
@@ -132,6 +134,7 @@ files:
 - spec/unit/chef/sugar/core_extensions/object_spec.rb
 - spec/unit/chef/sugar/core_extensions/string_spec.rb
 - spec/unit/chef/sugar/data_bag_spec.rb
+- spec/unit/chef/sugar/docker_spec.rb
 - spec/unit/chef/sugar/ip_spec.rb
 - spec/unit/chef/sugar/kernel_spec.rb
 - spec/unit/chef/sugar/node_spec.rb
@@ -178,6 +181,7 @@ test_files:
 - spec/unit/chef/sugar/core_extensions/object_spec.rb
 - spec/unit/chef/sugar/core_extensions/string_spec.rb
 - spec/unit/chef/sugar/data_bag_spec.rb
+- spec/unit/chef/sugar/docker_spec.rb
 - spec/unit/chef/sugar/ip_spec.rb
 - spec/unit/chef/sugar/kernel_spec.rb
 - spec/unit/chef/sugar/node_spec.rb