linux_admin 0.2.1 → 0.2.2

data/lib/linux_admin/common.rb

@@ -24,7 +24,10 @@ class LinuxAdmin
         error  ||= ""
         self.exitstatus = nil
       end
-
+    rescue Errno::ENOENT => err
+      raise NoSuchFileError.new(err.message) if NoSuchFileError.detected?(err.message)
+      raise
+    else
       CommandResult.new(output, error, status)
     end
 
@@ -56,13 +59,13 @@ class LinuxAdmin
 
     def assemble_params(sanitized_params)
       sanitized_params.collect do |pair|
-        pair_joiner = pair.first.try(:end_with?, "=") ? "" : " "
+        pair_joiner = pair.first.to_s.end_with?("=") ? "" : " "
         pair.flatten.compact.join(pair_joiner)
       end.join(" ")
     end
 
     def build_cmd(cmd, params = nil)
-      return cmd if params.blank?
+      return cmd.to_s if params.blank?
       "#{cmd} #{assemble_params(sanitize(params))}"
     end
 

data/lib/linux_admin/disk.rb

@@ -66,7 +66,7 @@ class LinuxAdmin
       #   If so, should other calls to parted also do the same?
       # requires sudo
       out = run(cmd(:parted),
-                :params => { nil => [@path, 'print'] }).output
+                :params => { nil => parted_options_array('print') }).output
       split = []
       out.each_line do |l|
         if l =~ /^ [0-9].*/
@@ -100,11 +100,11 @@ class LinuxAdmin
     public
 
     def create_partition_table(type = "msdos")
-      run!(cmd(:parted), :params => { nil => [path, "mklabel", type]})
+      run!(cmd(:parted), :params => { nil => parted_options_array("mklabel", type)})
     end
 
     def has_partition_table?
-      result = run(cmd(:parted), :params => { nil => [path, "print"]})
+      result = run(cmd(:parted), :params => { nil => parted_options_array("print")})
 
       result_indicates_partition_table?(result)
     end
@@ -117,9 +117,8 @@ class LinuxAdmin
           [(partitions.last.id + 1),
             partitions.last.end_sector]
 
-      run!(cmd(:parted),
-          :params => { nil => [path, 'mkpart', partition_type,
-                               start, start + size]})
+      options = parted_options_array('mkpart', partition_type, start, start + size)
+      run!(cmd(:parted), :params => { nil => options})
 
       partition = Partition.new(:disk           => self,
                                 :id             => id,
@@ -144,6 +143,15 @@ class LinuxAdmin
 
     private
 
+    def parted_options_array(*args)
+      args = args.first if args.first.kind_of?(Array)
+      parted_default_options + args
+    end
+
+    def parted_default_options
+      @parted_default_options ||= ['--script', path].freeze
+    end
+
     def result_indicates_partition_table?(result)
       # parted exits with 1 but writes this oddly spelled error to stdout.
       missing = (result.exit_status == 1 && result.output.include?("unrecognised disk label"))

data/lib/linux_admin/distro.rb

@@ -59,7 +59,7 @@ class LinuxAdmin
 
     class RedHat < Distro
       COMMANDS = {:service   => '/sbin/service',
-                  :systemctl => '/bin/systemctl',
+                  :chkconfig => '/sbin/chkconfig',
                   :parted    => '/sbin/parted',
                   :mount     => '/bin/mount',
                   :umount    => '/bin/umount',

data/lib/linux_admin/exceptions.rb

@@ -8,6 +8,16 @@ class CommandResultError < StandardError
 end
 
 class LinuxAdmin
+  class NoSuchFileError < Errno::ENOENT
+    def initialize(message)
+      super(message.split("No such file or directory -").last.split(" ").first)
+    end
+
+    def self.detected?(message)
+      message.start_with?("No such file or directory -")
+    end
+  end
+
   class CredentialError < CommandResultError
     def initialize(result)
       super("Invalid username or password", result)

data/lib/linux_admin/fstab.rb

@@ -56,13 +56,7 @@ class LinuxAdmin
     private
 
     def read
-      contents = File.read('/etc/fstab')
-      contents = contents.lines.to_a
-      contents.reject! { |line|
-        first_char = line.strip[0]
-        first_char == '#' || first_char =~ /\s/
-      }
-      contents
+      File.read('/etc/fstab').lines.find_all {|line| !line.blank? && !line.strip.starts_with?("#")}
     end
 
     def refresh

data/lib/linux_admin/logical_volume.rb

@@ -38,10 +38,34 @@ class LinuxAdmin
       self
     end
 
-    def self.create(name, vg, size)
+    private
+
+    def self.bytes_to_string(bytes)
+      if bytes > 1.gigabytes
+        (bytes / 1.gigabytes).to_s + "G"
+      elsif bytes > 1.megabytes
+        (bytes / 1.megabytes).to_s + "M"
+      elsif bytes > 1.kilobytes
+        (bytes / 1.kilobytes).to_s + "K"
+      else
+        bytes.to_s
+      end
+    end
+
+    public
+
+    def self.create(name, vg, value)
       self.scan # initialize local logical volumes
-      run!(cmd(:lvcreate),
-          :params => { '-n' => name, nil => vg.name, '-L' => size})
+      params = { '-n' => name, nil => vg.name}
+      size = nil
+      if value <= 100
+        # size = # TODO size from extents
+        params.merge!({'-l' => "#{value}%FREE"})
+      else
+        size = value
+        params.merge!({'-L' => bytes_to_string(size)})
+      end
+      run!(cmd(:lvcreate), :params => params)
       lv = LogicalVolume.new :name => name,
                              :volume_group => vg,
                              :sectors => size

data/lib/linux_admin/service.rb

@@ -9,11 +9,6 @@ class LinuxAdmin
 
     private
 
-    def systemctl(cmd)
-      run!(cmd(:systemctl),
-          :params => { nil => [cmd, "#{id}.service"] })
-    end
-
     public
 
     def initialize(id)
@@ -26,12 +21,14 @@ class LinuxAdmin
     end
 
     def enable
-      systemctl 'enable'
+      run!(cmd(:chkconfig),
+          :params => { nil => [id, "on"] })
       self
     end
 
     def disable
-      systemctl 'disable'
+      run!(cmd(:chkconfig),
+          :params => { nil => [id, "off"] })
       self
     end
 

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 class LinuxAdmin
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/linux_admin/volume.rb

@@ -23,7 +23,7 @@ class LinuxAdmin
       out = run!(cmd, :params => { '-c' => nil}).output
 
       out.each_line do |line|
-        fields, vg = process_volume_display_line(line)
+        fields, vg = process_volume_display_line(line.lstrip)
         volumes << yield(fields, vg)
       end
 

data/lib/linux_admin/volume_group.rb

@@ -60,8 +60,8 @@ class LinuxAdmin
         out = run!(cmd(:vgdisplay), :params => { '-c' => nil}).output
 
         out.each_line do |line|
-          fields = line.split(':')
-          vgs << VolumeGroup.new(:name   => fields[0])
+          fields = line.lstrip.split(':')
+          vgs << VolumeGroup.new(:name => fields[0])
         end
 
         vgs

data/spec/common_spec.rb

@@ -37,7 +37,7 @@ describe LinuxAdmin::Common do
   end
 
   shared_examples_for "run" do
-    context "with params" do
+    context "paramater and command handling" do
       before do
         subject.stub(:exitstatus => 0)
       end
@@ -49,7 +49,19 @@ describe LinuxAdmin::Common do
 
       it "sanitizes fixnum array params" do
         subject.should_receive(:launch).once.with("true 1", {})
-        subject.send(run_method, "true", :params => { nil => [1]})
+        subject.send(run_method, "true", :params => {nil => [1]})
+      end
+
+      it "sanitizes Pathname option value" do
+        require 'pathname'
+        subject.should_receive(:launch).once.with("true /usr/bin/ruby", {})
+        subject.send(run_method, "true", :params => {nil => [Pathname.new("/usr/bin/ruby")]})
+      end
+
+      it "sanitizes Pathname option" do
+        require 'pathname'
+        subject.should_receive(:launch).once.with("true /usr/bin/ruby", {})
+        subject.send(run_method, "true", :params => {Pathname.new("/usr/bin/ruby") => nil})
       end
 
       it "as empty hash" do
@@ -69,6 +81,16 @@ describe LinuxAdmin::Common do
         expect(orig_params).to eq(params)
       end
 
+      it "Pathname command" do
+        subject.should_receive(:launch).once.with("/usr/bin/ruby", {})
+        subject.send(run_method, Pathname.new("/usr/bin/ruby"), {})
+      end
+
+      it "Pathname command with params" do
+        subject.should_receive(:launch).once.with("/usr/bin/ruby -v", {})
+        subject.send(run_method, Pathname.new("/usr/bin/ruby"), :params => {"-v" => nil})
+      end
+
       it "supports spawn's chdir option" do
         subject.should_receive(:launch).once.with("true", {:chdir => ".."})
         subject.send(run_method, "true", :chdir => "..")
@@ -100,7 +122,7 @@ describe LinuxAdmin::Common do
       end
 
       it "command bad" do
-        expect {subject.send(run_method, "XXXXX")}.to raise_error(Errno::ENOENT)
+        expect {subject.send(run_method, "XXXXX --user=bob")}.to raise_error(LinuxAdmin::NoSuchFileError, "No such file or directory - XXXXX")
       end
 
       context "#exit_status" do

data/spec/disk_spec.rb

@@ -48,7 +48,7 @@ eos
       disk = LinuxAdmin::Disk.new :path => '/dev/hda'
       disk.should_receive(:run).
         with(disk.cmd(:parted),
-             :params => { nil => ['/dev/hda', 'print'] }).and_return(double(:output => ""))
+             :params => { nil => %w(--script /dev/hda print) }).and_return(double(:output => ""))
       disk.partitions
     end
 
@@ -112,7 +112,7 @@ eos
     it "uses parted" do
       @disk.should_receive(:run!).
         with(@disk.cmd(:parted),
-             :params => { nil => ['/dev/hda', 'mkpart', 'primary', 1024, 2048] })
+             :params => { nil => ['--script', '/dev/hda', 'mkpart', 'primary', 1024, 2048] })
       @disk.create_partition 'primary', 1024
     end
 
@@ -166,7 +166,7 @@ eos
 
   it "#create_partition_table" do
     disk = LinuxAdmin::Disk.new :path => '/dev/hda'
-    options = {:params => {nil => ["/dev/hda", "mklabel", "msdos"]}}
+    options = {:params => {nil => %w(--script /dev/hda mklabel msdos)}}
     disk.should_receive(:run!).with(disk.cmd(:parted), options)
     disk.create_partition_table
   end

data/spec/fstab_spec.rb

@@ -2,8 +2,26 @@ require 'spec_helper'
 require 'stringio'
 
 describe LinuxAdmin::FSTab do
+  before do
+    # Reset the singleton so subsequent tests get a new instance
+    Singleton.send :__init__, LinuxAdmin::FSTab
+  end
+
+  it "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
+  end
+
   it "creates FSTabEntry for each line in fstab" do
     fstab = <<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
@@ -36,6 +54,7 @@ eos
       entry.mount_options = 'defaults'
       entry.dumpable      = 1
       entry.fsck_order    = 1
+      LinuxAdmin::FSTab.any_instance.stub(:refresh) # don't read /etc/fstab
       LinuxAdmin::FSTab.instance.entries = [entry]
 
       File.should_receive(:write).with('/etc/fstab', "/dev/sda1 / ext4 defaults 1 1\n")

data/spec/logical_volume_spec.rb

@@ -5,12 +5,12 @@ describe LinuxAdmin::LogicalVolume do
     LinuxAdmin::Distro.stub(:local => LinuxAdmin::Distros::Test.new)
 
     @logical_volumes = <<eos
-/dev/vg_foobar/lv_swap:vg_foobar:3:1:-1:2:4128768:63:-1:0:-1:253:0
-/dev/vg_foobar/lv_root:vg_foobar:3:1:-1:1:19988480:305:-1:0:-1:253:1
+  /dev/vg_foobar/lv_swap:vg_foobar:3:1:-1:2:4128768:63:-1:0:-1:253:0
+  /dev/vg_foobar/lv_root:vg_foobar:3:1:-1:1:19988480:305:-1:0:-1:253:1
 eos
 
     @groups = <<eos
-vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
+  vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
 eos
   end
 
@@ -51,13 +51,37 @@ eos
                                      :params => { '-n' => 'lv',
                                                    nil => 'vg',
                                                   '-L' => '256G' })
-      described_class.create 'lv', @vg, '256G'
+      described_class.create 'lv', @vg, 256.gigabytes
+    end
+
+    context "size is specified" do
+      it "passes -L option to lvcreate" do
+        described_class.instance_variable_set(:@lvs, [])
+        described_class.should_receive(:run!).
+                                  with(LinuxAdmin.cmd(:lvcreate),
+                                       :params => { '-n' => 'lv',
+                                                     nil => 'vg',
+                                                    '-L' => '256G' })
+        described_class.create 'lv', @vg, 256.gigabytes
+      end
+    end
+
+    context "extents is specified" do
+      it "passes -l option to lvcreate" do
+        described_class.instance_variable_set(:@lvs, [])
+        described_class.should_receive(:run!).
+                                  with(LinuxAdmin.cmd(:lvcreate),
+                                       :params => { '-n' => 'lv',
+                                                     nil => 'vg',
+                                                    '-l' => '100%FREE' })
+        described_class.create 'lv', @vg, 100
+      end
     end
 
     it "returns new logical volume" do
       LinuxAdmin::VolumeGroup.stub(:run! => double(:output => ""))
       described_class.stub(:run! => double(:output => ""))
-      lv = described_class.create 'lv', @vg, '256G'
+      lv = described_class.create 'lv', @vg, 256.gigabytes
       lv.should be_an_instance_of(described_class)
       lv.name.should == 'lv'
     end
@@ -65,7 +89,7 @@ eos
     it "adds logical volume to local registry" do
       LinuxAdmin::VolumeGroup.stub(:run! => double(:output => ""))
       described_class.stub(:run! => double(:output => ""))
-      lv = described_class.create 'lv', @vg, '256G'
+      lv = described_class.create 'lv', @vg, 256.gigabytes
       described_class.scan.should include(lv)
     end
   end

data/spec/physical_volume_spec.rb

@@ -5,11 +5,11 @@ describe LinuxAdmin::PhysicalVolume do
     LinuxAdmin::Distro.stub(:local => LinuxAdmin::Distros::Test.new)
 
     @physical_volumes = <<eos
-/dev/vda2:vg_foobar:24139776:-1:8:8:-1:32768:368:0:368:pxR32D-YkC2-PfHe-zOwb-eaGD-9Ar0-mAOl9u
+  /dev/vda2:vg_foobar:24139776:-1:8:8:-1:32768:368:0:368:pxR32D-YkC2-PfHe-zOwb-eaGD-9Ar0-mAOl9u
 eos
 
     @groups = <<eos
-vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
+  vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
 eos
   end
 

data/spec/service_spec.rb

@@ -37,8 +37,8 @@ describe LinuxAdmin::Service do
   describe "#enable" do
     it "enables service" do
       @service.should_receive(:run!).
-         with(@service.cmd(:systemctl),
-              :params => { nil => [ 'enable', 'foo.service']})
+         with(@service.cmd(:chkconfig),
+              :params => { nil => [ 'foo', 'on']})
       @service.enable
     end
 
@@ -51,8 +51,8 @@ describe LinuxAdmin::Service do
   describe "#disable" do
     it "disable service" do
       @service.should_receive(:run!).
-         with(@service.cmd(:systemctl),
-              :params => { nil => [ 'disable', 'foo.service']})
+         with(@service.cmd(:chkconfig),
+              :params => { nil => [ 'foo', 'off']})
       @service.disable
     end
 

data/spec/volume_group_spec.rb

@@ -5,7 +5,7 @@ describe LinuxAdmin::VolumeGroup do
     LinuxAdmin::Distro.stub(:local => LinuxAdmin::Distros::Test.new)
 
     @groups = <<eos
-vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
+  vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
 eos
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler