kanrisuru 0.8.9 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1dfc7b4ed56b9054d2a9cffd137f21b47a992e76f89bc279911c619c9349b15
-  data.tar.gz: ed85d4d847c5cdffc544dc93faf32552e6216e96da0ee9a4effa03f4f1cac08a
+  metadata.gz: f2465d4419a5fa15bc4ec736c6064e48386be6e130d4a934404b8a1b0f7eaaa0
+  data.tar.gz: 5441c0ae297aad2fdc7f08686eca97585793f747aaf92b32339da66c4343f3cf
 SHA512:
-  metadata.gz: 1bfe2ce44a7a045ce622e3ca724fc9455e0efee19fd20235dda6befddeacd1c916604a41d053323879befe0762d37d9c41a87bd6221a564178973e9222cde6da
-  data.tar.gz: 7130b94ddf938c126f3d4ef8f76f28298ff7f8abe169dbb9b4dd8ae384d334f6ccf17019e1aafb1c07ac2fcd0a0b5558aae36dd07f8f0523fc9721e7b5ed2e6b
+  metadata.gz: 328fdfb44f1d0b18f4bd1fb49ab54779fb464e3f8948a8600f2d2e5cdddfe8ac351fa4499ee0f981a8f12fd262bf1d7757f71d721dafbf447834c8d6ff17ac6f
+  data.tar.gz: 20c59fd7d9e2e57e356beecf55809c3cbb009fe5d0e8b5692088731ed6bac3665e1e88f6e162d6cda1b7874e8a9a30e30ef52a6c5572cdfbd33f4328ee402eda

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## Kanrisuru 0.8.13 (October 4, 20201)
+* Fix `wc` command. Ensure result parsing is cast to integer values.
+
+## Kanrisuru 0.8.12 (October 4, 20201)
+* Refactor `rmdir` command to only work on empty directories. 
+
+## Kanrisuru 0.8.11 (October 1, 20201)
+* Allow `Kanrisuru::Mode` as mode type option in mkdir method.
+
+## Kanrisuru 0.8.10 (August 24, 20201)
+* Fix bug with rspec test case.
+
 ## Kanrisuru 0.8.9 (August 24, 2021)
 * Fix spelling error exception `ArgumentError` in `Kanrisuru::Mode` class.
 

data/lib/kanrisuru/core/file.rb

@@ -206,10 +206,19 @@ module Kanrisuru
         Kanrisuru::Result.new(command)
       end
 
-      def rmdir(path)
-        return false unless dir?(path)
+      def rmdir(paths, opts = {})
+        paths = [paths] if paths.instance_of?(String)
+        paths.each do |path|
+          raise ArgumentError, "Can't delete root path" if path == '/' || realpath(path).path == '/'
+        end
+
+        command = Kanrisuru::Command.new("rmdir #{paths.join(' ')}")
+        command.append_flag('--ignore-fail-on-non-empty', opts[:silent])
+        command.append_flag('--parents', opts[:parents])
+
+        execute_shell(command)
 
-        rm(path, force: true, recursive: true)
+        Kanrisuru::Result.new(command)
       end
 
       def mkdir(path, opts = {})
@@ -219,7 +228,17 @@ module Kanrisuru
 
         command = Kanrisuru::Command.new("mkdir #{path}")
         command.append_flag('-p', opts[:silent])
-        command.append_arg('-m', opts[:mode])
+
+        if Kanrisuru::Util.present?(opts[:mode])
+          mode = opts[:mode]
+          if mode.instance_of?(Kanrisuru::Mode)
+            mode = mode.numeric
+          elsif mode.instance_of?(String) && (mode.include?(',') || /[=+-]/.match(mode))
+            mode = Kanrisuru::Mode.new(mode).numeric
+          end
+
+          command.append_arg('-m', mode)
+        end
 
         execute_shell(command)
 
@@ -313,7 +332,7 @@ module Kanrisuru
         execute_shell(command)
 
         Kanrisuru::Result.new(command) do |cmd|
-          items = cmd.to_a
+          items = cmd.to_s.split
           FileCount.new(items[0].to_i, items[1].to_i, items[2].to_i)
         end
       end

data/lib/kanrisuru/version.rb

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

data/spec/functional/core/file_spec.rb

@@ -40,8 +40,8 @@ RSpec.describe Kanrisuru::Core::File do
           keys: [host_json['ssh_key']]
         )
 
-        host.rmdir("#{host_json['home']}/.kanrisuru_spec_files")
-        host.rmdir("#{host_json['home']}/extract-tar-files") if host.dir?("#{host_json['home']}/extract-tar-files")
+        host.rm("#{host_json['home']}/.kanrisuru_spec_files", force: true, recursive: true)
+        host.rm("#{host_json['home']}/extract-tar-files", force: true, recursive: true) if host.dir?("#{host_json['home']}/extract-tar-files")
         host.disconnect
       end
 
@@ -69,7 +69,7 @@ RSpec.describe Kanrisuru::Core::File do
         expect(mode.to_i).to eq(0o744)
 
         expect {
-          host.chmod(path, 600))
+          host.chmod(path, 600)
         }.to raise_error(ArgumentError)
       end
 
@@ -322,16 +322,44 @@ RSpec.describe Kanrisuru::Core::File do
         expect(host.empty_file?(path)).to eq(false)
       end
 
+      it 'removes directories' do
+        result = host.mkdir("#{spec_dir}/directory/1", silent: true)
+        expect(result).to be_success
+
+        result = host.mkdir("#{spec_dir}/directory/2", silent: true)
+        expect(result).to be_success
+
+        result = host.mkdir("#{spec_dir}/directory/3", silent: true)
+        expect(result).to be_success
+
+        result = host.rmdir(["#{spec_dir}/directory/1", "#{spec_dir}/directory/2"])
+        expect(result).to be_success
+
+        ## Can't delete non empty dir
+        result = host.rmdir("#{spec_dir}/directory")
+        expect(result).to be_failure
+       
+        result = host.rmdir("#{spec_dir}/directory/3")
+        expect(result).to be_success
+      end
+
       it 'counts a file' do
         result = host.wc('/etc/hosts')
 
         expect(result.success?).to eq(true)
         expect(result).to respond_to(:lines, :words, :characters)
 
-        lines = result.lines
-        result = host.cat('/etc/hosts')
+        ## Need to remap data including newline chars to get byte size
+        data = host.cat('/etc/hosts').command.raw_result
+        doc = data.map(&:lines).flatten
+
+        lines = doc.length
+        words = doc.map(&:split).flatten
+        chars = doc.map(&:length).flatten 
 
-        expect(lines).to eq(result.to_a.length)
+        expect(result.lines).to eq(doc.length)
+        expect(result.words).to eq(words.length)
+        expect(result.characters).to eq(chars.sum)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.13
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec