kanrisuru 0.8.8 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 389f21ebed2d778e05d949ab651e91e7fd959c4249c32d936355fa1f093802db
-  data.tar.gz: f83d7f3385b871890a856470a140d6ce2c2efc7ceefdc4f6fe8b9e2f7a454beb
+  metadata.gz: 96b168459e76c64aa511a58fc43d0d777d5d783874e47a24c373dd6da2ef3ff4
+  data.tar.gz: 461c0236448253694f369cfc1b7757f61aeb0a4e0af3841cea62b6297d862c14
 SHA512:
-  metadata.gz: '0185c24a3ff1bdbcc386999f63fb8544a18e8bf9c824e94d001be81785e6a10b7fb47cbcef421399e7e6b1bff805385d5dd4b253b8be7ce2b93fa94022d38596'
-  data.tar.gz: 74557bd5df7e1d10223a965d6c3e38fa8bed84f77ff4bfb75614abec344fd088299c7b4e92f9fb08b7aad1fa9630ee8c93d208dd40d3a4189ddf157bb048c694
+  metadata.gz: 4d8b47306256c698e30c7950fc18a59551fb156b14bc6e077df323a27832af8125f567213ec066ec1c8e5f7295411a0a113823ef4a6c97df0bbf5a6d753fc851
+  data.tar.gz: 5152a07e2d3580c4de9fb477d36c8de6f1d3fae3a6e234a6c3a80318524cb8ae6fefaebd984501f63b3b5de79350c2d9b53eac92b133453aebd1c47ba4323619

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 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 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.
+
 ## Kanrisuru 0.8.8 (August 21, 2021) ##
 * Add shorthand notation for tar command actions, such as `x` for `extract`, `t` for `list`, and `c` for `create`. 
 

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)
 

data/lib/kanrisuru/mode.rb

@@ -235,7 +235,7 @@ module Kanrisuru
         @group = Kanrisuru::Mode::Permission.new(symbolic_to_numeric(modes[3..5]), modes[3..5])
         @other = Kanrisuru::Mode::Permission.new(symbolic_to_numeric(modes[6..8]), modes[6..8])
       else
-        raise ArgumentErorr, "Invalid format for mode #{string}"
+        raise ArgumentError, "Invalid format for mode #{string}"
       end
     end
 

data/lib/kanrisuru/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanrisuru
-  VERSION = '0.8.8'
+  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
 
@@ -67,6 +67,10 @@ RSpec.describe Kanrisuru::Core::File do
         mode = host.chmod(path, mode).mode
         expect(mode.symbolic).to eq('-rwxr--r--')
         expect(mode.to_i).to eq(0o744)
+
+        expect {
+          host.chmod(path, 600)
+        }.to raise_error(ArgumentError)
       end
 
       it 'changes file owner and group' do
@@ -318,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.8
+  version: 0.8.12
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-22 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec