linux_admin 0.5.1 → 0.5.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGNlMTBjZmY0NmY3MjcyMjlhM2FiMWM5YjM4MjZhODFiNWY3M2FmNQ==
+  data.tar.gz: !binary |-
+    NjQxOGE5NDA4ZDQ2ZDdlYWI1OGQ0MWQ2M2NiZDhkNjFmN2JmNTNhMw==
+SHA512:
+  metadata.gz: !binary |-
+    NTk5NDA1MmM1MWY2ZGZjMzViNDQ3NGI1M2FjZjEzN2ZlYTA0ODIyMGZhMWY2
+    NjkxMWFiOTZkM2NhYzY4ZjhlMDZlYzE5NjdkYWY3ZTc0ZTk5M2M1YzAyMzIy
+    MDMwYTk2MDk4NDAwMjA2MzljMWYxYmIxMDMwNjVmYzQwMjdmNWE=
+  data.tar.gz: !binary |-
+    ZmNkNzQwZjE0NTNmZGFjMGMxMzMzMTA2ZjU5OTk3YjRmZjVhZDQ1ODJkZmU2
+    NDcyMWNjNGVkMDJhNGIzYmFkM2ZlNWUyOTdiN2Y4YTk5MWViNDllNzg1ZDM0
+    Y2I4Y2JlNjRiOGQ0NzhiOGFhYmQyMjQyMTVmOTRhMDg4OTJjNjA=

data/lib/linux_admin/command_result.rb

@@ -1,9 +1,14 @@
 class CommandResult
-  attr_reader :output, :error, :exit_status
+  attr_reader :command_line, :output, :error, :exit_status
 
-  def initialize(output, error, exit_status)
-    @output      = output
-    @error       = error
-    @exit_status = exit_status
+  def initialize(command_line, output, error, exit_status)
+    @command_line = command_line
+    @output       = output
+    @error        = error
+    @exit_status  = exit_status
+  end
+
+  def inspect
+    "#{to_s.chop} @exit_status=#{@exit_status}>"
   end
 end

data/lib/linux_admin/common.rb

@@ -12,12 +12,13 @@ class LinuxAdmin
       launch_params = {}
       launch_params[:chdir] = options[:chdir] if options[:chdir]
 
-      output = ""
-      error  = ""
-      status = nil
+      output        = ""
+      error         = ""
+      status        = nil
+      command_line  = build_cmd(cmd, params)
 
       begin
-        output, error = launch(build_cmd(cmd, params), launch_params)
+        output, error = launch(command_line, launch_params)
         status = exitstatus
       ensure
         output ||= ""
@@ -28,7 +29,7 @@ class LinuxAdmin
       raise NoSuchFileError.new(err.message) if NoSuchFileError.detected?(err.message)
       raise
     else
-      CommandResult.new(output, error, status)
+      CommandResult.new(command_line, output, error, status)
     end
 
     def run!(cmd, options = {})

data/lib/linux_admin/deb.rb

@@ -0,0 +1,39 @@
+# LinuxAdmin Deb Representation
+#
+# Copyright (C) 2013 Red Hat Inc.
+# Licensed under the MIT License
+
+class LinuxAdmin
+  class Deb < Package
+    APT_CACHE_CMD = '/usr/bin/apt-cache'
+
+    def self.from_line(apt_cache_line, in_description=false)
+      tag,value = apt_cache_line.split(':')
+      tag = tag.strip.downcase
+      [tag, value]
+    end
+
+    def self.from_string(apt_cache_string)
+      in_description = false
+      apt_cache_string.split("\n").each.with_object({}) do |line,deb|
+        tag,value = self.from_line(line)
+        if tag == 'description-en'
+          in_description = true
+        elsif tag == 'homepage'
+          in_description = false
+        end
+
+        if in_description && tag != 'description-en'
+          deb['description-en'] << line
+        else
+          deb[tag] = value.strip
+        end
+      end
+    end
+
+    def self.info(pkg)
+      self.from_string(run!(APT_CACHE_CMD, :params => ["show", pkg]).output)
+    end
+
+  end
+end

data/lib/linux_admin/hosts.rb

@@ -70,4 +70,4 @@ class LinuxAdmin
       line.flatten.join(" ").strip
     end
   end
-end
+end

data/lib/linux_admin/logical_volume.rb

@@ -3,8 +3,15 @@
 # Copyright (C) 2013 Red Hat Inc.
 # Licensed under the MIT License
 
+require 'pathname'
+
 class LinuxAdmin
   class LogicalVolume < Volume
+    DEVICE_PATH  = Pathname.new('/dev/')
+
+    # path to logical volume
+    attr_accessor :path
+
     # logical volume name
     attr_accessor :name
 
@@ -26,10 +33,19 @@ class LinuxAdmin
     # major device number of logical volume
     # minor device number of logical volume
 
+    def path=(value)
+      @path = value.include?(File::SEPARATOR) ? value : DEVICE_PATH.join(@volume_group.name, value)
+    end
+
+    def name=(value)
+      @name = value.include?(File::SEPARATOR) ? value.split(File::SEPARATOR).last : value
+    end
+
     def initialize(args = {})
-      @name         = args[:name]
       @volume_group = args[:volume_group]
       @sectors      = args[:sectors]
+      self.path     = args[:name]
+      self.name     = args[:name]
     end
 
     def extend_with(vg)
@@ -66,9 +82,10 @@ class LinuxAdmin
         params.merge!({'-L' => bytes_to_string(size)})
       end
       run!(cmd(:lvcreate), :params => params)
-      lv = LogicalVolume.new :name => name,
+
+      lv = LogicalVolume.new(:name => name,
                              :volume_group => vg,
-                             :sectors => size
+                             :sectors => size)
       @lvs << lv
       lv
     end

data/lib/linux_admin/package.rb

@@ -0,0 +1,18 @@
+# LinuxAdmin Abstract Package Representation
+#
+# Copyright (C) 2013 Red Hat Inc.
+# Licensed under the MIT License
+
+class LinuxAdmin
+  class Package < LinuxAdmin
+    def self.info(pkg)
+      if Distro.local == Distros.redhat
+        return Rpm.info(pkg)
+      elsif Distro.local == Distros.ubuntu
+        return Deb.info(pkg)
+      end
+
+      nil
+    end
+  end
+end

data/lib/linux_admin/registration_system/rhn.rb

@@ -2,6 +2,8 @@ require 'nokogiri'
 
 class LinuxAdmin
   class Rhn < RegistrationSystem
+    SATELLITE5_SERVER_CERT_PATH = "pub/rhn-org-trusted-ssl-cert-1.0-1.noarch.rpm"
+
     def registered?
       id = ""
       if File.exists?(systemid_file)
@@ -24,10 +26,13 @@ class LinuxAdmin
         raise ArgumentError, "activation key or username and password are required"
       end
 
+      install_server_certificate(options[:server_url], SATELLITE5_SERVER_CERT_PATH) if options[:server_url]
+
       params["--proxy="]          = options[:proxy_address]   if options[:proxy_address]
       params["--proxyUser="]      = options[:proxy_username]  if options[:proxy_username]
       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]
 
       run!(cmd, :params => params)
     end

data/lib/linux_admin/registration_system/subscription_manager.rb

@@ -9,6 +9,8 @@ class LinuxAdmin
       raise
     end
 
+    SATELLITE6_SERVER_CERT_PATH = "pub/candlepin-cert-consumer-latest.noarch.rpm"
+
     def validate_credentials(options)
       !!organizations(options)
     end
@@ -35,6 +37,9 @@ class LinuxAdmin
 
     def register(options)
       raise ArgumentError, "username and password are required" unless options[:username] && options[:password]
+
+      install_server_certificate(options[:server_url], SATELLITE6_SERVER_CERT_PATH) if options[:server_url]
+
       cmd = "subscription-manager register"
 
       params = {"--username=" => options[:username], "--password=" => options[:password]}

