blower 4.6 → 4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 79e96973d020612b20933bb5d08a5b0b82e2c1de
-  data.tar.gz: 37683b25be0777820a0c2bb1d74f8bec2799caff
+SHA256:
+  metadata.gz: cd4ef69511d05d0f1ee58cd814ddc58a85102c467fe695a0520cf02345dbad69
+  data.tar.gz: 82aeb0b7c6ead150c17d78f50513c300b5aa326cd7ccf4c1932eb84017e712d2
 SHA512:
-  metadata.gz: 331772a9141a5a58107c4002b248e9b7d5cea5e16931578dc9e91a8954393ce4fcfb81ea1ce575984ca4c96229fa29dbe862ce4625691bd64053474b306eeecc
-  data.tar.gz: 98256c7a32c6221eb34dd702cd52b7c97371d3bffbbe17f0bf979ecd01f0bbc0becdaf31f22d25b3e2eb692ee95b39ab1ac46404977dd92ca322ee395b67e848
+  metadata.gz: e932789921c9553fbefd425a38db2d0d3db063681a660065ad9e642b0335d364e09a392fd34535fb64ba57d05d87da40f8a8f9420d7749f53a8ff5a8851efc79
+  data.tar.gz: 40bf21b8b30968869d6a3f425155d66a4cb562fc1f1241e40f14c5987ac1b670713e10a4bbc148373e2b3012c376ada391f6157da79df24e947790bf3aa767f1

data/lib/blower/context.rb

@@ -1,3 +1,4 @@
+require 'find'
 require 'erb'
 require 'json'
 require 'forwardable'
@@ -158,12 +159,12 @@ module Blower
     #   @macro asable
     #   @macro quietable
     #   @macro onceable
-    def cp (from, to, as: user, on: hosts, quiet: false, once: nil)
+    def cp (from, to, as: user, on: hosts, quiet: false, once: nil, delete: false)
       self.once once, quiet: quiet do
         log.info "cp: #{from} -> #{to}", quiet: quiet do
           Dir.chdir File.dirname(file) do
             hash_map(hosts) do |host|
-              host.cp from, to, as: as, quiet: quiet
+              host.cp from, to, as: as, quiet: quiet, delete: delete
             end
           end
         end
@@ -212,12 +213,24 @@ module Blower
     def render (from, to, as: user, on: hosts, quiet: false, once: nil)
       self.once once, quiet: quiet do
         Dir.chdir File.dirname(file) do
-          (Dir["#{from}**/*.erb"] + Dir["#{from}**/.*.erb"]).each do |path|
-            template = ERB.new(File.read(path))
-            to_path = to + path[from.length..-5]
-            log.info "render: #{path} -> #{to_path}", quiet: quiet do
-              hash_map(hosts) do |host|
-                host.cp StringIO.new(template.result(binding)), to_path, as: as, quiet: quiet
+          Find.find(from).each do |path|
+            if File.directory?(path)
+              to_path = to + path[from.length..-1]
+              sh "mkdir -p #{to_path.shellescape}"
+            elsif path =~ /\.erb$/
+              template = ERB.new(File.read(path))
+              to_path = to + path[from.length..-5]
+              log.info "render: #{path} -> #{to_path}", quiet: quiet do
+                hash_map(hosts) do |host|
+                  host.cp StringIO.new(template.result(binding)), to_path, as: as, quiet: quiet
+                end
+              end
+            else
+              to_path = to + path[from.length..-1]
+              log.info "copy: #{path} -> #{to_path}", quiet: quiet do
+                hash_map(hosts) do |host|
+                  host.cp File.open(path), to_path, as: as, quiet: quiet
+                end
               end
             end
           end
@@ -316,7 +329,7 @@ module Blower
             begin
               yield host
             rescue => e
-              host.log.error e.message
+              host.log.error e.full_message
               hosts.delete host
             end
           end

data/lib/blower/host.rb

@@ -55,7 +55,7 @@ module Blower
 
     # Copy files or directories to the host.
     # @api private
-    def cp (froms, to, as: nil, quiet: false)
+    def cp (froms, to, as: nil, quiet: false, delete: false)
       as ||= @user
       output = ""
       synchronize do
@@ -63,6 +63,10 @@ module Blower
           if from.is_a?(String)
             to += "/" if to[-1] != "/" && from.is_a?(Array)
             command = ["rsync", "-e", ssh_command, "-r"]
+            if File.exist?(".blowignore")
+              command += ["--exclude-from", ".blowignore"]
+            end
+            command += ["--delete"] if delete
             command += [*from, "#{as}@#{@address}:#{to}"]
             log.trace command.shelljoin, quiet: quiet
             IO.popen(command, in: :close, err: %i(child out)) do |io|

data/lib/blower/version.rb

@@ -1,3 +1,3 @@
 module Blower
-  VERSION = "4.6"
+  VERSION = "4.7"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: blower
 version: !ruby/object:Gem::Version
-  version: '4.6'
+  version: '4.7'
 platform: ruby
 authors:
 - Nathan Baum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2018-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rbnacl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Really simple server orchestration