linux_admin 0.5.4 → 0.5.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWNjNTE2YjQ0NzM5MmNiNjgwZWJiZTNiODhkMzMxNGQ5MGUyNDMyYg==
+    YzkxZDkxZDkxMDNiNzlkMTkxNDY2MDExZDVlNzgwZGU3YTMyNDhkOQ==
   data.tar.gz: !binary |-
-    M2JkZjJmN2EwNzQxYmVhMjY3ZjdiZjI4ZjExYjdiMGY1YTE2M2E5ZQ==
+    NzQyODliMjBlMzMwMzY0NGM2YmI5YjdhYWYyYzNmMjgwNzJjYTExNg==
 SHA512:
   metadata.gz: !binary |-
-    NGVjZGQwMWViYTVmNTVmYjhlNmZmYjI5MTJhYjY1YWQ0ZmNiZDMyNDczNTEx
-    NTRmNzU1NjJjNGZhY2ZlNTJkYjY1MDEyMDhlODNmZTRjMGFmZTM2NGQ5OTdi
-    YTMzNmE3M2FkY2MwNGU0ZDcxYWQzM2RmZTMxNWNiOTcyNDhiYTI=
+    ZjZhZjg4NjczY2I3NGIxNjExNTI0Y2EwZDY5ZjNiMjE0ODcxZmU3NzkwM2Nj
+    NWMyMWI0NTAxNzA4N2FmNmJmNmM2NmFmMWJhNTgzODVlOGRjMzk0MDNhZDhi
+    YmE4ZDk5ZTNlZTgwMDI3OGM2MmQ4ZjBjOWYxODRkZDUwMzAzYTg=
   data.tar.gz: !binary |-
-    OGRlNmZlMjE1MzY5NmUyZDAxYzgyMjVhMmI2MzhmYjE4M2Q1NmNlNTk2NGRj
-    OTU5NDY4NDY1MTQ2N2EwMGY0MzVlZjA2MTA1MTBhNjE5ODdhMmEzZmMxNWU4
-    YTAyZjI2MTViZGM2YjJjOTRkODY2Y2QxODljZjg3MDBmMTZhNmU=
+    MGVkMmEzNjAxNTQ4ZTZmZTQ1YjVjMDMxMjZmYzI2NDA4N2RiMDllYzdlZmU5
+    MzI3YzU3MTQ0ZWQ0ZWVjZDEwY2I0NDQ3Y2IyOGM3NTk5MjhlYWRhZmJkMmY3
+    MDFjODIzMzJlODA4OTg1MDI3MGIyZjY4ZmI4NmFmMDljNTg5NGE=

data/lib/linux_admin/fstab.rb

@@ -13,25 +13,48 @@ class LinuxAdmin
     attr_accessor :mount_options
     attr_accessor :dumpable
     attr_accessor :fsck_order
+    attr_accessor :comment
 
     def initialize(args = {})
       @device        = args[:device]
       @mount_point   = args[:mount_point]
       @fs_type       = args[:fs_type]
       @mount_options = args[:mount_options]
-      @dumpable      = args[:dumpable]
-      @fsck_order    = args[:fsck_order]
+      @dumpable      = args[:dumpable].to_i unless args[:dumpable].nil?
+      @fsck_order    = args[:fsck_order].to_i unless args[:fsck_order].nil?
+      @comment       = args[:comment]
     end
 
     def self.from_line(fstab_line)
-      columns = fstab_line.chomp.split
+      columns, comment = fstab_line.split('#')
+      comment = "##{comment}" unless comment.blank?
+      columns = columns.chomp.split
+
       FSTabEntry.new :device        => columns[0],
                      :mount_point   => columns[1],
                      :fs_type       => columns[2],
                      :mount_options => columns[3],
-                     :dumpable      => columns[4].to_i,
-                     :fsck_order    => columns[5].to_i
-      
+                     :dumpable      => columns[4],
+                     :fsck_order    => columns[5],
+                     :comment       => comment
+    end
+
+    def has_content?
+      !self.columns.first.nil?
+    end
+
+    def columns
+      [self.device, self.mount_point, self.fs_type,
+       self.mount_options, self.dumpable, self.fsck_order, self.comment]
+    end
+
+    def column_lengths
+      self.columns.collect { |c| c ? c.size : 0 }
+    end
+
+    def formatted_columns(max_lengths)
+      self.columns.collect.
+        with_index { |col, i| col.to_s.rjust(max_lengths[i]) }.join(" ")
     end
   end
 
@@ -39,6 +62,7 @@ class LinuxAdmin
     include Singleton
 
     attr_accessor :entries
+    attr_accessor :maximum_column_lengths
 
     def initialize
       refresh
@@ -46,9 +70,15 @@ class LinuxAdmin
 
     def write!
       content = ''
+      comment_index = 0
       @entries.each do |entry|
-        content += "#{entry.device} #{entry.mount_point} #{entry.fs_type} #{entry.mount_options} #{entry.dumpable} #{entry.fsck_order}\n"
+        if entry.has_content?
+          content << entry.formatted_columns(@maximum_column_lengths) << "\n"
+        else
+          content << "#{entry.comment}"
+        end
       end
+
       File.write('/etc/fstab', content)
       self
     end
@@ -56,14 +86,22 @@ class LinuxAdmin
     private
 
     def read
-      File.read('/etc/fstab').lines.find_all {|line| !line.blank? && !line.strip.starts_with?("#")}
+      File.read('/etc/fstab').lines
     end
 
     def refresh
-      @entries = 
-        read.collect { |line|
-          FSTabEntry.from_line line
-        }
+      @entries  = []
+      @maximum_column_lengths = Array.new(7, 0) # # of columns
+      read.each do |line|
+        entry = FSTabEntry.from_line(line)
+        @entries << entry
+
+        lengths = entry.column_lengths
+        lengths.each_index do |i|
+          @maximum_column_lengths[i] =
+            lengths[i] if lengths[i] > @maximum_column_lengths[i]
+        end
+      end
     end
   end
 end

data/lib/linux_admin/logical_volume.rb

@@ -7,6 +7,8 @@ require 'pathname'
 
 class LinuxAdmin
   class LogicalVolume < Volume
+    include Mountable
+
     DEVICE_PATH  = Pathname.new('/dev/')
 
     # path to logical volume
@@ -55,6 +57,10 @@ class LinuxAdmin
       self
     end
 
+    def path
+      "/dev/#{self.volume_group.name}/#{self.name}"
+    end
+
     private
 
     def self.bytes_to_string(bytes)

data/lib/linux_admin/mountable.rb

@@ -0,0 +1,47 @@
+# LinuxAdmin Mountable Disk Mixin
+#
+# Copyright (C) 2013 Red Hat Inc.
+# Licensed under the MIT License
+
+class LinuxAdmin
+  module Mountable
+    attr_accessor :fs_type
+    attr_accessor :mount_point
+
+    module ClassMethods
+      def mount_point_exists?(mount_point)
+        result = self.run!(cmd(:mount))
+        result.output.split("\n").any? { |line| line.split[2] == mount_point }
+      end
+
+      def mount_point_available?(mount_point)
+        !mount_point_exists?(mount_point)
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def format_to(filesystem)
+      run!(cmd(:mke2fs),
+          :params => { '-t' => filesystem, nil => self.path})
+      @fs_type = filesystem
+    end
+
+    def mount(mount_point)
+      FileUtils.mkdir(mount_point) unless File.directory?(mount_point)
+
+      if self.class.mount_point_exists?(mount_point)
+        raise ArgumentError, "disk already mounted at #{mount_point}"
+      end
+
+      run!(cmd(:mount), :params => { nil => [self.path, mount_point] })
+      @mount_point = mount_point
+    end
+
+    def umount
+      run!(cmd(:umount), :params => { nil => [@mount_point] })
+    end
+  end
+end

data/lib/linux_admin/partition.rb

@@ -7,14 +7,14 @@ require 'fileutils'
 
 class LinuxAdmin
   class Partition < LinuxAdmin
+    include Mountable
+
     attr_accessor :id
     attr_accessor :partition_type
-    attr_accessor :fs_type
     attr_accessor :start_sector
     attr_accessor :end_sector
     attr_accessor :size
     attr_accessor :disk
-    attr_accessor :mount_point
 
     def initialize(args={})
       @id      = args[:id]
@@ -30,25 +30,9 @@ class LinuxAdmin
       "#{disk.path}#{id}"
     end
 
-    def format_to(filesystem)
-      run!(cmd(:mke2fs),
-          :params => { '-t' => filesystem, nil => self.path})
-      @fs_type = filesystem
-    end
-
     def mount(mount_point=nil)
-      @mount_point = mount_point
-      @mount_point  =
-        "/mnt/#{disk.path.split(File::SEPARATOR).last}#{id}" if mount_point.nil?
-      FileUtils.mkdir(@mount_point) unless File.directory?(@mount_point)
-
-      run!(cmd(:mount),
-          :params => { nil => [self.path, @mount_point] })
-    end
-
-    def umount
-      run!(cmd(:umount),
-          :params => { nil => [@mount_point] })
+      mount_point ||= "/mnt/#{disk.path.split(File::SEPARATOR).last}#{id}"
+      super(mount_point)
     end
   end
 end

