linux_admin 1.2.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b829f3cc2362f608bad95b43d9e3fe8b97a57bf027c84d16cd38c758dc841840
-  data.tar.gz: 0f9741c5305f8dee09358f9c1c44edf12ad150fa11a79514c59a8110c8254094
+  metadata.gz: 5681d25983ab26caad539f8b7978090804ba734a45ed80fdf2107730d4c2cc42
+  data.tar.gz: 4e3879832bbd3e426d5440fa42d4eade9dbf0120d03aa410450cd53f64092da9
 SHA512:
-  metadata.gz: e80cc3ce27b7b68d4d74947e81d8fa9451849aa0995a008874ec741ad30ff57a9c7306fca270299463a22785a490722aa55a0ffa036dd03903a6e79517beb755
-  data.tar.gz: 6887b3343ea5220c23c86373e049d4ff497babdda16bc70b8d542d506641575392092a3ecf1b85ec42060d31fc6f263efe5e29cd3fcb9bc7e7696bf100ccce83
+  metadata.gz: 873010562e96308eb395441c06eda128e44cdf900e829b91e76d4927313f2971f3d55be28d96ef5af4c083f646993a8d06b6542fa01e5b423ec61f70f6a2c646
+  data.tar.gz: dfa21c10b2a0490606c3c28b29e6dc813dba9d3d3d92ac3d845f95b41fb39d927daf08491b1c058af65b3aa097894e50be7e0b62be22d86839acd7e34c81de3c

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/disk.rb

@@ -8,16 +8,23 @@ module LinuxAdmin
 
     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]
-      @model = "unknown"
+      @model = args[:model] || "unknown"
+      @size  = args[:size]
     end
 
     def size

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.4".freeze
+  VERSION = "2.0.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -21,10 +21,12 @@ authors:
 - DuskyPrawn
 - Petr Blaho
 - Nick LaMuro
+- Daniel Berger
+- Satoe Imaishi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -213,6 +215,8 @@ email:
 - 32548790+DuskyPrawn@users.noreply.github.com
 - pblaho@redhat.com
 - nicklamuro@gmail.com
+- djberg96@gmail.com
+- simaishi@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -243,7 +247,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
@@ -259,53 +262,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
@@ -325,56 +281,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+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: []

data/lib/linux_admin/registration_system/rhn.rb

@@ -1,111 +0,0 @@
-require 'nokogiri'
-
-module LinuxAdmin
-  class Rhn < RegistrationSystem
-    SATELLITE5_SERVER_CERT_PATH = "pub/rhn-org-trusted-ssl-cert-1.0-1.noarch.rpm"
-    INSTALLED_SERVER_CERT_PATH  = "/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT"
-
-    def initialize
-      warn("[DEPRECATION] 'LinuxAdmin::Rhn' is deprecated.  Please use 'LinuxAdmin::SubscriptionManager' instead.")
-    end
-
-    def registered?(_options = nil)
-      id = ""
-      if File.exist?(systemid_file)
-        xml = Nokogiri.XML(File.read(systemid_file))
-        id = xml.xpath('/params/param/value/struct/member[name="system_id"]/value/string').text
-      end
-      id.length > 0
-    end
-
-    def register(options)
-      cmd    = "rhnreg_ks"
-      params = {}
-
-      if options[:activationkey]
-        params["--activationkey="]  = options[:activationkey]
-      elsif options[:username] && options[:password]
-        params["--username="]       = options[:username]
-        params["--password="]       = options[:password]
-      else
-        raise ArgumentError, "activation key or username and password are required"
-      end
-
-      install_server_certificate(options[:server_url], SATELLITE5_SERVER_CERT_PATH) if options[:server_url]
-      certificate_installed = LinuxAdmin::Rpm.list_installed["rhn-org-trusted-ssl-cert"]
-
-      params["--proxy="]          = options[:proxy_address]     if options[:proxy_address]
-      params["--proxyUser="]      = options[:proxy_username]    if options[:proxy_username]
-      params["--proxyPassword="]  = options[:proxy_password]    if options[:proxy_password]
-      params["--serverUrl="]      = options[:server_url]        if options[:server_url]
-      params["--systemorgid="]    = options[:org]               if options[:server_url] && options[:org]
-      params["--sslCACert="]      = INSTALLED_SERVER_CERT_PATH  if certificate_installed
-
-      Common.run!(cmd, :params => params)
-    end
-
-    def enable_channel(repo, options)
-      cmd       = "rhn-channel -a"
-      params    = user_pwd(options).merge("--channel=" => repo)
-
-      logger.info("#{self.class.name}##{__method__} Enabling channel: #{repo}")
-      Common.run!(cmd, :params => params)
-    end
-    alias_method :subscribe,    :enable_channel
-    alias_method :enable_repo,  :enable_channel
-
-    def disable_channel(repo, options)
-      cmd       = "rhn-channel -r"
-      params    = user_pwd(options).merge("--channel=" => repo)
-
-      Common.run!(cmd, :params => params)
-    end
-    alias_method :disable_repo, :disable_channel
-
-    def enabled_channels
-      cmd = "rhn-channel -l"
-
-      Common.run!(cmd).output.split("\n").compact
-    end
-    alias_method :enabled_repos, :enabled_channels
-    alias_method :subscribed_products, :enabled_channels
-
-    def available_channels(options)
-      cmd     = "rhn-channel -L"
-      params  = user_pwd(options)
-
-      Common.run!(cmd, :params => params).output.chomp.split("\n").compact
-    end
-
-    def all_repos(options)
-      available = available_channels_with_status(options)
-      merge_enabled_channels_with_status(available)
-    end
-
-    private
-
-    def available_channels_with_status(options)
-      available_channels(options).collect { |ac| {:repo_id => ac, :enabled => false} }
-    end
-
-    def merge_enabled_channels_with_status(available)
-      enabled_channels.each_with_object(available) do |enabled, all|
-        if repo = all.detect { |i| i[:repo_id] == enabled }
-          repo[:enabled] = true
-        else
-          all.push({:repo_id => enabled, :enabled => true})
-        end
-      end
-    end
-
-    def user_pwd(options)
-      raise ArgumentError, "username and password are required" if options[:username].blank? || options[:password].blank?
-
-      {"--user=" => options[:username], "--password=" => options[:password]}
-    end
-
-    def systemid_file
-      "/etc/sysconfig/rhn/systemid"
-    end
-  end
-end

data/spec/chrony_spec.rb

@@ -1,64 +0,0 @@
-describe LinuxAdmin::Chrony do
-  CHRONY_CONF = <<-EOF
-# commented server baz.example.net
-server foo.example.net
-server bar.example.net iburst
-driftfile /var/lib/chrony/drift
-makestep 10 3
-rtcsync
-EOF
-
-  subject do
-    allow(File).to receive(:exist?).and_return(true)
-    described_class.new
-  end
-
-  describe ".new" do
-    it "raises when the given config file doesn't exist" do
-      expect { described_class.new("nonsense/file") }.to raise_error(LinuxAdmin::MissingConfigurationFileError)
-    end
-  end
-
-  describe "#clear_servers" do
-    it "removes all the server lines from the conf file" do
-      allow(File).to receive(:read).and_return(CHRONY_CONF.dup)
-      expect(File).to receive(:write) do |_file, contents|
-        expect(contents).to eq "# commented server baz.example.net\ndriftfile /var/lib/chrony/drift\nmakestep 10 3\nrtcsync\n"
-      end
-      subject.clear_servers
-    end
-  end
-
-  describe "#add_servers" do
-    it "adds server lines to the conf file" do
-      allow(File).to receive(:read).and_return(CHRONY_CONF.dup)
-      expect(File).to receive(:write) do |_file, contents|
-        expect(contents).to eq(CHRONY_CONF + "server baz.example.net iburst\nserver foo.bar.example.com iburst\n")
-      end
-      allow(subject).to receive(:restart_service_if_running)
-      subject.add_servers("baz.example.net", "foo.bar.example.com")
-    end
-
-    it "restarts the service if it is running" do
-      allow(File).to receive(:read).and_return(CHRONY_CONF.dup)
-      allow(File).to receive(:write)
-
-      chronyd_service = double
-      expect(LinuxAdmin::Service).to receive(:new).with("chronyd").and_return(chronyd_service)
-      expect(chronyd_service).to receive(:running?).and_return true
-      expect(chronyd_service).to receive(:restart)
-      subject.add_servers("baz.example.net", "foo.bar.example.com")
-    end
-
-    it "doesn't restart the service if it is not running" do
-      allow(File).to receive(:read).and_return(CHRONY_CONF.dup)
-      allow(File).to receive(:write)
-
-      chronyd_service = double
-      expect(LinuxAdmin::Service).to receive(:new).with("chronyd").and_return(chronyd_service)
-      expect(chronyd_service).to receive(:running?).and_return false
-      expect(chronyd_service).not_to receive(:restart)
-      subject.add_servers("baz.example.net", "foo.bar.example.com")
-    end
-  end
-end