kanrisuru 0.9.1 → 0.11.1

data/lib/kanrisuru/core/find.rb

@@ -10,7 +10,7 @@ module Kanrisuru
       os_define :linux, :find
 
       FilePath = Struct.new(:path)
-      REGEX_TYPES = ['emacs', 'posix-awk', 'posix-basic', 'posix-egrep', 'posix-extended']
+      REGEX_TYPES = %w[emacs posix-awk posix-basic posix-egrep posix-extended].freeze
 
       def find(opts = {})
         paths      = opts[:paths]
@@ -66,9 +66,7 @@ module Kanrisuru
         command.append_arg('-mmin', opts[:mmin])
 
         if Kanrisuru::Util.present?(opts[:regex_type])
-          unless REGEX_TYPES.include?(opts[:regex_type])
-            raise ArgumentError, 'invalid regex type'
-          end
+          raise ArgumentError, 'invalid regex type' unless REGEX_TYPES.include?(opts[:regex_type])
 
           command.append_arg('-regextype', opts[:regex_type])
         end
@@ -77,7 +75,8 @@ module Kanrisuru
 
         if size.instance_of?(String)
           regex = Regexp.new(/^([-+])?(\d+)([bcwkMG])*$/)
-          raise ArgumentError, "invalid size string: '#{@size}'" unless regex.match?(size) 
+          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/core/socket.rb

@@ -59,7 +59,8 @@ module Kanrisuru
         command.append_flag('-w', opts[:raw])
 
         if Kanrisuru::Util.present?(family)
-          raise ArgumentError, 'invalid family type' if !NETWORK_FAMILIES.include?(family)
+          raise ArgumentError, 'invalid family type' unless NETWORK_FAMILIES.include?(family)
+
           command.append_arg('-f', family)
         end
 

data/lib/kanrisuru/core/stream.rb

@@ -95,7 +95,7 @@ module Kanrisuru
         command.append_flag('-b', opts[:number_nonblank])
         command.append_flag('-A', opts[:show_all])
 
-        files = files.instance_of?(String) ? [files] : files
+        files = [files] if files.instance_of?(String)
         command << files.join(' ')
 
         append_file(command, opts)

data/lib/kanrisuru/core/zypper.rb

@@ -278,7 +278,7 @@ module Kanrisuru
 
         repos = opts[:repos]
         if Kanrisuru::Util.present?(repos)
-          repos = repos.instance_of?(String) ? [repos] : repos
+          repos = [repos] if repos.instance_of?(String)
           command << repos.join(' ')
         end
 
@@ -374,7 +374,7 @@ module Kanrisuru
 
         services = opts[:services]
         if Kanrisuru::Util.present?(services)
-          services = services.instance_of?(Array) ? services : [services]
+          services = [services] if services.instance_of?(String)
           command << services.join(' ')
         end
 
@@ -392,7 +392,7 @@ module Kanrisuru
 
         services = opts[:services]
         if Kanrisuru::Util.present?(services)
-          services = services.instance_of?(String) ? [services] : services
+          services = [services] if services.instance_of?(String)
           command << services.join(' ')
         end
 

data/lib/kanrisuru/remote/cpu.rb

@@ -27,6 +27,10 @@ module Kanrisuru
         load_average[2]
       end
 
+      def architecture
+        @cpu_architecture.architecture
+      end
+
       def sockets
         @cpu_architecture.sockets
       end
@@ -103,7 +107,7 @@ module Kanrisuru
         @cpu_architecture.flags
       end
 
-        def hyperthreading?
+      def hyperthreading?
         threads_per_core > 1
       end
 

data/lib/kanrisuru/remote/env.rb

@@ -25,6 +25,14 @@ module Kanrisuru
         string
       end
 
+      def count
+        @env.count
+      end
+
+      def delete(key)
+        @env.delete(key.to_s.upcase)
+      end
+
       def [](key)
         @env[key.to_s.upcase]
       end

data/lib/kanrisuru/remote/fstab.rb

@@ -255,7 +255,7 @@ module Kanrisuru
           end
 
           result = @host.blkid(device: @device)
-          @uuid = result.success? ? result.uuid : nil
+          @uuid = result.success? ? result[0].uuid : nil
         end
 
         def parse_uuid(fsline)
@@ -269,15 +269,15 @@ module Kanrisuru
           end
 
           result = @host.blkid(device: @device)
-          @label = result.success? ? result.label : nil
+          @label = result.success? ? result[0].label : nil
         end
 
         def parse_dev(fsline)
           @device = fsline
           result = @host.blkid(device: @device)
 
-          @label = result.success? ? result.label : nil
-          @uuid = result.success? ? result.uuid : nil
+          @label = result.success? ? result[0].label : nil
+          @uuid = result.success? ? result[0].uuid : nil
         end
       end
 

data/lib/kanrisuru/util.rb

@@ -24,7 +24,7 @@ module Kanrisuru
       Kanrisuru.logger.info do
         'DEPRECATION WARNING: string_join_array will be removed in the upcoming major release. Use array_join_string instead.'
       end
-      
+
       array = arg.instance_of?(String) ? [arg] : arg
       array.join(field)
     end

data/lib/kanrisuru/version.rb

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

data/spec/functional/core/apt_spec.rb

@@ -22,10 +22,9 @@ RSpec.describe Kanrisuru::Core::Apt do
   it 'prepares apt list command' do
     expect_command(host.apt('list'), 'apt list')
     expect_command(host.apt('list',
-      installed: true,
-      upgradeable: true,
-      all_versions: true,
-    ), 'apt list --installed --upgradeable --all-versions')
+                            installed: true,
+                            upgradeable: true,
+                            all_versions: true), 'apt list --installed --upgradeable --all-versions')
 
     expect_command(host.apt('list', package_name: 'nginx'), 'apt list -a nginx')
   end
@@ -43,28 +42,22 @@ RSpec.describe Kanrisuru::Core::Apt do
   end
 
   it 'prepares apt install command' do
-    expect_command(host.apt('install', 
-        packages: 'nginx'
-      ),
-      'apt-get install -y nginx'
-    )
-
-    expect_command(host.apt('install', 
-        packages: 'monit',
-        no_upgrade: true,
-        reinstall: true
-      ),
-      'apt-get install -y --no-upgrade --reinstall monit'
-    )
-
-    expect_command(host.apt('install', 
-        packages: ['build-essential', 'manpages-dev'],
-        only_upgrade: true,
-      ),
-      'apt-get install -y --only-upgrade build-essential manpages-dev'
-    )
+    expect_command(host.apt('install',
+                            packages: 'nginx'),
+                   'apt-get install -y nginx')
+
+    expect_command(host.apt('install',
+                            packages: 'monit',
+                            no_upgrade: true,
+                            reinstall: true),
+                   'apt-get install -y --no-upgrade --reinstall monit')
+
+    expect_command(host.apt('install',
+                            packages: %w[build-essential manpages-dev],
+                            only_upgrade: true),
+                   'apt-get install -y --only-upgrade build-essential manpages-dev')
   end
-  
+
   it 'prepares apt remove command' do
     expect_command(host.apt('remove', packages: ['python']), 'apt-get remove -y python')
   end
@@ -82,15 +75,14 @@ RSpec.describe Kanrisuru::Core::Apt do
   end
 
   it 'prepares apt show command' do
-    expect_command(host.apt('show', packages: 'ruby'), 'apt show -a ruby') 
-  end 
+    expect_command(host.apt('show', packages: 'ruby'), 'apt show -a ruby')
+  end
 
   it 'prepares apt clean command' do
-    expect_command(host.apt('clean'), 'apt-get clean') 
+    expect_command(host.apt('clean'), 'apt-get clean')
   end
 
   it 'prepares apt autoclean command' do
-    expect_command(host.apt('autoclean'), 'apt-get autoclean') 
+    expect_command(host.apt('autoclean'), 'apt-get autoclean')
   end
-
 end

data/spec/functional/core/archive_spec.rb

@@ -0,0 +1,169 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Kanrisuru::Core::Apt do
+  before(:all) do
+    StubNetwork.stub!
+    StubNetwork.stub_command!(:realpath) do |_args|
+      Kanrisuru::Core::Path::FilePath.new(directory)
+    end
+  end
+
+  after(:all) do
+    StubNetwork.unstub_command!(:realpath)
+    StubNetwork.unstub!
+  end
+
+  let(:host) do
+    Kanrisuru::Remote::Host.new(
+      host: 'localhost',
+      username: 'ubuntu',
+      keys: ['id_rsa']
+    )
+  end
+
+  let(:directory) { '/home/ubuntu/dir' }
+
+  it 'prepares tar list command' do
+    %w[list t].each do |action_variant|
+      expect_command(host.tar(action_variant, 'file.txt'),
+                     'tar --restrict -f file.txt -t')
+
+      expect_command(host.tar(action_variant, '~/file.txt',
+                              compress: 'bzip2',
+                              directory: directory,
+                              occurrence: 1,
+                              label: true,
+                              multi_volume: true),
+                     'tar --restrict -C /home/ubuntu/dir -f ~/file.txt -j -t --occurrence 1 --label --multi-volume')
+    end
+  end
+
+  it 'prepares tar extract command' do
+    %w[extract get x].each do |action_variant|
+      expect_command(host.tar(action_variant, 'archive.tar'),
+                     'tar --restrict -f archive.tar -x')
+
+      expect_command(host.tar(action_variant, 'archive.tar',
+                              compress: 'xz',
+                              directory: directory,
+                              occurrence: 2,
+                              no_same_owner: true,
+                              no_same_permissions: true,
+                              no_selinux: true,
+                              no_xattrs: true,
+                              multi_volume: true,
+                              label: true,
+                              skip_old_files: true,
+                              overwrite: true,
+                              overwrite_dir: true,
+                              unlink_first: true,
+                              recursive_unlink: true,
+                              paths: 'file.txt'),
+                     'tar --restrict -C /home/ubuntu/dir -f archive.tar -J -x --occurrence 2 --no-same-owner --no-same-permissions --no-selinux --no-xattrs --multi-volume --label --skip-old-files --overwrite --overwrite-dir --unlink-first --recursive-unlink file.txt')
+
+      expect_command(host.tar(action_variant, 'archive.tar',
+                              preserve_permissions: true,
+                              same_owners: true,
+                              one_file_system: true,
+                              keep_old_files: true,
+                              paths: ['file1.txt', 'file2.txt']),
+                     'tar --restrict -f archive.tar -x --preserve-permissions --same-owner --one-file-system --keep-old-files file1.txt file2.txt')
+    end
+  end
+
+  it 'prepares tar create command' do
+    %w[create c].each do |action_variant|
+      expect_command(host.tar(action_variant, 'archive.lzma', compress: 'lzma'),
+                     'tar --restrict -f archive.lzma --lzma -c')
+      expect_command(host.tar(action_variant, 'archive.gz'), 'tar --restrict -f archive.gz -c')
+
+      expect_command(host.tar(action_variant, 'archive.gz',
+                              directory: directory,
+                              compress: 'gzip',
+                              exclude: 'file2.txt',
+                              paths: 'file1.txt'),
+                     'tar --restrict -C /home/ubuntu/dir -f archive.gz -z -c --exclude=file2.txt file1.txt')
+
+      expect_command(host.tar(action_variant, 'archive.gz',
+                              compress: 'gzip',
+                              exclude: ['file2.txt', 'file4.txt'],
+                              paths: ['file1.txt', 'file3.txt']),
+                     'tar --restrict -f archive.gz -z -c --exclude=file2.txt --exclude=file4.txt file1.txt file3.txt')
+    end
+  end
+
+  it 'prepares tar append command' do
+    %w[append r].each do |action_variant|
+      expect_command(host.tar(action_variant, 'archive.tar'), 'tar --restrict -f archive.tar -r')
+
+      expect_command(host.tar(action_variant, 'archive.tar',
+                              directory: directory,
+                              paths: 'main.conf'),
+                     'tar --restrict -C /home/ubuntu/dir -f archive.tar -r main.conf')
+
+      expect_command(host.tar(action_variant, 'archive.tar',
+                              paths: ['main.conf', 'main2.conf']),
+                     'tar --restrict -f archive.tar -r main.conf main2.conf')
+    end
+  end
+
+  it 'prepares tar concat command' do
+    %w[catenate concat A].each do |action_variant|
+      expect_command(host.tar(action_variant, 'archive.tar'), 'tar --restrict -f archive.tar -A')
+      expect_command(host.tar(action_variant, 'archive.tar',
+                              directory: directory,
+                              paths: 'archive2.tar'),
+                     'tar --restrict -C /home/ubuntu/dir -f archive.tar -A archive2.tar')
+
+      expect_command(host.tar(action_variant, 'archive.tar',
+                              directory: directory,
+                              paths: ['archive2.tar', 'archive3.tar']),
+                     'tar --restrict -C /home/ubuntu/dir -f archive.tar -A archive2.tar archive3.tar')
+    end
+  end
+
+  it 'prepares tar update command' do
+    %w[update u].each do |action_variant|
+      expect_command(host.tar(action_variant, 'archive',
+                              paths: 'file1.txt'),
+                     'tar --restrict -f archive -u file1.txt')
+
+      expect_command(host.tar(action_variant, 'archive',
+                              directory: directory,
+                              paths: ['file1.txt', 'file2.txt']),
+                     'tar --restrict -C /home/ubuntu/dir -f archive -u file1.txt file2.txt')
+    end
+  end
+
+  it 'prepares tar diff command' do
+    %w[diff compare d].each do |action_variant|
+      expect_command(host.tar(action_variant, 'archive.tar', directory: directory),
+                     'tar --restrict -C /home/ubuntu/dir -f archive.tar -d')
+      expect_command(host.tar(action_variant, 'archive.tar',
+                              directory: directory,
+                              occurrence: 4),
+                     'tar --restrict -C /home/ubuntu/dir -f archive.tar -d --occurrence 4')
+    end
+  end
+
+  it 'prepares tar delete command' do
+    expect_command(host.tar('delete', 'archive.tar', paths: 'file1.txt'),
+                   'tar --restrict -f archive.tar --delete file1.txt')
+    expect_command(host.tar('delete', 'archive.tar',
+                            paths: ['file1.txt', 'file2.txt'],
+                            occurrence: 3),
+                   'tar --restrict -f archive.tar --delete --occurrence 3 file1.txt file2.txt')
+  end
+
+  it 'prepares invalid tar command' do
+    expect do
+      host.tar('abc', 'file1.txt')
+    end.to raise_error(ArgumentError)
+
+    expect do
+      host.tar('create', 'archive.tar', compress: 'xip')
+    end.to raise_error(ArgumentError)
+  end
+end

data/spec/functional/core/find_spec.rb

@@ -20,150 +20,131 @@ RSpec.describe Kanrisuru::Core::Find do
   end
 
   it 'prepares find command' do
-    expect_command(host.find, "find")
+    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(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_command(host.find(paths: '/etc'), 'find /etc')
+    expect_command(host.find(paths: ['/etc', '/var', '/home']), 'find /etc /var /home')
 
-    expect {
+    expect do
       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"
-    )
+    end.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"
-    )
+                             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]*'"
-    )
+                     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]*'"
-    )
+                     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"
-    )
+                     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)
+                     paths: '/var/log',
+                     size: '100'
+                   ),
+                   'find /var/log -size 100')
+
+    expect do
+      host.find(size: '100n')
+    end.to raise_error(ArgumentError)
 
     expect_command(host.find(
-        paths: '/var/log',
-        size: "-100k"
-      ),
-      "find /var/log -size -100k"
-    )
+                     paths: '/var/log',
+                     size: '-100k'
+                   ),
+                   'find /var/log -size -100k')
 
     expect_command(host.find(
-        paths: '/var/log',
-        size: "+10M"
-      ),
-      "find /var/log -size +10M"
-    )
+                     paths: '/var/log',
+                     size: '+10M'
+                   ),
+                   'find /var/log -size +10M')
 
     expect_command(host.find(
-        paths: "/dev",
-        type: 'directory' 
-      ),
-      "find /dev -type d"
-    )
+                     paths: '/dev',
+                     type: 'directory'
+                   ),
+                   'find /dev -type d')
 
     expect_command(host.find(
-        paths: "/dev",
-        type: 'file' 
-      ),
-      "find /dev -type f"
-    )
+                     paths: '/dev',
+                     type: 'file'
+                   ),
+                   'find /dev -type f')
 
     expect_command(host.find(
-        paths: "/dev",
-        type: 'symlinks' 
-      ),
-      "find /dev -type l"
-    )
+                     paths: '/dev',
+                     type: 'symlinks'
+                   ),
+                   'find /dev -type l')
 
     expect_command(host.find(
-        paths: "/dev",
-        type: 'block'
-      ),
-      "find /dev -type b"
-    )
+                     paths: '/dev',
+                     type: 'block'
+                   ),
+                   'find /dev -type b')
 
     expect_command(host.find(
-        paths: "/dev",
-        type: 'character'
-      ),
-      "find /dev -type c"
-    )
+                     paths: '/dev',
+                     type: 'character'
+                   ),
+                   'find /dev -type c')
 
     expect_command(host.find(
-        paths: "/dev",
-        type: 'pipe'
-      ),
-      "find /dev -type p"
-    )
+                     paths: '/dev',
+                     type: 'pipe'
+                   ),
+                   'find /dev -type p')
 
     expect_command(host.find(
-        paths: "/dev",
-        type: 'socket'
-      ),
-      "find /dev -type s"
-    )
+                     paths: '/dev',
+                     type: 'socket'
+                   ),
+                   'find /dev -type s')
   end
 end