data/lib/linux_admin/registration_system/rhn.rb

@@ -33,6 +33,7 @@ class LinuxAdmin
       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="]      = options[:server_cert]     if options[:server_cert]
 
       run!(cmd, :params => params)
     end

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 class LinuxAdmin
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/lib/linux_admin.rb

@@ -13,6 +13,7 @@ require 'linux_admin/version'
 require 'linux_admin/yum'
 
 require 'linux_admin/service'
+require 'linux_admin/mountable'
 require 'linux_admin/disk'
 require 'linux_admin/hosts'
 require 'linux_admin/partition'

data/spec/fstab_spec.rb

@@ -7,14 +7,15 @@ describe LinuxAdmin::FSTab do
     Singleton.send :__init__, LinuxAdmin::FSTab
   end
 
-  it "newline, single spaces, tab" do
+  it "has newline, single spaces, tab" do
     fstab = <<eos
 
   
 	
 eos
     File.should_receive(:read).with('/etc/fstab').and_return(fstab)
-    LinuxAdmin::FSTab.instance.entries.size.should == 0
+    LinuxAdmin::FSTab.instance.entries.size.should == 3
+    LinuxAdmin::FSTab.instance.entries.any? { |e| e.has_content? }.should be_false
   end
 
   it "creates FSTabEntry for each line in fstab" do
@@ -22,26 +23,31 @@ eos
 # Comment, indented comment, comment with device information
   # /dev/sda1 / ext4  defaults  1 1
 # /dev/sda1 / ext4  defaults  1 1
+
 /dev/sda1 / ext4  defaults  1 1
 /dev/sda2 swap  swap  defaults  0 0
 eos
     File.should_receive(:read).with('/etc/fstab').and_return(fstab)
     entries = LinuxAdmin::FSTab.instance.entries
-    entries.size.should == 2
+    entries.size.should == 6
 
-    entries[0].device.should == '/dev/sda1'
-    entries[0].mount_point.should == '/'
-    entries[0].fs_type.should == 'ext4'
-    entries[0].mount_options.should == 'defaults'
-    entries[0].dumpable.should == 1
-    entries[0].fsck_order.should == 1
+    entries[0].comment.should == "# Comment, indented comment, comment with device information\n"
+    entries[1].comment.should == "# /dev/sda1 / ext4  defaults  1 1\n"
+    entries[2].comment.should == "# /dev/sda1 / ext4  defaults  1 1\n"
+    entries[3].comment.should == nil
+    entries[4].device.should == '/dev/sda1'
+    entries[4].mount_point.should == '/'
+    entries[4].fs_type.should == 'ext4'
+    entries[4].mount_options.should == 'defaults'
+    entries[4].dumpable.should == 1
+    entries[4].fsck_order.should == 1
 
-    entries[1].device.should == '/dev/sda2'
-    entries[1].mount_point.should == 'swap'
-    entries[1].fs_type.should == 'swap'
-    entries[1].mount_options.should == 'defaults'
-    entries[1].dumpable.should == 0
-    entries[1].fsck_order.should == 0
+    entries[5].device.should == '/dev/sda2'
+    entries[5].mount_point.should == 'swap'
+    entries[5].fs_type.should == 'swap'
+    entries[5].mount_options.should == 'defaults'
+    entries[5].dumpable.should == 0
+    entries[5].fsck_order.should == 0
   end
 
   describe "#write!" do
@@ -54,10 +60,12 @@ eos
       entry.mount_options = 'defaults'
       entry.dumpable      = 1
       entry.fsck_order    = 1
+      entry.comment = "# more"
       LinuxAdmin::FSTab.any_instance.stub(:refresh) # don't read /etc/fstab
-      LinuxAdmin::FSTab.instance.entries = [entry]
+      LinuxAdmin::FSTab.instance.maximum_column_lengths = [9, 1, 4, 8, 1, 1, 1]
+      LinuxAdmin::FSTab.instance.entries  = [entry]
 
-      File.should_receive(:write).with('/etc/fstab', "/dev/sda1 / ext4 defaults 1 1\n")
+      File.should_receive(:write).with('/etc/fstab', "/dev/sda1 / ext4 defaults 1 1 # more\n")
       LinuxAdmin::FSTab.instance.write!
     end
   end

data/spec/logical_volume_spec.rb

@@ -39,6 +39,14 @@ eos
     end
   end
 
+  describe "#path" do
+    it "returns /dev/vgname/lvname" do
+      vg = LinuxAdmin::VolumeGroup.new :name => 'vg'
+      lv = described_class.new :name => 'lv', :volume_group => vg
+      lv.path.should == '/dev/vg/lv'
+    end
+  end
+
   describe "#create" do
     before(:each) do
       @vg = LinuxAdmin::VolumeGroup.new :name => 'vg'

data/spec/mountable_spec.rb

@@ -0,0 +1,130 @@
+require 'spec_helper'
+
+class TestMountable < LinuxAdmin
+  include LinuxAdmin::Mountable
+
+  def path
+    "/dev/foo"
+  end
+end
+
+describe LinuxAdmin::Mountable do
+  before(:each) do
+    @mountable = TestMountable.new
+
+    # stub out calls that modify system
+    FileUtils.stub(:mkdir)
+    @mountable.stub(:run!)
+
+    @mount_out1 = <<eos
+/dev/sda on /mnt/usb type vfat (rw)
+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
+  end
+
+  describe "#mount_point_exists?" do
+    it "uses mount" do
+      TestMountable.should_receive(:run!).with(TestMountable.cmd(:mount)).and_return(CommandResult.new("", "", "", 0))
+      TestMountable.mount_point_exists?('/mnt/usb')
+    end
+
+    context "disk mounted at specified location" do
+      it "returns true" do
+        TestMountable.should_receive(:run!).and_return(CommandResult.new("", @mount_out1, "", 0))
+        TestMountable.mount_point_exists?('/mnt/usb').should be_true
+      end
+    end
+
+    context "no disk mounted at specified location" do
+      it "returns false" do
+        TestMountable.should_receive(:run!).and_return(CommandResult.new("", @mount_out2, "", 0))
+        TestMountable.mount_point_exists?('/mnt/usb').should be_false
+      end
+    end
+  end
+
+  describe "#mount_point_available?" do
+    it "uses mount" do
+      TestMountable.should_receive(:run!).with(TestMountable.cmd(:mount)).and_return(CommandResult.new("", "", "", 0))
+      TestMountable.mount_point_available?('/mnt/usb')
+    end
+
+    context "disk mounted at specified location" do
+      it "returns false" do
+        TestMountable.should_receive(:run!).and_return(CommandResult.new("", @mount_out1, "", 0))
+        TestMountable.mount_point_available?('/mnt/usb').should be_false
+      end
+    end
+
+    context "no disk mounted at specified location" do
+      it "returns true" do
+        TestMountable.should_receive(:run!).and_return(CommandResult.new("", @mount_out2, "", 0))
+        TestMountable.mount_point_available?('/mnt/usb').should be_true
+      end
+    end
+  end
+
+  describe "#format_to" do
+    it "uses mke2fs" do
+      @mountable.should_receive(:run!).
+         with(@mountable.cmd(:mke2fs),
+              :params => { '-t' => 'ext4', nil => '/dev/foo'})
+      @mountable.format_to('ext4')
+    end
+
+    it "sets fs type" do
+      @mountable.should_receive(:run!) # ignore actual formatting cmd
+      @mountable.format_to('ext4')
+      @mountable.fs_type.should == 'ext4'
+    end
+  end
+
+  describe "#mount" do
+    it "sets mount point" do
+      # ignore actual mount cmds
+      @mountable.should_receive(:run!).and_return(CommandResult.new("", "", "", ""))
+      TestMountable.should_receive(:run!).and_return(CommandResult.new("", "", "", ""))
+
+      @mountable.mount('/mnt/sda2').should == '/mnt/sda2'
+      @mountable.mount_point.should == '/mnt/sda2'
+    end
+    
+    context "mountpoint does not exist" do
+      it "creates mountpoint" do
+        TestMountable.should_receive(:mount_point_exists?).and_return(false)
+        File.should_receive(:directory?).with('/mnt/sda2').and_return(false)
+        FileUtils.should_receive(:mkdir).with('/mnt/sda2')
+        @mountable.should_receive(:run!) # ignore actual mount cmd
+        @mountable.mount '/mnt/sda2'
+      end
+    end
+
+    context "disk mounted at mountpoint" do
+      it "raises argument error" do
+        TestMountable.should_receive(:mount_point_exists?).and_return(true)
+        File.should_receive(:directory?).with('/mnt/sda2').and_return(true)
+        expect { @mountable.mount '/mnt/sda2' }.to raise_error(ArgumentError, "disk already mounted at /mnt/sda2")
+      end
+    end
+
+    it "mounts partition" do
+      TestMountable.should_receive(:mount_point_exists?).and_return(false)
+      @mountable.should_receive(:run!).
+         with(@mountable.cmd(:mount),
+              :params => { nil => ['/dev/foo', '/mnt/sda2']})
+      @mountable.mount '/mnt/sda2'
+    end
+  end
+
+  describe "#umount" do
+    it "unmounts partition" do
+      @mountable.mount_point = '/mnt/sda2'
+      @mountable.should_receive(:run!).with(@mountable.cmd(:umount), :params => { nil => ['/mnt/sda2']})
+      @mountable.umount
+    end
+  end
+
+end

data/spec/partition_spec.rb

@@ -4,10 +4,6 @@ describe LinuxAdmin::Partition do
   before(:each) do
     @disk = LinuxAdmin::Disk.new :path => '/dev/sda'
     @partition = LinuxAdmin::Partition.new :disk => @disk, :id => 2
-
-    # stub out calls that modify system
-    FileUtils.stub(:mkdir)
-    @partition.stub(:run!)
   end
 
   describe "#path" do
@@ -16,52 +12,15 @@ describe LinuxAdmin::Partition do
     end
   end
 
-  describe "#format_to" do
-    it "uses mke2fs" do
-      @partition.should_receive(:run!).
-         with(@partition.cmd(:mke2fs),
-              :params => { '-t' => 'ext4', nil => '/dev/sda2'})
-      @partition.format_to('ext4')
-    end
-
-    it "sets fs type" do
-      @partition.should_receive(:run!) # ignore actual formatting cmd
-      @partition.format_to('ext4')
-      @partition.fs_type.should == 'ext4'
-    end
-  end
-
   describe "#mount" do
-    it "sets mount point" do
-      @partition.should_receive(:run!) # ignore actual mount cmd
-      @partition.mount
-      @partition.mount_point.should == '/mnt/sda2'
-    end
-
-    context "mountpoint does not exist" do
-      it "creates mountpoint" do
-        File.should_receive(:directory?).with('/mnt/sda2').and_return(false)
-        FileUtils.should_receive(:mkdir).with('/mnt/sda2')
-        @partition.should_receive(:run!) # ignore actual mount cmd
+    context "mount_point not specified" do
+      it "sets default mount_point" do
+        described_class.should_receive(:mount_point_exists?).and_return(false)
+        File.should_receive(:directory?).with('/mnt/sda2').and_return(true)
+        @partition.should_receive(:run!)
         @partition.mount
+        @partition.mount_point.should == '/mnt/sda2'
       end
     end
-
-    it "mounts partition" do
-      @partition.should_receive(:run!).
-         with(@partition.cmd(:mount),
-              :params => { nil => ['/dev/sda2', '/mnt/sda2']})
-      @partition.mount
-    end
-  end
-
-  describe "#umount" do
-    it "unmounts partition" do
-      @partition.mount_point = '/mnt/sda2'
-      @partition.should_receive(:run!).
-         with(@partition.cmd(:umount),
-              :params => { nil => ['/mnt/sda2']})
-      @partition.umount
-    end
   end
 end

data/spec/rhn_spec.rb

@@ -30,9 +30,10 @@ describe LinuxAdmin::Rhn do
                             :proxy_address  => "1.2.3.4",
                             :proxy_username => "ProxyUser",
                             :proxy_password => "ProxyPass",
+                            :server_cert    => "/path/to/cert",
                           }
                         }
-      let(:run_params) { {:params=>{"--username="=>"SomeUser@SomeDomain.org", "--password="=>"SomePass", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass"}} }
+      let(:run_params) { {:params=>{"--username="=>"SomeUser@SomeDomain.org", "--password="=>"SomePass", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass", "--sslCACert="=>"/path/to/cert"}} }
 
       it "with server_url" do
         run_params.store_path(:params, "--systemorgid=", "2")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Brandon Dunne
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - lib/linux_admin/fstab.rb
 - lib/linux_admin/hosts.rb
 - lib/linux_admin/logical_volume.rb
+- lib/linux_admin/mountable.rb
 - lib/linux_admin/package.rb
 - lib/linux_admin/partition.rb
 - lib/linux_admin/physical_volume.rb
@@ -197,6 +198,7 @@ files:
 - spec/hosts_spec.rb
 - spec/linux_admin_spec.rb
 - spec/logical_volume_spec.rb
+- spec/mountable_spec.rb
 - spec/package_spec.rb
 - spec/partition_spec.rb
 - spec/physical_volume_spec.rb
@@ -256,6 +258,7 @@ test_files:
 - spec/hosts_spec.rb
 - spec/linux_admin_spec.rb
 - spec/logical_volume_spec.rb
+- spec/mountable_spec.rb
 - spec/package_spec.rb
 - spec/partition_spec.rb
 - spec/physical_volume_spec.rb