linux_admin 0.4.0 → 0.4.1

data/lib/linux_admin/registration_system.rb

@@ -22,10 +22,10 @@ class LinuxAdmin
     private
 
     def self.registration_type_uncached
-      if SubscriptionManager.new.registered?
-        SubscriptionManager
-      elsif Rhn.new.registered?
+      if Rhn.new.registered?
         Rhn
+      elsif SubscriptionManager.new.registered?
+        SubscriptionManager
       else
         self
       end

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 class LinuxAdmin
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/linux_admin/yum.rb

@@ -9,7 +9,7 @@ class LinuxAdmin
 
       FileUtils.mkdir_p(path)
 
-      cmd    = "yum createrepo"
+      cmd    = "createrepo"
       params = {nil => path}
       params["--database"]            = nil  if options[:database]
       params["--unique-md-filenames"] = nil  if options[:unique_file_names]

data/spec/registration_system_spec.rb

@@ -8,7 +8,7 @@ describe LinuxAdmin::RegistrationSystem do
     end
 
     it "when registered RHN" do
-      stub_registered_to_system(:rhn)
+      stub_registered_to_system(:sm, :rhn)
       expect(described_class.registration_type).to eq(LinuxAdmin::Rhn)
     end
 
@@ -53,8 +53,8 @@ describe LinuxAdmin::RegistrationSystem do
     end
   end
 
-  def stub_registered_to_system(system)
-    LinuxAdmin::SubscriptionManager.any_instance.stub(:registered? => (system == :sm))
-    LinuxAdmin::Rhn.any_instance.stub(:registered? => data_file_path("rhn/systemid")) if system == :rhn
+  def stub_registered_to_system(*system)
+    LinuxAdmin::SubscriptionManager.any_instance.stub(:registered? => (system.include?(:sm)))
+    LinuxAdmin::Rhn.any_instance.stub(:registered? => (system.include?(:rhn)))
   end
 end

data/spec/yum_spec.rb

@@ -7,12 +7,12 @@ describe LinuxAdmin::Yum do
 
   context ".create_repo" do
     it "default arguments" do
-      described_class.should_receive(:run!).once.with("yum createrepo", {:params=>{nil=>"some/path", "--database"=>nil, "--unique-md-filenames"=>nil}})
+      described_class.should_receive(:run!).once.with("createrepo", {:params=>{nil=>"some/path", "--database"=>nil, "--unique-md-filenames"=>nil}})
       described_class.create_repo("some/path")
     end
 
     it "bare create" do
-      described_class.should_receive(:run!).once.with("yum createrepo", {:params=>{nil=>"some/path"}})
+      described_class.should_receive(:run!).once.with("createrepo", {:params=>{nil=>"some/path"}})
       described_class.create_repo("some/path", :database => false, :unique_file_names => false)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler