capistrano-template 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa377bf5341fbaf19e2ed802e16c0dd4f3de2d5
-  data.tar.gz: 56b1b85e124ed8bdf19d5fcc342d4cf400228c3e
+  metadata.gz: d22bbf4b677ef6f6caf5a392ef945d42d7c9f10d
+  data.tar.gz: d1593087344132c09a1272469c3dcb085a7194f2
 SHA512:
-  metadata.gz: 8157f5434421031a4c750d53f7039e0e4ea1d76783f49ef054aa7d63cdd33686ec66742cac9f51fec9c0f2f334561f9765acbf29e4f2d24b8b3f593b9fefd9a5
-  data.tar.gz: 3c101ff655bbf32d6205faf1d96bb54d63753978408eda07462739284f0cb910d776c5f8c94e6b73354b6575024dc8f26dbc838a8966f78873227e328816aa86
+  metadata.gz: a5ef31f7beb2748c98a3d8f29931a11599d8ca0f7658e7092024ae74bc2b68c711dcd6f0174b0d08ec7bdc97a76484c8bcb2eb609c64eaa2c0a9eb5810383ea2
+  data.tar.gz: ab00f8c7da4d40f4ab97a35f72759ce8e60c220d24943d34c0b15eb07ce74f0c971f488521f8319f6f3003207ad63469712e4c8860d95513d195d2aa1b7fb867

data/README.md

@@ -1,6 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/capistrano-template.svg)](http://badge.fury.io/rb/capistrano-template)
 [![Build Status](https://travis-ci.org/faber-lotto/capistrano-template.svg?branch=master)](https://travis-ci.org/faber-lotto/capistrano-template)
 [![Code Climate](https://codeclimate.com/github/faber-lotto/capistrano-template.png)](https://codeclimate.com/github/faber-lotto/capistrano-template)
+[![Coverage Status](https://coveralls.io/repos/faber-lotto/capistrano-template/badge.png?branch=master)](https://coveralls.io/r/faber-lotto/capistrano-template?branch=master)
 
 # Capistrano::Template 
 
@@ -116,7 +117,7 @@ This settings can be changed in your Capfile, deploy.rb or stage file.
 | Variable              | Default                               | Description                           |
 |-----------------------|---------------------------------------|---------------------------------------|
 |`templating_digster`   | <code> -&gt;(data){ Digest::MD5.hexdigest(data)} </code> | Checksum algorythmous for rendered template to check for remote diffs |
-|`templating_digest_cmd`| <code>%Q{test "Z$(openssl md5 %&lt;path&gt;s &#124; sed "s/^.*= *//")" = "Z%&lt;digest&gt;s" }</code> | Remote command to validate a digest. Format placeholders path is replaces by full `path` to the remote file and `digest` with the digest calculated in capistrano. |
+|`templating_digest_cmd`| <code>%Q{test "Z$(openssl md5 %&lt;path&gt;s &#124; sed 's/^.*= *//')" = "Z%&lt;digest&gt;s" }</code> | Remote command to validate a digest. Format placeholders path is replaces by full `path` to the remote file and `digest` with the digest calculated in capistrano. |
 |`templating_mode_test_cmd` | <code>%Q{ &#91; "Z$(printf "%%.4o" 0$(stat -c "%%a" %&lt;path&gt;s 2&gt;/dev/null &#124;&#124;  stat -f "%%A" %&lt;path&gt;s))" != "Z%&lt;mode&gt;s" &#93; }</code> | Test command to check the remote file permissions. |
 | `templating_paths` | <code>&#91;"config/deploy/templates/#{fetch(:stage)}/%&lt;host&gt;s",</code> <br> <code> "config/deploy/templates/#{fetch(:stage)}",</code> <br> <code> "config/deploy/templates/shared/%&lt;host&gt;s",</code> <br> <code> "config/deploy/templates/shared"&#93;</code>| Folder to look for a template to render. `<host>` is replaced by the actual host. |
 

data/lib/capistrano/capistrano_plugin_template.rb

@@ -1,5 +1,9 @@
 require 'capistrano/template'
+require 'sshkit/all'
 
-include Capistrano::Template::Helpers::DSL
+# don't pollute global namespace
+extend Capistrano::Template::Helpers::DSL
+
+SSHKit::Backend::Netssh.send(:include, Capistrano::Template::Helpers::DSL)
 
 import File.join(__dir__, 'template', 'tasks', 'template_defaults.rake')

data/lib/capistrano/template/helpers/dsl.rb

@@ -47,7 +47,7 @@ module Capistrano
             path = File.dirname(path)
           end
 
-          remote_path = capture("(cd  #{path} && pwd -P) || readlink -sf #{path}").chomp
+          remote_path = capture("/bin/bash -c '(cd  #{path} && pwd -P) || readlink -sf #{path}'").chomp
 
           includes_filename ? File.join(remote_path, filename) : remote_path
         end
@@ -55,6 +55,14 @@ module Capistrano
         def _template_factory
           ->(from, context, digester) {TemplateDigester.new(Renderer.new(from, context), digester) }
         end
+
+        def method_missing(method_name, *args)
+          if self.class.respond_to? method_name
+            self.class.send(method_name, *args)
+          else
+            super
+          end
+        end
       end
     end
   end

data/lib/capistrano/template/tasks/template_defaults.rake

@@ -1,7 +1,7 @@
 namespace :load do
   task :defaults do
     set :templating_digster, ->{ ->(data){ Digest::MD5.hexdigest(data)} }
-    set :templating_digest_cmd, %Q{test "Z$(openssl md5 %<path>s| sed "s/^.*= *//")" = "Z%<digest>s" } # alternative %Q{echo "%<digest>s %<path>s" | md5sum -c --status }  should return true when the file content is the same
+    set :templating_digest_cmd, %Q{test "Z$(openssl md5 %<path>s| sed 's/^.*= *//')" = "Z%<digest>s" } # alternative %Q{echo "%<digest>s %<path>s" | md5sum -c --status }  should return true when the file content is the same
     set :templating_mode_test_cmd, %Q{ [ "Z$(printf "%%.4o" 0$(stat -c "%%a" %<path>s 2>/dev/null ||  stat -f "%%A" %<path>s))" != "Z%<mode>s" ] } # mac uses different mode formatter
     set :templating_paths , ->{ ["config/deploy/templates/#{fetch(:stage)}/%<host>s",
                                  "config/deploy/templates/#{fetch(:stage)}",

data/lib/capistrano/template/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Template
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-template
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dieter Späth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano