kanrisuru 0.16.13 → 0.16.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 247c662cf0cedccfd41d702e372cc536958fbfd16c583643201e13e528c3c049
-  data.tar.gz: 8d6256b6b5dfcf84793851432e0dfedfd352222bebb04bc530bb15bc9cdcd0d5
+  metadata.gz: d8db62531b521e5f8606ed7bb2520100d2f2f1fe20d78c1c8ae43759926e44ee
+  data.tar.gz: d3372a41fe3058ffaf938ce8ca31e7458f71fe981b380ac14143c46f2be9692b
 SHA512:
-  metadata.gz: 31bde2ec4894d4e6962ff99b438b67502687446918d59180693d11275e25944c1af1e22ad923e799c4208e7fff62ad93e9867082765b956d213b12eb5a950092
-  data.tar.gz: b69992182e95c7f3cf3061cd4f25d875ff6095ee7e18580a39f24a6be8c6978401d9023e55be01bbb0aac92b74ec904a016abdf60a4302c9fc1cfdd32df276b2
+  metadata.gz: 8bfafcc5e78e8545a1a2c6565bdbd9f5e581186c40b97696c1c4cd5b80426b03306f98a400db289293e86f4b919ee1b9cad622323c03b63264344a73c555f777
+  data.tar.gz: a1166a9650b3f3fe95a270abfa4950afb2b36fa3acde33ad4ed237944a44eddef6c4cc1d85352b87c0f672aed69d50dd60801295127c88ffc8b56a3ebd3e35e9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 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
 

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.13'
+  VERSION = '0.16.14'
 end

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')

metadata

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