linux_admin 0.2.2 → 0.2.3

data/lib/linux_admin/disk.rb

@@ -25,6 +25,30 @@ class LinuxAdmin
         val.to_f.gigabytes
       end
     end
+    
+    def overlapping_ranges?(ranges)
+      ranges.find do |range1|
+        ranges.any? do |range2|
+          range1 != range2 &&
+          range1.overlaps?(range2)
+        end
+      end
+    end
+
+    def check_if_partitions_overlap(partitions)
+      ranges =
+        partitions.collect do |partition|
+          start  = partition[:start]
+          finish = partition[:end]
+          start.delete('%')
+          finish.delete('%')
+          start.to_f..finish.to_f
+        end
+
+      if overlapping_ranges?(ranges)
+        raise ArgumentError, "overlapping partitions"
+      end
+    end
 
     public
 
@@ -109,27 +133,46 @@ class LinuxAdmin
       result_indicates_partition_table?(result)
     end
 
-    def create_partition(partition_type, size)
+    def create_partition(partition_type, *args)
       create_partition_table unless has_partition_table?
 
-      id, start =
-        partitions.empty? ? [1, 0] :
-          [(partitions.last.id + 1),
-            partitions.last.end_sector]
+      start = finish = size = nil
+      case args.length
+      when 1 then
+        start  = partitions.empty? ? 0 : partitions.last.end_sector
+        size   = args.first
+        finish = start + size
+
+      when 2 then
+        start  = args[0]
+        finish = args[1]
+
+      else
+        raise ArgumentError, "must specify start/finish or size"
+      end
 
-      options = parted_options_array('mkpart', partition_type, start, start + size)
+      id = partitions.empty? ? 1 : (partitions.last.id + 1)
+      options = parted_options_array('mkpart', '-a opt', partition_type, start, finish)
       run!(cmd(:parted), :params => { nil => options})
 
       partition = Partition.new(:disk           => self,
                                 :id             => id,
                                 :start_sector   => start,
-                                :end_sector     => start+size,
+                                :end_sector     => finish,
                                 :size           => size,
                                 :partition_type => partition_type)
       partitions << partition
       partition
     end
 
+    def create_partitions(partition_type, *args)
+      check_if_partitions_overlap(args)
+
+      args.each { |arg|
+        self.create_partition(partition_type, arg[:start], arg[:end])
+      }
+    end
+
     def clear!
       @partitions = []
 

data/lib/linux_admin/registration_system/rhn.rb

@@ -33,19 +33,24 @@ class LinuxAdmin
     end
 
     def subscribe(options)
-      raise ArgumentError, "pools, username and password are required" if options[:pools].blank? || options[:username].blank? || options[:password].blank?
+      raise ArgumentError, "channels, username and password are required" if options[:channels].blank? || options[:username].blank? || options[:password].blank?
       cmd = "rhn-channel -a"
 
-      pools = options[:pools].collect {|pool| ["--channel=", pool]}
+      channels = options[:channels].collect {|channel| ["--channel=", channel]}
 
       params                = {}
       params["--user="]     = options[:username]
       params["--password="] = options[:password]
-      params                = params.to_a + pools
+      params                = params.to_a + channels
 
       run!(cmd, :params => params)
     end
 
+    def subscribed_products
+      cmd = "rhn-channel -l"
+      run!(cmd).output.split("\n").compact
+    end
+
     private
 
     def systemid_file

data/lib/linux_admin/registration_system/subscription_manager.rb

@@ -47,12 +47,25 @@ class LinuxAdmin
 
     def subscribe(options)
       cmd    = "subscription-manager attach"
-      pools  = options[:pools].collect {|pool| ["--pool", pool]}
-      params = proxy_params(options).to_a + pools
+      params = proxy_params(options)
+
+      if options[:pools].blank?
+        params.merge!({"--auto" => nil})
+      else
+        pools  = options[:pools].collect {|pool| ["--pool", pool]}
+        params = params.to_a + pools
+      end
 
       run!(cmd, :params => params)
     end
 
+    def subscribed_products
+      cmd     = "subscription-manager list --installed"
+      output  = run!(cmd).output
+
+      parse_output(output).select {|p| p[:status].downcase == "subscribed"}.collect {|p| p[:product_id]}
+    end
+
     def available_subscriptions
       cmd     = "subscription-manager list --all --available"
       output  = run!(cmd).output
@@ -80,7 +93,8 @@ class LinuxAdmin
     end
 
     def format_values(content_group)
-      content_group[:ends] = Date.strptime(content_group[:ends], "%m/%d/%Y") if content_group[:ends]
+      content_group[:ends]    = Date.strptime(content_group[:ends], "%m/%d/%Y")   if content_group[:ends]
+      content_group[:starts]  = Date.strptime(content_group[:starts], "%m/%d/%Y") if content_group[:starts]
       content_group
     end
 

data/lib/linux_admin/version.rb

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

data/lib/linux_admin/yum.rb

@@ -66,10 +66,9 @@ class LinuxAdmin
 
       out = run!(cmd, :params => params).output
 
