chef-sugar 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f20f8de1e2ae7d007959739a79232f17f9c77ab8
-  data.tar.gz: c8a6790c44827d8f3423f0824cf87c47901cc306
+  metadata.gz: 75de0550f84f3b8ef3b94926f60c2b3a7a757c02
+  data.tar.gz: 081a7e696179a33958fe4a38cf7022da9c8c0d0b
 SHA512:
-  metadata.gz: 0449dc8267586cffc7699139e1d0aaad5f7bac5f79994b6ea8e5fc5e6719f779084852ba351341bc23009d995357f5f3aa277a27d400e85c0d9c1fc829c90384
-  data.tar.gz: 918e1e5c4f02c7e20d353a2b0dd891c204996b6e8a261c01ef16d0fbe67c3fa25929af83850fddee106858d69c99442f50e3bc97e621d2749f5cd4ace2884aa4
+  metadata.gz: f506eb432d8a39cfdea1b709fe760c9994887655503cb2e539bc1ffe5e299d49513a4a0f3928b1ac02e8c42e453726979df4f76d4c2f3c2f69a9d5b663fc337d
+  data.tar.gz: d6e52403bf24e0a37b61432373b455806d563004773a757fc2d61eff4103e4dbe89796ede0c3d67eea01ab332cdf63d64f25f9c429ea367f6367ec9bb8294983

data/.kitchen.yml

@@ -1,6 +1,8 @@
 driver_plugin: vagrant
 driver_config:
   require_chef_omnibus: true
+  synced_folders:
+    - ['<%= File.expand_path('..', __FILE__) %>', '/gem']
 
 platforms:
   # - name: ubuntu-10.04
@@ -11,4 +13,4 @@ platforms:
 suites:
   - name: install
     run_list:
-      - recipe[chef-sugar::default]
+      - recipe[chef-sugar::development]

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
-  - 1.9.1
+  - 1.9.3
   - 2.0.0
 script:
   - bundle exec rspec --color --format progress

data/CHANGELOG.md

@@ -2,6 +2,12 @@ Chef Sugar Changelog
 =========================
 This file is used to list changes made in each version of the chef-sugar cookbook and gem.
 
-v1.0.0 (TBD)
-------------
+
+v1.0.1 (2013-10-15)
+-------------------
+- Add development recipe
+- Add `compile_time`, `before`, and `after` filters
+
+v1.0.0 (2013-10-15)
+-------------------
 - First public release

data/README.md

@@ -175,6 +175,7 @@ end
 - `arch_linux?`
 - `debian?`
 - `fedora?`
+- `freebsd?`
 - `gentoo?`
 - `linux?`
 - `mac_os_x?`
