kanrisuru 0.3.1 → 0.5.0

data/lib/kanrisuru/util/os_family.rb

@@ -186,7 +186,7 @@ module Kanrisuru
           model: 'open_source',
           state: 'current',
           type: 'distribution'
-        },
+        }
       }
 
       def self.family_include_distribution?(family, dist)

data/lib/kanrisuru/util/signal.rb

@@ -136,7 +136,7 @@ module Kanrisuru
       def self.[](signal)
         return unless valid?(signal)
 
-        if key.instance_of?(Integer)
+        if signal.instance_of?(Integer)
           @linux_inverted[signal]
         else
           @linux[translate(signal)]

data/lib/kanrisuru/version.rb

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

data/spec/functional/core/apt_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Kanrisuru::Core::Apt do
-  TestHosts.each_os do |os_name|
+  TestHosts.each_os(only: %w[debian ubuntu]) do |os_name|
     context "with #{os_name}" do
       let(:host_json) { TestHosts.host(os_name) }
       let(:host) do
@@ -18,163 +18,102 @@ RSpec.describe Kanrisuru::Core::Apt do
         host.disconnect
       end
 
-      describe 'apt install' do
-        it 'installs package' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('install', packages: %w[ffmpeg curl])
-            expect(result).to be_success
-
-            result = host.which('ffmpeg')
-            expect(result).to be_success
-            paths = result.map(&:path)
-            expect(paths).to include(match('ffmpeg'))
-
-            result = host.which('curl')
-            expect(result).to be_success
-            paths = result.map(&:path)
-            expect(paths).to include(match('curl'))
-          end
-        end
-      end
-
-      describe 'apt remove' do
-        it 'removes installed packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('remove', packages: ['ffmpeg'])
-            expect(result).to be_success
-          end
-        end
-
-        it 'purges installed packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('purge', packages: ['ffmpeg'])
-            expect(result).to be_success
-          end
-        end
-      end
-
-      describe 'apt autoremove' do
-        it 'removes unused packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('autoremove')
-            expect(result).to be_success
-          end
-        end
-      end
-
-      describe 'apt clean' do
-        it 'cleans packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('clean')
-            expect(result).to be_success
-          end
-        end
-
-        it 'autocleans packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('autoclean')
-            expect(result).to be_success
-          end
-        end
-      end
-
-      describe 'apt update' do
-        it 'updates packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('update')
-            expect(result).to be_success
-          end
-        end
-      end
-
-      describe 'apt upgrade' do
-        it 'upgrades packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('upgrade')
-            expect(result).to be_success
-          end
-        end
-
-        it 'fully upgrades packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('full-upgrade')
-            expect(result).to be_success
-          end
-        end
-      end
-
-      describe 'apt show' do
-        it 'shows details of listed packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            result = host.apt('show', packages: %w[wget curl git sudo])
-            expect(result).to be_success
-          end
-        end
-      end
-
-      describe 'apt list' do
-        it 'lists all packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('list')
-            expect(result).to be_success
-          end
-        end
-
-        it 'lists installed packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('list', installed: true)
-            expect(result).to be_success
-          end
-        end
-
-        it 'lists upgradable packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('list', upgradable: true)
-            expect(result).to be_success
-          end
-        end
-
-        it 'lists all versions for packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            host.su('root')
-            result = host.apt('list', all_versions: true)
-            expect(result).to be_success
-          end
-        end
-
-        it 'searches packages' do
-          case os_name
-          when 'debian', 'ubuntu'
-            result = host.apt('search', query: 'wget')
-            expect(result).to be_success
-          end
-        end
+      it 'installs package' do
+        host.su('root')
+        result = host.apt('install', packages: %w[ffmpeg curl])
+        expect(result).to be_success
+
+        result = host.which('ffmpeg')
+        expect(result).to be_success
+        paths = result.map(&:path)
+        expect(paths).to include(match('ffmpeg'))
+
+        result = host.which('curl')
+        expect(result).to be_success
+        paths = result.map(&:path)
+        expect(paths).to include(match('curl'))
+      end
+
+      it 'removes installed packages' do
+        host.su('root')
+        result = host.apt('remove', packages: ['ffmpeg'])
+        expect(result).to be_success
+      end
+
+      it 'purges installed packages' do
+        host.su('root')
+        result = host.apt('purge', packages: ['ffmpeg'])
+        expect(result).to be_success
+      end
+
+      it 'removes unused packages' do
+        host.su('root')
+        result = host.apt('autoremove')
+        expect(result).to be_success
+      end
+
+      it 'cleans packages' do
+        host.su('root')
+        result = host.apt('clean')
+        expect(result).to be_success
+      end
+
+      it 'autocleans packages' do
+        host.su('root')
+        result = host.apt('autoclean')
+        expect(result).to be_success
+      end
+
+      it 'updates packages' do
+        host.su('root')
+        result = host.apt('update')
+        expect(result).to be_success
+      end
+
+      it 'upgrades packages' do
+        host.su('root')
+        result = host.apt('upgrade')
+        expect(result).to be_success
+      end
+
+      it 'fully upgrades packages' do
+        host.su('root')
+        result = host.apt('full-upgrade')
+        expect(result).to be_success
+      end
+
+      it 'shows details of listed packages' do
+        result = host.apt('show', packages: %w[wget curl git sudo])
+        expect(result).to be_success
+      end
+
+      it 'lists all packages' do
+        host.su('root')
+        result = host.apt('list')
+        expect(result).to be_success
+      end
+
+      it 'lists installed packages' do
+        host.su('root')
+        result = host.apt('list', installed: true)
+        expect(result).to be_success
+      end
+
+      it 'lists upgradable packages' do
+        host.su('root')
+        result = host.apt('list', upgradable: true)
+        expect(result).to be_success
+      end
+
+      it 'lists all versions for packages' do
+        host.su('root')
+        result = host.apt('list', all_versions: true)
+        expect(result).to be_success
+      end
+
+      it 'searches packages' do
+        result = host.apt('search', query: 'wget')
+        expect(result).to be_success
       end
     end
   end

data/spec/functional/core/dmi_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Kanrisuru::Core::Dmi do
+  TestHosts.each_os do |os_name|
+    context "with #{os_name}" do
+      let(:host_json) { TestHosts.host(os_name) }
+      let(:host) do
+        Kanrisuru::Remote::Host.new(
+          host: host_json['hostname'],
+          username: host_json['username'],
+          keys: [host_json['ssh_key']]
+        )
+      end
+
+      after do
+        host.disconnect
+      end
+
+      it 'parses dmi values' do
+        host.su('root')
+        result = host.dmi
+        expect(result).to be_success
+      end
+
+      it 'parses dmi values with types' do
+        host.su('root')
+        result = host.dmi(types: ['System', 3])
+        expect(result).to be_success
+
+        expect(result.find { |i| i.dmi_type == 'System' }).to be_instance_of(Kanrisuru::Core::Dmi::System)
+        expect(result.find { |i| i.dmi_type == 'Chassis' }).to be_instance_of(Kanrisuru::Core::Dmi::Chassis)
+      end
+    end
+  end
+end

data/spec/functional/core/file_spec.rb

@@ -167,16 +167,9 @@ RSpec.describe Kanrisuru::Core::File do
         path = "#{spec_dir}/test-dir/"
         result = host.mkdir(path)
 
-        expect(result.success?).to eq(true)
+        expect(result).to be_success
         expect(result.path).to eq(path)
-
-        case os_name
-        when 'fedora', 'rhel', 'centos'
-          expect(result.mode.numeric).to eq('775')
-        else
-          expect(result.mode.numeric).to eq('755')
-        end
-
+        expect(result.mode.numeric).to eq('755')
         expect(result.file_type).to eq('directory')
         expect(result.uid).to eq(1000)
         expect(result.user).to eq(host_json['username'])
@@ -250,7 +243,7 @@ RSpec.describe Kanrisuru::Core::File do
         end
 
         result = host.cp(path, copied_path)
-        expect(result.success?).to eq(true)
+        expect(result).to be_success
 
         file.append do |f|
           f << 'New Content'
@@ -260,8 +253,8 @@ RSpec.describe Kanrisuru::Core::File do
         expect(result.success?).to eq(true)
 
         result = host.ls(path: spec_dir)
-        backup = result.find { |f| f.path == 'remote-file-copied-2.txt~' }
-        expect(backup.path).to eq('remote-file-copied-2.txt~')
+        backup = result.find { |f| f.path == 'remote-file-copied-with-backup.txt~' }
+        expect(backup.path).to eq('remote-file-copied-with-backup.txt~')
       end
 
       it 'moves files' do

data/spec/functional/core/system_spec.rb

@@ -69,6 +69,27 @@ RSpec.describe Kanrisuru::Core::System do
         expect(process).to be_empty
       end
 
+      it 'gets kernel statistics' do
+        result = host.kernel_statistics
+        expect(result).to be_success
+
+        expect(result.data).to respond_to(
+          :cpu_total,
+          :cpus,
+          :interrupt_total,
+          :interrupts,
+          :ctxt,
+          :btime,
+          :processes,
+          :procs_running,
+          :procs_blocked,
+          :softirq_total,
+          :softirqs
+        )
+
+        expect(result.cpus.length).to eq(host.cpu.cores)
+      end
+
       it 'gets process details' do
         result = host.ps
 

data/spec/functional/core/yum_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Kanrisuru::Core::Yum do
-  TestHosts.each_os do |os_name|
+  TestHosts.each_os(only: %w[fedora rhel centos]) do |os_name|
     context "with #{os_name}" do
       let(:host_json) { TestHosts.host(os_name) }
       let(:host) do
@@ -19,21 +19,15 @@ RSpec.describe Kanrisuru::Core::Yum do
       end
 
       it 'upgrades packages' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          host.su('root')
-          result = host.yum('upgrade')
-          expect(result).to be_success
-        end
+        host.su('root')
+        result = host.yum('upgrade')
+        expect(result).to be_success
       end
 
       it 'updates packages' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          host.su('root')
-          result = host.yum('update')
-          expect(result).to be_success
-        end
+        host.su('root')
+        result = host.yum('update')
+        expect(result).to be_success
       end
 
       it 'installs local package from RPM' do
@@ -54,106 +48,70 @@ RSpec.describe Kanrisuru::Core::Yum do
       end
 
       it 'lists installed packages' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          result = host.yum('list', installed: true)
-          expect(result).to be_success
-        end
+        result = host.yum('list', installed: true)
+        expect(result).to be_success
       end
 
       it 'lists repos' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          result = host.yum('repolist')
-          expect(result).to be_success
-        end
+        result = host.yum('repolist')
+        expect(result).to be_success
       end
 
       it 'lists installed repos' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          result = host.yum('repolist', repos: 'updates')
-          expect(result).to be_success
-        end
+        result = host.yum('repolist', repos: 'updates')
+        expect(result).to be_success
       end
 
       it 'searches a single package' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          result = host.yum('search', packages: 'curl')
-          expect(result).to be_success
-        end
+        result = host.yum('search', packages: 'curl')
+        expect(result).to be_success
       end
 
       it 'searches all packages' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          result = host.yum('search', all: true, packages: %w[curl ffmpeg])
-          expect(result).to be_success
-        end
+        result = host.yum('search', all: true, packages: %w[curl ffmpeg])
+        expect(result).to be_success
       end
 
       it 'installs a package' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          host.su('root')
-          result = host.yum('install', packages: %(ffmpeg curl))
-          expect(result).to be_success
-        end
+        host.su('root')
+        result = host.yum('install', packages: %(ffmpeg curl))
+        expect(result).to be_success
       end
 
       it 'removes installed packages' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          host.su('root')
-          result = host.yum('remove', packages: ['ffmpeg'])
-          expect(result).to be_success
-        end
+        host.su('root')
+        result = host.yum('remove', packages: ['ffmpeg'])
+        expect(result).to be_success
       end
 
       it 'purges installed packages' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          host.su('root')
-          result = host.yum('erase', packages: ['ffmpeg'])
-          expect(result).to be_success
-        end
+        host.su('root')
+        result = host.yum('erase', packages: ['ffmpeg'])
+        expect(result).to be_success
       end
 
       it 'gets info for one package' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          host.su('root')
-          result = host.yum('info', packages: 'yum')
-          expect(result).to be_success
-        end
+        host.su('root')
+        result = host.yum('info', packages: 'yum')
+        expect(result).to be_success
       end
 
       it 'gets info for installed packages' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          host.su('root')
-          result = host.yum('info', installed: true)
-          expect(result).to be_success
-        end
+        host.su('root')
+        result = host.yum('info', installed: true)
+        expect(result).to be_success
       end
 
       it 'cleans packages' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          host.su('root')
-          result = host.yum('clean', all: true)
-          expect(result).to be_success
-        end
+        host.su('root')
+        result = host.yum('clean', all: true)
+        expect(result).to be_success
       end
 
       it 'autoremoves packages' do
-        case os_name
-        when 'centos', 'rhel', 'fedora'
-          host.su('root')
-          result = host.yum('autoremove')
-          expect(result).to be_success
-        end
+        host.su('root')
+        result = host.yum('autoremove')
+        expect(result).to be_success
       end
     end
   end