Merge remote-tracking branch 'upstream/master' into pr-1280

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/oxidized/cli.rb b/lib/oxidized/cli.rb
index 9a09d41..23cc28c 100644
--- a/lib/oxidized/cli.rb
+++ b/lib/oxidized/cli.rb
@@ -40,11 +40,11 @@ module Oxidized
     end
 
     def parse_opts
-      opts = Slop.new(:help=>true) do
+      opts = Slop.new(:help => true) do
         on 'd', 'debug', 'turn on debugging'
         on 'daemonize',  'Daemonize/fork the process'
         on 'v', 'version', 'show version' do
-          puts Oxidized::VERSION
+          puts Oxidized::VERSION_FULL
           Kernel.exit
         end
       end
@@ -62,7 +62,7 @@ module Oxidized
     def write_pid
       if pidfile?
         begin
-          File.open(pidfile, ::File::CREAT | ::File::EXCL | ::File::WRONLY){|f| f.write("#{Process.pid}") }
+          File.open(pidfile, ::File::CREAT | ::File::EXCL | ::File::WRONLY) { |f| f.write("#{Process.pid}") }
           at_exit { File.delete(pidfile) if File.exists?(pidfile) }
         rescue Errno::EEXIST
           check_pid