lib/ohai/application.rb in ohai-0.3.6 vs lib/ohai/application.rb in ohai-0.4.0

@@ -4,13 +4,13 @@
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
@@ -19,33 +19,33 @@
 require 'ohai/log'
 require 'mixlib/cli'
 
 class Ohai::Application
   include Mixlib::CLI
- 
+
   option :directory,
     :short       => "-d DIRECTORY",
     :long        => "--directory DIRECTORY",
     :description => "A directory to add to the Ohai search path"
 
   option :file,
     :short       => "-f FILE",
     :long        => "--file FILE",
     :description => "A file to run Ohai against"
-   
-  option :log_level, 
+
+  option :log_level,
     :short        => "-l LEVEL",
     :long         => "--log_level LEVEL",
     :description  => "Set the log level (debug, info, warn, error, fatal)",
     :proc         => lambda { |l| l.to_sym }
 
   option :log_location,
     :short        => "-L LOGLOCATION",
     :long         => "--logfile LOGLOCATION",
     :description  => "Set the log file location, defaults to STDOUT - recommended for daemonizing",
     :proc         => nil
- 
+
   option :help,
     :short        => "-h",
     :long         => "--help",
     :description  => "Show this message",
     :on           => :tail,
@@ -73,25 +73,25 @@
     Ohai::Config.merge!(config)
     if Ohai::Config[:directory]
       Ohai::Config[:plugin_path] << Ohai::Config[:directory]
     end
   end
- 
+
   def configure_logging
     Ohai::Log.init(Ohai::Config[:log_location])
-    Ohai::Log.level(Ohai::Config[:log_level])
+    Ohai::Log.level = Ohai::Config[:log_level]
   end
 
   def run_application
     ohai = Ohai::System.new
     if Ohai::Config[:file]
       ohai.from_file(Ohai::Config[:file])
     else
       ohai.all_plugins
     end
     if @attributes.length > 0
-      @attributes.each do |a| 
-        puts ohai.attributes_print(a) 
+      @attributes.each do |a|
+        puts ohai.attributes_print(a)
       end
     else
       puts ohai.json_pretty_print
     end
   end