@@ -237,6 +238,35 @@ http_request 'http://...' do
 end
 ```
 
+### Filters
+- `compile_time` - accepts a block of resources to run at compile time
+- `before` - insert resource in the collection before the given resource
+- `after` - insert resource in the collection after the given resource
+
+#### Examples
+```ruby
+compile_time do
+  package 'apache2'
+end
+
+# This is equivalent to
+package 'apache2' do
+  'apache2'
+end.run_action(:install)
+```
+
+```ruby
+before 'service[apache2]' do
+  log 'I am before the apache 2 service fires!'
+end
+```
+
+```ruby
+after 'service[apache2]' do
+  log 'I am after the apache 2 service fires!'
+end
+```
+
 
 License & Authors
 -----------------

data/lib/chef/sugar.rb

@@ -22,6 +22,7 @@ class Chef
   module Sugar
     require_relative 'sugar/architecture'
     require_relative 'sugar/cloud'
+    require_relative 'sugar/filters'
     require_relative 'sugar/ip'
     require_relative 'sugar/node'
     require_relative 'sugar/platform'

data/lib/chef/sugar/filters.rb

@@ -0,0 +1,147 @@
+class Chef
+  module Sugar
+    module Filters
+      #
+      # Evaluate resources at compile time instead of converge time.
+      #
+      class CompileTime
+        def initialize(recipe)
+          @recipe = recipe
+        end
+
+        def evaluate(&block)
+          instance_eval(&block)
+        end
+
+        def method_missing(m, *args, &block)
+          resource = @recipe.send(m, *args, &block)
+          actions  = Array(resource.action)
+          resource.action(:nothing)
+          actions.each do |action|
+            resource.run_action(action)
+          end
+        end
+      end
+
+      #
+      # A top-level class for manipulation the resource collection.
+      #
+      class Injector
+        def initialize(recipe, identifier, placement)
+          @recipe              = recipe
+          @resource_collection = @recipe.run_context.resource_collection
+          @resource            = @resource_collection.lookup(identifier)
+          @placement           = placement
+        end
+
+        def evaluate(&block)
+          instance_eval(&block)
+        end
+
+        def insert_before(resource, new_resource)
+          @resource_collection.instance_eval do
+            # Remove the resource because it's automatically created
+            @resources.delete_at(@resources_by_name[new_resource.to_s])
+            @resources_by_name.delete(new_resource.to_s)
+
+            index = @resources_by_name[resource.to_s]
+            @resources.insert(index, new_resource)
+            @resources_by_name[new_resource.to_s] = index
+          end
+        end
+
+        def insert_after(resource, new_resource)
+          @resource_collection.instance_eval do
+            # Remove the resource because it's automatically created
+            @resources.delete_at(@resources_by_name[new_resource.to_s])
+            @resources_by_name.delete(new_resource.to_s)
+
+            index = @resources_by_name[resource.to_s] + 2
+            @resources.insert(index, new_resource)
+            @resources_by_name[new_resource.to_s] = index
+          end
+        end
+
+        def method_missing(m, *args, &block)
+          new_resource = @recipe.send(m, *args, &block)
+
+          case @placement
+          when :before
+            insert_before(@resource, new_resource)
+          when :after
+            insert_after(@resource, new_resource)
+          else
+            super
+          end
+        end
+      end
+    end
+
+    module DSL
+      #
+      # Dynamically run resources specified in the block during the compilation
+      # phase, instead of the convergence phase.
+      #
+      # @example The old way
+      #   package('apache2') do
+      #     action :nothing
+      #   end.run_action(:install)
+      #
+      # @example The new way
+      #   compile_time do
+      #     package('apache2')
+      #   end
+      #
+      # @example Resource actions are run in order
+      #   compile_time do
+      #     service 'apache2' do
+      #       action [:enable, :start] # run_action(:enable), run_action(:start)
+      #     end
+      #   end
+      #
+      def compile_time(&block)
+        Chef::Sugar::Filters::CompileTime.new(self).evaluate(&block)
+      end
+
+      #
+      # Dynamically insert resources before an existing resource in the
+      # resource_collection.
+      #
+      # @example Write a custom template before the apache2 service actions
+      #          are run
+      #   before 'service[apache2]' do
+      #     template '/etc/apache2/thing.conf' do
+      #       source '...'
+      #     end
+      #   end
+      #
+      #
+      # @param [String] identifier
+      #   the +resource[name]+ identifier string
+      #
+      def before(identifier, &block)
+        Chef::Sugar::Filters::Injector.new(self, identifier, :before).evaluate(&block)
+      end
+
+      #
+      # Dynamically insert resources after an existing resource in the
+      # resource_collection.
+      #
+      # @example Write a custom template after the apache2 service actions
+      #          are run
+      #   after 'service[apache2]' do
+      #     template '/etc/apache2/thing.conf' do
+      #       source '...'
+      #     end
+      #   end
+      #
+      #
+      # @param [String] identifier
+      #   the +resource[name]+ identifier string
+      #
+      def after(identifier, &block)
+        Chef::Sugar::Filters::Injector.new(self, identifier, :after).evaluate(&block)
+      end
+    end
+  end
+end

data/lib/chef/sugar/platform_family.rb

@@ -53,6 +53,17 @@ class Chef
         node['platform_family'] == 'fedora'
       end
 
+      #
+      # Determine if the current node is a member of the freebsd family.
+      #
+      # @param [Chef::Node] node
+      #
+      # @return [Boolean]
+      #
+      def freebsd?(node)
+        node['platform_family'] == 'freebsd'
+      end
+
       #
       # Determine if the current node is a member of the arch family.
       #

data/lib/chef/sugar/version.rb

@@ -16,6 +16,6 @@
 
 class Chef
   module Sugar
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/metadata.rb

@@ -5,4 +5,4 @@ license          'Apache 2.0'
 description      'Installs chef-sugar. Please see the chef-sugar ' \
                  'Ruby gem for more information.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.0.0'
+version          '1.0.1'

data/recipes/default.rb

@@ -18,7 +18,7 @@
 #
 
 chef_gem('chef-sugar') do
-  version '1.0.0'
+  version '1.0.1'
   action  :nothing
 end.run_action(:install)
 

data/recipes/development.rb

@@ -0,0 +1,65 @@
+#
+# Cookbook Name:: chef-sugar
+# Recipe:: development
+#
+# Copyright 2013, 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.
+#
+
+#
+# This recipe is only meant for use when developing Chef Sugar.
+#
+
+execute('apt-get update') do
+  only_if { Time.now.to_i - 86400 > `stat -c %Y /var/cache/apt/`.to_i }
+end.run_action(:run)
+
+[
+  'build-essential',
+  'libxslt-dev',
+  'libxml2-dev',
+  'git'
+].each do |name|
+  package(name) do
+    action :nothing
+  end.run_action(:install)
+end
+
+execute('gem update bundler') do
+  action :nothing
+  not_if { `bundle -v`.strip.gsub(/[^0-9\.]/, '').to_f >= 1.3 }
+end.run_action(:run)
+
+execute 'bundle[chef-sugar]' do
+  cwd     '/gem'
+  command 'bundle install --path vendor'
+  not_if  'bundle check --gemfile /gem/Gemfile'
+  action  :nothing
+end.run_action(:run)
+
+execute 'build[chef-sugar]' do
+  cwd     '/gem'
+  command 'bundle exec rake build'
+  action  :nothing
+end.run_action(:run)
+
+sugar = chef_gem('chef-sugar') do
+  source '/gem/pkg/chef-sugar-1.0.0.gem'
+  action :nothing
+end
+
+sugar.run_action(:remove)
+sugar.run_action(:install)
+
+require 'chef/sugar'

data/spec/unit/chef/extensions/platform_family_spec.rb

@@ -39,6 +39,18 @@ describe Chef::Sugar::PlatformFamily do
     end
   end
 
+  describe '#freebsd?' do
+    it 'returns true when the platform_family is freebsd' do
+      node = { 'platform_family' => 'freebsd' }
+      expect(described_class.freebsd?(node)).to be_true
+    end
+
+    it 'returns false when the platform_family is not freebsd' do
+      node = { 'platform_family' => 'windows' }
+      expect(described_class.freebsd?(node)).to be_false
+    end
+  end
+
   describe '#gentoo?' do
     it 'returns true when the platform_family is gentoo' do
       node = { 'platform_family' => 'gentoo' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Seth Vargo
@@ -144,6 +144,7 @@ files:
 - lib/chef/sugar.rb
 - lib/chef/sugar/architecture.rb
 - lib/chef/sugar/cloud.rb
+- lib/chef/sugar/filters.rb
 - lib/chef/sugar/ip.rb
 - lib/chef/sugar/node.rb
 - lib/chef/sugar/platform.rb
@@ -154,6 +155,7 @@ files:
 - lib/chef/sugar/version.rb
 - metadata.rb
 - recipes/default.rb
+- recipes/development.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
 - spec/unit/chef/extensions/architecture_spec.rb