kanrisuru 0.2.5 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0213672a73fb6651ab25d44275fd5965154ceaf2515292adb840e28d0f7fb3fd
-  data.tar.gz: dc43e93139baa11a9c2afe9a242431a25293a0d3fdf21b111aae316a6ac125dc
+  metadata.gz: 0be09a32fde3ad8b5856c2e4b215d20201a6de1d890f1ede3cf27e471dfd50fd
+  data.tar.gz: 3573e66a75ce2fc88939e72bda7b915a7469506da713f19f8b80522a35849f58
 SHA512:
-  metadata.gz: 78f991ed867dbdd292568b42d1079a40926334fbdef6396092e0d5a25c03759038ff6b459c28b3005eac02863198b5306c9d54a3f6d8d77041c006d9fc89c7b2
-  data.tar.gz: '0719742cfd38a1e2b7a2e842c28d9b6038500b761661351c1ab4bf67650887fec4251abf93cbacd941cca28c1010fbdf23864622f203d501f44213bf9a1d169d'
+  metadata.gz: '08780b59675a42aeea9f523e253c23d393fa745bc66e73a5c79c6c3d6d6fa0462fa3e4ddf388b56668c32f80708671a1d2b9dbd6a9b918d4cecdfae37404a0f9'
+  data.tar.gz: 07fd46b83cf7b0391ba4729ad16cdcc88e73b2aacc1c7457855833c60ac4b55defd22914fba9f9cbe48bf5df42cad1bf34d2ddefc6db0918d651710cbbe549d2

data/kanrisuru.gemspec

@@ -9,19 +9,19 @@ Gem::Specification.new do |gem|
   gem.email       = 'ryan@avamia.com'
   gem.license     = 'MIT'
   gem.summary     = 'Manage remote servers over ssh with ruby.'
+  gem.description = 'Manage remote servers over ssh with ruby.'
   gem.homepage    = 'https://github.com/avamia/kanrisuru'
 
-  gem.required_ruby_version     = '>= 2.5.0'
-  gem.required_rubygems_version = '>= 1.8.11'
+  gem.required_ruby_version = '>= 2.5.0'
 
-  gem.add_development_dependency 'rspec', '>= 3.10.0'
-  gem.add_development_dependency 'rubocop', '>= 1.12.1'
-  gem.add_development_dependency 'rubocop-rspec', '>= 2.2.0'
-  gem.add_development_dependency 'simplecov', '>= 0.21.2'
+  gem.add_development_dependency 'rspec', '~> 3.10'
+  gem.add_development_dependency 'rubocop', '~> 1.12'
+  gem.add_development_dependency 'rubocop-rspec', '~> 2.2'
+  gem.add_development_dependency 'simplecov', '~> 0.21'
 
-  gem.add_runtime_dependency 'net-ping', '>= 2.0.8'
-  gem.add_runtime_dependency 'net-scp', '>= 3.0.0'
-  gem.add_runtime_dependency 'net-ssh', '>= 6.1.0'
+  gem.add_runtime_dependency 'net-ping', '~> 2.0'
+  gem.add_runtime_dependency 'net-scp', '~> 3.0'
+  gem.add_runtime_dependency 'net-ssh', '~> 6.1'
 
   gem.files         = `git ls-files`.split("\n")
   gem.require_paths = ['lib']

data/lib/kanrisuru/core.rb

@@ -16,6 +16,7 @@ require_relative 'core/ip'
 require_relative 'core/socket'
 require_relative 'core/apt'
 require_relative 'core/yum'
+require_relative 'core/zypper'
 
 module Kanrisuru
   module Remote
@@ -36,6 +37,7 @@ module Kanrisuru
       os_include Kanrisuru::Core::Socket
       os_include Kanrisuru::Core::Apt
       os_include Kanrisuru::Core::Yum
+      os_include Kanrisuru::Core::Zypper
     end
 
     class Cluster
@@ -54,6 +56,7 @@ module Kanrisuru
       os_collection Kanrisuru::Core::Socket
       os_collection Kanrisuru::Core::Apt
       os_collection Kanrisuru::Core::Yum
+      os_collection Kanrisuru::Core::Zypper
     end
   end
 end

data/lib/kanrisuru/core/path.rb

@@ -44,7 +44,6 @@ module Kanrisuru
             date = DateTime.parse("#{values[6]} #{values[7]} #{values[8]}")
 
             type = values[1].include?('d') ? 'directory' : 'file'
-
             items <<
               if id
                 FileInfoId.new(

data/lib/kanrisuru/core/yum.rb

@@ -341,8 +341,11 @@ module Kanrisuru
             end
           end
 
-          current_row.description = description.strip
-          rows << current_row
+          if current_row
+            current_row.description = description.strip
+            rows << current_row
+          end
+
           rows
         end
       end

data/lib/kanrisuru/remote/fstab.rb

@@ -67,7 +67,7 @@ module Kanrisuru
       def append_file!
         @file.append do |f|
           @entries.each do |_, entry|
-            f << entry.to_s if entry[:new]
+            f << entry[:entry].to_s if entry[:new]
           end
         end
 
@@ -78,13 +78,22 @@ module Kanrisuru
       def write_file!
         @file.write do |f|
           @entries.each do |_, entry|
-            f << entry.to_s
+            f << entry[:entry].to_s
           end
         end
 
         reload!
       end
 
+      def to_s
+        lines = []
+        @entries.each do |_, entry|
+          lines << entry[:entry].to_s
+        end
+
+        lines.join("\n")
+      end
+
       def reload!
         init_from_os
       end

data/lib/kanrisuru/remote/os.rb

@@ -72,7 +72,9 @@ module Kanrisuru
         result = @host.execute(command)
         raise 'Invalid os release' if result.failure?
 
-        result.to_s.gsub(/"/, '')
+        value = result.to_s
+        value = value.gsub(/"/, '')
+        value.gsub('-', '_')
       end
 
       def parse_os_version

data/lib/kanrisuru/util/bits.rb

@@ -13,11 +13,11 @@ module Kanrisuru
         case unit.downcase
         when 'b'
           Kanrisuru::Util::Bits.convert_bytes(size, :byte, :kilobyte)
-        when 'kb', 'k'
+        when 'kb', 'k', 'kib'
           size
-        when 'mb', 'm'
+        when 'mb', 'm', 'mib'
           Kanrisuru::Util::Bits.convert_from_mb(size, :kilobyte).to_i
-        when 'gb', 'g'
+        when 'gb', 'g', 'gib'
           Kanrisuru::Util::Bits.convert_from_gb(size, :kilobyte).to_i
         end
       end

data/lib/kanrisuru/util/os_family.rb

@@ -163,24 +163,27 @@ module Kanrisuru
           state: 'current',
           type: 'distribution'
         },
-        opensuse: {
-          name: 'openSUSE',
+        sles: {
+          name: 'SUSE Linux Enterprise Server',
           os_family: 'linux',
           upstream: 'linux',
-          model: 'open_source',
+          model: 'commercial',
           state: 'current',
           type: 'distribution'
         },
         opensuse_leap: {
           name: 'openSUSE Leap',
-          type: 'alias',
-          to: 'opensuse'
+          os_family: 'linux',
+          upstream: 'sles',
+          model: 'open_source',
+          state: 'current',
+          type: 'distribution'
         },
-        sles: {
-          name: 'SUSE Linux Enterprise Server',
+        opensuse: {
+          name: 'openSUSE',
           os_family: 'linux',
           upstream: 'linux',
-          model: 'commercial',
+          model: 'open_source',
           state: 'current',
           type: 'distribution'
         }

data/lib/kanrisuru/version.rb

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

data/spec/functional/remote/fstab_spec.rb

@@ -16,6 +16,22 @@ RSpec.describe Kanrisuru::Remote::Fstab do
         host.disconnect
       end
 
+      it 'outputs string version of fstab' do
+        host.su('root')
+
+        result = host.cat('/etc/fstab')
+        expect(result).to be_success
+        raw_file_lines = []
+        result.each do |line|
+          next if line.match(/^#/) || line == ''
+
+          raw_file_lines << line.split.join(' ')
+        end
+
+        raw_file_output = raw_file_lines.join("\n")
+        expect(raw_file_output).to eq(host.fstab.to_s)
+      end
+
       it 'parses fstab' do
         host.su('root')
         fstab = host.fstab

data/spec/unit/util_spec.rb

@@ -59,6 +59,7 @@ RSpec.describe Kanrisuru::Util do
     expect(Kanrisuru::Util::OsFamily.upstream_include_distribution?('linux', 'linux_mint')).to eq(true)
 
     expect(Kanrisuru::Util::OsFamily.upstream_include_distribution?('fedora', 'redhat')).to eq(true)
+    expect(Kanrisuru::Util::OsFamily.upstream_include_distribution?('sles', 'opensuse_leap')).to eq(true)
     expect(Kanrisuru::Util::OsFamily.upstream_include_distribution?('fedora', 'centos')).to eq(true)
 
     expect(Kanrisuru::Util::OsFamily.upstream_include_distribution?('unix_like', 'linux_mint')).to eq(false)

metadata

@@ -1,114 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.9
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: net-ping
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
-description: 
+        version: '6.1'
+description: Manage remote servers over ssh with ruby.
 email: ryan@avamia.com
 executables: []
 extensions: []
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.11
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: