kanrisuru 0.11.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71358a615946331ad5e1d4a0d6cd51523981ad046d788e5e189ba2c0f49c136e
-  data.tar.gz: 7b6bec928fcd0b0dc05a77a83a8b5dc224d3f54f1ae162911dd742f90cf8ef81
+  metadata.gz: 5c3224eaa762b9db3ba0544a1fd7195f477cd6681cd4f5ddf9638e512d476c5f
+  data.tar.gz: c592a88c34b8ecd9446cccaa800f14f34e48f9cccec6bde70142b11218e194e0
 SHA512:
-  metadata.gz: 26d0eff2b5548b07af887865f3b899e0e30d16ac4cfb1033eb761be282141156f3e24818d8257f432dfdd2a0687ceac4dee8abf2e7b6dfc9d5313950633ecf1a
-  data.tar.gz: 63e244ee640721f7ad653e77d915f150420c9c97949d5f7f441818c13b2c5015fb9c7cb43b503ceff49076823455e3164c06de3e773e8b885f9bb1684e0c1672
+  metadata.gz: 491f30a9148d1c99897eaec94de93357875e4c9dfa41cf86005eeeab2d7fe72fad63726bc0493b5ac2b4058f8ae70d4804778dee8a9e7a802e054c2374346e1d
+  data.tar.gz: 67c4732c93718dd1e49f86b2c06986cccef3e38887ade89815cbb091b026af63427b6ad108ff26847e33874109decb78466ed5d3ca98875401414e376c7fd0e0

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
+--format progress
 --color
 --require spec_helper

data/CHANGELOG.md

@@ -1,11 +1,32 @@
+## Kanrisuru 0.13.0 (December 06, 2021) ##
+*  Add functional test cases for `Kanrisuru::Result` class.
+*  Refactor integration tests for better parallelization with the `parallel_tests` gem. This dropped overall test time from 35 minutes, to 22 minutes after first integration with 1 processor. After scaling upto 8 core machine, the run time dropped to 16 minutes, but was still sending the entire test file to a processor. By splitting up each host test into a seperate file, the run time dropped to a little over 9 minutes. There's probably a way to optimize which test gets run together, but overall a much better scenario.
+
+## Kanrisuru 0.12.1 (December 05, 2021) ##
+*  Fix typo in spec.
+*  Cleanup bad code style.
+
+## Kanrisuru 0.12.0 (December 05, 2021) ##
+*  Add functional test cases for `mount` command.
+*  Fix typos and command preperation for `mount` command.
+*  Refactor `os_package` module into smaller modules for `Kanrisuru::OsPackage::Collection`, `Kanrisuru::OsPackage::Define`, and `Kanrisuru::OsPackage::Include`.
+*  Add `append_array` to `command` class for easy string to array conversion for variable option passing.
+*  Cleanup bad coding styles.
+*  Add parallel testing support for long running integration tests on remote servers. 
+*  Refactor specs to use variable spec_dir path for parallel testing on remote hosts with possible overwriting at the same time.
+
+## Kanrisuru 0.11.1 (December 04, 2021) ##
+*  Cleanup self-assignment branches
+*  Fix linting issues.
+
 ## Kanrisuru 0.11.0 (December 04, 2021) ##
 *  Add codequality badge, cleanup code linting issues.
 *  Fix `fstab` issue with blkid device return type.
-*  Fix `find` spec with sudo permissions. 
+*  Fix `find` spec with sudo permissions.
 *  Change `stub_network` result override to use `block.call` with a conditional check for indvidual command stubs.
 *  Add `architecture` method to `cpu`.
 *  Add functional test cases for `cpu` class.
-*  Add more unit test cases. 
+*  Add more unit test cases.
 
 ## Kanrisuru 0.10.0 (December 03, 2021) ##
 *  Add `stub_command` and `unstub_command` to mock indvidual command results from a remote server.
@@ -199,10 +220,9 @@ cache key to avoid any namespace collisions with the same method name, namely:
 *  Force "-" to "\_" from `os-release` release name in `host.os` module.
 
 ## Kanrisuru 0.2.5 (July 16, 2021) ##
-*  Update gem depedencies to non-zero values
-*  Change summary and description fields for `apt` 
-*  Move `normalize_size` from `apt` core module, to 
-`Kanrisuru::Util::Bits` class.
+*  Update gem depedencies to non-zero values.
+*  Change summary and description fields for `apt`. 
+*  Move `normalize_size` from `apt` core module, to `Kanrisuru::Util::Bits` class.
 *  Add additional test cases for `apt` core module.
 *  Add `-hi` to `who` command to explicility print out ip address for user.
 *  Update `inode?` command to execute without shell user. 

data/README.md

@@ -1,13 +1,20 @@
-[![Latest version](https://img.shields.io/gem/v/kanrisuru?style=flat-square)](https://rubygems.org/gems/kanrisuru) 
-[![Latest version](https://img.shields.io/github/license/avamia/kanrisuru)](https://github.com/avamia/kanrisuru/blob/main/LICENSE.txt) 
-![GitHub repo size](https://img.shields.io/github/repo-size/avamia/kanrisuru) 
-![Codecov](https://img.shields.io/codecov/c/gh/avamia/kanrisuru?token=2Q1BE106B2) 
-![Codacy grade](https://img.shields.io/codacy/grade/9e839eb160bc445ea4e81b64cef22b27) 
-
 <p align='center'>
   <img src="https://s3.us-east-2.amazonaws.com/kanrisuru.com/kanrisuru-banner-02.png" width="600" />
 </p>
 
+<p align="center">
+  <a href="https://rubygems.org/gems/kanrisuru">
+    <img src="https://img.shields.io/gem/v/kanrisuru?style=flat-square" alt="Latest version" />
+  </a> 
+  <a href="https://github.com/avamia/kanrisuru/blob/main/LICENSE.txt">
+    <img src="https://img.shields.io/github/license/avamia/kanrisuru" alt="Latest version" />
+  </a> 
+  <img src="https://img.shields.io/github/repo-size/avamia/kanrisuru" alt="GitHub repo size" />
+  <img src="https://img.shields.io/codecov/c/gh/avamia/kanrisuru?token=2Q1BE106B2" alt="Codecov" /> 
+  <img src="https://img.shields.io/codacy/grade/9e839eb160bc445ea4e81b64cef22b27" alt="Codacy grade" />
+  <img src="https://img.shields.io/codeclimate/maintainability/avamia/kanrisuru" alt="Code Climate maintainability" />
+</p>
+
 # Kanrisuru
 
 Kanrisuru (manage) helps you remotely control infrastructure using Ruby. This is done over SSH. I'm working on building up some basic functionality to help quickly provision, deploy and manage a single host or cluster of hosts.
@@ -28,14 +35,17 @@ gem 'kanrisuru'
 
 And then execute:
 
-    $ bundle install
+```bash
+$ bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install kanrisuru
+```bash
+$ gem install kanrisuru
+```
 
 ## Usage
-
 Run basic commands you would have access to while running on a remote host or on a cluster of hosts.
 
 ### Host
@@ -79,88 +89,6 @@ cluster = Kanrisuru::Remote::Cluster.new(host, {host: 'host2', username: 'alice'
 cluster.execute('uname') #=> {host: 'host1', result: 'Linux'}, {host: 'host2', result: 'Linux'}
 ```
 
-## Methods and Testing 
-
-| Description                           | Ruby             | Shell              | Module | Man                                  | Debian | Ubuntu | Fedora | Centos | RHEL | openSUSE | SLES |
-|---------------------------------------|------------------|--------------------|--------|--------------------------------------|--------|--------|--------|--------|------|----------|------|
-| **System**                            |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| Get CPU Info                          | cpu_info         | lscpu              | core   | https://linux.die.net/man/1/lscpu    | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get CPU architecture                          |  lscpu         | lscpu            | core   | https://linux.die.net/man/1/lscpu    | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get kernel stastics                          |  kernel_statistics         | cat /proc/stat            | core   |   | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get hardware BIOS info                          |  dmi         | dmidecode            | core   | https://linux.die.net/man/8/dmidecode  | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get open file details for processes                          |  lsof         | lsof            | core   | https://linux.die.net/man/8/lsof  | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get Load Average                      | load_average     | cat /proc/load_avg | core   |                                      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get RAM Available                     | free             | cat /proc/meminfo  | core   |                                      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get list of processes                 | ps               | ps                 | core   | https://linux.die.net/man/1/ps       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get Env vars                          | load_env         | env                | core   |                                      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Kill process                          | kill             | kill               | core   | https://linux.die.net/man/1/kill     | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get uptime of system                  | uptime           | cat /proc/uptime   | core   | https://linux.die.net/man/1/uptime   | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get who's logged in                   | w                | w                  | core   | https://linux.die.net/man/1/w        | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Reboot machine                        | reboot           | shutdown           | core   | https://linux.die.net/man/8/reboot   | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Poweroff machine                      | poweroff         | shutdown           | core   | https://linux.die.net/man/8/shutdown | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| **Disk**                              |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| Get Disk Space                        | df               | df                 | core   | https://linux.die.net/man/1/df       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get Disk Usage                        | du               | du                 | core   | https://linux.die.net/man/1/du       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| List block devices                    | lsblk            | lsblk              | core   | https://linux.die.net/man/8/lsblk    | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get block device attributes           | blkid            | blikd              | core   | https://linux.die.net/man/8/blkid    | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| **Mount**                             |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| Mount a filesystem                    | mount            | mount              | core   | https://linux.die.net/man/8/mount    |        |        |        |        |      |          |      |
-| Unmount a filesystem                  | umount           | umount             | core   | https://linux.die.net/man/8/umount   |        |        |        |        |      |          |      |
-| **Group**                             |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| Get Group Id                          | get_gid          | getent group       | core   | https://linux.die.net/man/1/getent   | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get Group                             | get_group        | grep /etc/group    | core   |                                      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Create Group                          | create_group     | groupadd           | core   | https://linux.die.net/man/8/groupadd | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Update Group                          | update_group     | groupmod           | core   | https://linux.die.net/man/8/groupmod | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Delete Group                          | delete_group     | groupdel           | core   | https://linux.die.net/man/8/groupdel | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| **User**                              |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| Get User Id                           | get_uid          | id -u              | core   | https://linux.die.net/man/1/id       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get User                              | get_user         | id                 | core   | https://linux.die.net/man/1/id       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Create User                           | create_user      | useradd            | core   | https://linux.die.net/man/8/useradd  | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Update User                           | update_user      | usermod            | core   | https://linux.die.net/man/8/usermod  | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Delete User                           | delete_user      | userdel            | core   | https://linux.die.net/man/8/userdel  | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| **Path**                              |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| List files and directories            | ls               | ls                 | core   | https://linux.die.net/man/1/ls       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get Current Dir                       | pwd              | pwd                | core   | https://linux.die.net/man/1/pwd      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get Current User                      | whoami           | whoami             | core   | https://linux.die.net/man/1/whoami   | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get Full Path of Shell Command        | which            | which              | core   | https://linux.die.net/man/1/which    | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Real Path                             | realpath         | realpath           | core   | https://linux.die.net/man/1/realpath | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Read link                             | readlink         | readlink           | core   | https://linux.die.net/man/1/readlink | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Change Dir                            | cd               | cd                 | core   |                                      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| **File**                              |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| "Find file, dir, special file device" | find             | find               | core   | https://linux.die.net/man/1/find     | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Stat file info                        | stat             | stat               | core   | https://linux.die.net/man/1/stat     | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Change Permission of file / folder    | chmod            | chmod              | core   | https://linux.die.net/man/1/chmod    | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Change Ownership of file / folder     | chown            | chown              | core   | https://linux.die.net/man/1/chown    | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Hard Link File                        | ln               | ln                 | core   | https://linux.die.net/man/1/ln       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Soft Link File / Dir                  | ln_s             | ln                 | core   | https://linux.die.net/man/1/ln       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Create Directory                      | mkdir            | mkdir              | core   | https://linux.die.net/man/1/mkdir    | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Remove file / directory               | rm               | rm                 | core   | https://linux.die.net/man/1/rm       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Remove Directory                      | rmdir            | rm                 | core   | https://linux.die.net/man/1/rm       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Touch File                            | touch            | touch              | core   | https://linux.die.net/man/1/touch    | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Copy file / directory                 | cp               | cp                 | core   | https://linux.die.net/man/1/cp       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Move file / directory                 | mv               | mv                 | core   | https://linux.die.net/man/1/mv       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| "Get file line, word, and char count" | wc               | wc                 | core   | https://linux.die.net/man/1/wc       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| **Stream**                            |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| Get content from beginning of file    | head             | head               | core   | https://linux.die.net/man/1/head     | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get content from end of file          | tail             | tail               | core   | https://linux.die.net/man/1/tail     | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Read a chunk from a file by lines     | reach_file_chunk | tail and head      | core   |                                      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Echo to stdout or to file             | echo             | echo               | core   | https://linux.die.net/man/1/echo     | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get all content from a file           | cat              | cat                | core   | https://linux.die.net/man/1/cat      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Sed                                   | sed              | sed                | core   | https://linux.die.net/man/1/sed      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| **Archive**                           |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| Tar Files                             | tar              | tar                | core   | https://linux.die.net/man/1/tar      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| **Network**                           |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| Manage network devices                | ip               | ip                 | core   | https://linux.die.net/man/8/ip       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Get Socket Details                    | ss               | ss                 | core   | https://linux.die.net/man/8/ss       | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| **Transfer**                          |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| Upload to remote server               | upload           | scp                | core   | https://linux.die.net/man/1/scp      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Download from remote server           | download         | scp                | core   | https://linux.die.net/man/1/scp      | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| Wget                                  | wget             | wget               | core   | https://linux.die.net/man/1/wget     | [x]    | [x]    | [x]    | [x]    | [x]  | [x]      | [x]  |
-| **Packages**                          |                  |                    |        |                                      |        |        |        |        |      |          |      |
-| Apt               | apt           | apt                | core   | https://linux.die.net/man/1/apt      | [x]    | [x]    |    |    |  |      |  |
-| Yum           | yum         | yum                | core   | https://linux.die.net/man/1/yum      |    |    | [x]    | [x]    | [x]  |      |  |
-| Zypper           | zypper         | zypper                | core   | https://en.opensuse.org/SDB:Zypper_manual   |    |    |   |    |  | [x] | [x] |
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. 

data/kanrisuru.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.5.0'
 
+  gem.add_development_dependency 'parallel_tests', '~> 3.7'
   gem.add_development_dependency 'rspec', '~> 3.10'
   gem.add_development_dependency 'rubocop', '~> 1.12'
   gem.add_development_dependency 'rubocop-rspec', '~> 2.2'

data/lib/kanrisuru/command.rb

@@ -84,6 +84,13 @@ module Kanrisuru
       append_value("| #{value}")
     end
 
+    def append_array(value)
+      return unless Kanrisuru::Util.present?(value)
+
+      value = [value] if value.instance_of?(String)
+      append_value(value.join(' '))
+    end
+
     def append_value(value)
       @raw_command = "#{@raw_command} #{value}"
     end

data/lib/kanrisuru/core/archive.rb

@@ -10,18 +10,16 @@ module Kanrisuru
       FilePath = Struct.new(:path)
 
       def tar(action, file, opts = {})
-        compress    = opts[:compress]
         paths       = opts[:paths]
         exclude     = opts[:exclude]
-        directory   = opts[:directory]
 
         command = Kanrisuru::Command.new('tar --restrict')
 
-        directory = realpath(directory, strip: true).path if directory
+        directory = opts[:directory] ? realpath(opts[:directory], strip: true).path : nil
         command.append_arg('-C', directory)
         command.append_arg('-f', file)
 
-        set_compression(command, compress) if compress
+        set_compression(command, opts[:compress]) if opts[:compress]
 
         case action
         when 'list', 't'
@@ -58,10 +56,7 @@ module Kanrisuru
           command.append_flag('--unlink-first', opts[:unlink_first])
           command.append_flag('--recursive-unlink', opts[:recursive_unlink])
 
-          if Kanrisuru::Util.present?(paths)
-            paths = paths.instance_of?(String) ? [paths] : paths
-            command << paths.join(' ')
-          end
+          command.append_array(paths)
 
           execute_shell(command)
           Kanrisuru::Result.new(command)
@@ -70,46 +65,31 @@ module Kanrisuru
           command.append_flag('--multi-volume', opts[:multi_volume])
 
           if Kanrisuru::Util.present?(exclude)
-            exclude_options = exclude.instance_of?(String) ? [exclude] : exclude
-            exclude_options.each do |exclude_option|
-              command << "--exclude=#{exclude_option}"
+            options = exclude.instance_of?(String) ? [exclude] : exclude
+            options.each do |option|
+              command << "--exclude=#{option}"
             end
           end
 
-          if Kanrisuru::Util.present?(paths)
-            paths = paths.instance_of?(String) ? [paths] : paths
-            command << paths.join(' ')
-          end
+          command.append_array(paths)
 
           execute_shell(command)
           Kanrisuru::Result.new(command)
         when 'append', 'r'
           command.append_flag('-r')
-
-          if Kanrisuru::Util.present?(paths)
-            paths = paths.instance_of?(String) ? [paths] : paths
-            command << paths.join(' ')
-          end
+          command.append_array(paths)
 
           execute_shell(command)
           Kanrisuru::Result.new(command)
         when 'catenate', 'concat', 'A'
           command.append_flag('-A')
-
-          if Kanrisuru::Util.present?(paths)
-            paths = paths.instance_of?(String) ? [paths] : paths
-            command << paths.join(' ')
-          end
+          command.append_array(paths)
 
           execute_shell(command)
           Kanrisuru::Result.new(command)
         when 'update', 'u'
           command.append_flag('-u')
-
-          if Kanrisuru::Util.present?(paths)
-            paths = paths.instance_of?(String) ? [paths] : paths
-            command << paths.join(' ')
-          end
+          command.append_array(paths)
 
           execute_shell(command)
           Kanrisuru::Result.new(command)
@@ -122,11 +102,7 @@ module Kanrisuru
         when 'delete'
           command.append_flag('--delete')
           command.append_arg('--occurrence', opts[:occurrence])
-
-          if Kanrisuru::Util.present?(paths)
-            paths = paths.instance_of?(String) ? [paths] : paths
-            command << paths.join(' ')
-          end
+          command.append_array(paths)
 
           execute_shell(command)
           Kanrisuru::Result.new(command)

data/lib/kanrisuru/core/dmi.rb

@@ -511,7 +511,7 @@ module Kanrisuru
         return unless Kanrisuru::Util.present?(opts[:types])
 
         types = opts[:types]
-        types = types.instance_of?(Array) ? types : [types]
+        types = [types] if types.instance_of?(String)
 
         types.each do |type|
           type = parse_dmi_type(type)

data/lib/kanrisuru/core/file.rb

@@ -64,12 +64,9 @@ module Kanrisuru
           command << dest
         elsif opts[:target_directory]
           command.append_arg('-t', dest)
-
-          source = source.instance_of?(String) ? [source] : source
-          command << source.join(' ')
+          command.append_array(source)
         else
-          source = source.instance_of?(String) ? [source] : source
-          command << source.join(' ')
+          command.append_array(source)
           command << dest
         end
 
@@ -108,13 +105,9 @@ module Kanrisuru
           command << dest
         elsif opts[:target_directory]
           command.append_arg('-t', dest)
-
-          source = source.instance_of?(String) ? [source] : source
-          command << source.join(' ')
+          command.append_array(source)
         else
-          source = source.instance_of?(String) ? [source] : source
-
-          command << source.join(' ')
+          command.append_array(source)
           command << dest
         end
 

data/lib/kanrisuru/core/find.rb

@@ -30,13 +30,9 @@ module Kanrisuru
         end
 
         if Kanrisuru::Util.present?(paths)
-          if paths.instance_of?(Array)
-            paths = paths.join(' ')
-          elsif paths.class != String
-            raise ArgumentError, 'Invalid paths type'
-          end
+          raise ArgumentError, 'Invalid paths type' unless [String, Array].include?(paths.class)
 
-          command << paths
+          command.append_array(paths)
         end
 
         command.append_flag('-executable', opts[:executable])

data/lib/kanrisuru/core/mount.rb

@@ -10,9 +10,6 @@ module Kanrisuru
 
       def mount(opts = {})
         type = opts[:type]
-        all  = opts[:all]
-        device = opts[:device]
-        directory = opts[:directory]
 
         bind_old = opts[:bind_old]
         bind_new = opts[:bind_new]
@@ -39,13 +36,12 @@ module Kanrisuru
         else
           command.append_arg('-L', opts[:label])
           command.append_arg('-U', opts[:uuid])
-          command.append_flag('-n', opts[:no_mtab])
           command.append_flag('-f', opts[:fake])
           command.append_flag('-i', opts[:internal_only])
           command.append_flag('-s', opts[:sloppy])
 
           command.append_flag('--no-mtab', opts[:no_mtab])
-          command.append_flag('--no-canonicalizeb', opts[:no_canonicalize])
+          command.append_flag('--no-canonicalize', opts[:no_canonicalize])
 
           fs_options = nil
           if Kanrisuru::Util.present?(type)
@@ -55,14 +51,14 @@ module Kanrisuru
             fs_options = Kanrisuru::Remote::Fstab::Options.new('common', fs_opts)
           end
 
-          if Kanrisuru::Util.present?(all)
+          if Kanrisuru::Util.present?(opts[:all])
             command.append_flag('-a')
             add_test_opts(command, opts[:test_opts], type)
           else
             command.append_arg('-o', fs_options.to_s)
 
-            command << device if Kanrisuru::Util.present?(device)
-            command << directory if Kanrisuru::Util.present?(directory)
+            command << opts[:device] if Kanrisuru::Util.present?(opts[:device])
+            command << opts[:directory] if Kanrisuru::Util.present?(opts[:directory])
           end
         end
 
@@ -75,12 +71,6 @@ module Kanrisuru
         type = opts[:type]
         command = Kanrisuru::Command.new('umount')
 
-        if Kanrisuru::Util.present?(all)
-          command.append_flag('-a')
-          add_type(command, type)
-          add_test_opts(command, opts[:test_opts], type)
-        end
-
         command.append_flag('--fake', opts[:fake])
         command.append_flag('--no-canonicalize', opts[:no_canonicalize])
         command.append_flag('-n', opts[:no_mtab])
@@ -90,6 +80,15 @@ module Kanrisuru
         command.append_flag('-l', opts[:lazy])
         command.append_flag('-f', opts[:force])
 
+        if Kanrisuru::Util.present?(all)
+          command.append_flag('-a')
+          add_type(command, type)
+          add_test_opts(command, opts[:test_opts], type)
+        else
+          command << opts[:device] if Kanrisuru::Util.present?(opts[:device])
+          command << opts[:directory] if Kanrisuru::Util.present?(opts[:directory])
+        end
+
         execute_shell(command)
 
         Kanrisuru::Result.new(command)
@@ -115,7 +114,7 @@ module Kanrisuru
 
         test_types.each do |t|
           device_opts = Kanrisuru::Util::FsMountOpts.get_device(t)
-          raise ArugmentError, "Invalid fstype: #{t}" unless device_opts
+          raise ArgumentError, "Invalid fstype: #{t}" unless device_opts
         end
 
         command.append_arg('-t', type)

data/lib/kanrisuru/core/stream.rb

@@ -95,8 +95,7 @@ module Kanrisuru
         command.append_flag('-b', opts[:number_nonblank])
         command.append_flag('-A', opts[:show_all])
 
-        files = files.instance_of?(String) ? [files] : files
-        command << files.join(' ')
+        command.append_array(files)
 
         append_file(command, opts)
         execute_shell(command)

data/lib/kanrisuru/core/zypper.rb

@@ -181,8 +181,7 @@ module Kanrisuru
         command.append_flag('--metadata', opts[:metadata])
         command.append_flag('--raw-metadata', opts[:raw_metadata])
         command.append_flag('--all', opts[:all])
-
-        command << opts[:repos]
+        command.append_array(opts[:repos])
 
         execute_shell(command)
 
@@ -276,11 +275,7 @@ module Kanrisuru
           command.append_arg('--medium-type', opts[:medium_type])
         end
 
-        repos = opts[:repos]
-        if Kanrisuru::Util.present?(repos)
-          repos = repos.instance_of?(String) ? [repos] : repos
-          command << repos.join(' ')
-        end
+        command.append_array(opts[:repos])
 
         execute_shell(command)
 
@@ -336,11 +331,7 @@ module Kanrisuru
           command.append_arg('--media-type', opts[:media_type])
         end
 
-        repos = opts[:repos]
-        if Kanrisuru::Util.present?(repos)
-          repos = repos.instance_of?(String) ? [repos] : repos
-          command << repos.join(' ')
-        end
+        command.append_array(opts[:repos])
 
         execute_shell(command)
 
@@ -372,11 +363,7 @@ module Kanrisuru
         command.append_flag('--refresh', opts[:refresh])
         command.append_flag('--no-refresh', opts[:no_refresh])
 
-        services = opts[:services]
-        if Kanrisuru::Util.present?(services)
-          services = services.instance_of?(Array) ? services : [services]
-          command << services.join(' ')
-        end
+        command.append_array(opts[:services])
 
         execute_shell(command)
 
@@ -386,15 +373,11 @@ module Kanrisuru
       def zypper_remove_service(opts)
         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])
-
-        services = opts[:services]
-        if Kanrisuru::Util.present?(services)
-          services = services.instance_of?(String) ? [services] : services
-          command << services.join(' ')
-        end
+        command.append_array(opts[:services])
 
         execute_shell(command)
 

data/lib/kanrisuru/os_package/collection.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module OsPackage
+    module Collection
+      def os_collection(mod, opts = {})
+        os_method_properties = mod.instance_variable_get(:@os_method_properties)
+        os_method_names = os_method_properties.keys
+
+        namespace          = opts[:namespace]
+        namespace_instance = nil
+
+        if namespace
+          ## Define the namespace as an eigen class instance on the host.
+          ## Namespaced instances will access core host methods
+          ## with @host instance variable.
+
+          if Kanrisuru::Remote::Cluster.instance_variable_defined?("@#{namespace}")
+            namespace_class = Kanrisuru::Remote::Cluster.const_get(Kanrisuru::Util.camelize(namespace))
+            namespace_instance = instance_variable_get("@#{namespace}")
+          else
+            namespace_class    = Kanrisuru::Remote::Cluster.const_set(Kanrisuru::Util.camelize(namespace), Class.new)
+            namespace_instance = Kanrisuru::Remote::Cluster.instance_variable_set("@#{namespace}", namespace_class.new)
+
+            class_eval do
+              define_method namespace do
+                namespace_instance.instance_variable_set(:@cluster, self)
+                namespace_instance
+              end
+            end
+          end
+
+          namespace_class.class_eval do
+            os_method_names.each do |method_name|
+              define_method method_name do |*args, &block|
+                cluster = namespace_instance.instance_variable_get(:@cluster)
+                hosts = cluster.instance_variable_get(:@hosts)
+                hosts.map do |host_addr, host|
+                  { host: host_addr, result: host.send(namespace).send(method_name, *args, &block) }
+                end
+              end
+            end
+          end
+        else
+          class_eval do
+            os_method_names.each do |method_name|
+              define_method method_name do |*args, &block|
+                @hosts.map do |host_addr, host|
+                  { host: host_addr, result: host.send(method_name, *args, &block) }
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kanrisuru/os_package/define.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Kanrisuru
+  module OsPackage
+    module Define
+      def self.extended(base)
+        base.instance_variable_set(:@os_method_properties, {})
+        base.instance_variable_set(:@os_methods, Set.new)
+      end
+
+      def os_define(os_name, method_name, options = {})
+        unique_method_name = options[:alias] || method_name
+
+        @os_methods.add(method_name)
+
+        if @os_method_properties.key?(unique_method_name)
+          params = {
+            os_name: os_name.to_s,
+            method_name: method_name,
+            options: options
+          }
+
+          @os_method_properties[unique_method_name].prepend(params)
+        else
+          @os_method_properties[unique_method_name] = [{
+            os_name: os_name.to_s,
+            method_name: method_name,
+            options: options
+          }]
+        end
+      end
+    end
+  end
+end