linux_admin 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a90ef3973da3f00152bf552f74cab0baa544af95
-  data.tar.gz: f296bf3c99266062abc2cc1f67d987aa0e974ec2
+  metadata.gz: 0909517c6cc080f6c8a9a82a7b1119e3a8c50452
+  data.tar.gz: d2182ff8ce82b685d55e562968154010e486874c
 SHA512:
-  metadata.gz: c010a5739c54682ca620bfb4b0851d28e785e063225230c0e848472dfb1359876e27ea7880881838e6c93cf1de30a31a470e4b605e301e8af3c642023e9e953b
-  data.tar.gz: f1f10c4d2bb146033cb405a35b7f510618b7c6cde0d5226b81ea4daa52d6bd44c6a40642ed504f427cebf655ee6784aa4752304c7fed5ed773420a5002c6c942
+  metadata.gz: 7ff4ffc9e1c2650ed0c127b1a2338e5476e7caa211198b471288b17f3874aa6a1b84cacbcafdc165eed7ad971e07ee5d4b53270d2bb593ccdfac378cdbbbd029
+  data.tar.gz: 9de9c8938028031bfe8f0793fe89f0e8e3dc6b329f4d6711842c43500ba41870f4bb5bf532e22206bd59f048a4879e92201c00c52ba5bc11f0c4e879fd3c49c3

data/lib/linux_admin/chrony.rb

@@ -1,5 +1,7 @@
 module LinuxAdmin
   class Chrony
+    SERVICE_NAME = "chronyd".freeze
+
     def initialize(conf = "/etc/chrony.conf")
       raise MissingConfigurationFileError, "#{conf} does not exist" unless File.exist?(conf)
       @conf = conf
@@ -16,6 +18,14 @@ module LinuxAdmin
       data << "\n" unless data.end_with?("\n")
       servers.each { |s| data << "server #{s} iburst\n" }
       File.write(@conf, data)
+      restart_service_if_running
+    end
+
+    private
+
+    def restart_service_if_running
+      service = Service.new(SERVICE_NAME)
+      service.restart if service.running?
     end
   end
 end

data/lib/linux_admin/hosts.rb

@@ -26,6 +26,10 @@ module LinuxAdmin
 
     alias_method :update_entry, :add_alias
 
+    def set_loopback_hostname(hostname, comment = nil)
+      ["::1", "127.0.0.1"].each { |address| add_name(address, hostname, true, comment, false) }
+    end
+
     def set_canonical_hostname(address, hostname, comment = nil)
       add_name(address, hostname, true, comment)
     end
@@ -46,9 +50,9 @@ module LinuxAdmin
 
     private
 
-    def add_name(address, hostname, fqdn, comment)
+    def add_name(address, hostname, fqdn, comment, remove_existing = true)
       # Delete entries for this hostname first
-      @parsed_file.each { |i| i[:hosts].to_a.delete(hostname) }
+      @parsed_file.each { |i| i[:hosts].to_a.delete(hostname) } if remove_existing
 
       # Add entry
       line_number = @parsed_file.find_path(address).first

data/lib/linux_admin/mountable.rb

@@ -18,6 +18,12 @@ module LinuxAdmin
       base.extend(ClassMethods)
     end
 
+    def discover_mount_point
+      result = Common.run!(Common.cmd(:mount))
+      mount_line = result.output.split("\n").find { |line| line.split[0] == path }
+      @mount_point = mount_line.split[2] if mount_line
+    end
+
     def format_to(filesystem)
       Common.run!(Common.cmd(:mke2fs),
                   :params => {'-t' => filesystem, nil => path})

data/lib/linux_admin/ssh.rb

@@ -25,10 +25,9 @@ module LinuxAdmin
 
     def execute_commands(commands, agent_socket, stdin)
       result = nil
-      args = {:paranoid => false}
+      args = {:paranoid => false, :number_of_password_prompts => 0}
       if agent_socket
         args.merge!(:forward_agent              => true,
-                    :number_of_password_prompts => 0,
                     :agent_socket_factory       => -> { UNIXSocket.open(agent_socket) })
       elsif @private_key
         args[:key_data] = [@private_key]

data/lib/linux_admin/time_date.rb

@@ -15,6 +15,13 @@ module LinuxAdmin
       system_timezone_detailed.split[0]
     end
 
+    def self.timezones
+      result = Common.run!(Common.cmd(COMMAND), :params => ["list-timezones"])
+      result.output.split("\n")
+    rescue AwesomeSpawn::CommandResultError => e
+      raise TimeCommandError, e.message
+    end
+
     def self.system_time=(time)
       Common.run!(Common.cmd(COMMAND), :params => ["set-time", "#{time.strftime("%F %T")}", :adjust_system_clock])
     rescue AwesomeSpawn::CommandResultError => e

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 module LinuxAdmin
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

data/lib/linux_admin/yum.rb

@@ -43,11 +43,11 @@ module LinuxAdmin
       cmd    = "yum check-update"
       params = {nil => packages} unless packages.blank?
 
-      exitstatus = Common.run(cmd, :params => params).exit_status
-      case exitstatus
+      spawn = Common.run(cmd, :params => params)
+      case spawn.exit_status
       when 0;   false
       when 100; true
-      else raise "Error: Exit Code #{exitstatus}"
+      else raise "Error: #{cmd} returns '#{spawn.exit_status}', '#{spawn.error}'"
       end
     end
 

data/spec/chrony_spec.rb

@@ -35,6 +35,29 @@ EOF
       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

data/spec/hosts_spec.rb

@@ -32,6 +32,35 @@ describe LinuxAdmin::Hosts do
     end
   end
 
+  describe "#set_loopback_hostname" do
+    etc_hosts_v6_loopback = <<-EOT
+
+#Some Comment
+::1\tlocalhost localhost.localdomain # with a comment
+127.0.0.1\tlocalhost localhost.localdomain # with a comment
+127.0.1.1  my.domain.local
+EOT
+
+    before do
+      allow(File).to receive(:read).and_return(etc_hosts_v6_loopback)
+      @instance_v6_loopback = LinuxAdmin::Hosts.new
+    end
+
+    it "adds the hostname to the start of the hosts list for the loopback addresses" do
+      expected_hash = [{:blank   => true},
+                       {:comment => "Some Comment"},
+                       {:address => "::1",
+                        :hosts   => ["examplehost.example.com", "localhost", "localhost.localdomain"],
+                        :comment => "with a comment"},
+                       {:address => "127.0.0.1",
+                        :hosts   => ["examplehost.example.com", "localhost", "localhost.localdomain"],
+                        :comment => "with a comment"},
+                       {:address => "127.0.1.1", :hosts => ["my.domain.local"]}]
+      @instance_v6_loopback.set_loopback_hostname("examplehost.example.com")
+      expect(@instance_v6_loopback.parsed_file).to eq(expected_hash)
+    end
+  end
+
   describe "#set_canonical_hostname" do
     it "removes an existing entry and creates a new one" do
       expected_hash = [{:blank => true},

data/spec/mountable_spec.rb

@@ -20,6 +20,12 @@ eos
     @mount_out2 = <<eos
 cgroup on /sys/fs/cgroup/perf_event type cgroup (rw,nosuid,nodev,noexec,relatime,perf_event)
 systemd-1 on /proc/sys/fs/binfmt_misc type autofs (rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct)
+eos
+
+    @mount_out3 = <<eos
+/dev/mapper/vg_data-lv_pg on /var/opt/rh/rh-postgresql95/lib/pgsql type xfs (rw,relatime,seclabel,attr2,inode64,noquota)
+/dev/foo on /tmp type xfs (rw,relatime,seclabel,attr2,inode64,noquota)
+/dev/foo on /home type xfs (rw,relatime,seclabel,attr2,inode64,noquota)
 eos
   end
 
@@ -67,6 +73,20 @@ eos
     end
   end
 
+  describe "#discover_mount_point" do
+    it "sets the correct mountpoint when the path is mounted" do
+      expect(LinuxAdmin::Common).to receive(:run!).and_return(double(:output => @mount_out3))
+      @mountable.discover_mount_point
+      expect(@mountable.mount_point).to eq("/tmp")
+    end
+
+    it "sets mount_point to nil when the path is not mounted" do
+      expect(LinuxAdmin::Common).to receive(:run!).and_return(double(:output => @mount_out1))
+      @mountable.discover_mount_point
+      expect(@mountable.mount_point).to be_nil
+    end
+  end
+
   describe "#format_to" do
     it "uses mke2fs" do
       expect(LinuxAdmin::Common).to receive(:run!)

data/spec/ssh_spec.rb

@@ -42,12 +42,12 @@ sV1Tr/acrE0aWBkD9RYrR2/UwG1zfXuIJeufdWf8c0SY3X6J7jJN
   end
 
   it "should preform command using private key" do
-    expect(Net::SSH).to receive(:start).with("127.0.0.1", "root", :paranoid => false, :key_data => [@example_ssh_key]).and_return(true)
+    expect(Net::SSH).to receive(:start).with("127.0.0.1", "root", :paranoid => false, :number_of_password_prompts => 0, :key_data => [@example_ssh_key]).and_return(true)
     LinuxAdmin::SSH.new("127.0.0.1", "root", @example_ssh_key).perform_commands(%w("ls", "pwd"))
   end
 
   it "should preform command using password" do
-    expect(Net::SSH).to receive(:start).with("127.0.0.1", "root", :paranoid => false, :password => "password").and_return(true)
+    expect(Net::SSH).to receive(:start).with("127.0.0.1", "root", :paranoid => false, :number_of_password_prompts => 0, :password => "password").and_return(true)
     LinuxAdmin::SSH.new("127.0.0.1", "root", nil, "password").perform_commands(%w("ls", "pwd"))
   end
 end

data/spec/time_date_spec.rb

@@ -30,6 +30,38 @@ describe LinuxAdmin::TimeDate do
     end
   end
 
+  describe ".timezones" do
+    let(:timezones) do
+      <<-EOS
+Africa/Bangui
+Africa/Banjul
+Africa/Bissau
+Africa/Blantyre
+Africa/Brazzaville
+Africa/Bujumbura
+Africa/Cairo
+America/Havana
+America/Hermosillo
+America/Indiana/Indianapolis
+America/Indiana/Knox
+America/Argentina/San_Juan
+America/Argentina/San_Luis
+America/Argentina/Tucuman
+America/Argentina/Ushuaia
+      EOS
+    end
+
+    it "returns the correct list" do
+      awesome_spawn_args = [
+        RUN_COMMAND,
+        :params => ["list-timezones"]
+      ]
+      result = AwesomeSpawn::CommandResult.new("", timezones, "", 0)
+      expect(AwesomeSpawn).to receive(:run!).with(*awesome_spawn_args).and_return(result)
+      expect(described_class.timezones).to eq(timezones.split("\n"))
+    end
+  end
+
   describe ".system_time=" do
     it "sets the time" do
       time = Time.new(2015, 1, 1, 1, 1, 1)

data/spec/yum_spec.rb

@@ -84,7 +84,7 @@ describe LinuxAdmin::Yum do
     end
 
     it "other exit code" do
-      allow(LinuxAdmin::Common).to receive_messages(:run => double(:exit_status => 255))
+      allow(LinuxAdmin::Common).to receive_messages(:run => double(:exit_status => 255, :error => 'test'))
       expect { described_class.updates_available? }.to raise_error(RuntimeError)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -15,10 +15,12 @@ authors:
 - Yuri Rudman
 - Oleg Barenboim
 - Alon Goldboim
+- Šimon Lukašík
+- Joe VLcek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,6 +193,8 @@ email:
 - yrudman@redhat.com
 - chessbyte@gmail.com
 - alongoldboim@gmail.com
+- isimluk@fedoraproject.org
+- jvlcek@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files: []