kanrisuru 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aa4c218e69710bd9ce035eca337448c240efc8e9b3e505dc1d70c4dea3e3190
-  data.tar.gz: 488db0a56c43a223031ef657f21413aa0852f6edd2afb68b0c5f5eac97d81cd3
+  metadata.gz: 96b168459e76c64aa511a58fc43d0d777d5d783874e47a24c373dd6da2ef3ff4
+  data.tar.gz: 461c0236448253694f369cfc1b7757f61aeb0a4e0af3841cea62b6297d862c14
 SHA512:
-  metadata.gz: b8c45c70ddfdfedb3dcad6698e9f1228ff1ce05aa222972f29e5979e33ef85dc7227dbe8532a50755a61342fec067fdde7303dfd4cba5048de9d44d4f6a27f65
-  data.tar.gz: d417cbc907dd714ffc2385e13f6547b5fd0f42bd5e3f5c83531ace728e355a19a12d2156f4f7cb52b51d608984fe65966f0d287e72655c4088f4b24299d3afc3
+  metadata.gz: 4d8b47306256c698e30c7950fc18a59551fb156b14bc6e077df323a27832af8125f567213ec066ec1c8e5f7295411a0a113823ef4a6c97df0bbf5a6d753fc851
+  data.tar.gz: 5152a07e2d3580c4de9fb477d36c8de6f1d3fae3a6e234a6c3a80318524cb8ae6fefaebd984501f63b3b5de79350c2d9b53eac92b133453aebd1c47ba4323619

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+## Kanrisuru 0.8.12 (October 3, 20201)
+* Refactor `rmdir` command to only work on empty directories. 
+
 ## Kanrisuru 0.8.11 (October 1, 20201)
-* Allow `Kanrisuru::Mode` as mode option in mkdir method.
+* Allow `Kanrisuru::Mode` as mode type option in mkdir method.
 
 ## Kanrisuru 0.8.10 (August 24, 20201)
 * Fix bug with rspec test case.

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
 
-        rm(path, force: true, recursive: true)
+        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)
+
+        Kanrisuru::Result.new(command)
       end
 
       def mkdir(path, opts = {})

data/lib/kanrisuru/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanrisuru
-  VERSION = '0.8.11'
+  VERSION = '0.8.12'
 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
 
@@ -322,6 +322,27 @@ 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')
 

metadata

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