capistrano-template 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf1b76bed38d227a7b50b774e670a58bbc31baf5
-  data.tar.gz: 347549beb8f5546df3002e1c5000e6b0c3d5ca81
+  metadata.gz: 7b458e887b43a265af8ce91bda6ec7e465f729ed
+  data.tar.gz: 3b19ea31edec13a9dfdaaa499db38b2972104fa4
 SHA512:
-  metadata.gz: 9957f08403791cb36451ed1a12fbd036f7a8bb35aaf052330699bc9cb8ccfaff801f5965705daf222eeb35e1f8d69b56ff12ce524819357d5a4aeb0e620fe717
-  data.tar.gz: 17ee68b87d83147ee93f0552d1a14f52da956b20a425a810aa019c7cdadd25a4055cacda8d5537f90040cd4a3411d28e270361713121386015c4e60959fe620a
+  metadata.gz: 30d9ed7fe3aba66ceb09754552706325633988b07bfd80f8c2a357c91b09791b184f2706fa615b6e783a95ca8f7e598da92a10fba6831e044a966bf044cb48bb
+  data.tar.gz: 36255e01b86881597082e3517055b6818985075335542f9a3b483e89fef26dca4ad533dbb7487de1a6df769532b0f56c93d8d90bbbd5ae0a5444960630d0932f

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 2.1.5
   - 2.2.1
   - 2.3.1
+  - 2.4.0
 script: bundle exec rake spec rubocop
 cache: bundler
 before_install:

data/.versions.conf

@@ -1,4 +1,4 @@
-ruby=ruby-2.3.1
+ruby=ruby-2.4.0
 ruby-gemset=capistrano-template
 #ruby-gem-install=bundler rake
 #ruby-bundle-install=true

data/CHANGELOG.md

@@ -1,23 +1,35 @@
-0.0.7 (Next)
-=============
+0.0.9 (next)
+==================
 
+0.0.8 (21/05/2017)
+==================
+
+#### Features
+
+* [#12](https://github.com/faber-lotto/capistrano-template/pull/12): Add support for partial rendering (Inspired by [@n-rodriguez]). [@slowjack2k](https://github.com/slowjack2k).
 
-0.0.6 (28/09/2016)
-=============
+
+0.0.7 (28/09/2016)
+==================
 
 #### Features
 
-* [#6](https://github.com/faber-lotto/capistrano-template/6): Add dry run support. [@claudusd](https://github.com/claudusd).
-* [#9](https://github.com/faber-lotto/capistrano-template/9): Add support for setting file owner. [@slowjack2k](https://github.com/slowjack2k).
-* [#10](https://github.com/faber-lotto/capistrano-template/10): Add support for within block. [@slowjack2k](https://github.com/slowjack2k).
+* [#6](https://github.com/faber-lotto/capistrano-template/pull/6): Add dry run support. [@claudusd](https://github.com/claudusd).
+* [#9](https://github.com/faber-lotto/capistrano-template/pull/9): Add support for setting file owner. [@slowjack2k](https://github.com/slowjack2k).
+* [#10](https://github.com/faber-lotto/capistrano-template/pull/10): Add support for within block. [@slowjack2k](https://github.com/slowjack2k).
+
+0.0.6 (28/09/2016)
+==================
+
+skipped
 
 0.0.5 (27/07/2016)
 ==================
 
 #### Features
 
-* [#5](https://github.com/faber-lotto/capistrano-template/5): Enable the usage of locals. [@slowjack2k](https://github.com/slowjack2k).
+* [#5](https://github.com/faber-lotto/capistrano-template/pull/5): Enable the usage of locals. [@slowjack2k](https://github.com/slowjack2k).
 
 #### Fixes
 
-* [#4](https://github.com/faber-lotto/capistrano-template/4): Fix for `Digest::Base cannot be directly inherited in Ruby` race condition within ruby digest - [@slowjack2k](https://github.com/slowjack2k).
+* [#4](https://github.com/faber-lotto/capistrano-template/pull/4): Fix for `Digest::Base cannot be directly inherited in Ruby` race condition within ruby digest - [@slowjack2k](https://github.com/slowjack2k).

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in capistrano-template.gemspec
 gemspec
 
-gem 'simplecov', require:  false, group: :test
 gem 'coveralls', require: false
 gem 'rubocop', require: false
+gem 'simplecov', require: false, group: :test
 

data/README.md

@@ -78,6 +78,8 @@ In your Capfile:
    server_name <%= host.properties.fetch(:host_server_name) %>;
    root <%= remote_path_for(current_path) %>/public;
  
+   <%= render 'partial.conf', indent: 2, locals: { 'other_local' => 'other local value' } %>
+
    location ^~ /assets/ {
      gzip_static on;
      expires max;

data/capistrano-template.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'capistrano/template/version'
@@ -28,7 +29,7 @@ the remote host or the content did change)
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
 
-  spec.add_development_dependency 'rspec', '3.0.0'
+  spec.add_development_dependency 'rspec', '3.5.0'
   # show nicely how many specs have to be run
   spec.add_development_dependency 'fuubar'
   # extended console

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

@@ -23,7 +23,7 @@ module Capistrano
 
         def paths_for_file(filename)
           paths.map do |path|
-            path = path % { host: host }
+            path = format(path, host: host)
             ["#{path}/#{filename}.erb", "#{path}/#{filename}"]
           end.flatten
         end

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

@@ -34,6 +34,17 @@ module Capistrano
           end
         end
 
+        def render(from, indent: 0, locals: {})
+          template = template_file(from)
+          content  = Renderer.new(template, self, reader: reader, locals: self.locals.merge(locals)).as_str
+
+          indented_content(content, indent)
+        end
+
+        def indented_content(content, indent)
+          content.split("\n").map { |line| "#{' ' * indent}#{line}" }.join("\n")
+        end
+
         def respond_to_missing?(m, include_private)
           if locals.key?(m)
             true

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

@@ -125,29 +125,26 @@ module Capistrano
         end
 
         def digest_cmd
-          @digest_cmd % { digest: digest,
-                          path: full_to_path }
+          format @digest_cmd , digest: digest,
+                               path: full_to_path
         end
 
         def mode_test_cmd
-          @mode_test_cmd % {
+          format @mode_test_cmd,
             path: full_to_path,
             mode: octal_mode_str
-          }
         end
 
         def user_test_cmd
-          @user_test_cmd % {
+          format @user_test_cmd ,
             path: full_to_path,
             user: user
-          }
         end
 
         def group_test_cmd
-          @group_test_cmd % {
+          format @group_test_cmd,
             path: full_to_path,
             group: group
-          }
         end
       end
       # rubocop: enable Metrics/ModuleLength

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

@@ -1,15 +1,15 @@
 namespace :load do
   # rubocop:disable LineLength
   task :defaults do
-    set :templating_digster, ->{ ->(data){ OpenSSL::Digest::MD5.hexdigest(data)} }
+    set(:templating_digster, ->{ ->(data){ OpenSSL::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_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_user_test_cmd, %Q{ [ "Z$(stat -c "%%U" %<path>s 2>/dev/null)" != "Z%<user>s" ] } # should return true when user is different
     set :templating_group_test_cmd, %Q{ [ "Z$(stat -c "%%G" %<path>s 2>/dev/null)" != "Z%<group>s" ] } # should return true when group is different
-    set :templating_paths , ->{ ["config/deploy/templates/#{fetch(:stage)}/%<host>s",
+    set(:templating_paths , ->{ ["config/deploy/templates/#{fetch(:stage)}/%<host>s",
                                  "config/deploy/templates/#{fetch(:stage)}",
                                  "config/deploy/templates/shared/%<host>s",
-                                 "config/deploy/templates/shared"].map {|partial_path| (partial_path)} }
+                                 "config/deploy/templates/shared"].map {|partial_path| (partial_path)} })
   end
   # rubocop:enable LineLength
 end

data/lib/capistrano/template/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Template
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

data/spec/integration/capistrano/template/helpers/dsl_spec.rb

@@ -55,14 +55,11 @@ module Capistrano
               `#{cmd}`
             end
 
-            def info(*)
-            end
+            def info(*); end
 
-            def error(*)
-            end
+            def error(*); end
 
-            def pwd_path
-            end
+            def pwd_path; end
 
             def dry_run?
               false
@@ -71,6 +68,7 @@ module Capistrano
         end
       end
 
+      # rubocop:disable Metrics/BlockLength
       describe DSL do
         subject do
           Integration::DSLSpec::Dummy.new.tap do |d|
@@ -122,6 +120,7 @@ module Capistrano
 
         end
       end
+      # rubocop:enable Metrics/BlockLength
     end
   end
 end

data/spec/integration/capistrano/template/helpers/paths_lookup_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 module Capistrano
   module Template
     module Helpers
+      # rubocop: disable Metrics/BlockLength
       describe PathsLookup do
         subject do
           PathsLookup.new(lookup_paths, context)
@@ -41,6 +42,7 @@ module Capistrano
         end
 
       end
+      # rubocop: enable Metrics/BlockLength
     end
   end
 end

data/spec/integration/capistrano/template/helpers/uploader_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 module Capistrano
   module Template
+    # rubocop: disable Metrics/BlockLength
     module Helpers
       describe Uploader do
 
@@ -95,5 +96,6 @@ module Capistrano
 
       end
     end
+    # rubocop: enable Metrics/BlockLength
   end
 end

data/spec/unit/capistrano/template/helpers/paths_lookup_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 module Capistrano
   module Template
+    # rubocop: disable Metrics/BlockLength
     module Helpers
       describe PathsLookup do
         subject do
@@ -50,5 +51,6 @@ module Capistrano
 
       end
     end
+    # rubocop: enable Metrics/BlockLength
   end
 end

data/spec/unit/capistrano/template/helpers/renderer_spec.rb

@@ -3,22 +3,35 @@ require 'spec_helper'
 module Capistrano
   module Template
     module Helpers
+      # rubocop: disable Metrics/BlockLength, Metrics/LineLength
       describe Renderer do
 
         subject do
           Renderer.new(template_name, context, reader: reader, locals: locals)
         end
 
-        let(:context) { OpenStruct.new(var1: 'my', var2: 'content') }
+        let(:context) do
+          cnt = OpenStruct.new(var1: 'my', var2: 'content')
+          cnt.extend(Capistrano::Template::Helpers::DSL)
+          def cnt.template_file(_)
+            'partial.conf'
+          end
+          cnt
+        end
         let(:locals) { { 'my_local' => 'local content' } }
         let(:template_name) { 'my_template' }
-        let(:reader) { double(read: template_content) }
-        let(:template_content) { '<%=var1%> -- <%=var2%> -- <%= my_local %>' }
+        let(:reader) do
+          reader = double
+          allow(reader).to receive(:read).and_return(main_template_content, partial_template_content)
+          reader
+        end
+        let(:main_template_content) { "<%=var1%> -- <%=var2%>\n<%= render 'partial.conf', indent: 2, locals: { 'my_local' => 'partial local content' } %>\n -- <%= my_local %>" }
+        let(:partial_template_content) { "--partial: <%=var1%>\n--partial: <%=var2%>\n--partial: <%= my_local %>" }
 
         describe '#as_str' do
 
           it 'renders a erb template' do
-            expect(subject.as_str).to eq('my -- content -- local content')
+            expect(subject.as_str).to eq("my -- content\n  --partial: my\n  --partial: content\n  --partial: partial local content\n -- local content")
           end
 
         end
@@ -50,5 +63,6 @@ module Capistrano
 
       end
     end
+    # rubocop: enable Metrics/BlockLength, Metrics/LineLength
   end
 end

data/spec/unit/capistrano/template/helpers/uploader_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Capistrano
   module Template
-    # rubocop: disable Metrics/ModuleLength
+    # rubocop: disable Metrics/ModuleLength, Metrics/BlockLength
     module Helpers
       describe Uploader do
 
@@ -147,7 +147,7 @@ module Capistrano
             allow(subject).to receive(:__check__)
             subject.permission_changed?
 
-            expect(subject).to have_received(:__check__).with(mode_test_cmd % { mode: '0640', path: remote_filename_expented })
+            expect(subject).to have_received(:__check__).with(format(mode_test_cmd, mode: '0640', path: remote_filename_expented))
           end
         end
 
@@ -160,12 +160,12 @@ module Capistrano
           it 'checks the actual user' do
             allow(subject).to receive(:__check__)
             subject.user_changed?
-            expect(subject).to have_received(:__check__).with(user_test_cmd % { user: 'deploy', path: remote_filename_expented })
+            expect(subject).to have_received(:__check__).with(format(user_test_cmd, user: 'deploy', path: remote_filename_expented))
           end
         end
 
       end
-      # rubocop: enable Metrics/ModuleLength
+      # rubocop: enable Metrics/ModuleLength, Metrics/BlockLength
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-template
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Dieter Späth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Erb-Template rendering and upload for capistrano 3