itamae 1.1.19 → 1.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bc2771249661bde6dc39318b631d963a7697ebc
-  data.tar.gz: e0daf9fcefe8de50700be1bd21a5e6d2713a514a
+  metadata.gz: 6ca9a458f030e2ec5d60c1bc8bd01d328a38203d
+  data.tar.gz: 69040c5649fe0ed36b626e51aca7bd936d2e66e0
 SHA512:
-  metadata.gz: 554595b1b3c7a10964e2d087d3b1a8194f1baab016fd4e6408dea6ab920d671d64744b1a19f2ec488e835d9072eb980dca6b24677c3c99bae1a5c55162dd9d44
-  data.tar.gz: 7b245129c145755de0ff1751c9fe275be4bb30532540269be2c6e0300d376af02fc3b1ef063153b9a32b08f409ada0228a3c21705c4ceef13b6777e827745d5a
+  metadata.gz: c5f30b1edb852c3835a93da78fe30414de0f29e526d1418c3404c022adc3ded024ec25d08d0967ae614e2c6eedd980e6db28fb7a3a917ea40bb404d0f2dc52b5
+  data.tar.gz: 324f116bd8332b90e5157456d888822e096df35c668dae41eec01f29ba96bb50370edf5b1276bc169b2624de639f32b4d27a190576602cab1d1df3f293587beb

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.1.20
+
+Features
+
+- `source :auto` of remote_file and template resources.
+  - details: https://github.com/itamae-kitchen/itamae/issues/94
+
 ## v1.1.19
 
 Features

data/lib/itamae/recipe.rb

@@ -32,6 +32,10 @@ module Itamae
       @children = RecipeChildren.new
     end
 
+    def dir
+      ::File.dirname(@path)
+    end
+
     def load
       EvalContext.new(self)
     end

data/lib/itamae/resource/file.rb

@@ -6,15 +6,14 @@ module Itamae
       define_attribute :action, default: :create
       define_attribute :path, type: String, default_name: true
       define_attribute :content, type: String, default: ''
-      define_attribute :content_file, type: String
       define_attribute :mode, type: String
       define_attribute :owner, type: String
       define_attribute :group, type: String
 
       def pre_action
         begin
-          src = if attributes.content_file
-                  ::File.expand_path(attributes.content_file, ::File.dirname(@recipe.path))
+          src = if content_file
+                  content_file
                 else
                   f = Tempfile.open('itamae')
                   f.write(attributes.content)
@@ -107,6 +106,11 @@ module Itamae
           end
         end
       end
+
+      # will be overridden
+      def content_file
+        nil
+      end
     end
   end
 end

data/lib/itamae/resource/remote_file.rb

@@ -3,13 +3,48 @@ require 'itamae'
 module Itamae
   module Resource
     class RemoteFile < File
-      define_attribute :source, type: String, required: true
+      SourceNotFoundError = Class.new(StandardError)
 
-      def pre_action
-        attributes.content_file =
-          ::File.expand_path(attributes.source, ::File.dirname(@recipe.path))
+      define_attribute :source, type: [String, Symbol], default: :auto
 
-        super
+      private
+
+      def content_file
+        source_file
+      end
+
+      def source_file
+        @source_file ||= find_source_file
+      end
+
+      def find_source_file
+        if attributes.source == :auto
+          dirs = attributes.path.split(::File::SEPARATOR)
+          dirs.shift if dirs.first == ""
+
+          searched_paths = []
+          dirs.size.times do |i|
+            path = ::File.join(@recipe.dir, source_file_dir, "#{dirs[i..-1].join("/")}#{source_file_ext}")
+            if ::File.exist?(path)
+              Logger.debug "#{path} is used as a source file."
+              return path
+            else
+              searched_paths << path
+            end
+          end
+
+          raise SourceNotFoundError, "source file is not found (searched paths: #{searched_paths.join(', ')})"
+        else
+          ::File.expand_path(attributes.source, @recipe.dir)
+        end
+      end
+
+      def source_file_dir
+        "files"
+      end
+
+      def source_file_ext
+        ""
       end
     end
   end

data/lib/itamae/resource/template.rb

@@ -4,17 +4,29 @@ require 'tempfile'
 
 module Itamae
   module Resource
-    class Template < File
-      define_attribute :source, type: String, required: true
+    class Template < RemoteFile
       define_attribute :variables, type: Hash, default: {}
 
       def pre_action
-        src = ::File.expand_path(attributes.source, ::File.dirname(@recipe.path))
-        attributes.content = RenderContext.new(self).render_file(src)
+        attributes.content = RenderContext.new(self).render_file(source_file)
 
         super
       end
 
+      private
+
+      def content_file
+        nil
+      end
+
+      def source_file_dir
+        "templates"
+      end
+
+      def source_file_ext
+        ".erb"
+      end
+
       class RenderContext
         def initialize(resource)
           @resource = resource

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.1.19
+1.1.20

data/spec/integration/default_spec.rb

@@ -22,9 +22,11 @@ describe package('resolvconf') do
   it { should_not be_installed }
 end
 
-describe file('/tmp/remote_file') do
-  it { should be_file }
-  its(:content) { should match(/Hello Itamae/) }
+%w!/tmp/remote_file /tmp/remote_file_auto!.each do |f|
+  describe file(f) do
+    it { should be_file }
+    its(:content) { should match(/Hello Itamae/) }
+  end
 end
 
 describe file('/tmp/directory') do
@@ -34,12 +36,14 @@ describe file('/tmp/directory') do
   it { should be_grouped_into "itamae" }
 end
 
-describe file('/tmp/template') do
-  it { should be_file }
-  its(:content) { should match(/Hello/) }
-  its(:content) { should match(/Good bye/) }
-  its(:content) { should match(/^total memory: \d+kB$/) }
-  its(:content) { should match(/^uninitialized node key: $/) }
+%w!/tmp/template /tmp/template_auto!.each do |f|
+  describe file(f) do
+    it { should be_file }
+    its(:content) { should match(/Hello/) }
+    its(:content) { should match(/Good bye/) }
+    its(:content) { should match(/^total memory: \d+kB$/) }
+    its(:content) { should match(/^uninitialized node key: $/) }
+  end
 end
 
 describe file('/tmp/file') do

data/spec/integration/recipes/default.rb

@@ -85,6 +85,12 @@ remote_file "/tmp/remote_file" do
   source "hello.txt"
 end
 
+remote_file "/tmp/remote_file_auto" do
+  source :auto
+end
+
+######
+
 directory "/tmp/directory" do
   mode "700"
   owner "itamae"
@@ -96,6 +102,11 @@ template "/tmp/template" do
   variables(goodbye: "Good bye")
 end
 
+template "/tmp/template_auto" do
+  source :auto
+  variables(goodbye: "Good bye")
+end
+
 file "/tmp/file" do
   content "Hello World"
   mode "777"

data/spec/integration/recipes/files/remote_file_auto

@@ -0,0 +1 @@
+Hello Itamae

data/spec/integration/recipes/templates/template_auto.erb

@@ -0,0 +1,6 @@
+<%= node['greeting'] %>
+<%= @goodbye %>
+
+total memory: <%= node['memory']['total'] %>
+
+uninitialized node key: <%= node['un-initialized'] %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.1.19
+  version: 1.1.20
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -189,11 +189,13 @@ files:
 - spec/integration/default_spec.rb
 - spec/integration/recipes/default.rb
 - spec/integration/recipes/default2.rb
+- spec/integration/recipes/files/remote_file_auto
 - spec/integration/recipes/hello.erb
 - spec/integration/recipes/hello.txt
 - spec/integration/recipes/included.rb
 - spec/integration/recipes/node.json
 - spec/integration/recipes/redefine.rb
+- spec/integration/recipes/templates/template_auto.erb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/config_spec.rb
 - spec/unit/lib/itamae/logger_spec.rb
@@ -233,11 +235,13 @@ test_files:
 - spec/integration/default_spec.rb
 - spec/integration/recipes/default.rb
 - spec/integration/recipes/default2.rb
+- spec/integration/recipes/files/remote_file_auto
 - spec/integration/recipes/hello.erb
 - spec/integration/recipes/hello.txt
 - spec/integration/recipes/included.rb
 - spec/integration/recipes/node.json
 - spec/integration/recipes/redefine.rb
+- spec/integration/recipes/templates/template_auto.erb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/config_spec.rb
 - spec/unit/lib/itamae/logger_spec.rb