capistrano-template 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b7c26cd31e68ace9c983f2690872cf25d451575
-  data.tar.gz: ad40226e2f26582edd73d56ea42006076d70c292
+  metadata.gz: cf1b76bed38d227a7b50b774e670a58bbc31baf5
+  data.tar.gz: 347549beb8f5546df3002e1c5000e6b0c3d5ca81
 SHA512:
-  metadata.gz: bb0f80f4116772a04a4a711e3cb1e65ba14d8029ab651b349036253726f203791a0720f12ce1839ca5d2eb779067b2e85dbd28547c4ceb352f2c6b9bfe3c086c
-  data.tar.gz: f26c7fb86f05eaccb669324573288f504c8f496bc6d7c0271334f13f1c6dfbba565a9a3724da4117994042d53593029907e932d563ead7a0167b4d32436fdd4d
+  metadata.gz: 9957f08403791cb36451ed1a12fbd036f7a8bb35aaf052330699bc9cb8ccfaff801f5965705daf222eeb35e1f8d69b56ff12ce524819357d5a4aeb0e620fe717
+  data.tar.gz: 17ee68b87d83147ee93f0552d1a14f52da956b20a425a810aa019c7cdadd25a4055cacda8d5537f90040cd4a3411d28e270361713121386015c4e60959fe620a

data/.gitignore

@@ -13,6 +13,8 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+spec/dummy_app/.vagrant
+spec/dummy_app/log
 test/tmp
 test/version_tmp
 tmp

data/.rubocop.yml

@@ -16,3 +16,10 @@ MethodLength:
 
 RegexpLiteral:
   Enabled: false
+
+AllCops:
+  Exclude:
+    - 'spec/dummy_app/**/*'
+    - 'vendor/**/*'
+    - 'tmp/**/*'
+  TargetRubyVersion: 2.0

data/.versions.conf

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

data/CHANGELOG.md

@@ -1,13 +1,22 @@
-0.0.6 (Next)
+0.0.7 (Next)
 =============
 
 
+0.0.6 (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).
+
 0.0.5 (27/07/2016)
 ==================
 
 #### Features
 
