kanrisuru 0.8.19 → 0.8.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90fafd703817d1e16744262817dd0b5e5a51ea942f2853b154f4bd2746295fd7
-  data.tar.gz: 0e0b35e325d3237faacbb71f22873b1c661495af0d93830e7ad91babbb060b3c
+  metadata.gz: cb7aac288555c629e9eb74721c2f0c21f45812426d4ac9b6e7fb1700433d360a
+  data.tar.gz: 16b5151fe50610ae0fe7ad4faa0eed72e49ad8aca017c7d6c609e377144c2532
 SHA512:
-  metadata.gz: 76e116b83a5c119c0672b8ec5f1bac8f23307e1e06d3b393804df912f6110faf63527ca126ed4eb164d6ba58ef4ba92f3d1c3e15b252dc703058e39fc3ab4ba3
-  data.tar.gz: 8e80e6457fd848d4dee5a31e33881c91458402df16cc82845b6300afc2543fe583fe48aeb2914e4329de9d9a668b6afbc2dd533d56886bd6fe0656ede58e5c95
+  metadata.gz: f4b592883b2f3541ae1ab7a4cbbf7ddaf626d376a39464401b428506eca21bf9546688384e0b8eb87e8f46c29a5c734356c4d407bb2f0aa47fe003d3e1e71a84
+  data.tar.gz: 0d8d36445c59ea52b7bbe25cfbc5782f21a42548fccdbcd3ae8f34431528b76a3a7bc13059583756c9fc4ce969b966479b632818dc2dc4dd23ef573a63c569e1

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 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.
+
+## Kanrisuru 0.8.20 (November 13, 2021)
+* Unstub network requests for full rspec test-suite run
+
 ## Kanrisuru 0.8.19 (October 31, 2021)
 * Add functional test cases for `ss` command.
 * Enforce contraints on `family` parameter for `ss` command.

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

@@ -247,7 +247,7 @@ module Kanrisuru
     def symbolic_to_numeric(ref)
       conversions = {
         '---' => 0,
-        '---x' => 1,
+        '--x' => 1,
         '-w-' => 2,
         '-wx' => 3,
         'r--' => 4,

data/lib/kanrisuru/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanrisuru
-  VERSION = '0.8.19'
+  VERSION = '0.8.23'
 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/find_spec.rb

@@ -2,9 +2,15 @@
 
 require 'spec_helper'
 
-StubNetwork.stub!
-
 RSpec.describe Kanrisuru::Core::Find do
+  before(:all) do
+    StubNetwork.stub!
+  end
+
+  after(:all) do
+    StubNetwork.unstub!
+  end
+
   let(:host) do
     Kanrisuru::Remote::Host.new(
       host: 'localhost',

data/spec/functional/core/path_spec.rb

@@ -2,9 +2,15 @@
 
 require 'spec_helper'
 
-StubNetwork.stub!
-
 RSpec.describe Kanrisuru::Core::Path do
+  before(:all) do
+    StubNetwork.stub!
+  end
+
+  after(:all) do
+    StubNetwork.unstub!
+  end
+
   let(:host) do
     Kanrisuru::Remote::Host.new(
       host: 'localhost',

data/spec/functional/core/socket_spec.rb

@@ -2,9 +2,15 @@
 
 require 'spec_helper'
 
-StubNetwork.stub!
-
 RSpec.describe Kanrisuru::Core::Socket do
+  before(:all) do
+    StubNetwork.stub!
+  end
+
+  after(:all) do
+    StubNetwork.unstub!
+  end
+
   let(:host) do
     Kanrisuru::Remote::Host.new(
       host: 'localhost',

data/spec/functional/core/stat_spec.rb

@@ -2,9 +2,15 @@
 
 require 'spec_helper'
 
-StubNetwork.stub!
-
 RSpec.describe Kanrisuru::Core::Stat do
+  before(:all) do
+    StubNetwork.stub!
+  end
+
+  after(:all) do
+    StubNetwork.unstub!
+  end
+
   let(:host) do
     Kanrisuru::Remote::Host.new(
       host: 'localhost',

data/spec/functional/core/stream_spec.rb

@@ -2,9 +2,15 @@
 
 require 'spec_helper'
 
-StubNetwork.stub!
-
 RSpec.describe Kanrisuru::Core::Stream do
+  before(:all) do
+    StubNetwork.stub!
+  end
+
+  after(:all) do
+    StubNetwork.unstub!
+  end
+
   let(:host) do
     Kanrisuru::Remote::Host.new(
       host: 'localhost',

data/spec/functional/core/transfer_spec.rb

@@ -2,9 +2,15 @@
 
 require 'spec_helper'
 
-StubNetwork.stub!
-
 RSpec.describe Kanrisuru::Core::Stat do
+  before(:all) do
+    StubNetwork.stub!
+  end
+
+  after(:all) do
+    StubNetwork.unstub!
+  end
+
   let(:host) do
     Kanrisuru::Remote::Host.new(
       host: 'localhost',

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/helper/expect_helpers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 def expect_command(result, string)
-  puts result.command.raw_command
+  # puts result.command.raw_command
   expect(result.command.raw_command).to eq(
     string
   )

data/spec/helper/stub_network.rb

@@ -2,42 +2,93 @@
 
 class StubNetwork
   class << self
-    def stub!
-      ## Stub out the execute_with_retries method to
-      ## test functionality of host commands
-      Kanrisuru::Remote::Host.class_eval do
-        private
-
-        def execute_with_retries(command)
-          command.handle_status(0)
-          command.handle_data(nil)
+    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
+          def execute_with_retries(command)
+            command.handle_status(0)
+            command.handle_data(nil)
 
-          command
+            command
+          end
         end
       end
 
-      Kanrisuru::Remote::Os.class_eval do
-        def initialize(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
+      unless Kanrisuru::Remote::Os.instance_methods(false).include?(:initialize_alias)
+        Kanrisuru::Remote::Os.class_eval do
+          alias_method :initialize_alias, :initialize 
+          define_method :initialize do |host|
+            @host = host
+
+            @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
 
-      Kanrisuru::Result.class_eval do
-        def initialize(command)
-          @command = command
-          @data = nil
+      unless Kanrisuru::Result.instance_methods(false).include?(:initialize_alias)
+        Kanrisuru::Result.class_eval do
+          alias_method :initialize_alias, :initialize 
+          def initialize(command)
+            @command = command
+            @data = nil
 
-          @error = @command.to_a if @command.failure?
+            @error = @command.to_a if @command.failure?
+          end
         end
       end
     end
+
+    def unstub!
+      Kanrisuru::Remote::Host.class_eval do
+        alias_method :execute_with_retries, :execute_with_retries_alias
+      end
+
+      Kanrisuru::Remote::Os.class_eval do
+        alias_method :initialize, :initialize_alias 
+      end
+
+      Kanrisuru::Result.class_eval do
+        alias_method :initialize, :initialize_alias 
+      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/mode_spec.rb

@@ -79,6 +79,31 @@ RSpec.describe Kanrisuru::Mode do
     expect(mode.other.all?).to eq(true)
     expect(mode.other.to_i).to eq(7)
     expect(mode.other.symbolic).to eq('rwx')
+
+    mode = described_class.new("---x--x--x")
+    expect(mode.directory?).to eq(false)
+    expect(mode.numeric).to eq("111")
+
+    expect(mode.owner.read?).to eq(false)
+    expect(mode.owner.write?).to eq(false)
+    expect(mode.owner.execute?).to eq(true)
+    expect(mode.owner.all?).to eq(false)
+    expect(mode.owner.to_i).to eq(1)
+    expect(mode.owner.symbolic).to eq('--x')
+
+    expect(mode.group.read?).to eq(false)
+    expect(mode.group.write?).to eq(false)
+    expect(mode.group.execute?).to eq(true)
+    expect(mode.group.all?).to eq(false)
+    expect(mode.group.to_i).to eq(1)
+    expect(mode.group.symbolic).to eq('--x')
+
+    expect(mode.other.read?).to eq(false)
+    expect(mode.other.write?).to eq(false)
+    expect(mode.other.execute?).to eq(true)
+    expect(mode.other.all?).to eq(false)
+    expect(mode.other.to_i).to eq(1)
+    expect(mode.other.symbolic).to eq('--x')
   end
 
   it 'changes mode numerically globally' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.8.19
+  version: 0.8.23
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-31 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -173,12 +173,14 @@ 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/helper/expect_helpers.rb
 - spec/helper/stub_network.rb