kanrisuru 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93755393c0e2f4b2353bdd4bda27df54e4aceccf3ae7cd6d77f0e4cbc8c908c7
-  data.tar.gz: f28c287f77b9edcb505e319030d67fc51287b99dc23cc0903fcfcb7dcec8c52c
+  metadata.gz: fb2d3362a0cb76eee232056937ae6d81c0d40c24d0a1bbafed6f78cbbfeda880
+  data.tar.gz: 3f8ddb4ed3d24ad2741f619bd3f12553ddd26181f42301dbe8c165ade253c006
 SHA512:
-  metadata.gz: 493e8a9019139f5326e50b2ade2ef1f5c631bec796fc08655455e356b0718ce41f5e34d1b348cc88f8f6c1f6857a56ed36dff30c56f285866c525ed07500b342
-  data.tar.gz: 4b4a6141a7bbc4731c6693639071470291881876589ee8033195d3f9e32a13fd6bad444ccfd2cf8bf1f5d302c93b3a09d6cf2e32ecda42fef954c2d2a93595d6
+  metadata.gz: c6e633ff0d3008cd8bd3ba003bf5c2bf0a5892e9e44c1eb0aeefe2435c4a5f7703ae088cede78a80ac01aa8aef11e6733f1a9926dac646f3d51f943e3a4be1e9
+  data.tar.gz: a163204d160ab1dff741f18f02a013b5a7cb3a274fc2fa7dd3c00ca9115809fbf64794ec4a075bfb4609019d81ab63fdf90385424a05aeaff2cfb959c2b2916d

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## Kanrisuru 0.8.1 (August 19, 2021) ##
+* Fix `nodeps` flag value for `lsblk` command in disk module. 
+
+## Kanrisuru 0.8.0 (August 18, 2021) ##
+* Add last / lastb implementation in system core module. 
+
+## Kanrisuru 0.7.3 (August 9, 2021) ##
+* Fixed bug with zypper remove package, where the package names weren't being added to the linux command. 
+* Test case added to ensure package is removed.
+
+## Kanrisuru 0.7.2 (August 9, 2021) ##
+* Fixed bug with the `os_method_cache` instance variable set in the namespaced instance of a host. This was causing collision issues inbetween host instances, where, hosts with the same aliased method name was getting overwritten (with a different OS), since the namespace instance variable existing on the host class definition wasn't getting reset inbetween host instantiations. Given that the `os_method_cache` is normally re-instantiated, this bug fix addresses this so that the `os_method_cache` is always defined on the host instance, ie:
+
+  ```ruby
+  host.instance_variable_get(:@os_method_cache)
+  host.instance_variable_set(:@os_method_cache, os_method_cache)
+  ```
+  This is done instead of being saved on the namespace module. With the previous bug fix of using namespaced keys, there's no way for a method to be overwritten otherwise with a global `os_method_cache`.
+
 ## Kanrisuru 0.7.1 (August 8, 2021) ##
 * Fix bug with `os_include` when caching namespace unbound methods, use the namespace in the 
 cache key to avoid any namespace collisions with the same method name, namely:

data/lib/kanrisuru/core/disk.rb

@@ -144,7 +144,7 @@ module Kanrisuru
 
         command.append_flag('-a', all)
         command.append_flag('-p', paths)
-        command.append_flag('-p', nodeps)
+        command.append_flag('-d', nodeps)
 
         command.append_arg('-o', 'NAME,FSTYPE,MAJ:MIN,MOUNTPOINT,SIZE,UUID,RO,RM,OWNER,GROUP,MODE,TYPE')
         execute(command)

data/lib/kanrisuru/core/system.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'date'
+require 'ipaddr'
 
 module Kanrisuru
   module Core
@@ -19,6 +20,7 @@ module Kanrisuru
       os_define :linux, :kstat
 
       os_define :linux, :lsof
+      os_define :linux, :last
 
       os_define :linux, :uptime
 
@@ -116,6 +118,19 @@ module Kanrisuru
         :name
       )
 
+      SessionDetail = Struct.new(
+        :tty,
+        :login_at,
+        :logout_at,
+        :ip_address,
+        :success
+      )
+
+      LoginUser = Struct.new(
+        :user,
+        :sessions
+      )
+
       def load_env
         command = Kanrisuru::Command.new('env')
         execute_shell(command)
@@ -271,6 +286,65 @@ module Kanrisuru
         Kanrisuru::Result.new(command, &:to_i)
       end
 
+      def last(opts = {})
+        command =
+          if opts[:failed_attempts]
+            Kanrisuru::Command.new('lastb')
+          else
+            Kanrisuru::Command.new('last')
+          end
+
+        command.append_flag('-i')
+        command.append_flag('-F')
+        command.append_arg('-f', opts[:file])
+
+        ## Some systems only use 1 space between user and TTY field
+        ## Add an additional space in output formatting for simple parsing
+        ## logic.
+        command | "sed 's/ /  /'"
+
+        execute_shell(command)
+
+        Kanrisuru::Result.new(command) do |cmd|
+          lines = cmd.to_a
+
+          mapping = {}
+
+          lines.each do |line|
+            next if Kanrisuru::Util.blank?(line)
+            next if line.include?('wtmp') || line.include?('btmp')
+
+            line = line.gsub('  still logged in', '- still logged in') if line.include?('still logged in')
+
+            values = line.split(/\s{2,}/, 4)
+            user   = values[0]
+            tty    = values[1]
+            ip     = IPAddr.new(values[2])
+
+            date_range = values[3]
+            login, logout = date_range.split(' - ')
+
+            login = parse_last_date(login) if login
+
+            logout = parse_last_date(logout) if logout
+
+            detail = SessionDetail.new
+            detail.tty = tty
+            detail.ip_address = ip
+            detail.login_at = login
+            detail.logout_at = logout
+
+            detail.success = !Kanrisuru::Util.present?(opts[:failed_attemps])
+
+            mapping[user] = LoginUser.new(user, []) unless mapping.key?(user)
+
+            mapping[user].sessions << detail
+          end
+
+          mapping.values
+        end
+      end
+
       def ps(opts = {})
         group = opts[:group]
         user  = opts[:user]
@@ -567,6 +641,19 @@ module Kanrisuru
         line.split(char, 2)[1]
       end
 
+      def parse_last_date(string)
+        tokens = string.split
+
+        return if tokens.length < 4
+
+        month_abbr = tokens[1]
+        day = tokens[2]
+        timestamp = tokens[3]
+        year = tokens[4]
+
+        DateTime.parse("#{day} #{month_abbr} #{year} #{timestamp}")
+      end
+
       def parse_policy_abbr(value)
         case value
         when '-'

data/lib/kanrisuru/core/zypper.rb

@@ -714,6 +714,9 @@ module Kanrisuru
         zypper_package_type_opt(command, opts)
         zypper_solver_opts(command, opts)
 
+        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        command << packages
+
         execute_shell(command)
         Kanrisuru::Result.new(command)
       end

data/lib/kanrisuru/os_package.rb

@@ -8,7 +8,6 @@ module Kanrisuru
       def self.extended(base)
         base.instance_variable_set(:@os_method_properties, {})
         base.instance_variable_set(:@os_methods, Set.new)
-        base.instance_variable_set(:@os_method_cache, {})
       end
 
       def os_define(os_name, method_name, options = {})
@@ -102,12 +101,6 @@ module Kanrisuru
         include_methods   = (public_methods + protected_methods + private_methods).flatten
 
         include_method_bindings = proc do
-          define_method 'os_method_cache' do
-            @os_method_cache ||= {}
-          end
-
-          private :os_method_cache
-
           include_methods.each do |method_name|
             define_method method_name do |*args, &block|
               unbound_method = mod.instance_method(method_name)
@@ -144,10 +137,11 @@ module Kanrisuru
           ## defined with the methods added.
           if Kanrisuru::Remote::Host.instance_variable_defined?("@#{namespace}")
             namespace_class = Kanrisuru::Remote::Host.const_get(Kanrisuru::Util.camelize(namespace))
-            namespace_instance = instance_variable_get("@#{namespace}")
+            namespace_instance = Kanrisuru::Remote::Host.instance_variable_get("@#{namespace}")
           else
             namespace_class    = Kanrisuru::Remote::Host.const_set(Kanrisuru::Util.camelize(namespace), Class.new)
             namespace_instance = Kanrisuru::Remote::Host.instance_variable_set("@#{namespace}", namespace_class.new)
+
             class_eval do
               define_method namespace do
                 namespace_instance.instance_variable_set(:@host, self)
@@ -168,11 +162,12 @@ module Kanrisuru
                 define_method method_name do |*args, &block|
                   unbound_method = nil
 
+                  host = namespace_instance.instance_variable_get(:@host)
+                  os_method_cache = host.instance_variable_get(:@os_method_cache) || {}
+
                   if os_method_cache.key?("#{namespace}.#{method_name}")
                     unbound_method = os_method_cache["#{namespace}.#{method_name}"]
                   else
-                    host = namespace_instance.instance_variable_get(:@host)
-
                     ## Find the correct method to resolve based on the OS for the remote host.
                     defined_method_name = host.resolve_os_method_name(os_method_properties, method_name)
                     unless defined_method_name
@@ -186,6 +181,7 @@ module Kanrisuru
                     ## Cache the unbound method on this host instance for faster resolution on
                     ## the next invocation of this method
                     os_method_cache["#{namespace}.#{method_name}"] = unbound_method
+                    host.instance_variable_set(:@os_method_cache, os_method_cache)
                   end
 
                   ## Bind the method to host instance and
@@ -197,11 +193,12 @@ module Kanrisuru
               define_method method_name do |*args, &block|
                 unbound_method = nil
 
+                host = self
+                os_method_cache = host.instance_variable_get(:@os_method_cache) || {}
+
                 if os_method_cache.key?(method_name)
                   unbound_method = os_method_cache[method_name]
                 else
-                  host = self
-
                   ## Find the correct method to resolve based on the OS for the remote host.
                   defined_method_name = host.resolve_os_method_name(os_method_properties, method_name)
                   raise NoMethodError, "undefined method `#{method_name}' for #{self.class}" unless defined_method_name
@@ -213,6 +210,7 @@ module Kanrisuru
                   ## Cache the unbound method on this host instance for faster resolution on
                   ## the next invocation of this method
                   os_method_cache[method_name] = unbound_method
+                  host.instance_variable_set(:@os_method_cache, os_method_cache)
                 end
 
                 ## Bind the method to host instance and

data/lib/kanrisuru/version.rb

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

data/spec/functional/core/system_spec.rb

@@ -96,6 +96,21 @@ RSpec.describe Kanrisuru::Core::System do
         expect(result.cpus.length).to eq(host.cpu.cores)
       end
 
+      it 'gets login details' do
+        host.su('root')
+
+        result = host.last
+        expect(result).to be_success
+      end
+
+      it 'gets failed login attempts' do
+        host.su('root')
+
+        result = host.last(failed_attempts: true)
+        puts result.data
+        expect(result).to be_success
+      end
+
       it 'gets process details' do
         result = host.ps
 

data/spec/functional/core/zypper_spec.rb

@@ -40,6 +40,12 @@ RSpec.describe Kanrisuru::Core::Zypper do
         expect(result).to be_success
       end
 
+      it 'removes a package' do
+        host.su('root')
+        result = host.zypper('remove', packages: ['ffmpeg'])
+        expect(result).to be_success
+      end
+
       it 'lists updates' do
         result = host.zypper('list-updates')
         expect(result).to be_success

data/spec/functional/os_package_spec.rb

@@ -40,18 +40,66 @@ module Kanrisuru
       a - b
     end
   end
