kanrisuru 0.16.15 → 0.16.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2d1d9331232a2c1c343da0fd4a8d11fcef4b0197aea108fe1d6047a60c390f7
-  data.tar.gz: 8e8cbf4381da58b367fbb9aa2ac29fa68d8c4eed68ca3197cfaedf71cec69f85
+  metadata.gz: c72c91f337408d0a7dee545cabeb07ba9fac668baf8d3c3dbb65d0e04a27e347
+  data.tar.gz: 28d8387d8081783dfd32031c202ffc5ec66e4a7fea3306e8cb35d117f2193c10
 SHA512:
-  metadata.gz: f5eaa5caba5ae1f48e02fc4d6dadc03ab0ff6a94c47353e365adca6235424189e76ccb41fe513121d97013b819bd149636edef726d988c436269f4d230e524b8
-  data.tar.gz: 9ab07c9fdcf14fc3a314cbce0d9952456fa0daccb77bfeb2e8de92ad4a131f4d5f661033a3ef41c540adc18b73be0e11574b86b65a2392f2d446baaa043f13a0
+  metadata.gz: 8a0d66db59619c3cb9e69567ef0ed08e564c53ca3171dccc7acd31410288dfa06ebfc5a5daa2ff09aa14cbbacf433175352928b8a6e837f2ba43217de5fb70ac
+  data.tar.gz: 8bfc4a39d3bb5ab4c9f180dd4e5682057a7c1fe5c5bd93e25a6d88280a6e12c79831e0c5d9cb05b2b3211b91e3c6161d585fcc20c2d851da100037393dd17752

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## Kanrisuru 0.16.16 (January 08, 2022) ##
+*  Fix issue with `download` command when downloading directories from remote server.
+
 ## Kanrisuru 0.16.15 (January 07, 2022) ##
 *  Add recursive and all_targets opts to `umount` command.
 

data/lib/kanrisuru/core/dmi/parsers/dmi.rb

@@ -126,8 +126,7 @@ module Kanrisuru
               field = field.downcase
               field = field.gsub(/\s/, '_')
               field = field.gsub('-', '_')
-              field = field.gsub(':', '')
-              field
+              field.gsub(':', '')
             end
 
             def dmi_type_to_struct(type)

data/lib/kanrisuru/core/transfer/commands/download.rb

@@ -4,21 +4,41 @@ module Kanrisuru
   module Core
     module Transfer
       def download(remote_path, local_path = nil, opts = {})
+        recursive = opts[:recursive] || false
+
+        remote_path += '/' if !remote_path.end_with?('/') && recursive
+        local_path += '/' if !local_path.nil? && !local_path.end_with?('/') && recursive
+
         if local_path.instance_of?(Hash)
           opts = local_path
           local_path = nil
         end
 
-        tmp_path = "/tmp/kanrisuru-tmp-#{Time.now.to_i}-#{object_id}"
+        tmp_name = "kanrisuru-tmp-#{Time.now.to_i}-#{object_id}"
+        tmp_path = "/tmp/#{tmp_name}"
 
         begin
-          result = cp(remote_path, tmp_path, force: true)
+          result = cp(remote_path, tmp_path, force: true, follow: true, recursive: recursive)
           raise 'Unable to copy remote file to temp path' unless result.success?
 
+          result = chown(tmp_path, owner: @username, group: @username, recursive: recursive)
+          raise 'Unable to update owner or group for temp path' unless result.success?
+
+          result = chmod(tmp_path, 'u+r', recursive: true)
+          raise 'Unable to update owner permission read access' unless result.success?
+
+          local_path = ::File.expand_path(local_path) if local_path
           result = ssh.scp.download!(tmp_path, local_path, opts)
-          Kanrisuru::Util.blank?(local_path) ? result : local_path
+          return false unless result
+
+          if Kanrisuru::Util.present?(local_path) && recursive
+            remote_dirname = remote_path.split('/').last
+            FileUtils.mv("#{local_path}/#{tmp_name}", "#{local_path}/#{remote_dirname}")
+          else
+            result
+          end
         ensure
-          rm(tmp_path, force: true) if inode?(tmp_path)
+          rm(tmp_path, force: true, recursive: recursive) if inode?(tmp_path)
         end
       end
     end

data/lib/kanrisuru/core/transfer/commands/upload.rb

@@ -12,9 +12,7 @@ module Kanrisuru
 
           ## Need to copy internal dir contents, not the tmp dir itself
           if opts[:recursive]
-            unless dir?(remote_path)
-              mkdir(remote_path, silent: true)
-            end
+            mkdir(remote_path, silent: true) unless dir?(remote_path)
 
             result = cp("#{tmp_path}/*", remote_path, recursive: true)
           else
@@ -22,6 +20,7 @@ module Kanrisuru
           end
 
           raise "Unable to move file to remote path - #{result.command.raw_result}" unless result.success?
+
           stat(remote_path)
         ensure
           rm(tmp_path, force: true) if inode?(tmp_path)

data/lib/kanrisuru/core/user/commands/get_user.rb

@@ -10,11 +10,12 @@ module Kanrisuru
         Kanrisuru::Result.new(command) do |cmd|
           if Kanrisuru::Util.numeric?(user)
             uid = user.to_i
-            user = Parser::User.parse(cmd) 
+            user = Parser::User.parse(cmd)
           else
             ## Get user id
             result = get_uid(user)
             break if result.failure?
+
             uid = result.to_i
           end
 

data/lib/kanrisuru/core/user/parsers/user.rb

@@ -8,7 +8,7 @@ module Kanrisuru
           def self.parse(command)
             string = command.to_s
             string = string.split[0]
-            
+
             matches = string.match(/uid=\d+\((.+)\)/)
             return if !matches || !matches.captures
 

data/lib/kanrisuru/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanrisuru
-  VERSION = '0.16.15'
+  VERSION = '0.16.16'
 end

data/spec/functional/core/find_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe Kanrisuru::Core::Find do
                      paths: '/dev',
                      iname: 'tty*'
                    ),
-                   "find /dev -iname tty*")
+                   'find /dev -iname tty*')
 
     expect_command(host.find(
                      paths: '/dev',

data/spec/functional/core/group_spec.rb

@@ -22,11 +22,9 @@ RSpec.describe Kanrisuru::Core::Group do
   it 'prepares create_group command' do
     expect_command(host.create_group('admin'), 'groupadd admin')
     expect_command(host.create_group('admin',
-        gid: 9000, 
-        non_unique: true
-      ), 
-      'groupadd admin -g 9000 -o'
-    )
+                                     gid: 9000,
+                                     non_unique: true),
+                   'groupadd admin -g 9000 -o')
 
     expect_command(host.create_group('admin', gid: 12, system: true), 'groupadd admin -g 12 -r')
   end

data/spec/functional/remote/cluster_spec.rb

@@ -85,9 +85,9 @@ RSpec.describe Kanrisuru::Remote::Cluster do
     expect(command.prepared_command).to eq('sudo -u root /bin/bash -c "ls"')
     expect(cloned_command.prepared_command).to eq('sudo -u root /bin/bash -c "ls"')
 
-    expect {
+    expect do
       cluster.send(:create_command, 1)
-    }.to raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 
   it 'runs execute for a command on a cluster' do
@@ -178,8 +178,8 @@ RSpec.describe Kanrisuru::Remote::Cluster do
 
     cluster.cd('/etc')
     cluster.each do |host|
-      expect(host.instance_variable_get(:@current_dir)).to eq('/etc') 
-    end 
+      expect(host.instance_variable_get(:@current_dir)).to eq('/etc')
+    end
 
     StubNetwork.unstub_command!(:pwd)
     StubNetwork.unstub_command!(:realpath)
@@ -198,18 +198,18 @@ RSpec.describe Kanrisuru::Remote::Cluster do
 
     cluster.chdir('/etc')
     cluster.each do |host|
-      expect(host.instance_variable_get(:@current_dir)).to eq('/etc') 
-    end 
+      expect(host.instance_variable_get(:@current_dir)).to eq('/etc')
+    end
 
     StubNetwork.unstub_command!(:pwd)
     StubNetwork.unstub_command!(:realpath)
   end
-  
+
   it 'fails to remove a host from a cluster' do
     cluster = described_class.new(host1, host2)
 
-    expect {
+    expect do
       cluster.delete(1)
-    }.to raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 end

data/spec/support/shared_examples/integration/core/transfer.rb

@@ -34,6 +34,7 @@ RSpec.shared_examples 'transfer' do |os_name, host_json, spec_dir|
         keys: [host_json['ssh_key']]
       )
 
+      FileUtils.rm_rf("../test-output-#{os_name}")
       host.rmdir(spec_dir)
       host.disconnect
     end
@@ -80,7 +81,7 @@ RSpec.shared_examples 'transfer' do |os_name, host_json, spec_dir|
       src_path = '/etc/hosts'
 
       result = host.download(src_path, path)
-      expect(result).to eq(path)
+      expect(result).to be_truthy
       FileUtils.rm(path)
     end
 
@@ -93,6 +94,22 @@ RSpec.shared_examples 'transfer' do |os_name, host_json, spec_dir|
       expect(lines.length).to be >= 1
     end
 
+    it 'downloads a dir' do
+      remote_path = '/var/log'
+      local_path  = "../test-output-#{os_name}"
+      FileUtils.mkdir(local_path)
+
+      host.su('root')
+      result = host.download(remote_path, local_path, recursive: true)
+      expect(result).not_to be nil
+
+      paths = host.ls(path: '/var/log').map(&:path)
+      Dir.glob("#{local_path}/log/*").each do |file|
+        name = File.basename(file)
+        expect(paths).to include(name)
+      end
+    end
+
     it 'wgets url' do
       result = host.wget('https://example.com', directory_prefix: spec_dir)
       expect(result).to be_success

data/spec/support/shared_examples/integration/remote/cluster.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.shared_examples 'cluster' do |os_name, host_json, spec_dir|
+RSpec.shared_examples 'cluster' do |os_name, host_json, _spec_dir|
   context "with #{os_name}" do
     let(:host1) do
       Kanrisuru::Remote::Host.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.16.15
+  version: 0.16.16
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests