nanoc-deploying 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4deeacd91c2a3b228d2a17dfe1e36b206630170fd1af913f7d35d61b2246b9b
-  data.tar.gz: af94b99608eaa89491a455c1fb924d873f7e9a4617a8fe23dbb842c3a3338be8
+  metadata.gz: ae80ba881eea1d91670111074e0c43380a9a085b30c800ce1c182c03c460a185
+  data.tar.gz: 5e8d665fd41ff854ac42ea10cba20975831c0b485409d869352a213ccda1abf3
 SHA512:
-  metadata.gz: 00330b4826714c0c822894e2bd6d4e2cd796f9793432f86bd9a7c31310d071149149d6c61455cac30282cdee8f4f6057bb1c35187c00918bf734ab7402900569
-  data.tar.gz: 5ad8ff954c98a8317c5e251cb13face6a84a8063ad7e7fc432a326669b7c7df8d2668ed9c7e3d8842e4e9a4e08a7b23c2148da1860a4ba9ee186cbeace137eb4
+  metadata.gz: fe6093e0d444988b0e5d2625e35c5b95a3e628c470dbafac3c0204d26ffac8d9b51e51658f963a1eebcb77c3c1dd40035962330dca1d068dfea2d98e8e994d6e
+  data.tar.gz: c9194440ef0c6d26369152c42c11bab044c49c4369a222a395817f822dad8f96e776ea19fd2c8ac3fbc2732aa203966f9edc6e7aab65d55a706307677cfad236

data/NEWS.md

@@ -1,5 +1,11 @@
 # nanoc-deploying news
 
+## 1.0.4 (2026-09-28)
+
+Fixes:
+
+- Fix the incorrect escaping of the rsync deployer’s default `--exclude` options (#1789, #1790)
+
 ## 1.0.3 (2025-10-30)
 
 Enhancements:

data/README.md

@@ -1,5 +1,5 @@
 # nanoc-deploying
 
-This provides the `deploy` command and associated functionality for [Nanoc](https://nanoc.app).
+This provides the `deploy` command and associated functionality for [Nanoc](https://nanoc.denisdefreyne.com).
 
-For details, see the [Deploying Nanoc sites](https://nanoc.app/doc/deploying/) chapter of the Nanoc documentation.
+For details, see the [Deploying Nanoc sites](https://nanoc.denisdefreyne.com/doc/deploying/) chapter of the Nanoc documentation.

data/lib/nanoc/deploying/command_runners/deploy.rb

@@ -106,7 +106,9 @@ module Nanoc
           deployer_class = Nanoc::Deploying::Deployer.named(name.to_sym)
           if deployer_class.nil?
             names = Nanoc::Deploying::Deployer.all.map(&:identifier)
-            raise Nanoc::Core::TrivialError, "The specified deploy target has an unrecognised kind “#{name}” (expected one of #{names.join(', ')})."
+            raise Nanoc::Core::TrivialError,
+                  'The specified deploy target has an unrecognised kind ' \
+                  "“#{name}” (expected one of #{names.join(', ')})."
           end
           deployer_class
         end

data/lib/nanoc/deploying/commands/deploy.rb

@@ -2,9 +2,9 @@
 
 usage 'deploy [target] [options]'
 summary 'deploy the compiled site'
-description "
-Deploys the compiled site. The compiled site contents in the output directory will be uploaded to the destination, which is specified using the `--target` option.
-"
+description <<~DESC.chomp
+  Deploys the compiled site. The compiled site contents in the output directory will be uploaded to the destination, which is specified using the `--target` option.
+DESC
 
 option :t, :target,         'specify the location to deploy to (default: `default`)', argument: :required
 flag :C, :'no-check',       'do not run the issue checks marked for deployment'

data/lib/nanoc/deploying/deployers/fog.rb

@@ -152,7 +152,7 @@ module Nanoc
         end
 
         def remote_key_for_local_filename(local_filename, src, path)
-          relative_local_filename = local_filename.sub(/\A#{src}\//, '')
+          relative_local_filename = local_filename.sub(%r{\A#{src}/}, '')
 
           if path
             File.join(path, relative_local_filename)
@@ -172,7 +172,7 @@ module Nanoc
         end
 
         def list_local_files(src)
-          Dir[src + '/**/*'].select { |f| File.file?(f) }
+          Dir["#{src}/**/*"].select { |f| File.file?(f) }
         end
 
         def upload_all(src, path, etags, wrapper)
@@ -204,8 +204,8 @@ module Nanoc
         def read_etags(files)
           case config[:provider]
           when 'aws'
-            files.each_with_object({}) do |file, etags|
-              etags[file.key] = file.etag
+            files.to_h do |file|
+              [file.key, file.etag]
             end
           else
             {}

data/lib/nanoc/deploying/deployers/git.rb

@@ -65,7 +65,7 @@ module Nanoc
             # Verify existence of remote, if remote is not a URL
             if remote_is_name?(remote)
               begin
-                run_cmd(%W[git config --get remote.#{remote}.url])
+                run_cmd(['git', 'config', '--get', "remote.#{remote}.url"])
               rescue TTY::Command::ExitError
                 raise Errors::RemoteDoesNotExist.new(remote)
               end
@@ -73,7 +73,7 @@ module Nanoc
 
             # If the branch exists then switch to it, otherwise prompt the user to create one.
             begin
-              run_cmd_unless_dry(%W[git checkout #{branch}])
+              run_cmd_unless_dry(['git', 'checkout', branch.to_s])
             rescue TTY::Command::ExitError
               raise Errors::BranchDoesNotExist.new(branch)
             end
@@ -82,15 +82,15 @@ module Nanoc
             unless clean_repo?
               msg = "Automated commit at #{Time.now.utc} by Nanoc #{Nanoc::VERSION}"
               author = 'Nanoc <>'
-              run_cmd_unless_dry(%w[git add -A])
-              run_cmd_unless_dry(%W[git commit -a --author #{author} -m #{msg}])
+              run_cmd_unless_dry(['git', 'add', '-A'])
+              run_cmd_unless_dry(['git', 'commit', '-a', '--author', author.to_s, '-m', msg.to_s])
             end
 
             # Push
             if forced
-              run_cmd_unless_dry(%W[git push -f #{remote} #{branch}])
+              run_cmd_unless_dry(['git', 'push', '-f', remote.to_s, branch.to_s])
             else
-              run_cmd_unless_dry(%W[git push #{remote} #{branch}])
+              run_cmd_unless_dry(['git', 'push', remote.to_s, branch.to_s])
             end
           end
         end
@@ -98,7 +98,7 @@ module Nanoc
         private
 
         def remote_is_name?(remote)
-          remote !~ /:\/\/|@.+:/
+          remote !~ %r{://|@.+:}
         end
 
         def run_cmd(cmd, dry_run: false)

data/lib/nanoc/deploying/deployers/rsync.rb

@@ -36,15 +36,15 @@ module Nanoc
           '--times',
           '--verbose',
           '--compress',
-          '--exclude=".hg"',
-          '--exclude=".svn"',
-          '--exclude=".git"',
+          '--exclude=.hg',
+          '--exclude=.svn',
+          '--exclude=.git',
         ].freeze
 
         # @see Nanoc::Deploying::Deployer#run
         def run
           # Get params
-          src = source_path + '/'
+          src = "#{source_path}/"
           dst = config[:dst]
           options = config[:options] || DEFAULT_OPTIONS
 
@@ -64,7 +64,26 @@ module Nanoc
         private
 
         def run_shell_cmd(cmd)
-          TTY::Command.new(uuid: false).run(*cmd)
+          status = nil
+
+          Open3.popen3(*cmd) do |_stdin, stdout, stderr, wait_thr|
+            stdout_thread = Thread.new do
+              stdout.each_line { $stdout << _1 }
+            end
+
+            stderr_thread = Thread.new do
+              stderr.each_line { $stderr << _1 }
+            end
+
+            stdout_thread.join
+            stderr_thread.join
+
+            status = wait_thr.value
+          end
+
+          unless status.success?
+            raise "Command failed with exit status #{status.exitstatus}"
+          end
         end
       end
     end

data/lib/nanoc/deploying/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Deploying
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-deploying
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Denis Defreyne
@@ -29,40 +29,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.11.15
+        version: '4.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.11.15
+        version: '4.14'
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.11.15
+        version: '4.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.11.15
+        version: '4.14'
 description: Provides deploying functionality for Nanoc
 email: denis+rubygems@denis.ws
 executables: []
@@ -82,12 +70,12 @@ files:
 - lib/nanoc/deploying/deployers/git.rb
 - lib/nanoc/deploying/deployers/rsync.rb
 - lib/nanoc/deploying/version.rb
-homepage: https://nanoc.app/
+homepage: https://nanoc.denisdefreyne.com/
 licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-deploying-v1.0.3/nanoc-deploying
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-deploying-v1.0.4/nanoc-deploying
 rdoc_options: []
 require_paths:
 - lib
@@ -102,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Deploying support for Nanoc
 test_files: []