+
+  module TestAliasNames
+    extend Kanrisuru::OsPackage::Define
+
+    os_define :fedora, :output_fedora, alias: :output
+    os_define :debian, :output_debian, alias: :output
+    os_define :sles,   :output_sles, alias: :output
+
+    def output_debian
+      'debian'
+    end
+
+    def output_fedora
+      'fedora'
+    end
+
+    def output_sles
+      'sles'
+    end
+  end
+
+  module TestAliasNamesNamespace
+    extend Kanrisuru::OsPackage::Define
+
+    os_define :fedora, :output_fedora, alias: :output
+    os_define :debian, :output_debian, alias: :output
+    os_define :sles,   :output_sles, alias: :output
+
+    def output_debian
+      'debian'
+    end
+
+    def output_fedora
+      'fedora'
+    end
+
+    def output_sles
+      'sles'
+    end
+  end
 end
 
 module Kanrisuru
   module Remote
     class Host
       os_include Kanrisuru::TestInclude
+
+      os_include Kanrisuru::TestAliasNames
+      os_include Kanrisuru::TestAliasNamesNamespace, namespace: :alias
+
       os_include Kanrisuru::TestNamespaceAdditions, namespace: :asdf
       os_include Kanrisuru::TestNamespace, namespace: :asdf
     end
 
     class Cluster
       os_collection Kanrisuru::TestInclude
+
+      os_collection Kanrisuru::TestAliasNames
+      os_collection Kanrisuru::TestAliasNamesNamespace, namespace: :alias
+
       os_collection Kanrisuru::TestNamespaceAdditions, namespace: :asdf
       os_collection Kanrisuru::TestNamespace, namespace: :asdf
     end
@@ -94,6 +142,52 @@ RSpec.describe Kanrisuru::OsPackage do
     expect(cluster.asdf.tester).to be_instance_of(Array)
 
     host.disconnect
+    host2.disconnect
+    cluster.disconnect
+  end
+
+  it 'includes the correct alias named method' do
+    host1 = Kanrisuru::Remote::Host.new(host: 'ubuntu-host', username: 'ubuntu', keys: ['~/.ssh/id_rsa'])
+    host2 = Kanrisuru::Remote::Host.new(host: 'centos-host', username: 'centos', keys: ['~/.ssh/id_rsa'])
+    host3 = Kanrisuru::Remote::Host.new(host: 'opensuse-host', username: 'opensuse', keys: ['~/.ssh/id_rsa'])
+
+    cluster = Kanrisuru::Remote::Cluster.new([host1, host2, host3])
+
+    expect(host1).to respond_to(:output)
+    expect(host2).to respond_to(:output)
+    expect(host3).to respond_to(:output)
+    expect(host1.output).to eq('debian')
+    expect(host2.output).to eq('fedora')
+    expect(host3.output).to eq('sles')
+
+    expect(cluster).to respond_to(:output)
+    expect(cluster.output).to eq([
+                                   { host: 'ubuntu-host', result: 'debian' },
+                                   { host: 'centos-host', result: 'fedora' },
+                                   { host: 'opensuse-host', result: 'sles' }
+                                 ])
+
+    expect(host1).to respond_to(:alias)
+    expect(host2).to respond_to(:alias)
+    expect(host3).to respond_to(:alias)
+    expect(host1.alias).to respond_to(:output)
+    expect(host2.alias).to respond_to(:output)
+    expect(host3.alias).to respond_to(:output)
+    expect(host1.alias.output).to eq('debian')
+    expect(host2.alias.output).to eq('fedora')
+    expect(host3.alias.output).to eq('sles')
+
+    expect(cluster).to respond_to(:alias)
+    expect(cluster.alias).to respond_to(:output)
+    expect(cluster.alias.output).to eq([
+                                         { host: 'ubuntu-host', result: 'debian' },
+                                         { host: 'centos-host', result: 'fedora' },
+                                         { host: 'opensuse-host', result: 'sles' }
+                                       ])
+
+    host1.disconnect
+    host2.disconnect
+    host3.disconnect
     cluster.disconnect
   end
 end

data/spec/unit/core/system_spec.rb

@@ -86,5 +86,17 @@ RSpec.describe Kanrisuru::Core::System do
       :inode,
       :name
     )
+    expect(Kanrisuru::Core::System::SessionDetail.new).to respond_to(
+      :tty,
+      :login_at,
+      :logout_at,
+      :ip_address,
+      :success
+    )
+
+    expect(Kanrisuru::Core::System::LoginUser.new).to respond_to(
+      :user,
+      :sessions
+    )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec