kanrisuru 0.8.10 → 0.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8665542405d850b01c9c8623c200207c284925a0c14eb21a908711ebce6acf1e
-  data.tar.gz: f52cdd4ecb4483d161494290da195270062865028a7ca02251a6de930f8477a1
+  metadata.gz: 1537cdde3ded7563e59018ddb94f1c05bb17ff486c87f6113eaa1800b6f7c338
+  data.tar.gz: 571b0fef3b4d780d3fac4f485f7f1b1dd14bd3c73253a7b5649ae7e86975fd81
 SHA512:
-  metadata.gz: b7eeaf4fb3741e149ee9563d244934e72d9cc56bdfbcffb90bdddf57545c49b5a9736c93dca2a78c65b73d8848f84617ce7b4d323de81c214ed473764a401a94
-  data.tar.gz: 834dc4092cfdd58e670b926eb3b77ed37d8a40cfb813aa8189f3ac718033d2de37d1ee23e59b530e7342dbd90c9807b35f95d194ac3239af4e9dfed2ee445875
+  metadata.gz: 2351ae7e335b61a1362c15a08540977c5d366ae2c441882f4feff32bc7939da71312dc5f380fa707a6c3cb187e81d413d558ae55e31e395d069e1a3c5e3f2a08
+  data.tar.gz: 2fbb6a9649eb2a67c46bc0a617cd22965738dfcbb092b4b99da588ae70518b4a0dfc79aa2da55c58d53f760170a5c33c844a86aae97f56eeed4628c735a65546

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## Kanrisuru 0.8.14 (October 8, 20201)
+* Update `Kanrisuru::Remote::Cluster` instantiation method to use array splat instead of passing array directly.
+
+## 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.
 

data/README.md

@@ -48,7 +48,7 @@ result.path 					# => /home/ubuntu
 
 ### Cluster 
 ```ruby
-cluster = Kanrisuru::Remote::Cluster.new([{
+cluster = Kanrisuru::Remote::Cluster.new({
   host: 'host1', username: 'ubuntu', keys: ['~/.ssh/id_rsa']
 }, {
   host: 'host2', username: 'alice', keys: ['~/.ssh/id_rsa']
@@ -72,7 +72,7 @@ host.execute(command)
 command.success? #=> true
 command.to_s  #=> Linux
 
-cluster = Kanrisuru::Remote::Cluster.new([host, {host: 'host2', username: 'alice', keys: ['~/.ssh/id_rsa']}])
+cluster = Kanrisuru::Remote::Cluster.new(host, {host: 'host2', username: 'alice', keys: ['~/.ssh/id_rsa']})
 
 cluster.execute('uname') #=> {host: 'host1', result: 'Linux'}, {host: 'host2', result: 'Linux'}
 ```

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/remote/cluster.rb

@@ -6,7 +6,7 @@ module Kanrisuru
       extend OsPackage::Collection
       include Enumerable
 
-      def initialize(hosts)
+      def initialize(*hosts)
         @hosts = {}
         hosts.each do |host_opts|
           add_host(host_opts)

data/lib/kanrisuru/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanrisuru
-  VERSION = '0.8.10'
+  VERSION = '0.8.14'
 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,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

data/spec/functional/os_package_spec.rb

@@ -111,7 +111,7 @@ RSpec.describe Kanrisuru::OsPackage do
     host = Kanrisuru::Remote::Host.new(host: '127.0.0.1', username: 'ubuntu', keys: ['~/.ssh/id_rsa'])
     host2 = Kanrisuru::Remote::Host.new(host: 'localhost', username: 'ubuntu', keys: ['~/.ssh/id_rsa'])
 
-    cluster = Kanrisuru::Remote::Cluster.new([host, host2])
+    cluster = Kanrisuru::Remote::Cluster.new(host, host2)
 
     expect(host).to respond_to(:tester)
     expect(host.tester).to eq('hello ubuntu')
@@ -125,7 +125,7 @@ RSpec.describe Kanrisuru::OsPackage do
     host = Kanrisuru::Remote::Host.new(host: '127.0.0.1', username: 'ubuntu', keys: ['~/.ssh/id_rsa'])
     host2 = Kanrisuru::Remote::Host.new(host: 'localhost', username: 'ubuntu', keys: ['~/.ssh/id_rsa'])
 
-    cluster = Kanrisuru::Remote::Cluster.new([host, host2])
+    cluster = Kanrisuru::Remote::Cluster.new(host, host2)
 
     expect(host).to respond_to(:asdf)
     expect(host.asdf).to respond_to(:tester)
@@ -151,7 +151,7 @@ RSpec.describe Kanrisuru::OsPackage do
     host2 = Kanrisuru::Remote::Host.new(host: 'centos-host', username: 'centos', keys: ['~/.ssh/id_rsa'])
     host3 = Kanrisuru::Remote::Host.new(host: 'opensuse-host', username: 'opensuse', keys: ['~/.ssh/id_rsa'])
 
-    cluster = Kanrisuru::Remote::Cluster.new([host1, host2, host3])
+    cluster = Kanrisuru::Remote::Cluster.new(host1, host2, host3)
 
     expect(host1).to respond_to(:output)
     expect(host2).to respond_to(:output)

data/spec/functional/remote/cluster_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Kanrisuru::Remote::Cluster do
   context 'with ubuntu' do
     it 'gets hostname for cluster' do
-      cluster = described_class.new([{
+      cluster = described_class.new({
                                       host: 'localhost',
                                       username: 'ubuntu',
                                       keys: ['~/.ssh/id_rsa']
@@ -13,7 +13,7 @@ RSpec.describe Kanrisuru::Remote::Cluster do
                                       host: '127.0.0.1',
                                       username: 'ubuntu',
                                       keys: ['~/.ssh/id_rsa']
-                                    }])
+                                    })
 
       expect(cluster.hostname).to match([
                                           { host: 'localhost', result: 'ubuntu' },
@@ -24,7 +24,7 @@ RSpec.describe Kanrisuru::Remote::Cluster do
     end
 
     it 'can ping host cluster' do
-      cluster = described_class.new([{
+      cluster = described_class.new({
                                       host: 'localhost',
                                       username: 'ubuntu',
                                       keys: ['~/.ssh/id_rsa']
@@ -32,7 +32,7 @@ RSpec.describe Kanrisuru::Remote::Cluster do
                                       host: '127.0.0.1',
                                       username: 'ubuntu',
                                       keys: ['~/.ssh/id_rsa']
-                                    }])
+                                    })
 
       expect(cluster.ping?).to match([
                                        { host: 'localhost', result: true },

metadata

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