capistrano-file-resources 0.1.0 → 0.1.1

data/capistrano-file-resources.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Capistrano::Configuration::Resources::FileResources::VERSION
 
   gem.add_dependency("capistrano")
+  gem.add_dependency("mime-types")
   gem.add_development_dependency("net-scp", "~> 1.0.4")
   gem.add_development_dependency("net-ssh", "~> 2.2.2")
   gem.add_development_dependency("vagrant", "~> 1.0.6")

data/lib/capistrano/configuration/resources/file_resources.rb

@@ -1,26 +1,37 @@
 require "capistrano/configuration/resources/file_resources/version"
 require "capistrano/configuration"
 require "erb"
+require "mime/types"
 
 module Capistrano
   class Configuration
     module Resources
       module FileResources
         def file(name, options={})
-          path = options.fetch(:path, ".")
+          options = options.dup
+          path = ( options.delete(:path) || "." )
           begin
-            File.read(File.join(path, name))
+            File.read(File.join(path, name), options)
           rescue SystemCallError => error
             abort("Could not render file resource - #{error}")
           end
         end
 
         def template(name, options={})
-          path = options.fetch(:path, ".")
-          name = "#{name}.erb" if File.exist?(File.join(path, "#{name}.erb"))
-          data = file(name, options)
+          path = options.fetch(:path, "." )
+          if File.exist?(File.join(path, "#{name}.erb"))
+            name = "#{name}.erb"
+          else
+            types = MIME::Types.type_for(name)
+            if types.include?("text/html")
+              name_without_ext = File.basename(name, File.extname(name))
+              if File.exist?(File.join(path, "#{name_without_ext}.rhtml"))
+                name = "#{name_without_ext}.rhtml"
+              end
+            end
+          end
           begin
-            ERB.new(data).result(binding)
+            ERB.new(file(name, options)).result(options.fetch(:binding, binding))
           rescue StandardError => error
             abort("Could not render template resource - #{error}")
           end

data/lib/capistrano/configuration/resources/file_resources/version.rb

@@ -2,7 +2,7 @@ module Capistrano
   class Configuration
     module Resources
       module FileResources
-        VERSION = "0.1.0"
+        VERSION = "0.1.1"
       end
     end
   end

data/test/centos6-64/run.sh

@@ -2,6 +2,6 @@
 
 bundle exec vagrant up
 bundle exec cap test_all
-bundle exec vagrant destroy -f
+bundle exec vagrant halt
 
 # vim:set ft=sh :

data/test/config/deploy.rb

@@ -16,21 +16,32 @@ role :db,  "192.168.33.10", :primary => true
 
 $LOAD_PATH.push(File.expand_path("../../lib", File.dirname(__FILE__)))
 require "capistrano/configuration/resources/file_resources"
-require "stringio"
+require "tempfile"
 
 task(:test_all) {
   find_and_execute_task("test_default")
 }
 
-def assert_equals(x, y)
-  abort("assert_equals(#{x.dump}, #{y.dump}) failed.") unless x == y
+def assert_equals(x, y, options={})
+  begin
+    raise if x != y
+  rescue
+    logger.debug("assert_equals(#{x.dump}, #{y.dump}) failed.")
+    raise
+  end
 end
 
-def assert_raises(error)
+def assert_raises(error, options={})
   begin
     yield
   rescue error => e
-    logger.debug("assert_raises: expected exception: #{e}")
+    raised = e
+  ensure
+    if raised
+      logger.debug("assert_raises(#{error}) expected exception: #{raised}")
+    else
+      raise("assert raises(#{error}) failed.")
+    end
   end
 end
 
@@ -54,42 +65,56 @@ namespace(:test_default) {
   }
 
   task(:test_file) {
-    run_locally("rm -f tmp/foo; echo foo > tmp/foo")
-    assert_equals("foo\n", file("foo", :path => "tmp"))
+    run_locally("rm -rf tmp; mkdir tmp")
+    File.write("tmp/foo", "foo")
+    assert_equals(file("foo", :path => "tmp"), "foo")
   }
 
   task(:test_missing_file) {
-    run_locally("rm -f tmp/foo")
+    run_locally("rm -rf tmp; mkdir tmp")
     assert_raises(SystemExit) do
       file("foo", :path => "tmp")
     end
   }
 
   task(:test_file_with_suffix) {
-    run_locally("rm -f tmp/foo tmp/foo.erb; echo foo > tmp/foo; echo foo.erb > tmp/foo.erb")
-    assert_equals("foo\n", file("foo", :path => "tmp"))
+    run_locally("rm -rf tmp; mkdir tmp")
+    File.write("tmp/foo", "foo")
+    File.write("tmp/foo.erb", "foo.erb")
+    assert_equals(file("foo", :path => "tmp"), "foo")
+
   }
 
   task(:test_template) {
-    run_locally("rm -f tmp/bar; echo bar > tmp/bar")
-    assert_equals("bar\n", template("bar", :path => "tmp"))
+    run_locally("rm -rf tmp; mkdir tmp")
+    File.write("tmp/bar", "bar")
+    assert_equals(template("bar", :path => "tmp"), "bar")
   }
 
   task(:test_missing_template) {
-    run_locally("rm -f tmp/bar")
+    run_locally("rm -rf tmp; mkdir tmp")
     assert_raises(SystemExit) do
       template("bar", :path => "tmp")
     end
   }
 
   task(:test_template_with_suffix) {
-    run_locally("rm -f tmp/bar tmp/bar.erb; echo bar > tmp/bar; echo bar.erb > tmp/bar.erb")
-    assert_equals("bar.erb\n", template("bar", :path => "tmp"))
+    run_locally("rm -rf tmp; mkdir tmp")
+    File.write("tmp/bar", "bar")
+    File.write("tmp/bar.erb", "bar.erb")
+    assert_equals(template("bar", :path => "tmp"), "bar.erb")
+  }
+
+  task(:test_template_with_suffix_rhtml) {
+    run_locally("rm -rf tmp; mkdir tmp")
+    File.write("tmp/bar.rhtml", "bar.rhtml")
+    assert_equals(template("bar.html", :path => "tmp"), "bar.rhtml")
   }
 
   task(:test_template_rendering) {
+    run_locally("rm -rf tmp; mkdir tmp")
     File.write("tmp/baz.erb", %q{<%= "baz" %>})
-    assert_equals("baz", template("baz", :path => "tmp"))
+    assert_equals(template("baz", :path => "tmp"), "baz")
   }
 }
 

data/test/precise64/run.sh

@@ -2,6 +2,6 @@
 
 bundle exec vagrant up
 bundle exec cap test_all
-bundle exec vagrant destroy -f
+bundle exec vagrant halt
 
 # vim:set ft=sh :

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-file-resources
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement