kanrisuru 0.8.17 → 0.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fddbe577acc9083ead480c1c69dad8e74c3b00c6a66cd770655b626bf022cb7
-  data.tar.gz: dac3e1bfc3ddcb59eff30b620e080210f23e0a2586ab0b38031db01920504c90
+  metadata.gz: 6e813c072c86f8c0b076a90d2b8136fb9bc64271df996c6c54c4e2bf6c7b5806
+  data.tar.gz: a763991aa4979eb17c1c0e123d80c2057552b2caf9be24358b39659a292e241d
 SHA512:
-  metadata.gz: 43537168eee374dbe372259ea263a139dd9999ad242666e1f036adecee96df6d1040e1a03cc083ca9e1ba6704c61d29c6146e97356951564927278f61e14762a
-  data.tar.gz: 45184c4eeafd9447b4e46f323a65d545f666eaeac33bd3e1e19f1d308fc1555ff6042850eecad47368ce5927fa8065b55e6cb141ca09731b3dd190f79fe0134a
+  metadata.gz: 52be23f3a72de4d6f9633e8b01470949035aec9be4123a87bbfc2e4a93120c463fa1470a69030ad696fbabb389ce60890b64925d129654f513a4baa392846ca8
+  data.tar.gz: 749dfdd773a1256575ab262a73f56be48ec6caaef21e8499ea9fb42d9cb2ae79e569d3f8b9581aa153d9d7031eef88d46c64a9a68900d27e00cf85e28885d45d

data/lib/kanrisuru/core/find.rb

@@ -10,6 +10,7 @@ module Kanrisuru
       os_define :linux, :find
 
       FilePath = Struct.new(:path)
+      REGEX_TYPES = ['emacs', 'posix-awk', 'posix-basic', 'posix-egrep', 'posix-extended']
 
       def find(opts = {})
         paths      = opts[:paths]
@@ -32,7 +33,7 @@ module Kanrisuru
           if paths.instance_of?(Array)
             paths = paths.join(' ')
           elsif paths.class != String
-            raise 'Invalid paths type'
+            raise ArgumentError, 'Invalid paths type'
           end
 
           command << paths
@@ -64,13 +65,19 @@ module Kanrisuru
         command.append_arg('-cmin', opts[:cmin])
         command.append_arg('-mmin', opts[:mmin])
 
-        command.append_arg('-regex', "'#{regex}'") if Kanrisuru::Util.present?(regex)
+        if Kanrisuru::Util.present?(opts[:regex_type])
+          unless REGEX_TYPES.include?(opts[:regex_type])
+            raise ArgumentError, 'invalid regex type'
+          end
 
-        if size.instance_of?(String)
-          match = Regexp.new(/^([-+]+)\s*?(\d+)([bcwkMG])$/).match(size)
+          command.append_arg('-regextype', opts[:regex_type])
+        end
 
-          raise ArgumentError, "invalid size string: '#{@size}'" if match.nil? || match.captures.include?(nil)
+        command.append_arg('-regex', "'#{regex}'") if Kanrisuru::Util.present?(regex)
 
+        if size.instance_of?(String)
+          regex = Regexp.new(/^([-+])?(\d+)([bcwkMG])*$/)
+          raise ArgumentError, "invalid size string: '#{@size}'" unless regex.match?(size) 
           command.append_arg('-size', size)
         elsif size.instance_of?(Integer)
           command.append_arg('-size', size)

data/lib/kanrisuru/version.rb

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

data/spec/functional/core/find_spec.rb

@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+StubNetwork.stub!
+
+RSpec.describe Kanrisuru::Core::Find do
+  let(:host) do
+    Kanrisuru::Remote::Host.new(
+      host: 'localhost',
+      username: 'ubuntu',
+      keys: ['id_rsa']
+    )
+  end
+
+  it 'prepares find command' do
+    expect_command(host.find, "find")
+
+    expect_command(host.find(follow: 'never'), "find -P")
+    expect_command(host.find(follow: 'always'), "find -L")
+    expect_command(host.find(follow: 'command'), "find -H")
+
+    expect_command(host.find(paths: '/etc'), "find /etc")
+    expect_command(host.find(paths: ['/etc', '/var', '/home']), "find /etc /var /home")
+
+    expect {
+      host.find(paths: 1)
+    }.to raise_error(ArgumentError)
+
+    expect_command(host.find(paths: '/', 
+        executable: true,
+        empty: true,
+        readable: true,
+        writeable: true,
+        nogroup: true,
+        nouser: true,
+        mount: true
+      ), 
+      "find / -executable -empty -readable -nogroup -nouser -mount"
+    )
+
+    expect_command(host.find(paths: '/', 
+        path: "/lib",
+        name: '*.so',
+        gid: 0,
+        uid: 0,
+        user: 'root',
+        group: 'root',
+        links: 2,
+        mindepth: 0,
+        maxdepth: 100   
+      ),
+      "find / -path /lib -name *.so -gid 0 -uid 0 -user root -group root -links 2 -maxdepth 100 -mindepth 0"
+    )
+
+    expect_command(host.find(paths: '/var/log',
+        atime: '+1',
+        ctime: '+2',
+        mtime: '+3',
+        amin: '100',
+        cmin: '200',
+        mmin: '300'
+      ),
+      "find /var/log -atime +1 -ctime +2 -mtime +3 -amin 100 -cmin 200 -mmin 300"
+    )
+
+    expect_command(host.find(
+        paths: '/dev', 
+        regex: '/dev/tty[0-9]*'
+      ), 
+      "find /dev -regex '/dev/tty[0-9]*'"
+    )
+
+    expect_command(host.find(
+        paths: '/dev', 
+        regex_type: 'posix-egrep',
+        regex: '/dev/tty[0-9]*'
+      ), 
+      "find /dev -regextype posix-egrep -regex '/dev/tty[0-9]*'"
+    )
+
+    expect_command(host.find(
+        paths: '/var/log',
+        size: 100
+      ),
+      "find /var/log -size 100"
+    )
+
+    expect_command(host.find(
+        paths: '/var/log',
+        size: "100"
+      ),
+      "find /var/log -size 100"
+    )
+    
+    expect {
+      host.find(size: "100n")
+    }.to raise_error(ArgumentError)
+
+    expect_command(host.find(
+        paths: '/var/log',
+        size: "-100k"
+      ),
+      "find /var/log -size -100k"
+    )
+
+    expect_command(host.find(
+        paths: '/var/log',
+        size: "+10M"
+      ),
+      "find /var/log -size +10M"
+    )
+
+    expect_command(host.find(
+        paths: "/dev",
+        type: 'directory' 
+      ),
+      "find /dev -type d"
+    )
+
+    expect_command(host.find(
+        paths: "/dev",
+        type: 'file' 
+      ),
+      "find /dev -type f"
+    )
+
+    expect_command(host.find(
+        paths: "/dev",
+        type: 'symlinks' 
+      ),
+      "find /dev -type l"
+    )
+
+    expect_command(host.find(
+        paths: "/dev",
+        type: 'block'
+      ),
+      "find /dev -type b"
+    )
+
+    expect_command(host.find(
+        paths: "/dev",
+        type: 'character'
+      ),
+      "find /dev -type c"
+    )
+
+    expect_command(host.find(
+        paths: "/dev",
+        type: 'pipe'
+      ),
+      "find /dev -type p"
+    )
+
+    expect_command(host.find(
+        paths: "/dev",
+        type: 'socket'
+      ),
+      "find /dev -type s"
+    )
+  end
+end

data/spec/unit/core/find_spec.rb

@@ -5,5 +5,8 @@ require 'spec_helper'
 RSpec.describe Kanrisuru::Core::Find do
   it 'responds to find fields' do
     expect(Kanrisuru::Core::Find::FilePath.new).to respond_to(:path)
+    expect(Kanrisuru::Core::Find::REGEX_TYPES).to(
+      eq(['emacs', 'posix-awk', 'posix-basic', 'posix-egrep', 'posix-extended'])
+    )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.8.17
+  version: 0.8.18
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-17 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -173,6 +173,7 @@ files:
 - lib/kanrisuru/util/os_family.rb
 - lib/kanrisuru/util/signal.rb
 - lib/kanrisuru/version.rb
+- spec/functional/core/find_spec.rb
 - spec/functional/core/path_spec.rb
 - spec/functional/core/stat_spec.rb
 - spec/functional/core/stream_spec.rb