kanrisuru 0.16.11 → 0.16.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7e691e6227ba9b1c056be999461a641fd28a425a4d75cb02af41265b724b0af
-  data.tar.gz: a44f3470adab298c100ada9e954e775df42a38f933bf6533f6f54de096158745
+  metadata.gz: f2d1d9331232a2c1c343da0fd4a8d11fcef4b0197aea108fe1d6047a60c390f7
+  data.tar.gz: 8e8cbf4381da58b367fbb9aa2ac29fa68d8c4eed68ca3197cfaedf71cec69f85
 SHA512:
-  metadata.gz: 631d251e1833edc36568eb00907850a45f39bf623e85b4bc2f45806800ce71de97f1f60e129d4f452d7696f265de1aaa9a8228a67c013edadbd3bdcee94c1f85
-  data.tar.gz: fee6dcab58110f2addc66c93394b679d6dcc5ac0b83fb619102dd3aed1556a3a4a224f34ad87cda7be79cc8e0d39fd3248e2c7340bc50b64ec5130b79ee640fe
+  metadata.gz: f5eaa5caba5ae1f48e02fc4d6dadc03ab0ff6a94c47353e365adca6235424189e76ccb41fe513121d97013b819bd149636edef726d988c436269f4d230e524b8
+  data.tar.gz: 9ab07c9fdcf14fc3a314cbce0d9952456fa0daccb77bfeb2e8de92ad4a131f4d5f661033a3ef41c540adc18b73be0e11574b86b65a2392f2d446baaa043f13a0

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 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`.
+
 ## Kanrisuru 0.16.11 (December 28, 2021) ##
 *  Add functional and integration test cases for the `Kanrisuru::Remote::Cluster` class.
 *  Allow for passing a command instance into `execute` and `execute_shell` on a cluster instance, by deep copying a command object. 

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020-2021 Avamia, LLC
+Copyright (c) 2020-2022 Avamia, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -8,11 +8,15 @@ 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 +28,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.11'
+  VERSION = '0.16.15'
 end

data/lib/kanrisuru.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2020-2021 Avamia, LLC
+# Copyright (c) 2020-2022 Avamia, LLC
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/spec/functional/core/group_spec.rb

@@ -21,7 +21,14 @@ 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/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/unit/kanrisuru_spec.rb

@@ -6,4 +6,8 @@ RSpec.describe Kanrisuru do
   it 'has a version number' do
     expect(Kanrisuru::VERSION).not_to be nil
   end
+
+  it 'has logger class' do
+    expect(Kanrisuru::Logger).not_to be nil
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.16.11
+  version: 0.16.15
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-01-07 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