linux_admin 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c8a9566372578734f209b1cb4d7795bc8d911ff
-  data.tar.gz: 0d10059fc09b699b8b0debda74afb30592021353
+  metadata.gz: 284247598cea1f7eabd5d8c8d4fb4710c0e040e0
+  data.tar.gz: a4943e48131e68c3bd2a8cc21b8dcd6c441fa5cd
 SHA512:
-  metadata.gz: 063fcd55e7a1b6f1aa8d595b0a060ac642fc00766aba7a26ab398f5d87f9cc4e5adec38321ee5f5bf6c8e0adda73798bbdb0b4015f9c33fff988d533afc1fac5
-  data.tar.gz: 33dfa49d8909ed8a7c2a28db9ac4d314ef09f263d7f10c64e628ba792b59a76d4964002c8f7a4b58badefb659fc0c2cb980cb404a1825ae50af64890c690cf25
+  metadata.gz: 04bb042b12b6b6155582bc4091965bf2968d3d01dfdde64277100ba461a668ba37b156e83f01754f0e8b07b2408ab4a8a8018b12cc56473ecde59a25d42897e4
+  data.tar.gz: 64a75e5340636156aa82cd16f96aedf96ecefcd7976e6d63e8b4a35e19d67a8c43f3eafc4b68cab0dcf8862c7451943f2d85f984aac5586e197b9a0d92426c3d

data/lib/linux_admin.rb

@@ -28,6 +28,8 @@ require 'linux_admin/logical_volume'
 require 'linux_admin/physical_volume'
 require 'linux_admin/volume_group'
 require 'linux_admin/scap'
+require 'linux_admin/time_date'
+require 'linux_admin/ip_address'
 
 module LinuxAdmin
   extend Common

data/lib/linux_admin/hosts.rb

@@ -1,5 +1,7 @@
 module LinuxAdmin
   class Hosts
+    include Common
+
     attr_accessor :filename
     attr_accessor :raw_lines
     attr_accessor :parsed_file
@@ -36,6 +38,20 @@ module LinuxAdmin
       end
     end
 
+    def hostname=(name)
+      if cmd?("hostnamectl")
+        run!(cmd('hostnamectl'), :params => ['set-hostname', name])
+      else
+        File.write("/etc/hostname", name)
+        run!(cmd('hostname'), :params => {:file => "/etc/hostname"})
+      end
+    end
+
+    def hostname
+      result = run(cmd("hostname"))
+      result.success? ? result.output : nil
+    end
+
   private
     def parse_file
       @parsed_file = []

data/lib/linux_admin/ip_address.rb

@@ -0,0 +1,27 @@
+module LinuxAdmin
+  class IpAddress
+    include Common
+
+    def address
+      address_list.detect { |ip| IPAddr.new(ip).ipv4? }
+    end
+
+    def address6
+      address_list.detect { |ip| IPAddr.new(ip).ipv6? }
+    end
+
+    private
+
+    def address_list
+      result = nil
+      # Added retry to account for slow DHCP not assigning an IP quickly at boot; specifically:
+      # https://github.com/ManageIQ/manageiq-appliance/commit/160d8ccbfbfd617bdb5445e56cdab66b9323b15b
+      5.times do
+        result = run(cmd("hostname"), :params => ["-I"])
+        break if result.success?
+      end
+
+      result.success? ? result.output.split(' ') : []
+    end
+  end
+end

data/lib/linux_admin/time_date.rb

@@ -0,0 +1,31 @@
+module LinuxAdmin
+  class TimeDate
+    extend Common
+    COMMAND = 'timedatectl'
+
+    TimeCommandError = Class.new(StandardError)
+
+    def self.system_timezone_detailed
+      result = run(cmd(COMMAND), :params => ["status"])
+      result.output.split("\n").each do |l|
+        return l.split(':')[1].strip if l =~ /Time.*zone/
+      end
+    end
+
+    def self.system_timezone
+      system_timezone_detailed.split[0]
+    end
+
+    def self.system_time=(time)
+      run!(cmd(COMMAND), :params => ["set-time", "#{time.strftime("%F %T")}", :adjust_system_clock])
+    rescue AwesomeSpawn::CommandResultError => e
+      raise TimeCommandError, e.message
+    end
+
+    def self.system_timezone=(zone)
+      run!(cmd(COMMAND), :params => ["set-timezone", zone])
+    rescue AwesomeSpawn::CommandResultError => e
+      raise TimeCommandError, e.message
+    end
+  end
+end

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 module LinuxAdmin
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/spec/data/time_date/timedatectl_output

@@ -0,0 +1,14 @@
+      Local time: Thu 2015-09-24 17:54:02 EDT
+  Universal time: Thu 2015-09-24 21:54:02 UTC
+        RTC time: Thu 2015-09-24 21:54:02
+       Time zone: America/New_York (EDT, -0400)
+     NTP enabled: yes
+NTP synchronized: yes
+ RTC in local TZ: no
+      DST active: yes
+ Last DST change: DST began at
+                  Sun 2015-03-08 01:59:59 EST
+                  Sun 2015-03-08 03:00:00 EDT
+ Next DST change: DST ends (the clock jumps one hour backwards) at
+                  Sun 2015-11-01 01:59:59 EDT
+                  Sun 2015-11-01 01:00:00 EST

data/spec/hosts_spec.rb

@@ -1,4 +1,5 @@
 describe LinuxAdmin::Hosts do
+  TEST_HOSTNAME = "test-hostname"
   etc_hosts = "\n #Some Comment\n127.0.0.1\tlocalhost localhost.localdomain # with a comment\n127.0.1.1  my.domain.local"
   before do
     allow(File).to receive(:read).and_return(etc_hosts)
@@ -50,4 +51,45 @@ describe LinuxAdmin::Hosts do
       expect(@instance.raw_lines).to eq(expected_array)
     end
   end
+
+  describe "#hostname=" do
+    it "sets the hostname using hostnamectl when the command exists" do
+      spawn_args = [
+        @instance.cmd('hostnamectl'),
+        :params => ['set-hostname', TEST_HOSTNAME]
+      ]
+      expect(@instance).to receive(:cmd?).with("hostnamectl").and_return(true)
+      expect(AwesomeSpawn).to receive(:run!).with(*spawn_args)
+      @instance.hostname = TEST_HOSTNAME
+    end
+
+    it "sets the hostname with hostname when hostnamectl does not exist" do
+      spawn_args = [
+        @instance.cmd('hostname'),
+        :params => {:file => "/etc/hostname"}
+      ]
+      expect(@instance).to receive(:cmd?).with("hostnamectl").and_return(false)
+      expect(File).to receive(:write).with("/etc/hostname", TEST_HOSTNAME)
+      expect(AwesomeSpawn).to receive(:run!).with(*spawn_args)
+      @instance.hostname = TEST_HOSTNAME
+    end
+  end
+
+  describe "#hostname" do
+    let(:spawn_args) do
+      [@instance.cmd('hostname'), {}]
+    end
+
+    it "returns the hostname" do
+      result = AwesomeSpawn::CommandResult.new("", TEST_HOSTNAME, nil, 0)
+      expect(AwesomeSpawn).to receive(:run).with(*spawn_args).and_return(result)
+      expect(@instance.hostname).to eq(TEST_HOSTNAME)
+    end
+
+    it "returns nil when the command fails" do
+      result = AwesomeSpawn::CommandResult.new("", "", "An error has happened", 1)
+      expect(AwesomeSpawn).to receive(:run).with(*spawn_args).and_return(result)
+      expect(@instance.hostname).to be_nil
+    end
+  end
 end

data/spec/ip_address_spec.rb

@@ -0,0 +1,52 @@
+describe LinuxAdmin::IpAddress do
+  let(:ip) { described_class.new }
+
+  SPAWN_ARGS = [
+    described_class.new.cmd("hostname"),
+    :params => ["-I"]
+  ]
+
+  def result(output, exit_status)
+    AwesomeSpawn::CommandResult.new("", output, "", exit_status)
+  end
+
+  describe "#address" do
+    it "returns an address" do
+      ip_addr = "192.168.1.2"
+      expect(AwesomeSpawn).to receive(:run).with(*SPAWN_ARGS).and_return(result(ip_addr, 0))
+      expect(ip.address).to eq(ip_addr)
+    end
+
+    it "returns nil when no address is found" do
+      ip_addr = ""
+      expect(AwesomeSpawn).to receive(:run).at_least(5).times.with(*SPAWN_ARGS).and_return(result(ip_addr, 1))
+      expect(ip.address).to be_nil
+    end
+
+    it "returns only IPv4 addresses" do
+      ip_addr = "fd12:3456:789a:1::1 192.168.1.2"
+      expect(AwesomeSpawn).to receive(:run).with(*SPAWN_ARGS).and_return(result(ip_addr, 0))
+      expect(ip.address).to eq("192.168.1.2")
+    end
+  end
+
+  describe "#address6" do
+    it "returns an address" do
+      ip_addr = "fd12:3456:789a:1::1"
+      expect(AwesomeSpawn).to receive(:run).with(*SPAWN_ARGS).and_return(result(ip_addr, 0))
+      expect(ip.address6).to eq(ip_addr)
+    end
+
+    it "returns nil when no address is found" do
+      ip_addr = ""
+      expect(AwesomeSpawn).to receive(:run).at_least(5).times.with(*SPAWN_ARGS).and_return(result(ip_addr, 1))
+      expect(ip.address6).to be_nil
+    end
+
+    it "returns only IPv6 addresses" do
+      ip_addr = "192.168.1.2 fd12:3456:789a:1::1"
+      expect(AwesomeSpawn).to receive(:run).with(*SPAWN_ARGS).and_return(result(ip_addr, 0))
+      expect(ip.address6).to eq("fd12:3456:789a:1::1")
+    end
+  end
+end

data/spec/time_date_spec.rb

@@ -0,0 +1,74 @@
+describe LinuxAdmin::TimeDate do
+  RUN_COMMAND = described_class.cmd("timedatectl")
+
+  def timedatectl_result
+    output = File.read(Pathname.new(data_file_path("time_date/timedatectl_output")))
+    AwesomeSpawn::CommandResult.new("", output, "", 0)
+  end
+
+  describe ".system_timezone_detailed" do
+    it "returns the correct timezone" do
+      awesome_spawn_args = [
+        RUN_COMMAND,
+        :params => ["status"]
+      ]
+      expect(AwesomeSpawn).to receive(:run).with(*awesome_spawn_args).and_return(timedatectl_result)
+      tz = described_class.system_timezone_detailed
+      expect(tz).to eq("America/New_York (EDT, -0400)")
+    end
+  end
+
+  describe ".system_timezone" do
+    it "returns the correct timezone" do
+      awesome_spawn_args = [
+        RUN_COMMAND,
+        :params => ["status"]
+      ]
+      expect(AwesomeSpawn).to receive(:run).with(*awesome_spawn_args).and_return(timedatectl_result)
+      tz = described_class.system_timezone
+      expect(tz).to eq("America/New_York")
+    end
+  end
+
+  describe ".system_time=" do
+    it "sets the time" do
+      time = Time.new(2015, 1, 1, 1, 1, 1)
+      awesome_spawn_args = [
+        RUN_COMMAND,
+        :params => ["set-time", "2015-01-01 01:01:01", :adjust_system_clock]
+      ]
+      expect(AwesomeSpawn).to receive(:run!).with(*awesome_spawn_args)
+      described_class.system_time = time
+    end
+
+    it "raises when the command fails" do
+      time = Time.new(2015, 1, 1, 1, 1, 1)
+      err = AwesomeSpawn::CommandResultError.new("message", nil)
+      allow(AwesomeSpawn).to receive(:run!).and_raise(err)
+      expect do
+        described_class.send(:system_time=, time)
+      end.to raise_error(described_class::TimeCommandError, "message")
+    end
+  end
+
+  describe ".system_timezone=" do
+    it "sets the timezone" do
+      zone = "Location/City"
+      awesome_spawn_args = [
+        RUN_COMMAND,
+        :params => ["set-timezone", zone]
+      ]
+      expect(AwesomeSpawn).to receive(:run!).with(*awesome_spawn_args)
+      described_class.system_timezone = zone
+    end
+
+    it "raises when the command fails" do
+      zone = "Location/City"
+      err = AwesomeSpawn::CommandResultError.new("message", nil)
+      allow(AwesomeSpawn).to receive(:run!).and_raise(err)
+      expect do
+        described_class.send(:system_timezone=, zone)
+      end.to raise_error(described_class::TimeCommandError, "message")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Brandon Dunne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,6 +184,7 @@ files:
 - lib/linux_admin/exceptions.rb
 - lib/linux_admin/fstab.rb
 - lib/linux_admin/hosts.rb
+- lib/linux_admin/ip_address.rb
 - lib/linux_admin/logging.rb
 - lib/linux_admin/logical_volume.rb
 - lib/linux_admin/mountable.rb
@@ -200,6 +201,7 @@ files:
 - lib/linux_admin/service/sys_v_init_service.rb
 - lib/linux_admin/service/systemd_service.rb
 - lib/linux_admin/system.rb
+- lib/linux_admin/time_date.rb
 - lib/linux_admin/version.rb
 - lib/linux_admin/volume.rb
 - lib/linux_admin/volume_group.rb
@@ -219,6 +221,7 @@ files:
 - 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
@@ -230,6 +233,7 @@ files:
 - spec/etc_issue_spec.rb
 - spec/fstab_spec.rb
 - spec/hosts_spec.rb
+- spec/ip_address_spec.rb
 - spec/logical_volume_spec.rb
 - spec/mountable_spec.rb
 - spec/partition_spec.rb
@@ -244,6 +248,7 @@ files:
 - spec/spec_helper.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
@@ -266,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: LinuxAdmin is a module to simplify management of linux systems.
@@ -285,6 +290,7 @@ test_files:
 - 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
@@ -296,6 +302,7 @@ test_files:
 - spec/etc_issue_spec.rb
 - spec/fstab_spec.rb
 - spec/hosts_spec.rb
+- spec/ip_address_spec.rb
 - spec/logical_volume_spec.rb
 - spec/mountable_spec.rb
 - spec/partition_spec.rb
@@ -310,5 +317,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/subscription_manager_spec.rb
 - spec/system_spec.rb
+- spec/time_date_spec.rb
 - spec/volume_group_spec.rb
 - spec/yum_spec.rb