From 6fc5aa4477f4434ca1ed62313f68a3c5a728a640 Mon Sep 17 00:00:00 2001
From: Brandon Dunne <bdunne@redhat.com>
Date: Wed, 21 Oct 2015 15:31:31 -0400
Subject: [PATCH] Don't extend self to set up the logger.

---
 lib/linux_admin.rb        | 7 ++++---
 lib/linux_admin/common.rb | 2 ++
 lib/linux_admin/rpm.rb    | 2 --
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/linux_admin.rb b/lib/linux_admin.rb
index efc46b5..1a6c061 100644
--- a/lib/linux_admin.rb
+++ b/lib/linux_admin.rb
@@ -34,11 +34,12 @@
 
 module LinuxAdmin
   extend Common
-  extend self
 
-  attr_writer :logger
+  class << self
+    attr_writer :logger
+  end
 
-  def logger
+  def self.logger
     @logger ||= NullLogger.new
   end
 end
diff --git a/lib/linux_admin/common.rb b/lib/linux_admin/common.rb
index 4a157fc..0888ce5 100644
--- a/lib/linux_admin/common.rb
+++ b/lib/linux_admin/common.rb
@@ -2,6 +2,8 @@
 
 module LinuxAdmin
   module Common
+    include Logging
+
     BIN_DIRS = %w(/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin)
 
     def cmd(name)
diff --git a/lib/linux_admin/rpm.rb b/lib/linux_admin/rpm.rb
index 340f02f..79fe48b 100644
--- a/lib/linux_admin/rpm.rb
+++ b/lib/linux_admin/rpm.rb
@@ -1,7 +1,5 @@
 module LinuxAdmin
   class Rpm < Package
-    extend Logging
-
     def self.rpm_cmd
       cmd(:rpm)
     end