data/lib/linux_admin/registration_system.rb

@@ -39,6 +39,12 @@ class LinuxAdmin
       end
     end
     private_class_method :white_list_methods
+
+    def install_server_certificate(server, cert_path)
+      host = server.start_with?("http") ? URI.parse(server).host : server
+
+      LinuxAdmin::Rpm.upgrade("http://#{host}/#{cert_path}")
+    end
   end
 end
 

data/lib/linux_admin/rpm.rb

@@ -1,5 +1,7 @@
 class LinuxAdmin
-  class Rpm < LinuxAdmin
+  class Rpm < Package
+    RPM_CMD = '/usr/bin/rpm'
+
     def self.list_installed
       out = run!("rpm -qa --qf \"%{NAME} %{VERSION}-%{RELEASE}\n\"").output
       out.split("\n").each_with_object({}) do |line, pkg_hash|
@@ -8,6 +10,25 @@ class LinuxAdmin
       end
     end
 
+    def self.info(pkg)
+      params = { "-qi" => pkg}
+      in_description = false
+      out = run!(RPM_CMD, :params => params).output
+      out.split("\n").each.with_object({}) do |line, rpm|
+        tag,value = line.split(':')
+        tag = tag.strip
+        if tag == 'Description'
+          in_description = true
+        elsif in_description
+          rpm['description'] ||= ""
+          rpm['description'] << line + " "
+        else
+          tag = tag.downcase.gsub(/\s/, '_')
+          rpm[tag] = value.strip
+        end
+      end
+    end
+
     def self.upgrade(pkg)
       cmd     = "rpm -U"
       params  = { nil => pkg }

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 class LinuxAdmin
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/linux_admin/yum.rb

@@ -72,6 +72,16 @@ class LinuxAdmin
       end
     end
 
+    def self.repo_list(scope = "enabled")
+      # Scopes could be "enabled", "all"
+
+      cmd     = "yum repolist"
+      params  = {nil => scope}
+      output  = run!(cmd, :params => params).output
+
+      parse_repo_list_output(output)
+    end
+
     private
 
     def self.parse_repo_dir(dir)
@@ -88,6 +98,22 @@ class LinuxAdmin
         int_keys.each { |k| data[k] = data[k].to_i if data.has_key?(k) }
       end
     end
+
+    def self.parse_repo_list_output(content)
+      collect_content = false
+      index_start = "repo id"
+      index_end   = "repolist:"
+
+      content.split("\n").each_with_object([]) do |line, array|
+        collect_content = false if line.start_with?(index_end)
+        collect_content = true  if line.start_with?(index_start)
+        next if line.start_with?(index_start)
+        next if !collect_content
+
+        repo_id, repo_name, status = line.split(/\s{2,}/)
+        array.push(repo_id)
+      end
+    end
   end
 end
 

data/lib/linux_admin.rb

@@ -6,7 +6,9 @@ require 'linux_admin/registration_system'
 require 'linux_admin/common'
 require 'linux_admin/exceptions'
 require 'linux_admin/command_result'
+require 'linux_admin/package'
 require 'linux_admin/rpm'
+require 'linux_admin/deb'
 require 'linux_admin/version'
 require 'linux_admin/yum'
 

data/spec/command_result_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe CommandResult do
+  context "#inspect" do
+    it "will not display sensitive information" do
+      command_result = described_class.new("aaa", "bbb", "ccc", 0).inspect
+
+      expect(command_result.include?("aaa")).to be_false
+      expect(command_result.include?("bbb")).to be_false
+      expect(command_result.include?("ccc")).to be_false
+    end
+  end
+end

data/spec/data/yum/output_repo_list

@@ -0,0 +1,13 @@
+Loaded plugins: product-id, rhnplugin, security, subscription-manager
+This system is receiving updates from Red Hat Subscription Management.
+This system is not registered with RHN Classic or RHN Satellite.
+You can use rhn_register to register.
+RHN Satellite or RHN Classic support will be disabled.
+rhel-6-server-rpms                                                                                                                                                | 3.7 kB     00:00     
+rhel-ha-for-rhel-6-server-rpms                                                                                                                                    | 3.7 kB     00:00     
+rhel-lb-for-rhel-6-server-rpms                                                                                                                                    | 3.7 kB     00:00     
+repo id                                                               repo name                                                                                                    status
+rhel-6-server-rpms                                                    Red Hat Enterprise Linux 6 Server (RPMs)                                                                     11,016
+rhel-ha-for-rhel-6-server-rpms                                        Red Hat Enterprise Linux High Availability (for RHEL 6 Server) (RPMs)                                           269
+rhel-lb-for-rhel-6-server-rpms                                        Red Hat Enterprise Linux Load Balancer (for RHEL 6 Server) (RPMs)                                                 0
+repolist: 11,909

data/spec/deb_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe LinuxAdmin::Deb do
+  describe "#info" do
+    it "returns package metadata" do
+      # as output w/ apt-cache show ruby on ubuntu 13.04
+      data = <<EOS
+Package: ruby
+Priority: optional
+Section: interpreters
+Installed-Size: 31
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: akira yamada <akira@debian.org>
+Architecture: all
+Source: ruby-defaults
+Version: 4.9
+Replaces: irb, rdoc
+Provides: irb, rdoc
+Depends: ruby1.9.1 (>= 1.9.3.194-1)
+Suggests: ri, ruby-dev
+Conflicts: irb, rdoc
+Filename: pool/main/r/ruby-defaults/ruby_4.9_all.deb
+Size: 4896
+MD5sum: b1991f2e0eafb04f5930ed242cfe1476
+SHA1: a7c55fbb83dd8382631ea771b5555d989351f840
+SHA256: 84d042e0273bd2f0082dd9e7dda0246267791fd09607041a35485bfff92f38d9
+Description-en: Interpreter of object-oriented scripting language Ruby (default version)
+ Ruby is the interpreted scripting language for quick and easy
+ object-oriented programming.  It has many features to process text
+ files and to do system management tasks (as in perl).  It is simple,
+ straight-forward, and extensible.
+ .
+ This package is a dependency package, which depends on Debian's default Ruby
+ version (currently v1.9.3).
+Homepage: http://www.ruby-lang.org/
+Description-md5: da2991b37e3991230d79ba70f9c01682
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+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).
+                      with(described_class::APT_CACHE_CMD, :params => ["show", "ruby"]).
+                      and_return(CommandResult.new("", data, "", 0))
+      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'
+    end
+  end
+end

data/spec/logical_volume_spec.rb

@@ -23,8 +23,8 @@ eos
 
   describe "#extend_with" do
     it "uses lvextend" do
-      lv = described_class.new :name => 'lv'
       vg = LinuxAdmin::VolumeGroup.new :name => 'vg'
+      lv = described_class.new :name => 'lv', :volume_group => vg
       lv.should_receive(:run!).
          with(vg.cmd(:lvextend),
               :params => ['lv', 'vg'])
@@ -32,8 +32,8 @@ eos
     end
 
     it "returns self" do
-      lv = described_class.new :name => 'lv'
       vg = LinuxAdmin::VolumeGroup.new :name => 'vg'
+      lv = described_class.new :name => 'lv', :volume_group => vg
       lv.stub(:run!)
       lv.extend_with(vg).should == lv
     end
@@ -86,6 +86,24 @@ eos
       lv.name.should == 'lv'
     end
 
+    context "name is specified" do
+      it "sets path under volume group" do
+        LinuxAdmin::VolumeGroup.stub(:run! => double(:output => ""))
+        described_class.stub(:run! => double(:output => ""))
+        lv = described_class.create 'lv', @vg, 256.gigabytes
+        lv.path.to_s.should == "#{described_class::DEVICE_PATH}#{@vg.name}/lv"
+      end
+    end
+
+    context "path is specified" do
+      it "sets name" do
+        LinuxAdmin::VolumeGroup.stub(:run! => double(:output => ""))
+        described_class.stub(:run! => double(:output => ""))
+        lv = described_class.create '/dev/lv', @vg, 256.gigabytes
+        lv.name.should == "lv"
+      end
+    end
+
     it "adds logical volume to local registry" do
       LinuxAdmin::VolumeGroup.stub(:run! => double(:output => ""))
       described_class.stub(:run! => double(:output => ""))
@@ -110,11 +128,13 @@ eos
       lvs = described_class.scan
 
       lvs[0].should be_an_instance_of(described_class)
-      lvs[0].name.should == '/dev/vg_foobar/lv_swap'
+      lvs[0].path.should == '/dev/vg_foobar/lv_swap'
+      lvs[0].name.should == 'lv_swap'
       lvs[0].sectors.should == 4128768
 
       lvs[1].should be_an_instance_of(described_class)
-      lvs[1].name.should == '/dev/vg_foobar/lv_root'
+      lvs[1].path.should == '/dev/vg_foobar/lv_root'
+      lvs[1].name.should == 'lv_root'
       lvs[1].sectors.should == 19988480
     end
 

data/spec/package_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe LinuxAdmin::Package do
+  describe "#info" do
+    it "dispatches to redhat lookup mechanism" do
+      LinuxAdmin::Distro.should_receive(:local).and_return(LinuxAdmin::Distros.redhat)
+      LinuxAdmin::Rpm.should_receive(:info).with('ruby')
+      described_class.info 'ruby'
+    end
+
+    it "dispatches to ubuntu lookup mechanism" do
+      LinuxAdmin::Distro.should_receive(:local).twice.and_return(LinuxAdmin::Distros.ubuntu)
+      LinuxAdmin::Deb.should_receive(:info).with('ruby')
+      described_class.info 'ruby'
+    end
+  end
+end

data/spec/rhn_spec.rb

@@ -23,26 +23,43 @@ describe LinuxAdmin::Rhn do
       expect { described_class.new.register({}) }.to raise_error(ArgumentError)
     end
 
-    it "with username and password" do
-      described_class.any_instance.should_receive(:run!).once.with("rhnreg_ks", {:params=>{"--username="=>"SomeUser", "--password="=>"SomePass", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass", "--serverUrl="=>"192.168.1.1"}})
-      described_class.new.register(
-        :username       => "SomeUser",
-        :password       => "SomePass",
-        :proxy_address  => "1.2.3.4",
-        :proxy_username => "ProxyUser",
-        :proxy_password => "ProxyPass",
-        :server_url     => "192.168.1.1",
-      )
+    context "with username and password" do
+      let(:base_options) { {:username       => "SomeUser@SomeDomain.org",
+                            :password       => "SomePass",
+                            :org            => "2",
+                            :proxy_address  => "1.2.3.4",
+                            :proxy_username => "ProxyUser",
+                            :proxy_password => "ProxyPass",
+                          }
+                        }
+      let(:run_params) { {:params=>{"--username="=>"SomeUser@SomeDomain.org", "--password="=>"SomePass", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass"}} }
+
+      it "with server_url" do
+        run_params.store_path(:params, "--systemorgid=", "2")
+        run_params.store_path(:params, "--serverUrl=", "https://server.url")
+        base_options.store_path(:server_url, "https://server.url")
+
+        described_class.any_instance.should_receive(:run!).once.with("rhnreg_ks", run_params)
+        LinuxAdmin::Rpm.should_receive(:upgrade).with("http://server.url/pub/rhn-org-trusted-ssl-cert-1.0-1.noarch.rpm")
+
+        described_class.new.register(base_options)
+      end
+
+      it "without server_url" do
+        described_class.any_instance.should_receive(:run!).once.with("rhnreg_ks", run_params)
+        described_class.any_instance.should_not_receive(:install_server_certificate)
+
+        described_class.new.register(base_options)
+      end
     end
 
     it "with activation key" do
-      described_class.any_instance.should_receive(:run!).once.with("rhnreg_ks", {:params=>{"--activationkey="=>"123abc", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass", "--serverUrl="=>"192.168.1.1"}})
+      described_class.any_instance.should_receive(:run!).once.with("rhnreg_ks", {:params=>{"--activationkey="=>"123abc", "--proxy="=>"1.2.3.4", "--proxyUser="=>"ProxyUser", "--proxyPassword="=>"ProxyPass"}})
       described_class.new.register(
         :activationkey  => "123abc",
         :proxy_address  => "1.2.3.4",
         :proxy_username => "ProxyUser",
         :proxy_password => "ProxyPass",
-        :server_url     => "192.168.1.1",
       )
     end
   end

data/spec/rpm_spec.rb

@@ -27,8 +27,54 @@ describe LinuxAdmin::Rpm do
       })
   end
 
+  describe "#info" do
+    it "returns package metadata" do
+      # as output w/ rpm -qi ruby on F19
+      data = <<EOS
+Name        : ruby
+Version     : 2.0.0.247
+Release     : 15.fc19
+Architecture: x86_64
+Install Date: Sat 19 Oct 2013 08:17:20 PM EDT
+Group       : Development/Languages
+Size        : 64473
+License     : (Ruby or BSD) and Public Domain
+Signature   : RSA/SHA256, Thu 01 Aug 2013 02:07:03 PM EDT, Key ID 07477e65fb4b18e6
+Source RPM  : ruby-2.0.0.247-15.fc19.src.rpm
+Build Date  : Wed 31 Jul 2013 08:26:49 AM EDT
+Build Host  : buildvm-16.phx2.fedoraproject.org
+Relocations : (not relocatable)
+Packager    : Fedora Project
+Vendor      : Fedora Project
+URL         : http://ruby-lang.org/
+Summary     : An interpreter of object-oriented scripting language
+Description :
+Ruby is the interpreted scripting language for quick and easy
+object-oriented programming.  It has many features to process text
+files and to do system management tasks (as in Perl).  It is simple,
+straight-forward, and extensible.
+EOS
+      described_class.should_receive(:run).
+                      with(described_class::RPM_CMD, :params => {"-qi" => "ruby"}).
+                      and_return(CommandResult.new("", data, "", 0))
+      metadata = described_class.info("ruby")
+      metadata['name'].should == 'ruby'
+      metadata['version'].should == '2.0.0.247'
+      metadata['release'].should == '15.fc19'
+      metadata['architecture'].should == 'x86_64'
+      metadata['group'].should == 'Development/Languages'
+      metadata['size'].should == '64473'
+      metadata['license'].should == '(Ruby or BSD) and Public Domain'
+      metadata['source_rpm'].should == 'ruby-2.0.0.247-15.fc19.src.rpm'
+      metadata['build_host'].should == 'buildvm-16.phx2.fedoraproject.org'
+      metadata['packager'].should == 'Fedora Project'
+      metadata['vendor'].should == 'Fedora Project'
+      metadata['summary'].should == 'An interpreter of object-oriented scripting language'
+    end
+  end
+
   it ".upgrade" do
-    described_class.should_receive(:run).with("rpm -U", {:params=>{nil=>"abc"}}).and_return(CommandResult.new("", "", 0))
+    described_class.should_receive(:run).with("rpm -U", {:params=>{nil=>"abc"}}).and_return(CommandResult.new("", "", "", 0))
     expect(described_class.upgrade("abc")).to be_true
   end
-end
+end

data/spec/subscription_manager_spec.rb

@@ -23,18 +23,34 @@ describe LinuxAdmin::SubscriptionManager do
       expect { described_class.new.register }.to raise_error(ArgumentError)
     end
 
-    it "with username and password" do
-      run_options = ["subscription-manager register", {:params=>{"--username="=>"SomeUser@SomeDomain.org", "--password="=>"SomePass", "--org="=>"IT", "--proxy="=>"1.2.3.4", "--proxyuser="=>"ProxyUser", "--proxypassword="=>"ProxyPass", "--serverurl="=>"192.168.1.1"}}]
-      described_class.any_instance.should_receive(:run!).once.with(*run_options)
-      described_class.new.register(
-        :username       => "SomeUser@SomeDomain.org",
-        :password       => "SomePass",
-        :org            => "IT",
-        :proxy_address  => "1.2.3.4",
-        :proxy_username => "ProxyUser",
-        :proxy_password => "ProxyPass",
-        :server_url     => "192.168.1.1",
-      )
+    context "with username and password" do
+      let(:base_options) { {:username       => "SomeUser@SomeDomain.org",
+                            :password       => "SomePass",
+                            :org            => "IT",
+                            :proxy_address  => "1.2.3.4",
+                            :proxy_username => "ProxyUser",
+                            :proxy_password => "ProxyPass",
+                          }
+                        }
+      let(:run_params) { {:params=>{"--username="=>"SomeUser@SomeDomain.org", "--password="=>"SomePass", "--proxy="=>"1.2.3.4", "--proxyuser="=>"ProxyUser", "--proxypassword="=>"ProxyPass"}} }
+
+      it "with server_url" do
+        run_params.store_path(:params, "--org=", "IT")
+        run_params.store_path(:params, "--serverurl=", "https://server.url")
+        base_options.store_path(:server_url, "https://server.url")
+
+        described_class.any_instance.should_receive(:run!).once.with("subscription-manager register", run_params)
+        LinuxAdmin::Rpm.should_receive(:upgrade).with("http://server.url/pub/candlepin-cert-consumer-latest.noarch.rpm")
+
+        described_class.new.register(base_options)
+      end
+
+      it "without server_url" do
+        described_class.any_instance.should_receive(:run!).once.with("subscription-manager register", run_params)
+        described_class.any_instance.should_not_receive(:install_server_certificate)
+
+        described_class.new.register(base_options)
+      end
     end
   end
 
@@ -121,7 +137,7 @@ describe LinuxAdmin::SubscriptionManager do
 
     it "with invalid credentials" do
       run_options = ["subscription-manager orgs", {:params=>{"--username="=>"BadUser", "--password="=>"BadPass"}}]
-      described_class.any_instance.should_receive(:run).once.with(*run_options).and_return(CommandResult.new("", "Invalid username or password. To create a login, please visit https://www.redhat.com/wapps/ugc/register.html", 255))
+      described_class.any_instance.should_receive(:run).once.with(*run_options).and_return(CommandResult.new("", "", "Invalid username or password. To create a login, please visit https://www.redhat.com/wapps/ugc/register.html", 255))
       expect { described_class.new.organizations({:username=>"BadUser", :password=>"BadPass"}) }.to raise_error(LinuxAdmin::CredentialError)
     end
   end

data/spec/volume_group_spec.rb

@@ -18,8 +18,8 @@ eos
 
   describe "#attach_to" do
     it "uses lvextend" do
-      lv = LinuxAdmin::LogicalVolume.new :name => 'lv'
       vg = described_class.new :name => 'vg'
+      lv = LinuxAdmin::LogicalVolume.new :name => 'lv', :volume_group => vg
       vg.should_receive(:run!).
          with(vg.cmd(:lvextend),
               :params => ['lv', 'vg'])
@@ -27,8 +27,8 @@ eos
     end
 
     it "returns self" do
-      lv = LinuxAdmin::LogicalVolume.new :name => 'lv'
       vg = described_class.new :name => 'vg'
+      lv = LinuxAdmin::LogicalVolume.new :name => 'lv', :volume_group => vg
       vg.stub(:run!)
       vg.attach_to(lv).should == vg
     end

data/spec/yum_spec.rb

@@ -124,4 +124,16 @@ describe LinuxAdmin::Yum do
       })
     end
   end
+
+  context ".repo_list" do
+    it "with no arguments" do
+      described_class.should_receive(:run!).with("yum repolist", {:params=>{nil=>"enabled"}}).and_return(double(:output => sample_output("yum/output_repo_list")))
+      expect(described_class.repo_list).to eq(["rhel-6-server-rpms", "rhel-ha-for-rhel-6-server-rpms", "rhel-lb-for-rhel-6-server-rpms"])
+    end
+
+    it "with argument" do
+      described_class.should_receive(:run!).with("yum repolist", {:params=>{nil=>"enabled"}}).and_return(double(:output => sample_output("yum/output_repo_list")))
+      expect(described_class.repo_list("enabled")).to eq(["rhel-6-server-rpms", "rhel-ha-for-rhel-6-server-rpms", "rhel-lb-for-rhel-6-server-rpms"])
+    end
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.5.2
 platform: ruby
 authors:
 - Brandon Dunne
@@ -12,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -33,7 +30,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,7 +37,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,7 +44,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -57,7 +51,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,7 +58,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -73,7 +65,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -81,7 +72,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -89,7 +79,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -97,7 +86,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -105,7 +93,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -113,7 +100,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: more_core_extensions
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -121,7 +107,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -129,7 +114,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -137,7 +121,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -170,12 +153,14 @@ files:
 - lib/linux_admin.rb
 - lib/linux_admin/command_result.rb
 - lib/linux_admin/common.rb
+- lib/linux_admin/deb.rb
 - lib/linux_admin/disk.rb
 - lib/linux_admin/distro.rb
 - lib/linux_admin/exceptions.rb
 - lib/linux_admin/fstab.rb
 - lib/linux_admin/hosts.rb
 - lib/linux_admin/logical_volume.rb
+- lib/linux_admin/package.rb
 - lib/linux_admin/partition.rb
 - lib/linux_admin/physical_volume.rb
 - lib/linux_admin/registration_system.rb
@@ -190,6 +175,7 @@ files:
 - lib/linux_admin/yum.rb
 - lib/linux_admin/yum/repo_file.rb
 - linux_admin.gemspec
+- spec/command_result_spec.rb
 - spec/common_spec.rb
 - spec/data/rhn/output_rhn-channel_list
 - spec/data/rhn/systemid
@@ -200,15 +186,18 @@ files:
 - spec/data/subscription_manager/output_list_installed_subscribed
 - spec/data/subscription_manager/output_orgs
 - spec/data/yum/first.repo
+- spec/data/yum/output_repo_list
 - spec/data/yum/output_repoquery_multiple
 - spec/data/yum/output_repoquery_single
 - spec/data/yum/second.repo
+- spec/deb_spec.rb
 - spec/disk_spec.rb
 - spec/distro_spec.rb
 - spec/fstab_spec.rb
 - spec/hosts_spec.rb
 - spec/linux_admin_spec.rb
 - spec/logical_volume_spec.rb
+- spec/package_spec.rb
 - spec/partition_spec.rb
 - spec/physical_volume_spec.rb
 - spec/registration_system_spec.rb
@@ -223,29 +212,29 @@ files:
 homepage: http://github.com/ManageIQ/linux_admin
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: LinuxAdmin is a module to simplify management of linux systems.
 test_files:
+- spec/command_result_spec.rb
 - spec/common_spec.rb
 - spec/data/rhn/output_rhn-channel_list
 - spec/data/rhn/systemid
@@ -256,15 +245,18 @@ test_files:
 - spec/data/subscription_manager/output_list_installed_subscribed
 - spec/data/subscription_manager/output_orgs
 - spec/data/yum/first.repo
+- spec/data/yum/output_repo_list
 - spec/data/yum/output_repoquery_multiple
 - spec/data/yum/output_repoquery_single
 - spec/data/yum/second.repo
+- spec/deb_spec.rb
 - spec/disk_spec.rb
 - spec/distro_spec.rb
 - spec/fstab_spec.rb
 - spec/hosts_spec.rb
 - spec/linux_admin_spec.rb
 - spec/logical_volume_spec.rb
+- spec/package_spec.rb
 - spec/partition_spec.rb
 - spec/physical_volume_spec.rb
 - spec/registration_system_spec.rb