-      items = out.split("\n")
-      items.each_with_object({}) do |i, versions|
-        name, version = i.split(" ", 2)
-        versions[name.strip] = version.strip
+      out.split("\n").each_with_object({}) do |i, versions|
+        name, version         = i.split(" ", 2)
+        versions[name.strip]  = version.strip
       end
     end
 

data/spec/data/rhn/output_rhn-channel_list

@@ -0,0 +1,2 @@
+rhel-x86_64-server-6
+rhel-x86_64-server-6-cf-me-2

data/spec/data/subscription_manager/output_list_installed_not_subscribed

@@ -0,0 +1,19 @@
++-------------------------------------------+
+    Installed Product Status
++-------------------------------------------+
+Product Name:           Red Hat Enterprise Linux Server
+Product ID:             69
+Version:                6.3
+Arch:                   x86_64
+Status:                 Not Subscribed
+Starts:                 09/27/2012
+Ends:                   09/26/2013
+
+Product Name:           Red Hat CloudForms
+Product ID:             167
+Version:                2.1
+Arch:                   x86_64
+Status:                 Subscribed
+Starts:                 01/03/2013
+Ends:                   01/03/2014
+

data/spec/data/subscription_manager/output_list_installed_subscribed

@@ -0,0 +1,19 @@
++-------------------------------------------+
+    Installed Product Status
++-------------------------------------------+
+Product Name:           Red Hat Enterprise Linux Server
+Product ID:             69
+Version:                6.3
+Arch:                   x86_64
+Status:                 Subscribed
+Starts:                 09/27/2012
+Ends:                   09/26/2013
+
+Product Name:           Red Hat CloudForms
+Product ID:             167
+Version:                2.1
+Arch:                   x86_64
+Status:                 Subscribed
+Starts:                 01/03/2013
+Ends:                   01/03/2014
+

data/spec/data/yum/output_repoquery_single

@@ -0,0 +1 @@
+subscription-manager 1.1.23.1 

data/spec/disk_spec.rb

@@ -99,6 +99,35 @@ eos
     end
   end
 
+  describe "#create_partitions" do
+    before(:each) do
+      @disk = LinuxAdmin::Disk.new(:path => '/dev/hda')
+    end
+
+    it "dispatches to create_partition" do
+      @disk.should_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%")
+        @disk.create_partitions("primary", {:start => "0%",  :end => "49%"},
+                                           {:start => "50%", :end => "100%"})
+      end
+
+      context "partitions overlap" do
+        it "raises argument error" do
+          expect{
+            @disk.create_partitions("primary", {:start => "0%",  :end => "50%"},
+                                               {:start => "49%", :end => "100%"})
+          }.to raise_error(ArgumentError)
+        end
+      end
+    end
+  end
+
   describe "#create_partition" do
     before(:each) do
       # test disk w/ existing partition
@@ -110,12 +139,29 @@ eos
     end
 
     it "uses parted" do
-      @disk.should_receive(:run!).
-        with(@disk.cmd(:parted),
-             :params => { nil => ['--script', '/dev/hda', 'mkpart', 'primary', 1024, 2048] })
+      params = ['--script', '/dev/hda', 'mkpart', '-a opt', 'primary', 1024, 2048]
+      @disk.should_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 })
+      @disk.create_partition 'primary', "0%", "50%"
+    end
+
+    context "missing params" do
+      it "raises ArgumentError" do
+        expect{
+          @disk.create_partition 'primary'
+        }.to raise_error(ArgumentError)
+
+        expect{
+          @disk.create_partition 'primary', '0%', '50%', 100
+        }.to raise_error(ArgumentError)
+      end
+    end
+
     it "returns partition" do
       @disk.should_receive(:run!) # stub out call to parted
       partition = @disk.create_partition 'primary', 1024

data/spec/rhn_spec.rb

@@ -52,13 +52,18 @@ describe LinuxAdmin::Rhn do
       expect { described_class.new.subscribe({}) }.to raise_error(ArgumentError)
     end
 
-    it "with pools" do
+    it "with channels" do
       described_class.any_instance.should_receive(:run!).once.with("rhn-channel -a", {:params=>[["--user=", "SomeUser"], ["--password=", "SomePass"], ["--channel=", 123], ["--channel=", 456]]})
       described_class.new.subscribe({
         :username => "SomeUser",
         :password => "SomePass",
-        :pools    => [123, 456]
+        :channels => [123, 456]
         })
     end
   end
+
+  it "#subscribed_products" do
+    described_class.any_instance.should_receive(:run!).once.with("rhn-channel -l").and_return(double(:output => sample_output("rhn/output_rhn-channel_list")))
+    expect(described_class.new.subscribed_products).to eq(["rhel-x86_64-server-6", "rhel-x86_64-server-6-cf-me-2"])
+  end
 end

data/spec/subscription_manager_spec.rb

@@ -24,10 +24,10 @@ describe LinuxAdmin::SubscriptionManager do
     end
 
     it "with username and password" do
