kanrisuru 0.8.18 → 0.8.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e813c072c86f8c0b076a90d2b8136fb9bc64271df996c6c54c4e2bf6c7b5806
-  data.tar.gz: a763991aa4979eb17c1c0e123d80c2057552b2caf9be24358b39659a292e241d
+  metadata.gz: 90fafd703817d1e16744262817dd0b5e5a51ea942f2853b154f4bd2746295fd7
+  data.tar.gz: 0e0b35e325d3237faacbb71f22873b1c661495af0d93830e7ad91babbb060b3c
 SHA512:
-  metadata.gz: 52be23f3a72de4d6f9633e8b01470949035aec9be4123a87bbfc2e4a93120c463fa1470a69030ad696fbabb389ce60890b64925d129654f513a4baa392846ca8
-  data.tar.gz: 749dfdd773a1256575ab262a73f56be48ec6caaef21e8499ea9fb42d9cb2ae79e569d3f8b9581aa153d9d7031eef88d46c64a9a68900d27e00cf85e28885d45d
+  metadata.gz: 76e116b83a5c119c0672b8ec5f1bac8f23307e1e06d3b393804df912f6110faf63527ca126ed4eb164d6ba58ef4ba92f3d1c3e15b252dc703058e39fc3ab4ba3
+  data.tar.gz: 8e80e6457fd848d4dee5a31e33881c91458402df16cc82845b6300afc2543fe583fe48aeb2914e4329de9d9a668b6afbc2dd533d56886bd6fe0656ede58e5c95

data/CHANGELOG.md

@@ -1,4 +1,15 @@
-## Kanrisuru 0.8.17 (October 16 2021)
+## Kanrisuru 0.8.19 (October 31, 2021)
+* Add functional test cases for `ss` command.
+* Enforce contraints on `family` parameter for `ss` command.
+* Deprecating `string_join_array` in favor of `array_join_string`. Both methods do the same thing, and the `array_join_string` has a better nameing interface; will be removed in the next major release.
+* Replace `string_join_array` method calls in `apt`, `transfer`, `yum`, and `zypper` with `array_join_string`. 
+
+## Kanrisuru 0.8.18 (October 19, 2021)
+* Add functional test cases for `find` commmand.
+* Add `regex_type` option for `find` command.
+* Fix bug with `size` option when using number in a string format, regex testing has been simplified on matching correctness for size with options like `100`, `+100`, `-100M` for comparitive fields.
+
+## Kanrisuru 0.8.17 (October 16, 2021)
 * Add functional test cases for `transfer` module
 * Update wget command to accept hash for `headers` opt.
 

data/lib/kanrisuru/core/apt.rb

@@ -142,7 +142,7 @@ module Kanrisuru
         command = Kanrisuru::Command.new('apt-get purge')
         command.append_flag('-y')
 
-        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
         command << packages
 
         execute_shell(command)
@@ -153,7 +153,7 @@ module Kanrisuru
         command = Kanrisuru::Command.new('apt-get remove')
         command.append_flag('-y')
 
-        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
         command << packages
 
         execute_shell(command)
@@ -168,7 +168,7 @@ module Kanrisuru
         command.append_flag('--only-upgrade', opts[:only_upgrade])
         command.append_flag('--reinstall', opts[:reinstall])
 
-        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
         command << packages
 
         execute_shell(command)
@@ -200,7 +200,7 @@ module Kanrisuru
         command = Kanrisuru::Command.new('apt show')
         command.append_flag('-a')
 
-        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
         command << packages
 
         execute_shell(command)

data/lib/kanrisuru/core/socket.rb

@@ -38,9 +38,14 @@ module Kanrisuru
         'LAST-ACK' => 'last-ack', 'CLOSING' => 'closing'
       }.freeze
 
+      NETWORK_FAMILIES = %w[
+        unix inet inet6 link netlink
+      ].freeze
+
       def ss(opts = {})
         state = opts[:state]
         expression = opts[:expression]
+        family = opts[:family]
 
         command = Kanrisuru::Command.new('ss')
 
@@ -53,7 +58,10 @@ module Kanrisuru
         command.append_flag('-x', opts[:unix])
         command.append_flag('-w', opts[:raw])
 
-        command.append_arg('-f', opts[:family])
+        if Kanrisuru::Util.present?(family)
+          raise ArgumentError, 'invalid family type' if !NETWORK_FAMILIES.include?(family)
+          command.append_arg('-f', family)
+        end
 
         if Kanrisuru::Util.present?(state)
           raise ArgumentError, 'invalid filter state' if !TCP_STATES.include?(state) && !OTHER_STATES.include?(state)

data/lib/kanrisuru/core/transfer.rb

@@ -87,7 +87,7 @@ module Kanrisuru
         command.append_arg('--quota', opts[:quota])
 
         if Kanrisuru::Util.present?(opts[:restrict_file_names])
-          command.append_arg('--restrict-file-names', Kanrisuru::Util.string_join_array(opts[:restrict_file_names]))
+          command.append_arg('--restrict-file-names', Kanrisuru::Util.array_join_string(opts[:restrict_file_names]))
         end
 
         case opts[:family]

data/lib/kanrisuru/core/yum.rb

@@ -78,7 +78,7 @@ module Kanrisuru
         command = Kanrisuru::Command.new('yum install')
         command.append_flag('-y')
 
-        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
         command << packages
 
         execute_shell(command)
@@ -91,7 +91,7 @@ module Kanrisuru
         command.append_flag('-y')
 
         if Kanrisuru::Util.present?(opts[:repos])
