chef-sandwich 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2282901c2af027ce54b89570e6269cee00718f61
+  data.tar.gz: 0ed0efbb3a04ae19a624539858513216584a3a36
+SHA512:
+  metadata.gz: e2d7d054dd49575b162a4881545e5b84e5bda8b1b0c3fc1152d8634821137eef62e133ede86cc568f89a82ad1d436ddc6442564d7235a29a602f92fbcadc8a20
+  data.tar.gz: 2b282f8d93c970e9ed15d2f8a97d65573cc182cac244070cab009fb8b91bfed2f9c6f2a7fb0c94e85db5b1168c2eb9157a8c54e226d14c5634dd2e30e065a94a

data/LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2011 Sebastian Boehm
+   Copyright 2011-2015 Sebastian Boehm
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/NEWS

@@ -1,4 +1,14 @@
 * sandwich NEWS
+** 0.4.0 (2015-01-18)
+
+ - Naotoshi Seo
+   - Fix uninitialized constant Sandwich::Client::UUIDTools
+   - Fix uninitialized constant Chef::Application
+   - Support segment_filenames
+   - Add --json-attributes option
+   - Support --why-run mode
+   - Enhance error message shown by sandwich command
+
 ** 0.3.0 (2011-10-17)
 
  - Add -e option

data/Rakefile

@@ -1,13 +1,11 @@
 require 'rake/testtask'
+require 'sandwich/version'
 
-namespace :gem do
-  desc 'Build chef-sandwich gem'
-  task :build do
-    sh 'gem build chef-sandwich.gemspec'
-  end
+desc "Build chef-sandwich-#{Sandwich::VERSION}.gem"
+task :gem do
+  sh 'gem build chef-sandwich.gemspec'
 end
 
 Rake::TestTask.new do |t|
   t.pattern = 'spec/*_spec.rb'
-  t.verbose = false
 end

data/bin/sandwich

@@ -6,6 +6,6 @@ begin
   sandwich.run(ARGV)
 rescue SystemExit
 rescue Exception => e
-  $stderr.puts("sandwich: #{e.message}")
+  $stderr.puts("sandwich: #{e.class} #{e.message} #{e.backtrace.first}")
   exit(1)
 end

data/lib/sandwich/cli.rb

@@ -43,6 +43,18 @@ module Sandwich
                 'Execute command as a sandwich script') do |c|
           @options[:command] << c
         end
+
+        opts.on('-W',
+                '--why-run',
+                'Enable whyrun mode') do
+          @options[:why_run] = true
+        end
+
+        opts.on('-j',
+                '--json-attributes JSON_ATTRIBS',
+                'Load attributes from a JSON file or URL') do |c|
+          @options[:json_attribs] = c
+        end
       end
     end
 
@@ -70,10 +82,19 @@ module Sandwich
         end
       end
 
+      if @options[:why_run]
+        Chef::Config[:why_run] = true
+      end
+
+      if @options[:json_attribs]
+        config_fetcher = Chef::ConfigFetcher.new(@options[:json_attribs])
+        json_attribs = config_fetcher.fetch_json
+      end
+
       # pass remaining arguments on to script
       ARGV.replace(unparsed_arguments)
 
-      runner = Sandwich::Runner.new(recipe_filename, recipe)
+      runner = Sandwich::Runner.new(recipe_filename, recipe, json_attribs)
       runner.run(@options[:log_level])
     end
   end

data/lib/sandwich/client.rb

@@ -1,5 +1,7 @@
 require 'sandwich/cookbook_version'
 require 'chef'
+require 'uuidtools'
+require 'chef/application'
 
 module Sandwich
   # Chef::Client extended to inject a Sandwich cookbook into the
@@ -13,9 +15,10 @@ module Sandwich
     #
     # @param [String] recipe_filename the recipe filename
     # @param [String] recipe_string the recipe definition
-    def initialize(recipe_filename, recipe_string = nil)
+    # @param [Hash]   json_attribs the JSON attributes
+    def initialize(recipe_filename, recipe_string = nil, json_attribs = nil)
       Chef::Config[:solo] = true
-      super()
+      super(json_attribs)
 
       if recipe_string
         @sandwich_basedir = Dir.getwd

data/lib/sandwich/cookbook_version.rb

@@ -24,8 +24,14 @@ module Sandwich
                                             segment,
                                             filename,
                                             current_filepath=nil)
-      # keep absolute paths, convert relative paths into absolute paths
-      filename.start_with?('/') ? filename : File.join(@basedir, filename)
+      segment_filenames = [
+        File.join(segment.to_s, "#{node[:platform]}-#{node[:platform_version]}", filename),
+        File.join(segment.to_s, node[:platform], filename),
+        File.join(segment.to_s, 'default', filename),
+        File.join(segment.to_s, filename),
+        File.expand_path(filename, @basedir), # keep absolute paths, convert relative paths into absolute paths
+      ]
+      segment_filenames.find {|filename| File.exist?(filename) }
     end
   end
 end