-* [#5](https://github.com/faber-lotto/capistrano-template/5): Enable the usage of locals.
+* [#5](https://github.com/faber-lotto/capistrano-template/5): Enable the usage of locals. [@slowjack2k](https://github.com/slowjack2k).
 
 #### Fixes
 

data/README.md

@@ -38,19 +38,22 @@ In your Capfile:
  
    desc 'Upload a rendered erb-template'
    task :setup do     
-     on roles :all
+     on roles :all do
        # searchs for template assets.host.site.erb in :templating_paths
        # renders the template and upload it to "#{release_path}/assets.host.site" on all hosts
        # when the new rendered content is changed or the remote file does not exists
        template 'assets.host.site', locals: { 'local1' => 'value local 1'}
      end
      
-     on roles :all       
+     on roles :all do      
        # searchs for template other.template.name.erb in :templating_paths
        # renders the template and upload it to "~/execute_some_thing.sh" on all hosts
        # when the new rendered content is changed or the remote file does not exists
        # after this the mode is changed to 0750
-       template 'other.template.name', '~/execute_some_thing.sh', 0750, locals: { 'local1' => 'value local 1'}
+       # owner is changed to "deployer:www-run"
+       # keep in mind chown and chgrp needs sudo privileges
+
+       template 'other.template.name', '~/execute_some_thing.sh', 0750, 'deployer', 'www-run' ,locals: { 'local1' => 'value local 1'}
      end
           
    end
@@ -119,6 +122,7 @@ This settings can be changed in your Capfile, deploy.rb or stage file.
 |`templating_digster`   | <code> -&gt;(data){ OpenSSL::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_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_user_test_cmd` | <code>%Q{ &#91; "Z$(stat -c "%%U" %&lt;path&gt;s 2&gt;/dev/null)" != "Z%&lt;user&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/template/helpers/dsl.rb

@@ -2,22 +2,27 @@ module Capistrano
   module Template
     module Helpers
       module DSL
-        def template(from, to = nil, mode = 0640, locals: {})
+        # rubocop: disable Metrics/AbcSize
+        def template(from, to = nil, mode = 0640, user = nil, group = nil, locals: {})
           fail ::ArgumentError, "template #{from} not found Paths: #{template_paths_lookup.paths_for_file(from).join(':')}" unless template_exists?(from)
 
-          to ||= "#{release_path}/#{File.basename(from, '.erb')}"
-          to = remote_path_for(to, true)
+          return if dry_run?
 
           template = _template_factory.call(template_file(from), self, fetch(:templating_digster), locals)
 
-          _uploader_factory.call(to, self,
+          _uploader_factory.call(get_to(to, from), self,
                                  digest: template.digest,
                                  digest_cmd: fetch(:templating_digest_cmd),
                                  mode_test_cmd: fetch(:templating_mode_test_cmd),
+                                 user_test_cmd: fetch(:templating_user_test_cmd),
+                                 group_test_cmd: fetch(:templating_group_test_cmd),
                                  mode: mode,
+                                 user: user,
+                                 group: group,
                                  io: template.as_io
                                 ).call
         end
+        # rubocop: enable Metrics/AbcSize
 
         def template_exists?(template)
           template_paths_lookup.template_exists?(template)
@@ -47,7 +52,10 @@ module Capistrano
             path = File.dirname(path)
           end
 
-          remote_path = capture("/bin/bash -c '(cd  #{path} && pwd -P) || readlink -sf #{path}'").chomp
+          cd_cmd = "cd #{path}"
+          cd_cmd = "cd #{pwd_path}; #{cd_cmd}" if pwd_path
+
+          remote_path = capture("/bin/bash -c '(#{cd_cmd} && pwd -P) || readlink -sf #{path}'").chomp
 
           includes_filename ? File.join(remote_path, filename) : remote_path
         end
@@ -63,6 +71,19 @@ module Capistrano
             super
           end
         end
+
+        def dry_run?
+          if ::Capistrano::Configuration.respond_to?(:dry_run?)
+            ::Capistrano::Configuration.dry_run?
+          else
+            ::Capistrano::Configuration.env.send(:config)[:sshkit_backend] == SSHKit::Backend::Printer
+          end
+        end
+
+        def get_to(to, from)
+          to ||= "#{release_path}/#{File.basename(from, '.erb')}"
+          remote_path_for(to, true)
+        end
       end
     end
   end

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

@@ -4,18 +4,27 @@ module Capistrano
       require 'capistrano/template/helpers/renderer'
       require 'capistrano/template/helpers/template_digester'
 
+      # rubocop: disable Metrics/ClassLength
       class Uploader
         attr_accessor :io,
                       :digest,
                       :full_to_path,
                       :digest_cmd,
                       :mode,
+                      :user,
+                      :group,
+                      :user_test_cmd,
+                      :group_test_cmd,
                       :remote_handler,
                       :mode_test_cmd
 
         def initialize(full_to_path, remote_handler,
             mode: 0640,
             mode_test_cmd: nil,
+            user: nil,
+            user_test_cmd: nil,
+            group: nil,
+            group_test_cmd: nil,
             digest: nil,
             digest_cmd: nil,
             io: nil
@@ -27,6 +36,10 @@ module Capistrano
           self.digest_cmd = digest_cmd
           self.mode = mode
           self.mode_test_cmd = mode_test_cmd
+          self.user = user
+          self.user_test_cmd = user_test_cmd
+          self.group = group
+          self.group_test_cmd = group_test_cmd
 
           self.io = io
           self.digest = digest
@@ -35,11 +48,17 @@ module Capistrano
         def call
           upload_as_file
           set_mode
+          set_user
+          set_group
         end
 
         def upload_as_file
           if file_changed?
             remote_handler.info "copying to: #{full_to_path}"
+
+            # just in case owner changed
+            remote_handler.execute 'rm', '-f', full_to_path
+
             remote_handler.upload! io, full_to_path
           else
             remote_handler.info "File #{full_to_path} on host #{host} not changed"
@@ -59,6 +78,26 @@ module Capistrano
           end
         end
 
+        def set_user
+          if user_changed?
+            remote_handler.info "user changed for file #{full_to_path} on #{host} set new user"
+
+            remote_handler.execute 'sudo', 'chown', user, full_to_path
+          else
+            remote_handler.info "user not changed for file #{full_to_path} on #{host}"
+          end
+        end
+
+        def set_group
+          if group_changed?
+            remote_handler.info "group changed for file #{full_to_path} on #{host} set new group"
+
+            remote_handler.execute 'sudo', 'chgrp', group, full_to_path
+          else
+            remote_handler.info "group not changed for file #{full_to_path} on #{host}"
+          end
+        end
+
         def file_changed?
           !__check__(digest_cmd)
         end
@@ -67,6 +106,14 @@ module Capistrano
           __check__(mode_test_cmd)
         end
 
+        def user_changed?
+          user && __check__(user_test_cmd)
+        end
+
+        def group_changed?
+          group && __check__(group_test_cmd)
+        end
+
         protected
 
         def __check__(*args)
@@ -88,7 +135,22 @@ module Capistrano
             mode: octal_mode_str
           }
         end
+
+        def user_test_cmd
+          @user_test_cmd % {
+            path: full_to_path,
+            user: user
+          }
+        end
+
+        def group_test_cmd
+          @group_test_cmd % {
+            path: full_to_path,
+            group: group
+          }
+        end
       end
+      # rubocop: enable Metrics/ModuleLength
     end
   end
 end

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

@@ -4,6 +4,8 @@ namespace :load do
     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",
                                  "config/deploy/templates/#{fetch(:stage)}",
                                  "config/deploy/templates/shared/%<host>s",

data/lib/capistrano/template/version.rb

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

data/spec/dummy_app/Capfile

@@ -0,0 +1,31 @@
+# Load DSL and set up stages
+require 'capistrano/setup'
+
+# Include default deployment tasks
+require 'capistrano/deploy'
+
+Bundler.require(:development)
+
+# Include tasks from other gems included in your Gemfile
+#
+# For documentation on these, see for example:
+#
+#   https://github.com/capistrano/rvm
+#   https://github.com/capistrano/rbenv
+#   https://github.com/capistrano/chruby
+#   https://github.com/capistrano/bundler
+#   https://github.com/capistrano/rails
+#   https://github.com/capistrano/passenger
+#
+# require 'capistrano/rvm'
+# require 'capistrano/rbenv'
+# require 'capistrano/chruby'
+# require 'capistrano/bundler'
+# require 'capistrano/rails/assets'
+# require 'capistrano/rails/migrations'
+# require 'capistrano/passenger'
+
+require 'capistrano/capistrano_plugin_template'
+
+# Load custom tasks from `lib/capistrano/tasks` if you have any defined
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

data/spec/dummy_app/Vagrantfile

@@ -0,0 +1,26 @@
+VAGRANTFILE_API_VERSION = '2'.freeze
+
+$provision_script = <<SCRIPT
+echo I am provisioning...
+useradd deploy -s /bin/bash -m
+chpasswd << 'END'
+deploy:12345678
+END
+apt-get update -y
+apt-get install -y git-core
+mkdir -p /var/www
+chown -R vagrant /var/www
+date > /etc/vagrant_provisioned_at
+SCRIPT
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = 'ubuntu/precise64'
+  config.vm.box_url = 'https://files.vagrantup.com/precise64.box'
+
+  config.vm.define 'cap-template-1' do |web|
+    web.vm.network 'forwarded_port', guest: 22, host: 3001
+
+    config.vm.provision 'shell',
+                        inline: $provision_script
+  end
+end

data/spec/dummy_app/config/deploy.rb

@@ -0,0 +1,36 @@
+# config valid only for current version of Capistrano
+lock '3.6.1'
+
+set :application, 'my_app_name'
+
+set :repo_url, 'https://github.com/faber-lotto/capistrano-template.git'
+# Default branch is :master
+# ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp
+
+# Default deploy_to directory is /var/www/my_app_name
+# set :deploy_to, '/var/www/my_app_name'
+
+# Default value for :scm is :git
+# set :scm, :git
+
+# Default value for :format is :airbrussh.
+set :format, :pretty
+
+# You can configure the Airbrussh format using :format_options.
+# These are the defaults.
+# set :format_options, command_output: true, log_file: 'log/capistrano.log', color: :auto, truncate: :auto
+
+# Default value for :pty is false
+# set :pty, true
+
+# Default value for :linked_files is []
+# append :linked_files, 'config/database.yml', 'config/secrets.yml'
+
+# Default value for linked_dirs is []
+# append :linked_dirs, 'log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'public/system'
+
+# Default value for default_env is {}
+# set :default_env, { path: "/opt/ruby/bin:$PATH" }
+
+# Default value for keep_releases is 5
+# set :keep_releases, 5

data/spec/dummy_app/config/deploy/development.rb

@@ -0,0 +1,53 @@
+# server-based syntax
+# ======================
+# Defines a single server with a list of roles and multiple properties.
+# You can define all roles on a single server, or split them:
+
+server 'localhost', user: 'vagrant', roles: %w(app db web)
+
+# role-based syntax
+# ==================
+
+# Defines a role with one or multiple servers. The primary server in each
+# group is considered to be the first unless any  hosts have the primary
+# property set. Specify the username and a domain or IP for the server.
+# Don't use `:all`, it's a meta role.
+
+# role :app, %w{deploy@example.com}, my_property: :my_value
+# role :web, %w{user1@primary.com user2@additional.com}, other_property: :other_value
+# role :db,  %w{deploy@example.com}
+
+# Configuration
+# =============
+# You can set any configuration variable like in config/deploy.rb
+# These variables are then only loaded and set in this stage.
+# For available Capistrano configuration variables see the documentation page.
+# http://capistranorb.com/documentation/getting-started/configuration/
+# Feel free to add new variables to customise your setup.
+
+# Custom SSH Options
+# ==================
+# You may pass any option but keep in mind that net/ssh understands a
+# limited set of options, consult the Net::SSH documentation.
+# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start
+#
+# Global options
+# --------------
+set :ssh_options,   port: '3001',
+                    password: 'vagrant',
+                    forward_agent: false,
+                    auth_methods: %w(password)
+
+#
+# The server-based syntax can be used to override options:
+# ------------------------------------
+# server 'example.com',
+#   user: 'user_name',
+#   roles: %w{web app},
+#   ssh_options: {
+#     user: 'user_name', # overrides user setting above
+#     keys: %w(/home/user_name/.ssh/id_rsa),
+#     forward_agent: false,
+#     auth_methods: %w(publickey password)
+#     # password: 'please use keys'
+#   }

data/spec/dummy_app/config/deploy/templates/development/localhost/other.template.name.erb

@@ -0,0 +1,6 @@
+FOO
+
+<%= local1 %>
+
+BAR
+

data/spec/dummy_app/lib/capistrano/tasks/test_template.rake

@@ -0,0 +1,31 @@
+desc 'Upload a rendered erb-template'
+task :setup do
+  on roles :all do
+    # searchs for template other.template.name.erb in :templating_paths
+    # renders the template and upload it to "~/execute_some_thing.sh" on all hosts
+    # when the new rendered content is changed or the remote file does not exists
+    # after this the mode is changed to 0750
+    template 'other.template.name',
+             './execute_some_thing.sh',
+             0o750,
+             'deploy',
+             'deploy',
+             locals: { 'local1' => 'value local 1' }
+
+    puts "PATH: #{pwd_path}"
+
+    within '/var/www' do
+
+      puts "PATH: #{pwd_path}"
+
+
+      template 'other.template.name',
+               './execute_some_thing.sh',
+               0o750,
+               'deploy',
+               'deploy',
+               locals: { 'local1' => 'value local 1' }
+
+    end
+  end
+end

data/spec/dummy_app/test.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+SCRIPT_PATH="`dirname \"$0\"`"
+
+SCRIPT_PATH="`( cd \"$SCRIPT_PATH\" && pwd )`"
+if [ -z "$SCRIPT_PATH" ] ; then
+  exit 1
+fi
+
+(
+    cd $SCRIPT_PATH
+
+    vagrant up
+    #vagrant ssh -- -t 'sudo rm ~/execute_some_thing.sh'
+    rm -f $SCRIPT_PATH/log/*
+    cap development check
+    cap development setup
+    vagrant ssh -- -t 'sudo ls -l ~/execute_some_thing.sh; sudo cat ~/execute_some_thing.sh'
+    vagrant ssh -- -t 'sudo ls -l /var/www/execute_some_thing.sh; sudo cat /var/www/execute_some_thing.sh'
+    vagrant halt
+)

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

@@ -13,7 +13,9 @@ module Capistrano
               self.data = {
                 templating_digster: ->(data) { Digest::MD5.hexdigest(data) },
                 templating_digest_cmd: %Q(echo "%<digest>s %<path>s" | md5sum -c --status ),
-                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" ] }
+                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" ] },
+                templating_user_test_cmd: %Q{ [ "Z$(stat -c "%%U" %<path>s 2>/dev/null)" != "Z%<user>s" ] },
+                templating_group_test_cmd: %Q{ [ "Z$(stat -c "%%G" %<path>s 2>/dev/null)" != "Z%<group>s" ] }
               }
             end
 
@@ -58,6 +60,13 @@ module Capistrano
 
             def error(*)
             end
+
+            def pwd_path
+            end
+
+            def dry_run?
+              false
+            end
           end
         end
       end

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

@@ -91,7 +91,6 @@ module Capistrano
 
             expect(mode).to eq(0640)
           end
-
         end
 
       end

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

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+module Capistrano
+  module Template
+    module Helpers
+      module Unit # protect from other dummy classes
+        module DSLSpec
+          class DummyDryRun
+            include DSL
+            def template_exists?
+              true
+            end
+
+            def dry_run?
+              true
+            end
+          end
+        end
+      end
+
+      describe DSL do
+        subject do
+          Unit::DSLSpec::DummyDryRun.new
+        end
+
+        describe '#template dry run' do
+          it 'do nothing' do
+            expect(subject).not_to receive(:_template_factory)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,10 @@ module Capistrano
               '/var/www/app/releases/20140510'
             end
 
+            def pwd_path
+              nil
+            end
+
             def fetch(*args)
               data.fetch(*args)
             end

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

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 module Capistrano
   module Template
+    # rubocop: disable Metrics/ModuleLength
     module Helpers
       describe Uploader do
 
@@ -11,6 +12,9 @@ module Capistrano
               upload_handler,
               mode: 0640,
               mode_test_cmd: mode_test_cmd,
+              user: 'deploy',
+              group: 'www-run',
+              user_test_cmd: user_test_cmd,
               digest: digest,
               digest_cmd: digest_cmd,
               io: as_io
@@ -34,13 +38,28 @@ module Capistrano
         let(:digest) { Digest::MD5.hexdigest(rendered_template_content) }
         let(:digest_cmd) { %Q(echo "%<digest>s %<path>s" | md5sum -c --status) }
         let(:mode_test_cmd) { %Q{ [ "Z$(printf "%%.4o" 0$(stat -c "%%a" %<path>s 2>/dev/null ||  stat -f "%%A" %<path>s))" != "Z%<mode>s" ] } }
+        let(:user_test_cmd) { %Q{ [ "Z$(stat -c "%%U" %<path>s 2>/dev/null)" != "Z%<user>s" ] } }
 
         describe '#upload_as_file' do
 
           it 'uploads changed files' do
             allow(subject).to receive(:file_changed?).and_return true
-            expect(upload_handler).to receive(:upload!).with(as_io, remote_filename_expented)
+            allow(upload_handler).to receive(:execute).and_return true
+            allow(upload_handler).to receive(:upload!).and_return true
+
+            subject.upload_as_file
+
+            expect(upload_handler).to have_received(:upload!).with(as_io, remote_filename_expented)
+          end
+
+          it 'deletes a file before upload' do
+            allow(subject).to receive(:file_changed?).and_return true
+            allow(upload_handler).to receive(:execute).and_return true
+            allow(upload_handler).to receive(:upload!).and_return true
+
             subject.upload_as_file
+
+            expect(upload_handler).to have_received(:execute).with('rm', '-f', remote_filename_expented)
           end
 
           it 'does not upload unchanged files' do
@@ -67,6 +86,38 @@ module Capistrano
           end
         end
 
+        describe '#set_user' do
+          it 'sets the user for the remote file' do
+            allow(subject).to receive(:user_changed?).and_return true
+
+            expect(upload_handler).to receive(:execute).with('sudo', 'chown', 'deploy', remote_filename_expented)
+
+            subject.set_user
+          end
+
+          it 'sets not the user for the remote file' do
+            allow(subject).to receive(:user_changed?).and_return false
+            expect(upload_handler).not_to receive(:execute)
+            subject.set_user
+          end
+        end
+
+        describe '#set_group' do
+          it 'sets the group for the remote file' do
+            allow(subject).to receive(:group_changed?).and_return true
+
+            expect(upload_handler).to receive(:execute).with('sudo', 'chgrp', 'www-run', remote_filename_expented)
+
+            subject.set_group
+          end
+
+          it 'sets not the group for the remote file' do
+            allow(subject).to receive(:group_changed?).and_return false
+            expect(upload_handler).not_to receive(:execute)
+            subject.set_group
+          end
+        end
+
         describe '#file_changed?' do
           it 'uses the "digest_cmd" to check file changes' do
             expect(subject).to receive(:__check__).with(%Q(echo "#{digest} /var/www/shared/config/database.yml" | md5sum -c --status))
@@ -82,22 +133,39 @@ module Capistrano
           end
 
           it 'replaces "<path>"' do
+            allow(subject).to receive(:__check__)
             subject.digest_cmd = '%<path>s'
-            expect(subject).to receive(:__check__).with(remote_filename_expented)
 
             subject.file_changed?
+
+            expect(subject).to have_received(:__check__).with(remote_filename_expented)
           end
         end
 
         describe '#permission_changed?' do
           it 'checks the actual file permissions' do
-            expect(subject).to receive(:__check__).with(mode_test_cmd % { mode: '0640', path: remote_filename_expented })
-
+            allow(subject).to receive(:__check__)
             subject.permission_changed?
+
+            expect(subject).to have_received(:__check__).with(mode_test_cmd % { mode: '0640', path: remote_filename_expented })
+          end
+        end
+
+        describe '#user_changed?' do
+          it 'returns "false" when no user is given' do
+            subject.user = nil
+            expect(subject.user_changed?).to be_falsy
+          end
+
+          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 })
           end
         end
 
       end
+      # rubocop: enable Metrics/ModuleLength
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-template
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Dieter Späth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -139,10 +139,19 @@ files:
 - lib/capistrano/template/helpers/uploader.rb
 - lib/capistrano/template/tasks/template_defaults.rake
 - lib/capistrano/template/version.rb
+- spec/dummy_app/Capfile
+- spec/dummy_app/Vagrantfile
+- spec/dummy_app/config/deploy.rb
+- spec/dummy_app/config/deploy/development.rb
+- spec/dummy_app/config/deploy/templates/development/localhost/other.template.name.erb
+- spec/dummy_app/lib/capistrano/tasks/test_template.rake
+- spec/dummy_app/log/.gitkeep
+- spec/dummy_app/test.sh
 - spec/integration/capistrano/template/helpers/dsl_spec.rb
 - spec/integration/capistrano/template/helpers/paths_lookup_spec.rb
 - spec/integration/capistrano/template/helpers/uploader_spec.rb
 - spec/spec_helper.rb
+- spec/unit/capistrano/template/helpers/dsl_dry_run_spec.rb
 - spec/unit/capistrano/template/helpers/dsl_spec.rb
 - spec/unit/capistrano/template/helpers/paths_lookup_spec.rb
 - spec/unit/capistrano/template/helpers/renderer_spec.rb
@@ -174,10 +183,19 @@ signing_key:
 specification_version: 4
 summary: Erb-Template rendering and upload for capistrano 3
 test_files:
+- spec/dummy_app/Capfile
+- spec/dummy_app/Vagrantfile
+- spec/dummy_app/config/deploy.rb
+- spec/dummy_app/config/deploy/development.rb
+- spec/dummy_app/config/deploy/templates/development/localhost/other.template.name.erb
+- spec/dummy_app/lib/capistrano/tasks/test_template.rake
+- spec/dummy_app/log/.gitkeep
+- spec/dummy_app/test.sh
 - spec/integration/capistrano/template/helpers/dsl_spec.rb
 - spec/integration/capistrano/template/helpers/paths_lookup_spec.rb
 - spec/integration/capistrano/template/helpers/uploader_spec.rb
 - spec/spec_helper.rb
+- spec/unit/capistrano/template/helpers/dsl_dry_run_spec.rb
 - spec/unit/capistrano/template/helpers/dsl_spec.rb
 - spec/unit/capistrano/template/helpers/paths_lookup_spec.rb
 - spec/unit/capistrano/template/helpers/renderer_spec.rb