-          repos = Kanrisuru::Util.string_join_array(opts[:repos], ' ')
+          repos = Kanrisuru::Util.array_join_string(opts[:repos], ' ')
           command << repos
         end
 
@@ -136,7 +136,7 @@ module Kanrisuru
         command = Kanrisuru::Command.new('yum remove')
         command.append_flag('-y')
 
-        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
         raise ArugmentError, "can't remove yum" if packages.include?('yum')
 
         command << packages
@@ -172,7 +172,7 @@ module Kanrisuru
         command = Kanrisuru::Command.new('yum erase')
         command.append_flag('-y')
 
-        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
         raise ArugmentError, "can't erase yum" if packages.include?('yum')
 
         command << packages
@@ -198,7 +198,7 @@ module Kanrisuru
       def yum_search(opts)
         command = Kanrisuru::Command.new('yum search')
         command.append_flag('all', opts[:all])
-        command << Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        command << Kanrisuru::Util.array_join_string(opts[:packages], ' ')
 
         pipe_output_newline(command)
 
@@ -228,7 +228,7 @@ module Kanrisuru
         command = Kanrisuru::Command.new('yum repolist')
         command.append_flag('--verbose')
 
-        command << Kanrisuru::Util.string_join_array(opts[:repos], ' ') if opts[:repos]
+        command << Kanrisuru::Util.array_join_string(opts[:repos], ' ') if opts[:repos]
 
         execute_shell(command)
 
@@ -287,7 +287,7 @@ module Kanrisuru
         command.append_flag('--quiet')
         command.append_flag('installed', opts[:installed])
 
-        command << Kanrisuru::Util.string_join_array(opts[:packages], ' ') if opts[:packages]
+        command << Kanrisuru::Util.array_join_string(opts[:packages], ' ') if opts[:packages]
 
         execute_shell(command)
 

data/lib/kanrisuru/core/zypper.rb

@@ -567,7 +567,7 @@ module Kanrisuru
         zypper_repos_opt(command, opts)
         zypper_package_type_opt(command, opts)
 
-        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
         command << packages
 
         execute_shell(command)
@@ -663,7 +663,7 @@ module Kanrisuru
         zypper_download_and_install_opts(command, opts)
         zypper_expert_opts(command, opts)
 
-        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
         command << packages
 
         execute_shell(command)
@@ -714,7 +714,7 @@ module Kanrisuru
         zypper_package_type_opt(command, opts)
         zypper_solver_opts(command, opts)
 
-        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
         command << packages
 
         execute_shell(command)
@@ -783,7 +783,7 @@ module Kanrisuru
         zypper_repos_opt(command, opts)
         zypper_package_type_opt(command, opts)
 
-        packages = Kanrisuru::Util.string_join_array(opts[:packages], ' ')
+        packages = Kanrisuru::Util.array_join_string(opts[:packages], ' ')
         command << packages
 
         execute_shell(command)

data/lib/kanrisuru/util.rb

@@ -21,6 +21,10 @@ module Kanrisuru
     end
 
     def self.string_join_array(arg, field = ',')
+      Kanrisuru.logger.info do
+        'DEPRECATION WARNING: string_join_array will be removed in the upcoming major release. Use array_join_string instead.'
+      end
+      
       array = arg.instance_of?(String) ? [arg] : arg
       array.join(field)
     end

data/lib/kanrisuru/version.rb

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

data/spec/functional/core/socket_spec.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+StubNetwork.stub!
+
+RSpec.describe Kanrisuru::Core::Socket do
+  let(:host) do
+    Kanrisuru::Remote::Host.new(
+      host: 'localhost',
+      username: 'ubuntu',
+      keys: ['id_rsa']
+    )
+  end
+
+  it 'prepares ss command' do
+    expect_command(host.ss, 'ss -a -m')
+
+    expect_command(host.ss(
+        numeric: true,
+        tcp: true,
+        udp: true,
+        unix: true,
+        raw: true
+      ),
+      'ss -a -m -n -t -u -x -w'
+    )
+
+    expect_command(host.ss(
+        family: 'inet'
+      ),
+      'ss -a -m -f inet'
+    )
+
+    expect {
+      host.ss(family: 'inet5')
+    }.to raise_error(ArgumentError)
+
+    expect_command(host.ss(
+        state: 'established'
+      ),
+      'ss -a -m state established'
+    )
+
+    expect_command(host.ss(
+        state: 'connected'
+      ),
+      'ss -a -m state connected'
+    )
+
+    expect {
+      host.ss(state: 'test')
+    }.to raise_error(ArgumentError)
+
+    expect_command(host.ss(
+        expression: "'( dport = :ssh or sport = :ssh )'"
+      ),
+      "ss -a -m '( dport = :ssh or sport = :ssh )'"
+    )
+  end
+end

data/spec/unit/core/socket_spec.rb

@@ -20,6 +20,11 @@ RSpec.describe Kanrisuru::Core::Socket do
         closed close-wait last-ack listening closing
       ]
     )
+    expect(Kanrisuru::Core::Socket::NETWORK_FAMILIES).to eq(
+      %w[
+        unix inet inet6 link netlink
+      ]
+    )
     expect(Kanrisuru::Core::Socket::OTHER_STATES).to eq(
       %w[
         all connected synchronized bucket syn-recv

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.8.18
+  version: 0.8.19
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -175,6 +175,7 @@ files:
 - lib/kanrisuru/version.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