linux_admin 1.2.2 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7e59d030d792e7f4855c26079a6603b4283e6327438316e2b8acf77659cf36a
-  data.tar.gz: 333842257625f0836cc5dd8f34f2512d4714f239d61e88aebee6642543a9e1fb
+  metadata.gz: 2ddedcd6ceb14d076ced3bfb96af9c8f29ad37abd2971dacf4f53259e908e86f
+  data.tar.gz: 999756b223217fcff6fc317a256e8ee2dfaaa7fc18bb97bbfb4c7216be824079
 SHA512:
-  metadata.gz: 4e131edeb3e983f65beebf33818e98956da47aaad6346cb3a6f8c72b936ddc6e82e97e20edf712f407b08f5053b45ff0c61fe959e316e9afdd99fe6823288c3b
-  data.tar.gz: 986bd3e4510e9a9b3cba5fb013a79af6d37e71c895fee414e1568e78c39767c946133a70dfc59bace475f7084a9ffd4c23f7bede8fb5156677628d4f06b8522f
+  metadata.gz: 686d0e331bacae73eed707a30d21fcbf188d14aaa61651a9f606202a62b295e4a0d4c45c73f6a62fa7d3946cd062c2fc49cd791013559b6b057fbed50012be5b
+  data.tar.gz: 1eabbe2ea7f4bd9ce0deb9f590d50a90e03ac880cf3bd3360025a828be206fa9705145bf73fa92f1cb60c27e2175382760db48cc8504d0e136c689580fe88aab

data/README.md

@@ -1,7 +1,7 @@
 # LinuxAdmin
 
 [![Gem Version](https://badge.fury.io/rb/linux_admin.svg)](http://badge.fury.io/rb/linux_admin)
-[![Build Status](https://travis-ci.org/ManageIQ/linux_admin.svg)](https://travis-ci.org/ManageIQ/linux_admin)
+[![Build Status](https://travis-ci.com/ManageIQ/linux_admin.svg)](https://travis-ci.com/ManageIQ/linux_admin)
 [![Code Climate](http://img.shields.io/codeclimate/github/ManageIQ/linux_admin.svg)](https://codeclimate.com/github/ManageIQ/linux_admin)
 [![Coverage Status](http://img.shields.io/coveralls/ManageIQ/linux_admin.svg)](https://coveralls.io/r/ManageIQ/linux_admin)
 [![Dependency Status](https://gemnasium.com/ManageIQ/linux_admin.svg)](https://gemnasium.com/ManageIQ/linux_admin)

data/lib/linux_admin.rb

@@ -33,18 +33,10 @@ require 'linux_admin/ip_address'
 require 'linux_admin/dns'
 require 'linux_admin/network_interface'
 require 'linux_admin/chrony'
-require 'forwardable'
 
 module LinuxAdmin
   class << self
-    extend Forwardable
-    extend Gem::Deprecate
     attr_writer :logger
-
-    def_delegators Common, :run
-    def_delegators Common, :run!
-    deprecate :run,  "AwesomeSpawn.run",  2017, 6
-    deprecate :run!, "AwesomeSpawn.run!", 2017, 6
   end
 
   def self.logger

data/lib/linux_admin/chrony.rb

@@ -10,6 +10,7 @@ module LinuxAdmin
     def clear_servers
       data = File.read(@conf)
       data.gsub!(/^server\s+.+\n/, "")
+      data.gsub!(/^pool\s+.+\n/, "")
       File.write(@conf, data)
     end
 

data/lib/linux_admin/disk.rb

@@ -6,17 +6,25 @@ module LinuxAdmin
       [:id, :start_sector, :end_sector,
        :size, :partition_type, :fs_type]
 
-    attr_accessor :path
+    attr_accessor :path, :model
 
+    # Collect local disk information via the lsblk command. Only disks with a
+    # size greater than zero are returned.
+    #
     def self.local
-      result = Common.run!(Common.cmd("lsblk"), :params => {:d => nil, :n => nil, :p => nil, :o => "NAME"})
-      result.output.split.collect do |d|
-        Disk.new :path => d
-      end
+      result = Common.run!(Common.cmd("lsblk"), :params => {:b => nil, :d => nil, :n => nil, :p => nil, :o => "NAME,SIZE,TYPE,MODEL"})
+      result.output.split("\n").collect do |string|
+        path, size, type, *model = string.split
+        if type.casecmp?('disk') && size.to_i > 0
+          self.new(:path => path, :size => size.to_i, :model => model.join(' '))
+        end
+      end.compact
     end
 
     def initialize(args = {})
-      @path = args[:path]
+      @path  = args[:path]
+      @model = args[:model] || "unknown"
+      @size  = args[:size]
     end
 
     def size
@@ -101,11 +109,20 @@ module LinuxAdmin
       self
     end
 
+    def partition_path(id)
+      case model
+      when "nvme"
+        "#{path}p#{id}"
+      else
+        "#{path}#{id}"
+      end
+    end
+
     private
 
     def str_to_bytes(val, unit)
       case unit
-      when 'K' then
+      when 'K', 'k' then
         val.to_f * 1_024 # 1.kilobytes
       when 'M' then
         val.to_f * 1_048_576 # 1.megabyte
@@ -152,11 +169,17 @@ module LinuxAdmin
       out.each_line do |l|
         if l =~ /^ [0-9].*/
           split << l.split
+        elsif l =~ /^Model:.*/
+          parse_model(l)
         end
       end
       split
     end
 
+    def parse_model(parted_line)
+      matches = parted_line.match(/^Model:.*\((?<model>\w+)\)$/)
+      @model = matches[:model] if matches
+    end
 
     def partition_from_parted(output_disk)
       args = {:disk => self}
@@ -164,7 +187,7 @@ module LinuxAdmin
         val = output_disk[i]
         case PARTED_FIELDS[i]
         when :start_sector, :end_sector, :size
-          if val =~ /([0-9\.]*)([KMG])B/
+          if val =~ /([0-9\.]*)([kKMG])B/
             val = str_to_bytes($1, $2)
           end
 

data/lib/linux_admin/fstab.rb

@@ -25,13 +25,13 @@ module LinuxAdmin
       comment = "##{comment}" unless comment.blank?
       columns = columns.chomp.split
 
-      FSTabEntry.new :device        => columns[0],
+      FSTabEntry.new(:device        => columns[0],
                      :mount_point   => columns[1],
                      :fs_type       => columns[2],
                      :mount_options => columns[3],
                      :dumpable      => columns[4],
                      :fsck_order    => columns[5],
-                     :comment       => comment
+                     :comment       => comment)
     end
 
     def has_content?
@@ -44,30 +44,35 @@ module LinuxAdmin
     end
 
     def column_lengths
-      self.columns.collect { |c| c ? c.size : 0 }
+      columns.collect { |c| c ? c.to_s.size : 0 }
     end
 
     def formatted_columns(max_lengths)
       self.columns.collect.
-        with_index { |col, i| col.to_s.rjust(max_lengths[i]) }.join(" ")
+        with_index { |col, i| col.to_s.rjust(max_lengths[i]) }.join(" ").rstrip
     end
   end
 
   class FSTab
     include Singleton
 
-    attr_accessor :entries
-    attr_accessor :maximum_column_lengths
-
     def initialize
       refresh
     end
 
+    def entries
+      @entries ||= LinuxAdmin::FSTab::EntryCollection.new
+    end
+
+    def maximum_column_lengths
+      entries.maximum_column_lengths
+    end
+
     def write!
       content = ''
-      @entries.each do |entry|
+      entries.each do |entry|
         if entry.has_content?
-          content << entry.formatted_columns(@maximum_column_lengths) << "\n"
+          content << entry.formatted_columns(entries.maximum_column_lengths) << "\n"
         else
           content << "#{entry.comment}"
         end
@@ -84,17 +89,27 @@ module LinuxAdmin
     end
 
     def refresh
-      @entries  = []
-      @maximum_column_lengths = Array.new(7, 0) # # of columns
+      @entries = nil
       read.each do |line|
         entry = FSTabEntry.from_line(line)
-        @entries << entry
+        entries << entry
+      end
+    end
+
+    class EntryCollection < Array
+      attr_reader :maximum_column_lengths
 
+      def initialize
+        @maximum_column_lengths = Array.new(7, 0) # # of columns
+      end
+
+      def <<(entry)
         lengths = entry.column_lengths
         lengths.each_index do |i|
-          @maximum_column_lengths[i] =
-            lengths[i] if lengths[i] > @maximum_column_lengths[i]
+          maximum_column_lengths[i] = [lengths[i], maximum_column_lengths[i]].max
         end
+
+        super
       end
     end
   end

data/lib/linux_admin/partition.rb

@@ -22,7 +22,7 @@ module LinuxAdmin
     end
 
     def path
-      "#{disk.path}#{id}"
+      disk.partition_path(id)
     end
 
     def mount(mount_point=nil)

data/lib/linux_admin/registration_system.rb

@@ -3,6 +3,7 @@ module LinuxAdmin
     include Logging
 
     def self.registration_type(reload = false)
+      @registration_type ||= nil
       return @registration_type if @registration_type && !reload
       @registration_type = registration_type_uncached
     end
@@ -23,10 +24,13 @@ module LinuxAdmin
 
     private
 
+    def self.respond_to_missing?(method_name, _include_private = false)
+      white_list_methods.include?(method_name)
+    end
+    private_class_method :respond_to_missing?
+
     def self.registration_type_uncached
-      if Rhn.new.registered?
-        Rhn
-      elsif SubscriptionManager.new.registered?
+      if SubscriptionManager.new.registered?
         SubscriptionManager
       else
         self
@@ -36,7 +40,7 @@ module LinuxAdmin
 
     def self.white_list_methods
       @white_list_methods ||= begin
-        all_methods = RegistrationSystem.instance_methods(false) + Rhn.instance_methods(false) + SubscriptionManager.instance_methods(false)
+        all_methods = RegistrationSystem.instance_methods(false) + SubscriptionManager.instance_methods(false)
         all_methods.uniq
       end
     end

data/lib/linux_admin/scap.rb

@@ -83,7 +83,7 @@ module LinuxAdmin
     end
 
     def model_xml_element(doc)
-      doc.css("//nist_list|model", "nist_list" => "http://checklists.nist.gov/xccdf/1.2").detect { |model| model.namespace.prefix.nil? }
+      doc.xpath("//ns10:model").first
     end
   end
 end

data/lib/linux_admin/service/sys_v_init_service.rb

@@ -17,9 +17,10 @@ module LinuxAdmin
       self
     end
 
-    def start
+    def start(enable = false)
       Common.run!(Common.cmd(:service),
                   :params => {nil => [name, "start"]})
+      self.enable if enable
       self
     end
 

data/lib/linux_admin/service/systemd_service.rb

@@ -14,8 +14,12 @@ module LinuxAdmin
       self
     end
 
-    def start
-      Common.run!(command_path, :params => ["start", name])
+    def start(enable = false)
+      if enable
+        Common.run!(command_path, :params => ["enable", "--now", name])
+      else
+        Common.run!(command_path, :params => ["start", name])
+      end
       self
     end
 

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 module LinuxAdmin
-  VERSION = "1.2.2".freeze
+  VERSION = "2.0.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.2
 platform: ruby
 authors:
 - Brandon Dunne
@@ -21,25 +21,14 @@ authors:
 - DuskyPrawn
 - Petr Blaho
 - Nick LaMuro
+- Daniel Berger
+- Satoe Imaishi
+- d-m-u
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -130,34 +119,52 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
-    - - "~>"
+        version: 1.8.5
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.10.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
-    - - "~>"
+        version: 1.8.5
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.10.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: openscap
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +216,9 @@ email:
 - 32548790+DuskyPrawn@users.noreply.github.com
 - pblaho@redhat.com
 - nicklamuro@gmail.com
+- djberg96@gmail.com
+- simaishi@redhat.com
+- drewuhlmann@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -239,7 +249,6 @@ files:
 - lib/linux_admin/partition.rb
 - lib/linux_admin/physical_volume.rb
 - lib/linux_admin/registration_system.rb
-- lib/linux_admin/registration_system/rhn.rb
 - lib/linux_admin/registration_system/subscription_manager.rb
 - lib/linux_admin/rpm.rb
 - lib/linux_admin/scap.rb
@@ -255,53 +264,6 @@ files:
 - lib/linux_admin/volume_group.rb
 - lib/linux_admin/yum.rb
 - lib/linux_admin/yum/repo_file.rb
-- spec/chrony_spec.rb
-- spec/common_spec.rb
-- spec/data/rhn/output_rhn-channel_list
-- spec/data/rhn/output_rhn-channel_list_available
-- spec/data/rhn/systemid
-- spec/data/rhn/systemid.missing_system_id
-- spec/data/rpm/cmd_output_for_list_installed
-- spec/data/subscription_manager/output_list_all_available
-- spec/data/subscription_manager/output_list_installed_not_subscribed
-- spec/data/subscription_manager/output_list_installed_subscribed
-- spec/data/subscription_manager/output_orgs
-- spec/data/subscription_manager/output_repos
-- spec/data/time_date/timedatectl_output
-- spec/data/yum/first.repo
-- spec/data/yum/output_repo_list
-- spec/data/yum/output_repoquery_multiple
-- spec/data/yum/output_repoquery_single
-- spec/data/yum/second.repo
-- spec/deb_spec.rb
-- spec/disk_spec.rb
-- spec/distro_spec.rb
-- spec/dns_spec.rb
-- spec/etc_issue_spec.rb
-- spec/fstab_spec.rb
-- spec/hardware_spec.rb
-- spec/hosts_spec.rb
-- spec/ip_address_spec.rb
-- spec/logical_volume_spec.rb
-- spec/mountable_spec.rb
-- spec/network_interface/network_interface_rh_spec.rb
-- spec/network_interface_spec.rb
-- spec/partition_spec.rb
-- spec/physical_volume_spec.rb
-- spec/registration_system_spec.rb
-- spec/rhn_spec.rb
-- spec/rpm_spec.rb
-- spec/scap_spec.rb
-- spec/service/sys_v_init_service_spec.rb
-- spec/service/systemd_service_spec.rb
-- spec/service_spec.rb
-- spec/spec_helper.rb
-- spec/ssh_spec.rb
-- spec/subscription_manager_spec.rb
-- spec/system_spec.rb
-- spec/time_date_spec.rb
-- spec/volume_group_spec.rb
-- spec/yum_spec.rb
 homepage: http://github.com/ManageIQ/linux_admin
 licenses:
 - MIT
@@ -321,56 +283,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: LinuxAdmin is a module to simplify management of linux systems.
-test_files:
-- spec/chrony_spec.rb
-- spec/common_spec.rb
-- spec/data/rhn/output_rhn-channel_list
-- spec/data/rhn/output_rhn-channel_list_available
-- spec/data/rhn/systemid
-- spec/data/rhn/systemid.missing_system_id
-- spec/data/rpm/cmd_output_for_list_installed
-- spec/data/subscription_manager/output_list_all_available
-- spec/data/subscription_manager/output_list_installed_not_subscribed
-- spec/data/subscription_manager/output_list_installed_subscribed
-- spec/data/subscription_manager/output_orgs
-- spec/data/subscription_manager/output_repos
-- spec/data/time_date/timedatectl_output
-- spec/data/yum/first.repo
-- spec/data/yum/output_repo_list
-- spec/data/yum/output_repoquery_multiple
-- spec/data/yum/output_repoquery_single
-- spec/data/yum/second.repo
-- spec/deb_spec.rb
-- spec/disk_spec.rb
-- spec/distro_spec.rb
-- spec/dns_spec.rb
-- spec/etc_issue_spec.rb
-- spec/fstab_spec.rb
-- spec/hardware_spec.rb
-- spec/hosts_spec.rb
-- spec/ip_address_spec.rb
-- spec/logical_volume_spec.rb
-- spec/mountable_spec.rb
-- spec/network_interface/network_interface_rh_spec.rb
-- spec/network_interface_spec.rb
-- spec/partition_spec.rb
-- spec/physical_volume_spec.rb
-- spec/registration_system_spec.rb
-- spec/rhn_spec.rb
-- spec/rpm_spec.rb
-- spec/scap_spec.rb
-- spec/service/sys_v_init_service_spec.rb
-- spec/service/systemd_service_spec.rb
-- spec/service_spec.rb
-- spec/spec_helper.rb
-- spec/ssh_spec.rb
-- spec/subscription_manager_spec.rb
-- spec/system_spec.rb
-- spec/time_date_spec.rb
-- spec/volume_group_spec.rb
-- spec/yum_spec.rb
+test_files: []