linux_admin 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7a836fda94b3dbbc618dcab138690adde8e2803a
-  data.tar.gz: b3e87b291a6dba82b58a0b924c44fb41dbebadb1
+SHA256:
+  metadata.gz: b829f3cc2362f608bad95b43d9e3fe8b97a57bf027c84d16cd38c758dc841840
+  data.tar.gz: 0f9741c5305f8dee09358f9c1c44edf12ad150fa11a79514c59a8110c8254094
 SHA512:
-  metadata.gz: 78b8cd87fcbc328aa5c5910ab26b201bb48cd2f19029bc7da944c50bccc4d1a21324507e4c762fe76221604fe303a0f6f5fab1cac18b513780619aa2bcbd1a51
-  data.tar.gz: 5c2f30b0e6ac5fc86bb116ad68dfe3e5b25b446742ad16e23cb0866f4f68582d1297b6027c4945c91e4dffeb69f7a9e962b78f7c2d3b4127a91bc780dda7d055
+  metadata.gz: e80cc3ce27b7b68d4d74947e81d8fa9451849aa0995a008874ec741ad30ff57a9c7306fca270299463a22785a490722aa55a0ffa036dd03903a6e79517beb755
+  data.tar.gz: 6887b3343ea5220c23c86373e049d4ff497babdda16bc70b8d542d506641575392092a3ecf1b85ec42060d31fc6f263efe5e29cd3fcb9bc7e7696bf100ccce83

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

@@ -1,3 +1,3 @@
 module LinuxAdmin
-  VERSION = "1.2.3".freeze
+  VERSION = "1.2.4".freeze
 end

data/spec/fstab_spec.rb

@@ -46,20 +46,86 @@ eos
 
   describe "#write!" do
     it "writes entries to /etc/fstab" do
-      # maually set fstab
-      entry = LinuxAdmin::FSTabEntry.new
-      entry.device        = '/dev/sda1'
-      entry.mount_point   = '/'
-      entry.fs_type       = 'ext4'
-      entry.mount_options = 'defaults'
-      entry.dumpable      = 1
-      entry.fsck_order    = 1
-      entry.comment = "# more"
-      allow_any_instance_of(subject).to receive(:refresh) # in case this is the first time we reference .instance
-      subject.instance.maximum_column_lengths = [9, 1, 4, 8, 1, 1, 1]
-      subject.instance.entries = [entry]
+      expect(File).to receive(:read).with("/etc/fstab").and_return("")
+
+      subject.instance.entries << LinuxAdmin::FSTabEntry.new(
+        :device        => '/dev/sda1',
+        :mount_point   => '/',
+        :fs_type       => 'ext4',
+        :mount_options => 'defaults',
+        :dumpable      => 1,
+        :fsck_order    => 1,
+        :comment       => "# more"
+      )
 
       expect(File).to receive(:write).with('/etc/fstab', "/dev/sda1 / ext4 defaults 1 1 # more\n")
+
+      subject.instance.write!
+    end
+  end
+
+  describe "#entries" do
+    it "#<< updates maximum_column_lengths" do
+      expect(File).to receive(:read).with("/etc/fstab").and_return("")
+
+      subject.instance.entries << LinuxAdmin::FSTabEntry.new(
+        :device        => '/dev/sda1',
+        :mount_point   => '/',
+        :fs_type       => 'ext4',
+        :mount_options => 'defaults',
+        :dumpable      => 1,
+        :fsck_order    => 1,
+        :comment       => "# more"
+      )
+
+      expect(subject.instance.entries.maximum_column_lengths).to eq([9, 1, 4, 8, 1, 1, 6])
+    end
+  end
+
+  describe "integration test" do
+    it "input equals output, just alignment changed" do
+      original_fstab = <<~END_OF_FSTAB
+
+        #
+        # /etc/fstab
+        # Created by anaconda on Wed May 29 12:37:40 2019
+        #
+        # Accessible filesystems, by reference, are maintained under '/dev/disk'
+        # See man pages fstab(5), findfs(8), mount(8) and/or blkid(8) for more info
+        #
+        /dev/mapper/VG--MIQ-lv_os /                       xfs     defaults        0 0
+        UUID=02bf07b5-2404-4779-b93c-d8eb7f2eedea /boot                   xfs     defaults        0 0
+        /dev/mapper/VG--MIQ-lv_home /home                   xfs     defaults        0 0
+        /dev/mapper/VG--MIQ-lv_tmp /tmp                    xfs     defaults        0 0
+        /dev/mapper/VG--MIQ-lv_var /var                    xfs     defaults        0 0
+        /dev/mapper/VG--MIQ-lv_var_log /var/log                xfs     defaults        0 0
+        /dev/mapper/VG--MIQ-lv_var_log_audit /var/log/audit          xfs     defaults        0 0
+        /dev/mapper/VG--MIQ-lv_log /var/www/miq/vmdb/log   xfs     defaults        0 0
+        /dev/mapper/VG--MIQ-lv_swap swap                    swap    defaults        0 0
+      END_OF_FSTAB
+
+      new_fstab = <<~END_OF_FSTAB
+
+        # /etc/fstab
+        # Created by anaconda on Wed May 29 12:37:40 2019
+
+        # Accessible filesystems, by reference, are maintained under '/dev/disk'
+        # See man pages fstab(5), findfs(8), mount(8) and/or blkid(8) for more info
+
+                        /dev/mapper/VG--MIQ-lv_os                     /  xfs defaults 0 0
+        UUID=02bf07b5-2404-4779-b93c-d8eb7f2eedea                 /boot  xfs defaults 0 0
+                      /dev/mapper/VG--MIQ-lv_home                 /home  xfs defaults 0 0
+                       /dev/mapper/VG--MIQ-lv_tmp                  /tmp  xfs defaults 0 0
+                       /dev/mapper/VG--MIQ-lv_var                  /var  xfs defaults 0 0
+                   /dev/mapper/VG--MIQ-lv_var_log              /var/log  xfs defaults 0 0
+             /dev/mapper/VG--MIQ-lv_var_log_audit        /var/log/audit  xfs defaults 0 0
+                       /dev/mapper/VG--MIQ-lv_log /var/www/miq/vmdb/log  xfs defaults 0 0
+                      /dev/mapper/VG--MIQ-lv_swap                  swap swap defaults 0 0
+      END_OF_FSTAB
+
+      expect(File).to receive(:read).with("/etc/fstab").and_return(original_fstab)
+      expect(File).to receive(:write).with("/etc/fstab", new_fstab)
+
       subject.instance.write!
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Brandon Dunne
@@ -24,7 +24,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: LinuxAdmin is a module to simplify management of linux systems.