kanrisuru 0.16.1 → 0.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd7661452984fde76a67c205c6de2fc65ef6dd4eca517ff207677ddac0adfe25
-  data.tar.gz: 0ff31a1685bb616fb4039da422544944ba3b713a00a3941ccb8a4fa03d753def
+  metadata.gz: 44eda2d0bb8165ff1df3d763531ffdb64a442b390e6e97ccda473105ddd8b04b
+  data.tar.gz: 14967498be11e552b7f546984173abf279387649da8fc9d45a98b42ed06aaa4f
 SHA512:
-  metadata.gz: 7e7ba4e672987e7650c5a0ce288f38fac309514a2670ec705eb7df8880f7b805a45ee3ed961366bed2981d8113a32343fe1d403e3c6cd96a3e77a327a6e3272f
-  data.tar.gz: 1821f242cd12a8b246d30a2079741988bd36f12df58d2e18551c8f416b6048ed1005cafb48faf33d0741da16a3fd0ccf2487d6c6166b497c54406dcb5aee67cd
+  metadata.gz: 5c281ab5f1e6fa063a5f11df3cb7138fe0acd19bb810aaf2e01685b847a1ec7d972420c86e155bc32b23a9d9bf1796077dfa753edfa0c62f7ec671ee81198d09
+  data.tar.gz: 7c64b72d543a18e1eee6d8dad9530c7e281a3856003b15d5587bf1351dd55fbbb49a8177e2c8a8cc749549f587e2b42fe76692dd436f0b1d9f57431d9e36cb9e

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## Kanrisuru 0.16.5 (December 25, 2021) ##
+*  Refactor `dmi_field_translate` to reduce complexity.
+
+## Kanrisuru 0.16.4 (December 25, 2021) ##
+*  Refactor `Kanrisuru::Fstab::Entry` and `Kanrisuru::Fstab::Options` classes into separate files.
+
+## Kanrisuru 0.16.3 (December 25, 2021) ##
+*  Refactor `Kanrisuru::Mode::Permission` class into separate file.
+
+## Kanrisuru 0.16.2 (December 19, 2021) ##
+*  Organize functional ip specs
+*  Log in realtime, debug output the stdout from the remote server, as opposed to waiting until after the command is done.
+*  Fix the `opensuse_leap` for the stubnetwork rspec helper.
+*  Refactor and cleanup the `append_array` method for the `Kanrisuru::Command` instance
+*  Move `gpg_opts` for `zypper` command into re-usable method
+*  Add functional test cases for `zypper` command. 
+
 ## Kanrisuru 0.16.1 (December 16, 2021) ##
 *  Fix require class for `os_package`.
 

data/lib/kanrisuru/command.rb

@@ -88,11 +88,10 @@ module Kanrisuru
       append_value("| #{value}")
     end
 
-    def append_array(value)
+    def append_array(value, separator = ' ')
       return unless Kanrisuru::Util.present?(value)
 
-      value = [value] unless value.instance_of?(Array)
-      append_value(value.join(' '))
+      append_value(Kanrisuru::Util.array_join_string(value, separator))
     end
 
     def append_value(value)

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

@@ -93,37 +93,41 @@ module Kanrisuru
             end
 
             def dmi_field_translate(struct, field)
-              field = field.downcase
-              field = field.gsub(/\s/, '_')
-              field = field.gsub('-', '_')
-              field = field.gsub(':', '')
+              field = dmi_scrub_field(field)
 
               case struct.dmi_type
               when 'Memory Device'
                 case field
                 when 'size'
-                  return 'mem_size'
+                  'mem_size'
                 end
               when 'System Slots'
                 case field
                 when 'length'
-                  return 'slot_length'
+                  'slot_length'
                 end
               when 'OEM Strings'
                 case field
                 when /^string/
-                  return 'strings'
+                  'strings'
                 end
               when 'Boot Integrity Services'
                 case field
                 when '16_bit_entry_point_address'
-                  return 'sixteen_bit_entry_point_address'
+                  'sixteen_bit_entry_point_address'
                 when '32_bit_entry_point_address'
-                  return 'thirty_two_bit_entry_point_address'
+                  'thirty_two_bit_entry_point_address'
                 end
+              else
+                field
               end
+            end
 
-              field
+            def dmi_scrub_field(field)
+              field = field.downcase
+              field = field.gsub(/\s/, '_')
+              field = field.gsub('-', '_')
+              field.gsub(':', '')
             end
 
             def dmi_type_to_struct(type)

data/lib/kanrisuru/core/zypper/commands/add_repo.rb

@@ -17,16 +17,9 @@ module Kanrisuru
         command.append_flag('--no-refresh', opts[:no_refresh])
         command.append_flag('--keep-packages', opts[:keep_packages])
         command.append_flag('--no-keep-packages', opts[:no_keep_packages])
-        command.append_flag('--gpgcheck', opts[:gpgcheck])
-        command.append_flag('--gpgcheck-strict', opts[:gpgcheck_strict])
-        command.append_flag('--gpgcheck-allow-unsigned', opts[:gpgcheck_allow_unsigned])
-        command.append_flag('--gpgcheck-allow-unsigned-repo', opts[:gpgcheck_allow_unsigned_repo])
-        command.append_flag('--gpgcheck-allow-unsigned-package', opts[:gpgcheck_allow_unsigned_package])
-        command.append_flag('--no-gpgcheck', opts[:no_gpgcheck])
-        command.append_flag('--default-gpgcheck', opts[:default_gpgcheck])
-
         command.append_arg('--priority', opts[:priority])
 
+        zypper_gpg_opts(command, opts)
         zypper_repos_opt(command, opts)
 
         execute_shell(command)

data/lib/kanrisuru/core/zypper/commands/add_service.rb

@@ -8,14 +8,16 @@ module Kanrisuru
         zypper_global_opts(command, opts)
         command << 'addservice'
 
-        command.append_arg('--name', opts[:name])
+        name = ("'#{opts[:name]}'" if Kanrisuru::Util.present?(opts[:name]))
 
+        command.append_arg('--name', name)
         command.append_flag('--enable', opts[:enable])
         command.append_flag('--disable', opts[:disable])
         command.append_flag('--refresh', opts[:refresh])
         command.append_flag('--no-refresh', opts[:no_refresh])
 
-        command.append_array(opts[:services])
+        command << opts[:service]
+        command << opts[:alias]
 
         execute_shell(command)
 

data/lib/kanrisuru/core/zypper/commands/info.rb

@@ -11,8 +11,7 @@ module Kanrisuru
         zypper_repos_opt(command, opts)
         zypper_package_type_opt(command, opts)
 
-        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
-        command << packages
+        command.append_array(opts[:packages])
 
         execute_shell(command)
 

data/lib/kanrisuru/core/zypper/commands/install.rb

@@ -12,7 +12,7 @@ module Kanrisuru
         zypper_package_type_opt(command, opts)
 
         command.append_arg('-n', opts[:name])
-        command.append_arg('-f', opts[:force])
+        command.append_flag('-f', opts[:force])
         command.append_flag('--oldpackage', opts[:oldpackage])
         command.append_arg('--from', opts[:from])
         command.append_arg('--capability', opts[:capability])
@@ -27,8 +27,7 @@ module Kanrisuru
         zypper_download_and_install_opts(command, opts)
         zypper_expert_opts(command, opts)
 
-        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
-        command << packages
+        command.append_array(opts[:packages])
 
         execute_shell(command)
 

data/lib/kanrisuru/core/zypper/commands/modify_repo.rb

@@ -19,13 +19,7 @@ module Kanrisuru
         command.append_flag('--keep-packages', opts[:keep_packages])
         command.append_flag('--no-keep-packages', opts[:no_keep_packages])
 
-        command.append_flag('--gpgcheck', opts[:gpgcheck])
-        command.append_flag('--gpgcheck-strict', opts[:gpgcheck_strict])
-        command.append_flag('--gpgcheck-allow-unsigned', opts[:gpgcheck_allow_unsigned])
-        command.append_flag('--gpgcheck-allow-unsigned-repo', opts[:gpgcheck_allow_unsigned_repo])
-        command.append_flag('--gpgcheck-allow-unsigned-package', opts[:gpgcheck_allow_unsigned_package])
-        command.append_flag('--no-gpgcheck', opts[:no_gpgcheck])
-        command.append_flag('--default-gpgcheck', opts[:default_gpgcheck])
+        zypper_gpg_opts(command, opts)
 
         command.append_flag('--all', opts[:all])
         command.append_flag('--local', opts[:local])

data/lib/kanrisuru/core/zypper/commands/modify_service.rb

@@ -8,8 +8,8 @@ module Kanrisuru
         zypper_global_opts(command, opts)
 
         command << 'modifyservice'
-        command.append_arg('--name', opts[:name])
 
+        command.append_arg('--name', opts[:name])
         command.append_flag('--enable', opts[:enable])
         command.append_flag('--disable', opts[:disable])
         command.append_flag('--refresh', opts[:refresh])
@@ -31,6 +31,8 @@ module Kanrisuru
           command.append_arg('--medium-type', opts[:medium_type])
         end
 
+        command << opts[:service] if Kanrisuru::Util.present?(opts[:service])
+
         execute_shell(command)
 
         Kanrisuru::Result.new(command)

data/lib/kanrisuru/core/zypper/commands/remove.rb

@@ -15,8 +15,7 @@ module Kanrisuru
         zypper_package_type_opt(command, opts)
         zypper_solver_opts(command, opts)
 
-        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
-        command << packages
+        command.append_array(opts[:packages])
 
         execute_shell(command)
         Kanrisuru::Result.new(command)

data/lib/kanrisuru/core/zypper/commands/remove_repo.rb

@@ -15,10 +15,10 @@ module Kanrisuru
         command.append_flag('--local', opts[:local])
         command.append_flag('--remote', opts[:remote])
 
-        if Kanrisuru::Util.present?(opts[:media_type])
-          raise ArgumentError, 'Invalid media type' unless ZYPPER_MEDIA_TYPES.include?(opts[:media_type])
+        if Kanrisuru::Util.present?(opts[:medium_type])
+          raise ArgumentError, 'Invalid media type' unless MEDIUM_TYPES.include?(opts[:medium_type])
 
-          command.append_arg('--media-type', opts[:media_type])
+          command.append_arg('--medium-type', opts[:medium_type])
         end
 
         command.append_array(opts[:repos])

data/lib/kanrisuru/core/zypper/commands/remove_service.rb

@@ -4,13 +4,18 @@ module Kanrisuru
   module Core
     module Zypper
       def zypper_remove_service(opts)
+        service = opts[:service]
+
         command = Kanrisuru::Command.new('zypper')
         zypper_global_opts(command, opts)
 
         command << 'removeservice'
         command.append_flag('--loose-auth', opts[:loose_auth])
         command.append_flag('--loose-query', opts[:loose_query])
-        command.append_array(opts[:services])
+
+        service = "'#{service}'" if service.match(/\s/)
+
+        command << service
 
         execute_shell(command)
 

data/lib/kanrisuru/core/zypper/commands/search.rb

@@ -37,9 +37,7 @@ module Kanrisuru
 
         zypper_repos_opt(command, opts)
         zypper_package_type_opt(command, opts)
-
-        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
-        command << packages
+        command.append_array(opts[:packages])
 
         execute_shell(command)
 

data/lib/kanrisuru/core/zypper/commands/source_install.rb

@@ -13,6 +13,8 @@ module Kanrisuru
         command.append_flag('--no-build-deps', opts[:no_build_deps])
         command.append_flag('--download-only', opts[:download_only])
 
+        command.append_array(opts[:packages])
+
         execute_shell(command)
 
         Kanrisuru::Result.new(command)

data/lib/kanrisuru/core/zypper/commands.rb

@@ -76,6 +76,16 @@ module Kanrisuru
         command.append_flag('--no-allow-vendor-change', opts[:no_allow_vendor_change])
       end
 
+      def zypper_gpg_opts(command, opts)
+        command.append_flag('--gpgcheck', opts[:gpgcheck])
+        command.append_flag('--gpgcheck-strict', opts[:gpgcheck_strict])
+        command.append_flag('--gpgcheck-allow-unsigned', opts[:gpgcheck_allow_unsigned])
+        command.append_flag('--gpgcheck-allow-unsigned-repo', opts[:gpgcheck_allow_unsigned_repo])
+        command.append_flag('--gpgcheck-allow-unsigned-package', opts[:gpgcheck_allow_unsigned_package])
+        command.append_flag('--no-gpgcheck', opts[:no_gpgcheck])
+        command.append_flag('--default-gpgcheck', opts[:default_gpgcheck])
+      end
+
       def zypper_repos_opt(command, opts)
         zypper_array_opt(command, opts[:repos], '--repo')
       end
@@ -101,7 +111,6 @@ module Kanrisuru
 
       def zypper_package_type_opt(command, opts)
         type = opts[:type]
-
         command.append_arg('-t', type) if Kanrisuru::Util.present?(type) && PACKAGE_TYPES.include?(type)
       end
     end

data/lib/kanrisuru/mode/permission.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  class Mode
+    class Permission
+      attr_reader :symbolic
+
+      def initialize(numeric, symbolic)
+        @numeric = numeric
+        @symbolic = symbolic
+
+        update_symbolic_rwx
+      end
+
+      def to_i
+        numeric.to_i
+      end
+
+      def to_s
+        symbolic
+      end
+
+      def numeric
+        @numeric.to_s
+      end
+
+      def all?
+        read? && write? && execute?
+      end
+
+      def symbolic=(symbolic)
+        @symbolic = symbolic
+
+        update_symbolic_rwx
+        update_numeric
+      end
+
+      def numeric=(numeric)
+        @numeric = numeric
+
+        update_numeric_rwx
+        update_symbolic
+      end
+
+      def read=(boolean)
+        @readable = boolean
+
+        update_numeric
+        update_symbolic
+      end
+
+      def write=(boolean)
+        @writeable = boolean
+
+        update_numeric
+        update_symbolic
+      end
+
+      def execute=(boolean)
+        @executable = boolean
+
+        update_numeric
+        update_symbolic
+      end
+
+      def read?
+        @readable
+      end
+
+      def write?
+        @writeable
+      end
+
+      def execute?
+        @executable
+      end
+
+      private
+
+      def update_symbolic_rwx
+        @readable   = @symbolic.include?('r')
+        @writeable  = @symbolic.include?('w')
+        @executable = @symbolic.include?('x')
+      end
+
+      def update_numeric_rwx
+        mode = @numeric.to_i(8)
+
+        @readable   = ((mode >> 2) & 0b001) == 1
+        @writeable  = ((mode >> 1) & 0b001) == 1
+        @executable = ((mode >> 0) & 0b001) == 1
+      end
+
+      def update_numeric
+        @numeric = (((read? ? 1 : 0) << 2) + ((write? ? 1 : 0) << 1) + (execute? ? 1 : 0)).to_s
+      end
+
+      def update_symbolic
+        @symbolic = "#{read? ? 'r' : '-'}#{write? ? 'w' : '-'}#{execute? ? 'x' : '-'}"
+      end
+    end
+  end
+end

data/lib/kanrisuru/mode.rb

@@ -1,105 +1,9 @@
 # frozen_string_literal: true
 
+require_relative 'mode/permission'
+
 module Kanrisuru
   class Mode
-    class Permission
-      attr_reader :symbolic
-
-      def initialize(numeric, symbolic)
-        @numeric = numeric
-        @symbolic = symbolic
-
-        update_symbolic_rwx
-      end
-
-      def to_i
-        numeric.to_i
-      end
-
-      def to_s
-        symbolic
-      end
-
-      def numeric
-        @numeric.to_s
-      end
-
-      def all?
-        read? && write? && execute?
-      end
-
-      def symbolic=(symbolic)
-        @symbolic = symbolic
-
-        update_symbolic_rwx
-        update_numeric
-      end
-
-      def numeric=(numeric)
-        @numeric = numeric
-
-        update_numeric_rwx
-        update_symbolic
-      end
-
-      def read=(boolean)
-        @readable = boolean
-
-        update_numeric
-        update_symbolic
-      end
-
-      def write=(boolean)
-        @writeable = boolean
-
-        update_numeric
-        update_symbolic
-      end
-
-      def execute=(boolean)
-        @executable = boolean
-
-        update_numeric
-        update_symbolic
-      end
-
-      def read?
-        @readable
-      end
-
-      def write?
-        @writeable
-      end
-
-      def execute?
-        @executable
-      end
-
-      private
-
-      def update_symbolic_rwx
-        @readable   = @symbolic.include?('r')
-        @writeable  = @symbolic.include?('w')
-        @executable = @symbolic.include?('x')
-      end
-
-      def update_numeric_rwx
-        mode = @numeric.to_i(8)
-
-        @readable   = ((mode >> 2) & 0b001) == 1
-        @writeable  = ((mode >> 1) & 0b001) == 1
-        @executable = ((mode >> 0) & 0b001) == 1
-      end
-
-      def update_numeric
-        @numeric = (((read? ? 1 : 0) << 2) + ((write? ? 1 : 0) << 1) + (execute? ? 1 : 0)).to_s
-      end
-
-      def update_symbolic
-        @symbolic = "#{read? ? 'r' : '-'}#{write? ? 'w' : '-'}#{execute? ? 'x' : '-'}"
-      end
-    end
-
     attr_reader :owner, :group, :other
 
     def initialize(mode)

data/lib/kanrisuru/remote/fstab/entry.rb

@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module Remote
+    class Fstab
+      class Entry
+        attr_reader :device, :uuid, :invalid, :label, :type, :opts, :freq, :passno
+        attr_accessor :mount_point
+
+        def initialize(opts = {})
+          @host = opts[:host]
+          @line = opts[:line]
+
+          @default = nil
+
+          @device = opts[:device] || nil
+          @opts = opts[:opts] || nil
+          @label = opts[:label] || nil
+          @uuid = opts[:uuid] || nil
+          @mount_point = opts[:mount_point] || nil
+          @type = opts[:type] || nil
+          @freq = opts[:freq] || nil
+          @passno = opts[:passno] || nil
+
+          @changed = false
+
+          @ucount = 0
+          @special = false
+          @invalid = false
+
+          if Kanrisuru::Util.present?(@line) && @line.instance_of?(String)
+            parse_line!
+          elsif (Kanrisuru::Util.present?(@opts) && @opts.instance_of?(String)) || @opts.instance_of?(Hash)
+            @opts = Kanrisuru::Remote::Fstab::Options.new(@type, @opts)
+          end
+        end
+
+        def inspect
+          str = '#<Kanrisuru::Remote::Fstab::Entry:0x%<object_id>s ' \
+                '@line=%<line>s @device=%<device>s @label=%<label>s' \
+                '@uuid=%<uuid>s @freq=%<freq>s @pasno=%<passno>s' \
+                '@opts=%<opts>s}>'
+
+          format(
+            str,
+            object_id: object_id,
+            line: @line,
+            device: @device,
+            label: @label,
+            uuid: @uuid,
+            freq: @freq,
+            passno: @passno,
+            opts: @opts.inspect
+          )
+        end
+
+        def valid?
+          !@invalid
+        end
+
+        def to_s(override = nil)
+          mode = override || @default
+
+          case mode
+          when 'uuid'
+            "UUID=#{@uuid} #{@mount_point} #{@type} #{@opts} #{@freq} #{@passno}"
+          when 'label'
+            "LABEL=#{@label} #{@mount_point} #{@type} #{@opts} #{@freq} #{@passno}"
+          else
+            "#{@device} #{@mount_point} #{@type} #{@opts} #{@freq} #{@passno}"
+          end
+        end
+
+        private
+
+        def parse_line!
+          fsline, mp, @type, opts, freq, passno = @line.split
+
+          @mount_point = mp
+          @freq = freq || '0'
+          @passno = passno || '0'
+
+          @opts = Fstab::Options.new(@type, opts)
+
+          case @line
+          when /^\s*LABEL=/
+            @default = 'label'
+            parse_label(fsline)
+          when /^\s*UUID=/
+            @default = 'uuid'
+            parse_uuid(fsline)
+          when %r{^\s*/dev}
+            @default = 'dev'
+            parse_dev(fsline)
+          else
+            # TODO: somewhat risky to assume that everything else
+            # can be considered a special device, but validating this
+            # is really tricky.
+            @special = true
+            @device = fsline
+          end
+
+          # Fstab entries not matching real devices have device unknown
+          @invalid = (@line.split.count != 6) # invalid entry if < 6 columns
+
+          if (@uuid.nil? && @label.nil? && !@special) ||
+             @device =~ /^unknown_/ ||
+             (!@host.inode?(@device) && !@special)
+            @invalid = true
+            @ucount += 1
+          end
+
+          @invalid = true unless @freq =~ /0|1|2/ && @passno =~ /0|1|2/
+        end
+
+        def parse_label(fsline)
+          @label = fsline.split('=').last.strip.chomp
+          path = @host.realpath("/dev/disk/by-label/#{@label}").path
+
+          @device = begin
+            "/dev/#{path.split('/').last}"
+          rescue StandardError
+            "unknown_#{@ucount}"
+          end
+
+          result = @host.blkid(device: @device)
+          @uuid = result.success? ? result[0].uuid : nil
+        end
+
+        def parse_uuid(fsline)
+          @uuid = fsline.split('=').last.strip.chomp
+          path = @host.realpath("/dev/disk/by-uuid/#{uuid}").path
+
+          @device = begin
+            "/dev/#{path.split('/').last}"
+          rescue StandardError
+            "unknown_#{@ucount}"
+          end
+
+          result = @host.blkid(device: @device)
+          @label = result.success? ? result[0].label : nil
+        end
+
+        def parse_dev(fsline)
+          @device = fsline
+          result = @host.blkid(device: @device)
+
+          @label = result.success? ? result[0].label : nil
+          @uuid = result.success? ? result[0].uuid : nil
+        end
+      end
+    end
+  end
+end