kanrisuru 0.14.0 → 0.16.2

data/lib/kanrisuru/core/user/commands/update_user.rb

@@ -4,52 +4,43 @@ module Kanrisuru
   module Core
     module User
       def update_user(user, opts = {})
-        uid           = opts[:uid]
         group         = opts[:group]
         groups        = opts[:groups]
-        append        = opts[:append]
-        home          = opts[:home]
-        move_home     = opts[:move_home]
-        shell         = opts[:shell] || '/bin/false'
-        non_unique    = opts[:non_unique]
-        password      = opts[:password]
-        expires       = opts[:expires] ## YYYY-MM-DD
-        locked        = opts[:locked]
 
         command = Kanrisuru::Command.new("usermod #{user}")
 
-        if Kanrisuru::Util.present?(home)
-          command.append_arg('-d', home)
-          command.append_flag('-m', move_home)
+        if Kanrisuru::Util.present?(opts[:home])
+          command.append_arg('-d', opts[:home])
+          command.append_flag('-m', opts[:move_home])
         end
 
-        command.append_arg('-s', shell)
+        command.append_arg('-s', opts[:shell])
 
-        if Kanrisuru::Util.present?(uid)
-          command.append_arg('-u', uid)
-          command.append_flag('-o', non_unique)
+        if Kanrisuru::Util.present?(opts[:uid])
+          command.append_arg('-u', opts[:uid])
+          command.append_flag('-o', opts[:non_unique])
         end
 
-        command.append_arg('-g', group) if Kanrisuru::Util.present?(group) && group_exists?(group)
+        command.append_arg('-g', group) if Kanrisuru::Util.present?(group) && group?(group)
 
         if Kanrisuru::Util.present?(groups)
-          command.append_arg('-G', groups.join(','))
-          command.append_flag('-a', append)
+          command.append_arg('-G', Kanrisuru::Util.array_join_string(groups, ','))
+          command.append_flag('-a', opts[:append])
         end
 
-        case locked
+        case opts[:locked]
         when true
           command.append_flag('-L')
           command.append_arg('-e', 1)
         when false
-          command.append_arg('-U')
+          command.append_flag('-U')
           command.append_arg('-e', 99_999)
         else
           ## Ensure expires isn't added twice.
-          command.append_arg('-e', expires)
+          command.append_arg('-e', opts[:expires]) ## YYYY-MM-DD
 
           ## Can't use password with lock / unlock flag.
-          command.append_arg('-p', password)
+          command.append_arg('-p', opts[:password])
         end
 
         execute_shell(command)

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/os_package.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'set'
+
 require_relative 'os_package/collection'
 require_relative 'os_package/define'
 require_relative 'os_package/include'

data/lib/kanrisuru/remote/host.rb

@@ -135,6 +135,7 @@ module Kanrisuru
               end
 
               ch.on_data do |_, data|
+                Kanrisuru.logger.debug { data.strip }
                 command.handle_data(data)
               end
 
@@ -145,9 +146,6 @@ module Kanrisuru
           end
 
           channel.wait
-
-          Kanrisuru.logger.debug { command.to_a }
-
           command
         rescue Net::SSH::ConnectionTimeout, Net::SSH::Timeout => e
           if retry_attempts > 1

data/lib/kanrisuru/result.rb

@@ -39,6 +39,21 @@ module Kanrisuru
       @data.instance_of?(Array) ? @data : [@data]
     end
 
+    def to_f
+      case @data
+      when Numeric
+        @data
+      when String
+        @data.to_f
+      when Array
+        @data.map(&:to_f)
+      when NilClass
+        nil
+      else
+        raise NoMethodError, "(undefined method `to_f' for Kanrisuru::Result)"
+      end
+    end
+
     def to_i
       case @data
       when Integer

data/lib/kanrisuru/version.rb

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

data/spec/functional/core/archive_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Kanrisuru::Core::Archive do
   before(:all) do
     StubNetwork.stub!
-    StubNetwork.stub_command!(:realpath) do |_args|
+    StubNetwork.stub_command!(:realpath) do
       Kanrisuru::Core::Path::FilePath.new(directory)
     end
   end

data/spec/functional/core/disk_spec.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Kanrisuru::Core::Disk do
+  before(:all) do
+    StubNetwork.stub!
+  end
+
+  after(:all) do
+    StubNetwork.unstub!
+  end
+
+  let(:host) do
+    Kanrisuru::Remote::Host.new(
+      host: 'localhost',
+      username: 'ubuntu',
+      keys: ['id_rsa']
+    )
+  end
+
+  it 'prepares blkid command' do
+    expect_command(host.blkid, 'blkid -o export')
+    expect_command(host.blkid(device: '/dev/vda1'), 'blkid -pio export /dev/vda1')
+    expect_command(host.blkid(label: 'UEFI'), 'blkid -L UEFI')
+    expect_command(host.blkid(uuid: '26F2-56F9'), 'blkid -U 26F2-56F9')
+    expect_command(host.blkid(label: 'UEFI', uuid: '26F2-56F9'), 'blkid -L UEFI -U 26F2-56F9')
+  end
+
+  it 'prepares df command' do
+    expect_command(host.df, "df -PT | awk '{print $1, $2, $3, $5, $6, $7}'")
+    expect_command(host.df(inodes: true, path: '/dev/vda1'),
+                   "df -PT -i /dev/vda1 | awk '{print $1, $2, $3, $5, $6, $7}'")
+  end
+
+  it 'prepares du command' do
+    expect_command(host.du, "du | awk '{print \\$1, \\$2}'")
+    expect_command(host.du(summarize: true, path: '/etc'), "du -s /etc | awk '{print \\$1, \\$2}'")
+  end
+
+  context 'with json support' do
+    before(:all) do
+      StubNetwork.stub_command!(:lsblk_version) do
+        Kanrisuru::Core::Disk::LSBK_VERSION
+      end
+    end
+
+    after(:all) do
+      StubNetwork.unstub_command!(:lsblk_version)
+    end
+
+    it 'prepares lsblk command' do
+      expect_command(host.lsblk, 'lsblk --json -o NAME,FSTYPE,MAJ:MIN,MOUNTPOINT,SIZE,UUID,RO,RM,OWNER,GROUP,MODE,TYPE')
+      expect_command(host.lsblk(all: true, paths: true, nodeps: true),
+                     'lsblk --json -a -p -d -o NAME,FSTYPE,MAJ:MIN,MOUNTPOINT,SIZE,UUID,RO,RM,OWNER,GROUP,MODE,TYPE')
+    end
+  end
+
+  context 'without json support' do
+    before(:all) do
+      StubNetwork.stub_command!(:lsblk_version) do
+        Kanrisuru::Core::Disk::LSBK_VERSION - 0.1
+      end
+    end
+
+    after(:all) do
+      StubNetwork.unstub_command!(:lsblk_version)
+    end
+
+    it 'prepares lsblk command' do
+      expect_command(host.lsblk,
+                     'lsblk -i -P --noheadings -o NAME,FSTYPE,MAJ:MIN,MOUNTPOINT,SIZE,UUID,RO,RM,OWNER,GROUP,MODE,TYPE')
+      expect_command(host.lsblk(all: true, paths: true, nodeps: true),
+                     'lsblk -i -P --noheadings -a -p -d -o NAME,FSTYPE,MAJ:MIN,MOUNTPOINT,SIZE,UUID,RO,RM,OWNER,GROUP,MODE,TYPE')
+    end
+  end
+end

data/spec/functional/core/dmi_spec.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Kanrisuru::Core::Dmi do
+  before(:all) do
+    StubNetwork.stub!
+  end
+
+  after(:all) do
+    StubNetwork.unstub!
+  end
+
+  let(:host) do
+    Kanrisuru::Remote::Host.new(
+      host: 'localhost',
+      username: 'ubuntu',
+      keys: ['id_rsa']
+    )
+  end
+
+  it 'prepares dmi command' do
+    expect_command(host.dmi, 'dmidecode')
+    expect_command(host.dmi(types: 'BIOS'), 'dmidecode --type 0')
+    expect_command(host.dmi(types: 1), 'dmidecode --type 1')
+
+    expect do
+      host.dmi(types: 'hello')
+    end.to raise_error(ArgumentError)
+
+    expect_command(host.dmi(types: [
+                              'BIOS',
+                              'System',
+                              'Baseboard',
+                              'Chassis',
+                              'Processor',
+                              'Memory Controller',
+                              'Memory Module',
+                              'Cache',
+                              'Port Connector',
+                              'System Slots',
+                              'On Board Devices',
+                              'OEM Strings',
+                              'System Configuration Options',
+                              'BIOS Language',
+                              'Group Associations',
+                              'System Event Log',
+                              'Physical Memory Array',
+                              'Memory Device',
+                              '32-bit Memory Error',
+                              'Memory Array Mapped Address',
+                              'Memory Device Mapped Address',
+                              'Built-in Pointing Device',
+                              'Portable Battery',
+                              'System Reset',
+                              'Hardware Security',
+                              'System Power Controls',
+                              'Voltage Probe',
+                              'Cooling Device',
+                              'Temperature Probe',
+                              'Electrical Current Probe',
+                              'Out-of-band Remote Access',
+                              'Boot Integrity Services',
+                              'System Boot',
+                              '64-bit Memory Error',
+                              'Management Device',
+                              'Management Device Component',
+                              'Management Device Threshold Data',
+                              'Memory Channel',
+                              'IPMI Device',
+                              'System Power Supply',
+                              'Additional Information',
+                              'Onboard Devices Extended Information',
+                              'Management Controller Host Interface',
+                              'TPM Device'
+                            ]), 'dmidecode --type 0 --type 1 --type 2 --type 3 --type 4 --type 5 --type 6 --type 7 --type 8 --type 9 --type 10 --type 11 --type 12 --type 13 --type 14 --type 15 --type 16 --type 17 --type 18 --type 19 --type 20 --type 21 --type 22 --type 23 --type 24 --type 25 --type 26 --type 27 --type 28 --type 29 --type 30 --type 31 --type 32 --type 33 --type 34 --type 35 --type 36 --type 37 --type 38 --type 39 --type 40 --type 41 --type 42 --type 43')
+  end
+end