-      run_options = ["subscription-manager register", {:params=>{"--username="=>"SomeUser", "--password="=>"SomePass", "--org="=>"IT", "--proxy="=>"1.2.3.4", "--proxyuser="=>"ProxyUser", "--proxypassword="=>"ProxyPass", "--serverurl="=>"192.168.1.1"}}]
+      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",
+        :username       => "SomeUser@SomeDomain.org",
         :password       => "SomePass",
         :org            => "IT",
         :proxy_address  => "1.2.3.4",
@@ -38,9 +38,28 @@ describe LinuxAdmin::SubscriptionManager do
     end
   end
 
-  it "#subscribe" do
-    described_class.any_instance.should_receive(:run!).once.with("subscription-manager attach", {:params=>[["--pool", 123], ["--pool", 456]]})
-    described_class.new.subscribe({:pools => [123, 456]})
+  context "#subscribe" do
+    it "with pools" do
+      described_class.any_instance.should_receive(:run!).once.with("subscription-manager attach", {:params=>[["--pool", 123], ["--pool", 456]]})
+      described_class.new.subscribe({:pools => [123, 456]})
+    end
+
+    it "without pools" do
+      described_class.any_instance.should_receive(:run!).once.with("subscription-manager attach --auto", {:params=>{}})
+      described_class.new.subscribe({})
+    end
+  end
+
+  context "#subscribed_products" do
+    it "subscribed" do
+      described_class.any_instance.should_receive(:run!).once.with("subscription-manager list --installed").and_return(double(:output => sample_output("subscription_manager/output_list_installed_subscribed")))
+      expect(described_class.new.subscribed_products).to eq(["69", "167"])
+    end
+
+    it "not subscribed" do
+      described_class.any_instance.should_receive(:run!).once.with("subscription-manager list --installed").and_return(double(:output => sample_output("subscription_manager/output_list_installed_not_subscribed")))
+      expect(described_class.new.subscribed_products).to eq(["167"])
+    end
   end
 
   it "#available_subscriptions" do

data/spec/yum_spec.rb

@@ -110,9 +110,14 @@ describe LinuxAdmin::Yum do
       expect { described_class.version_available }.to raise_error(ArgumentError)
     end
 
-    it "with packages" do
-      described_class.should_receive(:run!).once.with("repoquery --qf=\"%{name} %{version}\"", {:params=>{nil=>["curl"]}}).and_return(double(:output => sample_output("yum/output_repoquery")))
-      expect(described_class.version_available("curl")).to eq({
+    it "with one package" do
+      described_class.should_receive(:run!).once.with("repoquery --qf=\"%{name} %{version}\"", {:params=>{nil=>["subscription-manager"]}}).and_return(double(:output => sample_output("yum/output_repoquery_single")))
+      expect(described_class.version_available("subscription-manager")).to eq({"subscription-manager" => "1.1.23.1"})
+    end
+
+    it "with multiple packages" do
+      described_class.should_receive(:run!).once.with("repoquery --qf=\"%{name} %{version}\"", {:params=>{nil=>["curl", "subscription-manager", "wget"]}}).and_return(double(:output => sample_output("yum/output_repoquery_multiple")))
+      expect(described_class.version_available("curl", "subscription-manager", "wget")).to eq({
         "curl"                  => "7.19.7",
         "subscription-manager"  => "1.1.23.1",
         "wget"                  => "1.12"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,13 +189,17 @@ files:
 - lib/linux_admin/yum.rb
 - linux_admin.gemspec
 - spec/common_spec.rb
+- spec/data/rhn/output_rhn-channel_list
 - spec/data/rhn/systemid
 - spec/data/rhn/systemid.missing_system_id
 - spec/data/rpm/cmd_output_for_list_installed
 - spec/data/subscription_manager/output_list_all_available
+- spec/data/subscription_manager/output_list_installed_not_subscribed
+- spec/data/subscription_manager/output_list_installed_subscribed
 - spec/data/subscription_manager/output_orgs
 - spec/data/yum/first.repo
-- spec/data/yum/output_repoquery
+- spec/data/yum/output_repoquery_multiple
+- spec/data/yum/output_repoquery_single
 - spec/data/yum/second.repo
 - spec/disk_spec.rb
 - spec/distro_spec.rb
@@ -240,13 +244,17 @@ specification_version: 3
 summary: LinuxAdmin is a module to simplify management of linux systems.
 test_files:
 - spec/common_spec.rb
+- spec/data/rhn/output_rhn-channel_list
 - spec/data/rhn/systemid
 - spec/data/rhn/systemid.missing_system_id
 - spec/data/rpm/cmd_output_for_list_installed
 - spec/data/subscription_manager/output_list_all_available
+- spec/data/subscription_manager/output_list_installed_not_subscribed
+- spec/data/subscription_manager/output_list_installed_subscribed
 - spec/data/subscription_manager/output_orgs
 - spec/data/yum/first.repo
-- spec/data/yum/output_repoquery
+- spec/data/yum/output_repoquery_multiple
+- spec/data/yum/output_repoquery_single
 - spec/data/yum/second.repo
 - spec/disk_spec.rb
 - spec/distro_spec.rb