data/lib/sandwich/runner.rb

@@ -14,8 +14,9 @@ module Sandwich
     #
     # @param [String] recipe_filename the recipe filename
     # @param [String] recipe_string the recipe definition
-    def initialize(recipe_filename, recipe_string = nil)
-      @client = Sandwich::Client.new(recipe_filename, recipe_string)
+    # @param [Hash]   json_attribs the JSON attributes
+    def initialize(recipe_filename, recipe_string = nil, json_attribs = nil)
+      @client = Sandwich::Client.new(recipe_filename, recipe_string, json_attribs)
     end
 
     # Run Chef in standalone mode, apply recipe

data/lib/sandwich/version.rb

@@ -1,4 +1,4 @@
 module Sandwich
   # the current version of sandwich
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/runner_spec.rb

@@ -17,17 +17,6 @@ describe Sandwich::Runner do
         file.must_equal content
       end
     end
-
-    it 'should throw exceptions for files in missing directories' do
-      with_fakefs do
-        filename = '/i/am/not/here'
-        content = 'hello world'
-        recipe = %Q(file '#{filename}' do content '#{content}';end)
-        run = Proc.new { run_recipe recipe }
-        run.must_raise(Errno::ENOENT,
-                       Chef::Exceptions::EnclosingDirectoryDoesNotExist)
-      end
-    end
   end
 
   describe Chef::Resource::CookbookFile do
@@ -45,6 +34,22 @@ describe Sandwich::Runner do
     end
   end
 
+  describe Chef::Resource::Template do
+    it 'should create templates' do
+      with_fakefs do
+        source = '/source.erb'
+        target = '/target'
+        content = 'hello <%= node[:hostname] %>'
+        recipe = %Q(template '#{target}' do source '/source.erb';end)
+        # create source template
+        File.open(source, 'w') { |f| f.write(content) }
+        run_recipe(recipe)
+        hostname = ohai_data(:hostname)
+        File.read(target).must_equal "hello #{hostname}"
+      end
+    end
+  end
+
   describe Chef::Resource::Directory do
     it 'should create directories' do
       with_fakefs do

data/spec/spec_helper.rb

@@ -16,11 +16,10 @@ class Ohai::System
   end
 end
 
-# monkey patch for https://github.com/defunkt/fakefs/issues/96
-class FakeFS::Dir
-  def self.mkdir(path, integer = 0)
-    FileUtils.mkdir(path)
-  end
+def ohai_data(key)
+  ohai = Ohai::System.new
+  ohai.all_plugins
+  ohai.data[key]
 end
 
 def runner_from_recipe(recipe)
@@ -31,17 +30,46 @@ def run_recipe(recipe)
   runner_from_recipe(recipe).run(:fatal)
 end
 
-def with_fakefs
-  FakeFS.activate!
-  setup_standard_dirs
+# fakefs does not support IO.binread (which is used a lot by chef),
+# therefore monkey patch IO.binread to use FakeFS::File.binread
+def with_fake_io_binread
+  IO.instance_eval do
+    alias :binread_orig :binread
+    def self.binread(path); FakeFS::File.binread(path); end
+  end
   yield
 ensure
-  FakeFS.deactivate!
+  IO.instance_eval { alias :binread :binread_orig }
+end
+
+def with_fakefs
+  FakeFS do
+    setup_standard_dirs
+    with_fake_io_binread { yield }
+  end
 end
 
 def setup_standard_dirs
   FileUtils.mkdir_p '/tmp'
+  FileUtils.mkdir_p Chef::Config[:file_cache_path]
 end
 
 # make sure Chef 0.10 exceptions are available when using older Chef versions
 class Chef::Exceptions::EnclosingDirectoryDoesNotExist; end
+
+Chef::Config[:client_fork] = false
+Chef::Config[:force_logger] = true
+
+# FakeFS does not provide File.realpath, but for our simple tests
+# expand_path is close enough
+class FakeFS::File
+  def self.realpath(*args)
+    expand_path(*args)
+  end
+end
+
+# disable Chef run locks
+class Chef::RunLock
+  def test; true; end
+  def save_pid; end
+end

metadata

@@ -1,85 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chef-sandwich
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Sebastian Boehm
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-17 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-01-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chef
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 11.12.8
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 11.12.8
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.5
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.5
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.5.1
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.5.1
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.4
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.7
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.4.2
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.4.2
 description: |
   Sandwich lets you apply Chef recipes to your system without having to
   worry about cookbooks or configuration.
-
 email: sebastian@sometimesfood.org
-executables: 
+executables:
 - sandwich
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - README.md
 - LICENSE
@@ -94,33 +103,28 @@ files:
 - lib/sandwich.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/sometimesfood/sandwich
-licenses: []
-
+licenses:
+- Apache License (2.0)
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The easiest way to get started as a chef
 test_files: []
-