linux_admin 0.9.1 → 0.9.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ae83085610c76ae512132f71299833426b68c566
+  data.tar.gz: 37a232193db39e75850aee03e397c87988a9b99f
+SHA512:
+  metadata.gz: 41b4c8a63752bcbcb11fdd9f20161847a861e88d2c86f4b1f34cf21238d5e069a04d8e6a498e53d0f1d7f1f3d844c9394100232137f24477ca8d44e1a09cb273
+  data.tar.gz: 7347bac8c99654f4a357907ca81deac4e7466d8b3b135ddaafa7fc7a1522727fa2a259c66d0bd2c2ce0d48b11340701f7bad978614ffa03de5c2a1b3c7bd80cd

data/README.md

@@ -1,17 +1,15 @@
 # LinuxAdmin
-[![Gem Version](https://badge.fury.io/rb/linux_admin.png)](http://badge.fury.io/rb/linux_admin)
-[![Build Status](https://travis-ci.org/ManageIQ/linux_admin.png)](https://travis-ci.org/ManageIQ/linux_admin)
-[![Code Climate](https://codeclimate.com/github/ManageIQ/linux_admin.png)](https://codeclimate.com/github/ManageIQ/linux_admin)
-[![Coverage Status](https://coveralls.io/repos/ManageIQ/linux_admin/badge.png?branch=master)](https://coveralls.io/r/ManageIQ/linux_admin)
-[![Dependency Status](https://gemnasium.com/ManageIQ/linux_admin.png)](https://gemnasium.com/ManageIQ/linux_admin)
+
+[![Gem Version](https://badge.fury.io/rb/linux_admin.svg)](http://badge.fury.io/rb/linux_admin)
+[![Build Status](https://travis-ci.org/ManageIQ/linux_admin.svg)](https://travis-ci.org/ManageIQ/linux_admin)
+[![Code Climate](http://img.shields.io/codeclimate/github/ManageIQ/linux_admin.svg)](https://codeclimate.com/github/ManageIQ/linux_admin)
+[![Coverage Status](http://img.shields.io/coveralls/ManageIQ/linux_admin.svg)](https://coveralls.io/r/ManageIQ/linux_admin)
+[![Dependency Status](https://gemnasium.com/ManageIQ/linux_admin.svg)](https://gemnasium.com/ManageIQ/linux_admin)
 
 LinuxAdmin is a module to simplify management of linux systems.
 It should be a single place to manage various system level configurations,
 registration, updates, etc.
 
-## Supported Rubies
-* MRI 1.9
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/linux_admin/distro.rb

@@ -53,11 +53,11 @@ class LinuxAdmin
       end
 
       def detected_by_etc_release?
-        release_file && File.exists?(release_file)
+        release_file && File.exist?(release_file)
       end
 
       def command(name)
-        @path.collect { |dir| "#{dir}/#{name}" }.detect { |cmd| File.exists?(cmd) }
+        @path.collect { |dir| "#{dir}/#{name}" }.detect { |cmd| File.exist?(cmd) }
       end
 
       def info(pkg)

data/lib/linux_admin/etc_issue.rb

@@ -16,7 +16,7 @@ class LinuxAdmin
     end
 
     def data
-      @data ||= File.exists?(PATH) ? File.read(PATH) : ""
+      @data ||= File.exist?(PATH) ? File.read(PATH) : ""
     end
 
     def refresh

data/lib/linux_admin/fstab.rb

@@ -70,7 +70,6 @@ class LinuxAdmin
 
     def write!
       content = ''
-      comment_index = 0
       @entries.each do |entry|
         if entry.has_content?
           content << entry.formatted_columns(@maximum_column_lengths) << "\n"

data/lib/linux_admin/logical_volume.rb

@@ -11,11 +11,8 @@ class LinuxAdmin
 
     DEVICE_PATH  = Pathname.new('/dev/')
 
-    # path to logical volume
-    attr_accessor :path
-
     # logical volume name
-    attr_accessor :name
+    attr_reader :name
 
     # volume group name
     attr_accessor :volume_group
@@ -35,6 +32,11 @@ class LinuxAdmin
     # major device number of logical volume
     # minor device number of logical volume
 
+    # path to logical volume
+    def path
+      "/dev/#{self.volume_group.name}/#{self.name}"
+    end
+
     def path=(value)
       @path = value.include?(File::SEPARATOR) ? value : DEVICE_PATH.join(@volume_group.name, value)
     end
@@ -57,10 +59,6 @@ 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/registration_system/rhn.rb

@@ -7,7 +7,7 @@ class LinuxAdmin
 
     def registered?
       id = ""
-      if File.exists?(systemid_file)
+      if File.exist?(systemid_file)
         xml = Nokogiri.XML(File.read(systemid_file))
         id = xml.xpath('/params/param/value/struct/member[name="system_id"]/value/string').text
       end
@@ -103,4 +103,4 @@ class LinuxAdmin
       "/etc/sysconfig/rhn/systemid"
     end
   end
-end
+end

data/lib/linux_admin/registration_system/subscription_manager.rb

@@ -9,7 +9,7 @@ class LinuxAdmin
       raise
     end
 
-    SATELLITE6_SERVER_CERT_PATH = "pub/candlepin-cert-consumer-latest.noarch.rpm"
+    SATELLITE6_SERVER_CERT_PATH = "pub/katello-ca-consumer-latest.noarch.rpm"
 
     def validate_credentials(options)
       !!organizations(options)

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 class LinuxAdmin
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/linux_admin/volume.rb

@@ -10,9 +10,9 @@ class LinuxAdmin
     def self.process_volume_display_line(line)
       groups = VolumeGroup.scan
       fields = line.split(':')
-      vgname = fields[1] 
-      vg = groups.find { |vg| vg.name == vgname }
-      return fields, vg 
+      vgname = fields[1]
+      vg = groups.find { |g| g.name == vgname }
+      return fields, vg
     end
 
     protected

data/lib/linux_admin/yum.rb

@@ -55,7 +55,12 @@ class LinuxAdmin
       cmd    = "yum -y update"
       params = {nil => packages} unless packages.blank?
 
-      run!(cmd, :params => params)
+      out = run!(cmd, :params => params)
+
+      # Handle errors that exit 0  https://bugzilla.redhat.com/show_bug.cgi?id=1141318
+      raise AwesomeSpawn::CommandResultError.new(out.error, out) if out.error.include?("No Match for argument")
+
+      out
     end
 
     def self.version_available(*packages)
@@ -110,11 +115,11 @@ class LinuxAdmin
         next if line.start_with?(index_start)
         next if !collect_content
 
-        repo_id, repo_name, status = line.split(/\s{2,}/)
+        repo_id, _repo_name, _status = line.split(/\s{2,}/)
         array.push(repo_id)
       end
     end
   end
 end
 
-Dir.glob(File.join(File.dirname(__FILE__), "yum", "*.rb")).each { |f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), "yum", "*.rb")).each { |f| require f }

data/spec/common_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe LinuxAdmin::Common do
   subject { Class.new { include LinuxAdmin::Common }.new }
 
@@ -10,12 +8,12 @@ describe LinuxAdmin::Common do
   end
 
   it "#run" do
-    AwesomeSpawn.should_receive(:run).with("echo", nil => "test")
+    expect(AwesomeSpawn).to receive(:run).with("echo", nil => "test")
     subject.run("echo", nil => "test")
   end
 
   it "#run!" do
-    AwesomeSpawn.should_receive(:run!).with("echo", nil => "test")
+    expect(AwesomeSpawn).to receive(:run!).with("echo", nil => "test")
     subject.run!("echo", nil => "test")
   end
 end

data/spec/deb_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe LinuxAdmin::Deb do
   describe "#info" do
     it "returns package metadata" do
@@ -39,16 +37,16 @@ Origin: Ubuntu
 Supported: 9m
 Task: kubuntu-desktop, kubuntu-full, kubuntu-active, kubuntu-active-desktop, kubuntu-active-full, kubuntu-active, edubuntu-desktop-gnome, ubuntustudio-font-meta
 EOS
-      described_class.should_receive(:run!).
+      expect(described_class).to receive(:run!).
                       with(described_class::APT_CACHE_CMD, :params => ["show", "ruby"]).
                       and_return(double(:output => data))
       metadata = described_class.info("ruby")
-      metadata['package'].should == 'ruby'
-      metadata['priority'].should == 'optional'
-      metadata['section'].should == 'interpreters'
-      metadata['architecture'].should == 'all'
-      metadata['version'].should == '4.9'
-      metadata['origin'].should == 'Ubuntu'
+      expect(metadata['package']).to eq('ruby')
+      expect(metadata['priority']).to eq('optional')
+      expect(metadata['section']).to eq('interpreters')
+      expect(metadata['architecture']).to eq('all')
+      expect(metadata['version']).to eq('4.9')
+      expect(metadata['origin']).to eq('Ubuntu')
     end
   end
 end

data/spec/disk_spec.rb

@@ -1,21 +1,19 @@
-require 'spec_helper'
-
 describe LinuxAdmin::Disk do
   describe "#local" do
     it "returns local disks" do
-      Dir.should_receive(:glob).with(['/dev/[vhs]d[a-z]', '/dev/xvd[a-z]']).
+      expect(Dir).to receive(:glob).with(['/dev/[vhs]d[a-z]', '/dev/xvd[a-z]']).
           and_return(['/dev/hda', '/dev/sda'])
       disks = LinuxAdmin::Disk.local
       paths = disks.collect { |disk| disk.path }
-      paths.should include('/dev/hda')
-      paths.should include('/dev/sda')
+      expect(paths).to include('/dev/hda')
+      expect(paths).to include('/dev/sda')
     end
   end
 
   describe "#size" do
     it "uses fdisk" do
       disk = LinuxAdmin::Disk.new :path => '/dev/hda'
-      disk.should_receive(:run!).
+      expect(disk).to receive(:run!).
         with(disk.cmd(:fdisk),
              :params => {"-l" => nil}).
         and_return(double(:output => ""))
@@ -38,15 +36,15 @@ Disk identifier: 0x3ddb508b
 eos
 
       disk = LinuxAdmin::Disk.new :path => '/dev/hda'
-      disk.stub(:run!).and_return(double(:output => fdisk))
-      disk.size.should == 500.1.gigabytes
+      allow(disk).to receive(:run!).and_return(double(:output => fdisk))
+      expect(disk.size).to eq(500.1.gigabytes)
     end
   end
 
   describe "#partitions" do
     it "uses parted" do
       disk = LinuxAdmin::Disk.new :path => '/dev/hda'
-      disk.should_receive(:run).
+      expect(disk).to receive(:run).
         with(disk.cmd(:parted),
              :params => { nil => %w(--script /dev/hda print) }).and_return(double(:output => ""))
       disk.partitions
@@ -54,8 +52,8 @@ eos
 
     it "returns [] on non-zero parted rc" do
       disk = LinuxAdmin::Disk.new :path => '/dev/hda'
-      disk.should_receive(:run).and_return(double(:output => "", :exit_status => 1))
-      disk.partitions.should == []
+      expect(disk).to receive(:run).and_return(double(:output => "", :exit_status => 1))
+      expect(disk.partitions).to eq([])
     end
 
     it "sets partitons" do
@@ -72,29 +70,29 @@ Number  Start   End     Size    Type      File system     Flags
  3      162GB   163GB   1074MB  logical   linux-swap(v1)
 eos
       disk = LinuxAdmin::Disk.new
-      disk.should_receive(:run).and_return(double(:output => partitions))
-
-      disk.partitions[0].id.should == 1
-      disk.partitions[0].disk.should == disk
-      disk.partitions[0].size.should == 80.5.gigabytes
-      disk.partitions[0].start_sector.should == 1259.megabytes
-      disk.partitions[0].end_sector.should == 81.8.gigabytes
-      disk.partitions[0].partition_type.should == 'primary'
-      disk.partitions[0].fs_type.should == 'ntfs'
-      disk.partitions[1].id.should == 2
-      disk.partitions[1].disk.should == disk
-      disk.partitions[1].size.should == 80.5.gigabytes
-      disk.partitions[1].start_sector.should == 81.8.gigabytes
-      disk.partitions[1].end_sector.should == 162.gigabytes
-      disk.partitions[1].partition_type.should == 'primary'
-      disk.partitions[1].fs_type.should == 'ext4'
-      disk.partitions[2].id.should == 3
-      disk.partitions[2].disk.should == disk
-      disk.partitions[2].size.should == 1074.megabytes
-      disk.partitions[2].start_sector.should == 162.gigabytes
-      disk.partitions[2].end_sector.should == 163.gigabytes
-      disk.partitions[2].partition_type.should == 'logical'
-      disk.partitions[2].fs_type.should == 'linux-swap(v1)'
+      expect(disk).to receive(:run).and_return(double(:output => partitions))
+
+      expect(disk.partitions[0].id).to eq(1)
+      expect(disk.partitions[0].disk).to eq(disk)
+      expect(disk.partitions[0].size).to eq(80.5.gigabytes)
+      expect(disk.partitions[0].start_sector).to eq(1259.megabytes)
+      expect(disk.partitions[0].end_sector).to eq(81.8.gigabytes)
+      expect(disk.partitions[0].partition_type).to eq('primary')
+      expect(disk.partitions[0].fs_type).to eq('ntfs')
+      expect(disk.partitions[1].id).to eq(2)
+      expect(disk.partitions[1].disk).to eq(disk)
+      expect(disk.partitions[1].size).to eq(80.5.gigabytes)
+      expect(disk.partitions[1].start_sector).to eq(81.8.gigabytes)
+      expect(disk.partitions[1].end_sector).to eq(162.gigabytes)
+      expect(disk.partitions[1].partition_type).to eq('primary')
+      expect(disk.partitions[1].fs_type).to eq('ext4')
+      expect(disk.partitions[2].id).to eq(3)
+      expect(disk.partitions[2].disk).to eq(disk)
+      expect(disk.partitions[2].size).to eq(1074.megabytes)
+      expect(disk.partitions[2].start_sector).to eq(162.gigabytes)
+      expect(disk.partitions[2].end_sector).to eq(163.gigabytes)
+      expect(disk.partitions[2].partition_type).to eq('logical')
+      expect(disk.partitions[2].fs_type).to eq('linux-swap(v1)')
     end
   end
 
@@ -104,14 +102,14 @@ eos
     end
 
     it "dispatches to create_partition" do
-      @disk.should_receive(:create_partition).with("primary", "0%", "50%")
+      expect(@disk).to receive(:create_partition).with("primary", "0%", "50%")
       @disk.create_partitions "primary", :start => "0%", :end => "50%"
     end
 
     context "multiple partitions specified" do
       it "calls create_partition for each partition" do
-        @disk.should_receive(:create_partition).with("primary", "0%", "49%")
-        @disk.should_receive(:create_partition).with("primary", "50%", "100%")
+        expect(@disk).to receive(:create_partition).with("primary", "0%", "49%")
+        expect(@disk).to receive(:create_partition).with("primary", "50%", "100%")
         @disk.create_partitions("primary", {:start => "0%",  :end => "49%"},
                                            {:start => "50%", :end => "100%"})
       end
@@ -134,18 +132,18 @@ eos
       @disk.instance_variable_set(:@partitions,
                                   [LinuxAdmin::Partition.new(:id => 1,
                                                  :end_sector => 1024)])
-      @disk.stub(:has_partition_table? => true)
+      allow(@disk).to receive_messages(:has_partition_table? => true)
     end
 
     it "uses parted" do
       params = ['--script', '/dev/hda', 'mkpart', '-a', 'opt', 'primary', 1024, 2048]
-      @disk.should_receive(:run!).with(@disk.cmd(:parted), :params => { nil => params })
+      expect(@disk).to receive(:run!).with(@disk.cmd(:parted), :params => { nil => params })
       @disk.create_partition 'primary', 1024
     end
 
     it "accepts start/end params" do
       params = ['--script', '/dev/hda', 'mkpart', '-a', 'opt', 'primary', "0%", "50%"]
-      @disk.should_receive(:run!).with(@disk.cmd(:parted), :params => { nil => params })
+      expect(@disk).to receive(:run!).with(@disk.cmd(:parted), :params => { nil => params })
       @disk.create_partition 'primary', "0%", "50%"
     end
 
@@ -162,34 +160,34 @@ eos
     end
 
     it "returns partition" do
-      @disk.should_receive(:run!) # stub out call to parted
+      expect(@disk).to receive(:run!) # stub out call to parted
       partition = @disk.create_partition 'primary', 1024
-      partition.should be_an_instance_of(LinuxAdmin::Partition)
+      expect(partition).to be_an_instance_of(LinuxAdmin::Partition)
     end
 
     it "increments partition id" do
-      @disk.should_receive(:run!) # stub out call to parted
+      expect(@disk).to receive(:run!) # stub out call to parted
       partition = @disk.create_partition 'primary', 1024
-      partition.id.should == 2
+      expect(partition.id).to eq(2)
     end
 
     it "sets partition start to first unused sector on disk" do
-      @disk.should_receive(:run!) # stub out call to parted
+      expect(@disk).to receive(:run!) # stub out call to parted
       partition = @disk.create_partition 'primary', 1024
-      partition.start_sector.should == 1024
+      expect(partition.start_sector).to eq(1024)
     end
 
     it "stores new partition locally" do
-      @disk.should_receive(:run!) # stub out call to parted
-      lambda {
+      expect(@disk).to receive(:run!) # stub out call to parted
+      expect {
         @disk.create_partition 'primary', 1024
-      }.should change{@disk.partitions.size}.by(1)
+      }.to change{@disk.partitions.size}.by(1)
     end
 
     it "creates partition table if missing" do
-      @disk.stub(:has_partition_table? => false)
-      @disk.should_receive(:create_partition_table)
-      @disk.should_receive(:run!)
+      allow(@disk).to receive_messages(:has_partition_table? => false)
+      expect(@disk).to receive(:create_partition_table)
+      expect(@disk).to receive(:run!)
       @disk.create_partition 'primary', 1024
     end
   end
@@ -197,39 +195,39 @@ eos
   describe "#has_partition_table?" do
     it "positive case" do
       disk = LinuxAdmin::Disk.new :path => '/dev/hda'
-      disk.should_receive(:run).and_return(double(:output => "", :exit_status => 0))
-      disk.should have_partition_table
+      expect(disk).to receive(:run).and_return(double(:output => "", :exit_status => 0))
+      expect(disk).to have_partition_table
     end
 
     it "negative case" do
       disk = LinuxAdmin::Disk.new :path => '/dev/hda'
       output = "\e[?1034h\r\rError: /dev/sdb: unrecognised disk label\n"
-      disk.should_receive(:run).and_return(double(:output => output, :exit_status => 1))
-      disk.should_not have_partition_table
+      expect(disk).to receive(:run).and_return(double(:output => output, :exit_status => 1))
+      expect(disk).not_to have_partition_table
     end
   end
 
   it "#create_partition_table" do
     disk = LinuxAdmin::Disk.new :path => '/dev/hda'
     options = {:params => {nil => %w(--script /dev/hda mklabel msdos)}}
-    disk.should_receive(:run!).with(disk.cmd(:parted), options)
+    expect(disk).to receive(:run!).with(disk.cmd(:parted), options)
     disk.create_partition_table
   end
 
   describe "#clear!" do
     it "clears partitions" do
       disk = LinuxAdmin::Disk.new :path => '/dev/hda'
-      disk.should_receive(:run).and_return(double(:output => "")) # stub out call to cmds
+      expect(disk).to receive(:run).and_return(double(:output => "")) # stub out call to cmds
       disk.partitions << LinuxAdmin::Partition.new
 
-      disk.should_receive(:run!)
+      expect(disk).to receive(:run!)
       disk.clear!
-      disk.partitions.should be_empty
+      expect(disk.partitions).to be_empty
     end
 
     it "uses dd to clear partition table" do
       disk = LinuxAdmin::Disk.new :path => '/dev/hda'
-      disk.should_receive(:run!).
+      expect(disk).to receive(:run!).
            with(disk.cmd(:dd),
                 :params => {'if=' => '/dev/zero', 'of=' => '/dev/hda',
                             'bs=' => 512, 'count=' => 1})
@@ -238,8 +236,8 @@ eos
 
     it "returns self" do
       disk = LinuxAdmin::Disk.new :path => '/dev/hda'
-      disk.stub(:run!) # stub out call to dd
-      disk.clear!.should == disk
+      allow(disk).to receive(:run!) # stub out call to dd
+      expect(disk.clear!).to eq(disk)
     end
   end