linux_admin 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf61e72eb74854665e5ffcd5a3301f8d4adf7b47
-  data.tar.gz: '093787d03b9e5e257c1b8a4a51e2f1d5a2808700'
+SHA256:
+  metadata.gz: 2eb1ce6c58d77a8b64d80d126f85a6fa82c101509aba2a2cbc3520c9665950b1
+  data.tar.gz: 838500eef5f901726c55bf63b21900e859a129968e5bde72792b0f278574ea21
 SHA512:
-  metadata.gz: f9ba05b7aa256903fd6295fd6a69d23643314dd8228e03dbc14bc03b9df145640187705d1672a1c176a47be42f72131f6758a07ed81e664f63bc5794ea297b16
-  data.tar.gz: 58105741a7dea22d59daebe727bebcd65bc3737c7dc02339b93968fccd57024ab6cf1a7d975b117686f82e08e651929ba940ab3b93d0dff187377e076d9a4f9b
+  metadata.gz: b89d8e1a0bfb0714af8f4fe09206ebb1b90f505d2ddd0472dbda7508a7c9d89fe8b0805792e02d4d2bf5e1a3fbb686c9f9da18cfb6eb2d4011b8286851859d8e
+  data.tar.gz: 6c17e878e9fa74ad1d4b884b905cc818ff0d842b705b361e264015c7cdc1a51f5e5372efcb3ed4d17741b5931f4f0761d6ab6a6666ee9c9de661fa97200ff985

data/lib/linux_admin/registration_system.rb

@@ -17,7 +17,7 @@ module LinuxAdmin
       end
     end
 
-    def registered?
+    def registered?(_options = nil)
       false
     end
 

data/lib/linux_admin/registration_system/rhn.rb

@@ -5,7 +5,11 @@ module LinuxAdmin
     SATELLITE5_SERVER_CERT_PATH = "pub/rhn-org-trusted-ssl-cert-1.0-1.noarch.rpm"
     INSTALLED_SERVER_CERT_PATH  = "/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT"
 
-    def registered?
+    def initialize
+      warn("[DEPRECATION] 'LinuxAdmin::Rhn' is deprecated.  Please use 'LinuxAdmin::SubscriptionManager' instead.")
+    end
+
+    def registered?(_options = nil)
       id = ""
       if File.exist?(systemid_file)
         xml = Nokogiri.XML(File.read(systemid_file))

data/lib/linux_admin/registration_system/subscription_manager.rb

@@ -15,8 +15,10 @@ module LinuxAdmin
       !!organizations(options)
     end
 
-    def registered?
-      Common.run("subscription-manager identity").exit_status == 0
+    def registered?(options = nil)
+      args = ["subscription-manager identity"]
+      args << {:params => proxy_params(options)} if options
+      Common.run(*args).exit_status.zero?
     end
 
     def refresh

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 module LinuxAdmin
-  VERSION = "1.1.0".freeze
+  VERSION = "1.2.0".freeze
 end

data/spec/registration_system_spec.rb

@@ -28,9 +28,36 @@ describe LinuxAdmin::RegistrationSystem do
     end
   end
 
-  it "#registered? when unregistered" do
-    stub_registered_to_system(nil)
-    expect(described_class.registered?).to be_falsey
+  context "#registered?" do
+    it "when unregistered" do
+      stub_registered_to_system(nil)
+      expect(described_class.registered?).to be_falsey
+    end
+
+    context "SubscriptionManager" do
+      it "with no args" do
+        expect(LinuxAdmin::Common).to receive(:run).with("subscription-manager identity").and_return(double(:exit_status => 0))
+
+        LinuxAdmin::SubscriptionManager.new.registered?
+      end
+
+      it "with a proxy" do
+        expect(LinuxAdmin::Common).to receive(:run).with(
+          "subscription-manager identity",
+          :params => {
+            "--proxy="         => "https://example.com",
+            "--proxyuser="     => "user",
+            "--proxypassword=" => "pass"
+          }
+        ).and_return(double(:exit_status => 0))
+
+        LinuxAdmin::SubscriptionManager.new.registered?(
+          :proxy_address  => "https://example.com",
+          :proxy_username => "user",
+          :proxy_password => "pass"
+        )
+      end
+    end
   end
 
   context ".method_missing" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -23,7 +23,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: LinuxAdmin is a module to simplify management of linux systems.