linux_admin 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cff55729b03594f6057598b4c52e8b46f9d150f
-  data.tar.gz: c4396ebccac857e757be07437c734b307682c359
+  metadata.gz: 0c5b96fbeb251ef6a0e5c6a2215b828d78ccaa94
+  data.tar.gz: 32276203e615b1a9a22e0d0899fa3eb1cc7f7551
 SHA512:
-  metadata.gz: 304dae896d5b1d43efe3b92206c029ea305933eb38c5a37f0e77b7393b729542e71c4e18ebf01e0b1eed558ecd6512890609efde18a343f353f8a6b12935e290
-  data.tar.gz: 90aea3e3a2f7f043e68c506fa342201c8ca3a7f8a5078e7a5abe500fc3cd187b7691b4393416af16793e955a76d4c9bfdb36a635fd906e9badc0267b4e6790f8
+  metadata.gz: a02c17575fc1db9259f7192c9ad138a69d2aa0bf5abf87059f5a91566b3ba0f0fea862279f24a69271eb4ec7d873ce3451b928b6e7ee4256b274dea67df92022
+  data.tar.gz: b7b51b7c0bab05f59e4cce1105abf548ca925be5ee2b2213d8ecebb2f055e41e508adb5eb72862426a15e36023f7d32b7ac5989afb5c78e1d412221f0982b366

data/lib/linux_admin/chrony.rb

@@ -0,0 +1,21 @@
+module LinuxAdmin
+  class Chrony
+    def initialize(conf = "/etc/chrony.conf")
+      raise MissingConfigurationFileError, "#{conf} does not exist" unless File.exist?(conf)
+      @conf = conf
+    end
+
+    def clear_servers
+      data = File.read(@conf)
+      data.gsub!(/^server\s+.+\n/, "")
+      File.write(@conf, data)
+    end
+
+    def add_servers(*servers)
+      data = File.read(@conf)
+      data << "\n" unless data.end_with?("\n")
+      servers.each { |s| data << "server #{s}\n" }
+      File.write(@conf, data)
+    end
+  end
+end

data/lib/linux_admin/exceptions.rb

@@ -6,4 +6,6 @@ module LinuxAdmin
   end
 
   class NetworkInterfaceError < AwesomeSpawn::CommandResultError; end
+
+  class MissingConfigurationFileError < StandardError; end
 end

data/lib/linux_admin/hosts.rb

@@ -19,23 +19,17 @@ module LinuxAdmin
     def save
       cleanup_empty
       @raw_lines = assemble_lines
-      File.write(@filename, @raw_lines.join("\n"))
+      File.write(@filename, @raw_lines.join("\n") + "\n")
     end
 
-    def update_entry(address, hostname, comment = nil)
-      # Delete entries for this hostname first
-      @parsed_file.each {|i| i[:hosts].to_a.delete(hostname)}
+    def add_alias(address, hostname, comment = nil)
+      add_name(address, hostname, false, comment)
+    end
 
-      # Add entry
-      line_number = @parsed_file.find_path(address).first
+    alias_method :update_entry, :add_alias
 
-      if line_number.blank?
-        @parsed_file.push({:address => address, :hosts => [hostname], :comment => comment})
-      else
-        new_hosts = @parsed_file.fetch_path(line_number, :hosts).to_a.push(hostname)
-        @parsed_file.store_path(line_number, :hosts, new_hosts)
-        @parsed_file.store_path(line_number, :comment, comment) if comment
-      end
+    def set_canonical_hostname(address, hostname, comment = nil)
+      add_name(address, hostname, true, comment)
     end
 
     def hostname=(name)
@@ -52,7 +46,28 @@ module LinuxAdmin
       result.success? ? result.output.strip : nil
     end
 
-  private
+    private
+
+    def add_name(address, hostname, fqdn, comment)
+      # Delete entries for this hostname first
+      @parsed_file.each { |i| i[:hosts].to_a.delete(hostname) }
+
+      # Add entry
+      line_number = @parsed_file.find_path(address).first
+
+      if line_number.blank?
+        @parsed_file.push(:address => address, :hosts => [hostname], :comment => comment)
+      else
+        if fqdn
+          new_hosts = @parsed_file.fetch_path(line_number, :hosts).to_a.unshift(hostname)
+        else
+          new_hosts = @parsed_file.fetch_path(line_number, :hosts).to_a.push(hostname)
+        end
+        @parsed_file.store_path(line_number, :hosts, new_hosts)
+        @parsed_file.store_path(line_number, :comment, comment) if comment
+      end
+    end
+
     def parse_file
       @parsed_file = []
       @raw_lines.each { |line| @parsed_file.push(parse_line(line.strip)) }

data/lib/linux_admin/network_interface/network_interface_rh.rb

@@ -10,8 +10,9 @@ module LinuxAdmin
 
     # @param interface [String] Name of the network interface to manage
     def initialize(interface)
+      @interface_file = Pathname.new(IFACE_DIR).join("ifcfg-#{interface}")
+      raise MissingConfigurationFileError unless File.exist?(@interface_file)
       super
-      @interface_file = Pathname.new(IFACE_DIR).join("ifcfg-#{@interface}")
       parse_conf
     end
 

data/lib/linux_admin/network_interface.rb

@@ -25,6 +25,8 @@ module LinuxAdmin
     # Creates an instance of the correct NetworkInterface subclass for the local distro
     def self.new(*args)
       self == LinuxAdmin::NetworkInterface ? dist_class.new(*args) : super
+    rescue MissingConfigurationFileError
+      NetworkInterfaceGeneric.new(*args)
     end
 
     # @return [String] the interface for networking operations
@@ -156,7 +158,7 @@ module LinuxAdmin
     #
     # @param ip_output [String] The command output
     def parse_ip4(ip_output)
-      cidr_ip = parse_ip_output(ip_output, /inet/, 1)
+      cidr_ip = parse_ip_output(ip_output, /inet /, 1)
       return unless cidr_ip
 
       @network_conf[:address] = cidr_ip.split('/')[0]

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 module LinuxAdmin
-  VERSION = "0.12.1"
+  VERSION = "0.13.0"
 end

data/lib/linux_admin.rb

@@ -32,6 +32,7 @@ require 'linux_admin/time_date'
 require 'linux_admin/ip_address'
 require 'linux_admin/dns'
 require 'linux_admin/network_interface'
+require 'linux_admin/chrony'
 
 module LinuxAdmin
   extend Common

data/spec/chrony_spec.rb

@@ -0,0 +1,41 @@
+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\nserver foo.bar.example.com\n")
+      end
+      subject.add_servers("baz.example.net", "foo.bar.example.com")
+    end
+  end
+end

data/spec/hosts_spec.rb

@@ -32,12 +32,30 @@ describe LinuxAdmin::Hosts do
     end
   end
 
-  describe "#save" do
-    before do
-      allow(File).to receive(:write)
+  describe "#set_canonical_hostname" do
+    it "removes an existing entry and creates a new one" do
+      expected_hash = [{:blank => true},
+                       {:comment => "Some Comment"},
+                       {:address => "127.0.0.1", :hosts => ["localhost", "localhost.localdomain"], :comment => "with a comment"},
+                       {:address => "127.0.1.1", :hosts => []},
+                       {:address => "1.2.3.4", :hosts => ["my.domain.local"], :comment => nil}]
+      @instance.set_canonical_hostname("1.2.3.4", "my.domain.local")
+      expect(@instance.parsed_file).to eq(expected_hash)
+    end
+
+    it "adds the hostname to the start of the hosts list" do
+      expected_hash = [{:blank => true},
+                       {:comment => "Some 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.set_canonical_hostname("127.0.0.1", "examplehost.example.com")
+      expect(@instance.parsed_file).to eq(expected_hash)
     end
+  end
 
+  describe "#save" do
     it "properly generates file with new content" do
+      allow(File).to receive(:write)
       expected_array = ["", "#Some Comment", "127.0.0.1        localhost localhost.localdomain #with a comment", "127.0.1.1        my.domain.local", "1.2.3.4          test"]
       @instance.update_entry("1.2.3.4", "test")
       @instance.save
@@ -45,11 +63,19 @@ describe LinuxAdmin::Hosts do
     end
 
     it "properly generates file with removed content" do
+      allow(File).to receive(:write)
       expected_array = ["", "#Some Comment", "127.0.0.1        localhost localhost.localdomain my.domain.local #with a comment"]
       @instance.update_entry("127.0.0.1", "my.domain.local")
       @instance.save
       expect(@instance.raw_lines).to eq(expected_array)
     end
+
+    it "ends the file with a new line" do
+      expect(File).to receive(:write) do |_file, contents|
+        expect(contents).to end_with("\n")
+      end
+      @instance.save
+    end
   end
 
   describe "#hostname=" do

data/spec/network_interface/network_interface_rh_spec.rb

@@ -34,12 +34,14 @@ EOF
   end
 
   subject(:dhcp_interface) do
+    allow(File).to receive(:exist?).and_return(true)
     stub_foreach_to_string(IFCFG_FILE_DHCP)
     allow(AwesomeSpawn).to receive(:run!).twice.and_return(result("", 0))
     described_class.new(DEVICE_NAME)
   end
 
   subject(:static_interface) do
+    allow(File).to receive(:exist?).and_return(true)
     stub_foreach_to_string(IFCFG_FILE_STATIC)
     allow(AwesomeSpawn).to receive(:run!).twice.and_return(result("", 0))
     described_class.new(DEVICE_NAME)

data/spec/network_interface_spec.rb

@@ -1,13 +1,22 @@
 describe LinuxAdmin::NetworkInterface do
   context "on redhat systems" do
-    subject do
+    subject(:subj_success) do
       allow_any_instance_of(described_class).to receive(:ip_show).and_return(nil)
       allow(LinuxAdmin::Distros).to receive(:local).and_return(LinuxAdmin::Distros.rhel)
       described_class.dist_class(true)
+      allow(File).to receive(:exist?).and_return(true)
       allow(File).to receive(:foreach).and_return("")
       described_class.new("eth0")
     end
 
+    subject(:subj_failure) do
+      allow_any_instance_of(described_class).to receive(:ip_show).and_return(nil)
+      allow(LinuxAdmin::Distros).to receive(:local).and_return(LinuxAdmin::Distros.rhel)
+      described_class.dist_class(true)
+      allow(File).to receive(:exist?).and_return(false)
+      described_class.new("eth0")
+    end
+
     describe ".dist_class" do
       it "returns NetworkInterfaceRH" do
         allow(LinuxAdmin::Distros).to receive(:local).and_return(LinuxAdmin::Distros.rhel)
@@ -17,7 +26,11 @@ describe LinuxAdmin::NetworkInterface do
 
     describe ".new" do
       it "creates a NetworkInterfaceRH instance" do
-        expect(subject).to be_an_instance_of(LinuxAdmin::NetworkInterfaceRH)
+        expect(subj_success).to be_an_instance_of(LinuxAdmin::NetworkInterfaceRH)
+      end
+
+      it "creates a NetworkInterfaceGeneric instance if the config file does not exist" do
+        expect(subj_failure).to be_an_instance_of(LinuxAdmin::NetworkInterfaceGeneric)
       end
     end
   end
@@ -78,6 +91,15 @@ describe LinuxAdmin::NetworkInterface do
        valid_lft forever preferred_lft forever
 IP_OUT
 
+    IP6_ADDR_OUT = <<-IP_OUT
+2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 1000
+    link/ether 00:0c:29:ed:0e:8b brd ff:ff:ff:ff:ff:ff
+    inet6 fe80::20c:29ff:feed:e8b/64 scope link
+       valid_lft forever preferred_lft forever
+    inet6 fd12:3456:789a:1::1/96 scope global
+       valid_lft forever preferred_lft forever
+IP_OUT
+
     IP_ROUTE_OUT = <<-IP_OUT
 default via 192.168.1.1 dev eth0  proto static  metric 100
 192.168.1.0/24 dev eth0  proto kernel  scope link  src 192.168.1.9  metric 100
@@ -92,6 +114,15 @@ IP_OUT
       described_class.new("eth0")
     end
 
+    subject(:subj6) do
+      allow(LinuxAdmin::Distros).to receive(:local).and_return(LinuxAdmin::Distros.generic)
+      described_class.dist_class(true)
+
+      allow(AwesomeSpawn).to receive(:run!).with(*IP_SHOW_ARGS).and_return(result(IP6_ADDR_OUT, 0))
+      allow(AwesomeSpawn).to receive(:run!).with(*IP_ROUTE_ARGS).and_return(result(IP_ROUTE_OUT, 0))
+      described_class.new("eth0")
+    end
+
     def result(output, exit_status)
       AwesomeSpawn::CommandResult.new("", output, "", exit_status)
     end
@@ -111,6 +142,13 @@ IP_OUT
         allow(AwesomeSpawn).to receive(:run!).with(*IP_ROUTE_ARGS).and_raise(awesome_error)
         expect { subj.reload }.to raise_error(LinuxAdmin::NetworkInterfaceError)
       end
+
+      it "doesn't blow up when given only ipv6 addresses" do
+        subj6
+        allow(AwesomeSpawn).to receive(:run!).with(*IP_SHOW_ARGS).and_return(result(IP6_ADDR_OUT, 0))
+        allow(AwesomeSpawn).to receive(:run!).with(*IP_ROUTE_ARGS).and_return(result(IP_ROUTE_OUT, 0))
+        expect { subj.reload }.to_not raise_error
+      end
     end
 
     describe "#address" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,6 +176,7 @@ files:
 - LICENSE.txt
 - README.md
 - lib/linux_admin.rb
+- lib/linux_admin/chrony.rb
 - lib/linux_admin/common.rb
 - lib/linux_admin/deb.rb
 - lib/linux_admin/disk.rb
@@ -211,6 +212,7 @@ 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
@@ -283,6 +285,7 @@ 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