kanrisuru 0.16.12 → 0.16.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd3a735e0a70fbbb36f076c0da975dfd3b9088a48d4efc4668de218d7c60f0e3
-  data.tar.gz: 7b3eb81b6d3f3f1152d96963c0dd24d2effd0b84d7718dc613ae0a610b78544e
+  metadata.gz: c72c91f337408d0a7dee545cabeb07ba9fac668baf8d3c3dbb65d0e04a27e347
+  data.tar.gz: 28d8387d8081783dfd32031c202ffc5ec66e4a7fea3306e8cb35d117f2193c10
 SHA512:
-  metadata.gz: 4c2647a730b53a3ab851e737526bc95f2a8b8f05bf7c4e7325b5a08be1e0bd90cc2c9815850f9f1635a03658566dc28c84e935dd069551ead0fd534ea8d9c78c
-  data.tar.gz: ab3b397ed40a8b3282178dbb019f336455b9bbbd9d8b0f350695441735dbe65d7e25a3b346409f52c3449e11185c91b496df5384d6ad23b65017e29fda53e3d2
+  metadata.gz: 8a0d66db59619c3cb9e69567ef0ed08e564c53ca3171dccc7acd31410288dfa06ebfc5a5daa2ff09aa14cbbacf433175352928b8a6e837f2ba43217de5fb70ac
+  data.tar.gz: 8bfc4a39d3bb5ab4c9f180dd4e5682057a7c1fe5c5bd93e25a6d88280a6e12c79831e0c5d9cb05b2b3211b91e3c6161d585fcc20c2d851da100037393dd17752

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 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.
+
+## Kanrisuru 0.16.14 (January 02, 2022) ##
+*  Fix `get_user` command by parsing output to get user name if uid is passed in. 
+
+## Kanrisuru 0.16.13 (January 01, 2022) ##
+*  Add `non_unique` and `system` opts to `create_group` command
+
 ## Kanrisuru 0.16.12 (January 01, 2022) ## 
 *  Update date ranges for 2022 on license files.
 *  Add unit test case for `Kanrisuru::Logger`.

data/README.md

@@ -1,5 +1,5 @@
 <h1>
-  <img src="./logo/kanrisuru-logo.png" alt="Kanrisuru" width="400" height="100%"/>  
+  <img src="https://s3.us-east-2.amazonaws.com/kanrisuru.com/kanrisuru-logo.png" alt="Kanrisuru" width="400" height="100%"/>  
 </h1>
 
 <p>

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/group/commands/create_group.rb

@@ -8,6 +8,8 @@ module Kanrisuru
 
         command = Kanrisuru::Command.new("groupadd #{group}")
         command.append_arg('-g', gid)
+        command.append_flag('-o', opts[:non_unique])
+        command.append_flag('-r', opts[:system])
 
         execute_shell(command)
 

data/lib/kanrisuru/core/mount/commands/umount.rb

@@ -16,6 +16,9 @@ module Kanrisuru
 
         command.append_flag('-l', opts[:lazy])
         command.append_flag('-f', opts[:force])
+        
+        command.append_flag('--all-targets', opts[:all_targets])
+        command.append_flag('--recursive', opts[:recursive])
 
         if Kanrisuru::Util.present?(all)
           command.append_flag('-a')

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

@@ -8,11 +8,16 @@ module Kanrisuru
         execute_shell(command)
 
         Kanrisuru::Result.new(command) do |cmd|
-          ## Get user id
-          result = get_uid(user)
-          break if result.failure?
-
-          uid = result.to_i
+          if Kanrisuru::Util.numeric?(user)
+            uid = user.to_i
+            user = Parser::User.parse(cmd)
+          else
+            ## Get user id
+            result = get_uid(user)
+            break if result.failure?
+
+            uid = result.to_i
+          end
 
           ## Get all groups for the user, with gid and group name
           array = Parser::Groups.parse(cmd)
@@ -24,12 +29,12 @@ module Kanrisuru
           end
 
           ## Get home / shell path information
-          cmd = Kanrisuru::Command.new("getent passwd #{user}")
-          cmd | "awk -F: '{print $6, $7}'"
+          command2 = Kanrisuru::Command.new("getent passwd #{user}")
+          command2 | "awk -F: '{print $6, $7}'"
 
-          execute(cmd)
+          execute(command2)
 
-          result = Kanrisuru::Result.new(cmd) do |cmd2|
+          result = Kanrisuru::Result.new(command2) do |cmd2|
             Parser::Getent.parse(cmd2)
           end
 

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

@@ -2,3 +2,4 @@
 
 require_relative 'parsers/getent'
 require_relative 'parsers/groups'
+require_relative 'parsers/user'

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Core
+    module User
+      module Parser
+        class User
+          def self.parse(command)
+            string = command.to_s
+            string = string.split[0]
+
+            matches = string.match(/uid=\d+\((.+)\)/)
+            return if !matches || !matches.captures
+
+            matches.captures.first
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kanrisuru/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanrisuru
-  VERSION = '0.16.12'
+  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

@@ -21,7 +21,12 @@ 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 }), 'groupadd admin -g 9000')
+    expect_command(host.create_group('admin',
+                                     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
 
   it 'prepares delete_group command' do

data/spec/functional/core/mount_spec.rb

@@ -95,6 +95,8 @@ RSpec.describe Kanrisuru::Core::Mount do
 
   it 'prepares umount command' do
     expect_command(host.umount, 'umount')
+    expect_command(host.umount(recursive: true, all_targets: true), 'umount --all-targets --recursive')
+
     expect_command(host.umount(
                      fake: true,
                      no_canonicalize: true,

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/core/user.rb

@@ -35,7 +35,7 @@ RSpec.shared_examples 'user' do |os_name, host_json, _spec_dir|
       expect(host.get_uid('asdf').to_i).to eq(nil)
     end
 
-    it 'gets a user details' do
+    it 'gets a user details by name' do
       result = host.get_user(host_json['username'])
       expect(result.uid).to eq(1000)
       expect(result.name).to eq(host_json['username'])
@@ -49,6 +49,20 @@ RSpec.shared_examples 'user' do |os_name, host_json, _spec_dir|
       end
     end
 
+    it 'gets a user details by uid' do
+      result = host.get_user(1000)
+      expect(result.uid).to eq(1000)
+      expect(result.name).to eq(host_json['username'])
+      expect(result.home.path).to eq(host_json['home'])
+
+      case os_name
+      when 'opensuse', 'sles'
+        expect(result.groups[0]).to have_attributes(gid: 100, name: 'users')
+      else
+        expect(result.groups[0]).to have_attributes(gid: 1000, name: host_json['username'])
+      end
+    end
+
     it 'manages a user' do
       ## Need priviledge escalation to manage group
       host.su('root')

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.12
+  version: 0.16.16
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-01 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
@@ -347,6 +347,7 @@ files:
 - lib/kanrisuru/core/user/parser.rb
 - lib/kanrisuru/core/user/parsers/getent.rb
 - lib/kanrisuru/core/user/parsers/groups.rb
+- lib/kanrisuru/core/user/parsers/user.rb
 - lib/kanrisuru/core/user/types.rb
 - lib/kanrisuru/core/yum.rb
 - lib/kanrisuru/core/yum/commands.rb