kanrisuru 0.8.21 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1681e03fd41949c6519e0606a6e7138fed6bb8a75302848ad446e2c44fab3252
-  data.tar.gz: 2215d0f12fba2b91a9412db908975c4a82b76ab2eff8f93e095fb6acb1735d88
+  metadata.gz: a0ae74abc67963114dc04cc67783eaaab104ad77de4bba9dc497cd2307c92e7c
+  data.tar.gz: 94ba0cb2da9fa973cbcf5ff0e866931b64fdd8b529f44e35e0ede06edcd47581
 SHA512:
-  metadata.gz: b4477883aef70e512d5b1e91cc65154cc1381075531d35063b1ef9fc3c409e0a094b586e7c9892e121321f4642714f607d7e9333d2f46590bdfdc0101afb5787
-  data.tar.gz: 6b1cb465511443feeb85d4cc115bde8cb91eef4c047a037b89bc4ab33e78a3a800694c917f9366cfd151d3f3e1565d3dee2f3a22f8ca20f0e5d0369b7606455e
+  metadata.gz: 46b7fa66b9fceb225536604774a655f8ad332a1f1565a10005d8ba679fb2d14c894d16862535a98a555ba5a669e1f43674b61c77f8c718fea36efd4071523194
+  data.tar.gz: b97bbdbf4a2ed6ceb0aef10f63bfc1dad44559d825bdffcc095b979aad2aa9ca3cfdab5c5a0270eb3f96b67cdd93b63d4dad032c8601dc4372ebf54209b127ca

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## Kanrisuru 0.9.1 (November 29, 2021)
+* Fix type on `address_sizes` for `Kanrisuru::Remote::Cpu` class.
+* Add unit test cases for the `cpu` class.
+
+## Kanrisuru 0.9.0 (November 23, 2021)
+* Add `delete` to `Kanrisuru::Remote::Cluster` class to allow removal of hosts from cluster.
+* Add functional test cases for remote cluster class. 
+
+## Kanrisuru 0.8.23 (November 19, 2021)
+* Add functional test cases for `yum` command
+* Add stub by operating system method, with support for `ubuntu` and `centos` os types. 
+* Fix `ArgumentError` typo in yum commands, `erase` and `remove`.
+
+## Kanrisuru 0.8.22 (November 18, 2021)
+* Add functional test cases for `apt` command
+
 ## Kanrisuru 0.8.21 (November 15, 2021)
 * Fix bug with `Kanrisuru::Mode` class, lookup table had incorrect value for execute only symbolic to numeric field.
 

data/lib/kanrisuru/core/yum.rb

@@ -137,7 +137,7 @@ module Kanrisuru
         command.append_flag('-y')
 
         packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
-        raise ArugmentError, "can't remove yum" if packages.include?('yum')
+        raise ArgumentError, "can't remove yum" if packages.include?('yum')
 
         command << packages
 
@@ -173,7 +173,7 @@ module Kanrisuru
         command.append_flag('-y')
 
         packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
-        raise ArugmentError, "can't erase yum" if packages.include?('yum')
+        raise ArgumentError, "can't erase yum" if packages.include?('yum')
 
         command << packages
 

data/lib/kanrisuru/remote/cluster.rb

@@ -13,6 +13,10 @@ module Kanrisuru
         end
       end
 
+      def hosts
+        @hosts.values
+      end
+
       def [](hostname)
         @hosts[hostname]
       end
@@ -21,6 +25,10 @@ module Kanrisuru
         add_host(host_opts)
       end
 
+      def delete(host)
+        remove_host(host)
+      end
+
       def execute(command)
         @hosts.map do |host_addr, host|
           ## Need to evaluate each host independently for the command.
@@ -81,13 +89,37 @@ module Kanrisuru
         end
       end
 
+      def remove_host(host)
+        if host.instance_of?(Kanrisuru::Remote::Host)
+          removed = false
+
+          if @hosts.key?(host.host)
+            removed = true
+            @hosts.delete(host.host)
+          end
+
+          removed
+        elsif host.instance_of?(String)
+          removed = false
+
+          if @hosts.key?(host)
+            removed = true
+            @hosts.delete(host)
+          end
+
+          removed
+        else
+          raise ArgumentError, 'Invalid host type'
+        end
+      end
+
       def add_host(host_opts)
         if host_opts.instance_of?(Hash)
           @hosts[host_opts[:host]] = Kanrisuru::Remote::Host.new(host_opts)
         elsif host_opts.instance_of?(Kanrisuru::Remote::Host)
           @hosts[host_opts.host] = host_opts
         else
-          raise 'Not a valid host option'
+          raise ArgumentError, 'Invalid host option'
         end
       end
     end

data/lib/kanrisuru/remote/cpu.rb

@@ -75,8 +75,8 @@ module Kanrisuru
         @cpu_architecture.byte_order
       end
 
-      def address_size
-        @cpu_architecture.address_size
+      def address_sizes
+        @cpu_architecture.address_sizes
       end
 
       def cpu_mhz
@@ -103,7 +103,7 @@ module Kanrisuru
         @cpu_architecture.flags
       end
 
-      def hyperthreading?
+        def hyperthreading?
         threads_per_core > 1
       end
 

data/lib/kanrisuru/version.rb

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

data/spec/functional/core/apt_spec.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Kanrisuru::Core::Apt 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 apt list command' do
+    expect_command(host.apt('list'), 'apt list')
+    expect_command(host.apt('list',
+      installed: true,
+      upgradeable: true,
+      all_versions: true,
+    ), 'apt list --installed --upgradeable --all-versions')
+
+    expect_command(host.apt('list', package_name: 'nginx'), 'apt list -a nginx')
+  end
+
+  it 'prepares apt update command' do
+    expect_command(host.apt('update'), 'apt-get update -y')
+  end
+
+  it 'prepares apt upgrade command' do
+    expect_command(host.apt('upgrade'), 'apt-get upgrade -y')
+  end
+
+  it 'prepares apt full-upgrade command' do
+    expect_command(host.apt('full-upgrade'), 'apt full-upgrade -y')
+  end
+
+  it 'prepares apt install command' do
+    expect_command(host.apt('install', 
+        packages: 'nginx'
+      ),
+      'apt-get install -y nginx'
+    )
+
+    expect_command(host.apt('install', 
+        packages: 'monit',
+        no_upgrade: true,
+        reinstall: true
+      ),
+      'apt-get install -y --no-upgrade --reinstall monit'
+    )
+
+    expect_command(host.apt('install', 
+        packages: ['build-essential', 'manpages-dev'],
+        only_upgrade: true,
+      ),
+      'apt-get install -y --only-upgrade build-essential manpages-dev'
+    )
+  end
+  
+  it 'prepares apt remove command' do
+    expect_command(host.apt('remove', packages: ['python']), 'apt-get remove -y python')
+  end
+
+  it 'prepares apt purge command' do
+    expect_command(host.apt('purge', packages: ['python']), 'apt-get purge -y python')
+  end
+
+  it 'prepares apt autoremove command' do
+    expect_command(host.apt('autoremove'), 'apt-get autoremove -y')
+  end
+
+  it 'prepares apt search command' do
+    expect_command(host.apt('search', query: 'ruby'), 'apt search ruby')
+  end
+
+  it 'prepares apt show command' do
+    expect_command(host.apt('show', packages: 'ruby'), 'apt show -a ruby') 
+  end 
+
+  it 'prepares apt clean command' do
+    expect_command(host.apt('clean'), 'apt-get clean') 
+  end
+
+  it 'prepares apt autoclean command' do
+    expect_command(host.apt('autoclean'), 'apt-get autoclean') 
+  end
+
+end

data/spec/functional/core/yum_spec.rb

@@ -0,0 +1,159 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Kanrisuru::Core::Yum do
+  before(:all) do
+    StubNetwork.stub!(:centos)
+  end
+
+  after(:all) do
+    StubNetwork.unstub!
+  end
+
+  let(:host) do
+    Kanrisuru::Remote::Host.new(
+      host: 'centos-host',
+      username: 'centos',
+      keys: ['id_rsa']
+    )
+  end
+
+  it 'prepares yum install command' do
+    expect_command(host.yum('install', packages: 'nginx'), 
+      'yum install -y nginx'
+    )
+
+    expect_command(host.yum('install', packages: ['nginx', 'apache2']), 
+      'yum install -y nginx apache2'
+    )
+  end
+
+  it 'prepares yum localinstall command' do
+    expect_command(host.yum('localinstall', repos: 'foo.rpm'), 
+      'yum localinstall -y foo.rpm'
+    )
+
+    expect_command(host.yum('localinstall', 
+        repos: ['foo.rpm', 'bar.rpm', 'baz.rpm'],
+        disable_repo: '*'
+      ), 
+      'yum localinstall --disablerepo=* -y foo.rpm bar.rpm baz.rpm'
+    )
+  end
+
+  it 'prepares yum list command' do
+    expect_command(host.yum('list'), 
+      "yum list | tr '\\n' '#' | sed -e 's/# / /g' | tr '#' '\\n'"
+    )
+
+    expect_command(host.yum('list', all: true, query: 'ruby*'),
+      "yum list all ruby* | tr '\\n' '#' | sed -e 's/# / /g' | tr '#' '\\n'"
+    )
+
+    expect_command(host.yum('list', 
+        available: true, 
+        updates: true, 
+        installed: true, 
+        extras: true, 
+        obsoletes: true,
+        disable_repo: '*'
+      ),
+      "yum list --disablerepo=* available updates installed extras obsoletes | tr '\\n' '#' | sed -e 's/# / /g' | tr '#' '\\n'"
+    )
+  end
+
+  it 'prepares yum search command' do
+    expect_command(host.yum('search', 
+        packages: 'redis'
+      ),
+      "yum search redis | tr '\\n' '#' | sed -e 's/# / /g' | tr '#' '\\n'"
+    )
+
+    expect_command(host.yum('search',
+        packages: ['package1', 'package2', 'package3'],
+        all: true
+      ),
+      "yum search all package1 package2 package3 | tr '\\n' '#' | sed -e 's/# / /g' | tr '#' '\\n'"
+    )
+  end
+
+  it 'prepares yum info command' do
+    expect_command(host.yum('info', 
+        packages: 'redis'
+      ),
+      "yum info --quiet redis"
+    )
+
+    expect_command(host.yum('info', 
+        packages: ['package1', 'package2', 'package3'],
+        installed: true
+      ),
+      "yum info --quiet installed package1 package2 package3"
+    )
+  end
+
+  it 'prepares yum repolist command' do
+    expect_command(host.yum('repolist'),
+      "yum repolist --verbose"
+    )
+
+    expect_command(host.yum('repolist', repos: 'repo1'),
+      "yum repolist --verbose repo1"
+    )
+
+    expect_command(host.yum('repolist', repos: ['repo1', 'repo2', 'repo3']),
+      "yum repolist --verbose repo1 repo2 repo3"
+    )
+  end
+
+  it 'prepares yum clean command' do
+    expect_command(host.yum('clean'), 'yum clean')
+    expect_command(host.yum('clean', all: true), 'yum clean all')
+    expect_command(host.yum('clean', 
+        dbcache: true,
+        expire_cache: true,
+        metadata: true,
+        packages: true,
+        headers: true,
+        rpmdb: true
+      ),
+      "yum clean dbcache expire-cache metadata packages headers rpmdb"
+    )
+  end 
+
+  it 'prepares yum remove command' do
+    expect_command(host.yum('remove', packages: 'gcc'), 'yum remove -y gcc') 
+    expect_command(host.yum('remove', packages: ['p1', 'p2', 'p3']), 
+      'yum remove -y p1 p2 p3'
+    )
+
+    expect {
+      host.yum('remove', packages: 'yum')
+    }.to raise_error(ArgumentError) 
+  end
+
+  it 'prepares yum autoremove command' do
+    expect_command(host.yum('autoremove'), 'yum autoremove -y')
+  end
+
+  it 'prepares yum erase command' do
+    expect_command(host.yum('erase', packages: 'gcc'), 'yum erase -y gcc')
+    expect_command(host.yum('erase', packages: ['p1', 'p2', 'p3']), 
+      'yum erase -y p1 p2 p3'
+    )
+
+    expect {
+      host.yum('erase', packages: 'yum')
+    }.to raise_error(ArgumentError)
+  end
+
+  it 'prepares yum update command' do
+    expect_command(host.yum('update'), 'yum update -y')
+  end
+
+  it 'prepares yum upgrade command' do
+    expect_command(host.yum('upgrade'), 'yum upgrade -y')
+  end
+
+end

data/spec/functional/remote/cluster_spec.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Kanrisuru::Remote::Cluster do
+  before(:all) do
+    StubNetwork.stub!
+  end
+
+  after(:all) do
+    StubNetwork.unstub!
+  end
+
+  let(:host1) do
+    Kanrisuru::Remote::Host.new(
+      host: 'localhost',
+      username: 'ubuntu',
+      keys: ['id_rsa']
+    )
+  end
+
+  let(:host2) do
+    Kanrisuru::Remote::Host.new(
+      host: 'ubuntu-host',
+      username: 'ubuntu',
+      keys: ['id_rsa']
+    )
+  end
+
+  it 'adds host to a cluster' do
+    cluster = Kanrisuru::Remote::Cluster.new(host1)
+    expect(cluster.hosts.length).to eq(1)
+    expect(cluster.count).to eq(1)
+    expect(cluster[host1.host]).to eq(host1)
+    expect(cluster.hosts).to include(host1)
+
+    cluster << host2
+    expect(cluster.hosts.length).to eq(2)
+    expect(cluster.count).to eq(2)
+    expect(cluster[host2.host]).to eq(host2)
+    expect(cluster.hosts).to include(host1)
+    expect(cluster.hosts).to include(host2)
+  end
+
+  it 'removes a host from a cluster' do
+    cluster = Kanrisuru::Remote::Cluster.new(host1, host2)
+    expect(cluster.count).to eq(2)
+
+    cluster.delete(host2)
+    expect(cluster.count).to eq(1)
+    expect(cluster.hosts).not_to include(host2)
+
+    cluster.delete(host1.host)
+    expect(cluster.count).to eq(0)
+    expect(cluster.hosts).not_to include(host1)
+  end
+end

data/spec/helper/stub_network.rb

@@ -2,7 +2,7 @@
 
 class StubNetwork
   class << self
-    def stub!
+    def stub!(os_type = 'ubuntu')
       unless Kanrisuru::Remote::Host.instance_methods(false).include?(:execute_with_retries_alias)
         Kanrisuru::Remote::Host.class_eval do
           alias_method :execute_with_retries_alias, :execute_with_retries
@@ -18,16 +18,16 @@ class StubNetwork
       unless Kanrisuru::Remote::Os.instance_methods(false).include?(:initialize_alias)
         Kanrisuru::Remote::Os.class_eval do
           alias_method :initialize_alias, :initialize 
-          def initialize(host)
+          define_method :initialize do |host|
             @host = host
 
-            @kernel_name       = 'Linux'
-            @kernel_version    = '#91-Ubuntu SMP Thu Jul 15 19:09:17 UTC 2021'
-            @operating_system  = 'GNU/Linux'
-            @hardware_platform = 'x86_64'
-            @processor         = 'x86_64'
-            @release           = 'ubuntu'
-            @version           = 20.0
+            @kernel_name       = StubNetwork.send(:os_defaults, os_type, :kernel_name)
+            @kernel_version    = StubNetwork.send(:os_defaults, os_type, :kernel_version)
+            @operating_system  = StubNetwork.send(:os_defaults, os_type, :operating_system)
+            @hardware_platform = StubNetwork.send(:os_defaults, os_type, :hardware_platform)
+            @processor         = StubNetwork.send(:os_defaults, os_type, :processor)
+            @release           = StubNetwork.send(:os_defaults, os_type, :release)
+            @version           = StubNetwork.send(:os_defaults, os_type, :version)
           end
         end
       end
@@ -59,5 +59,36 @@ class StubNetwork
       end
     end
 
+    private
+
+    def os_defaults(name, property)
+      name = name.to_sym
+
+      defaults = {
+        ubuntu: {
+          kernel_name: 'Linux',
+          kernel_version: '#91-Ubuntu SMP Thu Jul 15 19:09:17 UTC 2021',
+          operating_system: 'GNU/Linux',
+          hardware_platform: 'x86_64',
+          processor: 'x86_64',
+          release: 'ubuntu',
+          version: 20.0
+        },
+        centos: {
+          kernel_name: 'Linux',
+          kernel_version: '"#1 SMP Wed Jul 21 11:57:15 UTC 2021"',
+          operating_system: 'GNU/Linux',
+          hardware_platform: 'x86_64',
+          processor: 'x86_64',
+          release: 'centos',
+          version: 7.0
+        }
+      }
+
+
+      defaults[name].key?(property) ?
+        defaults[name][property] : nil
+    end
+
   end
 end

data/spec/unit/remote/cpu_spec.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Kanrisuru::Remote::Cpu do
+  before(:all) do
+    StubNetwork.stub!
+  end
+
+  after(:all) do
+    StubNetwork.unstub!
+  end
+
+  let(:host1) do
+    Kanrisuru::Remote::Host.new(
+      host: 'localhost',
+      username: 'ubuntu',
+      keys: ['id_rsa']
+    )
+  end
+
+  it 'responds to methods' do
+    cpu = Kanrisuru::Remote::Cpu.new(host1)
+
+    expect(cpu).to respond_to(:load_average)
+    expect(cpu).to respond_to(:load_average1)
+    expect(cpu).to respond_to(:load_average5)
+    expect(cpu).to respond_to(:load_average15)
+    expect(cpu).to respond_to(:sockets)
+    expect(cpu).to respond_to(:cores)
+    expect(cpu).to respond_to(:total)
+    expect(cpu).to respond_to(:count)
+    expect(cpu).to respond_to(:threads_per_core)
+    expect(cpu).to respond_to(:cores_per_socket)
+    expect(cpu).to respond_to(:numa_nodes)
+    expect(cpu).to respond_to(:vendor_id)
+    expect(cpu).to respond_to(:cpu_family)
+    expect(cpu).to respond_to(:model)
+    expect(cpu).to respond_to(:model_name)
+    expect(cpu).to respond_to(:byte_order)
+    expect(cpu).to respond_to(:address_sizes)
+    expect(cpu).to respond_to(:cpu_mhz)
+    expect(cpu).to respond_to(:cpu_max_mhz)
+    expect(cpu).to respond_to(:cpu_min_mhz)
+    expect(cpu).to respond_to(:hypervisor)
+    expect(cpu).to respond_to(:virtualization_type)
+    expect(cpu).to respond_to(:flags)
+    expect(cpu).to respond_to(:hyperthreading?)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.8.21
+  version: 0.9.1
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -173,13 +173,16 @@ files:
 - lib/kanrisuru/util/os_family.rb
 - lib/kanrisuru/util/signal.rb
 - lib/kanrisuru/version.rb
+- spec/functional/core/apt_spec.rb
 - spec/functional/core/find_spec.rb
 - spec/functional/core/path_spec.rb
 - spec/functional/core/socket_spec.rb
 - spec/functional/core/stat_spec.rb
 - spec/functional/core/stream_spec.rb
 - spec/functional/core/transfer_spec.rb
+- spec/functional/core/yum_spec.rb
 - spec/functional/os_package_spec.rb
+- spec/functional/remote/cluster_spec.rb
 - spec/helper/expect_helpers.rb
 - spec/helper/stub_network.rb
 - spec/helper/test_hosts.rb
@@ -229,6 +232,7 @@ files:
 - spec/unit/fstab_spec.rb
 - spec/unit/kanrisuru_spec.rb
 - spec/unit/mode_spec.rb
+- spec/unit/remote/cpu_spec.rb
 - spec/unit/template_spec.rb
 - spec/unit/util_spec.rb
 - spec/zz_reboot_spec.rb