jerakia 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee5eb2a4faf74cf645495edd5114d0178dfbb99
-  data.tar.gz: 5a81e8e5210436fe37fc6bbeb928403cfe6e2cb4
+  metadata.gz: f3e8936250f4d06c2553fe8569715bd13c94b58d
+  data.tar.gz: 807773e2bf5c2792e553ad5db456426938aa2348
 SHA512:
-  metadata.gz: d4ef37d1c685dda04906927edcafcdc580053e76b3302dacbd3e19b87dd01bf60876d3994b43c11c033b970b2d796d836769a146df90532fad16dc4413ad991e
-  data.tar.gz: f2784346815525259012798a2a5ab40dd3497d26373c29b2a972caa3fa419d200f662d3c533efcb1c383eda98acbf996f4057fc2e6d3674643f8d604bb00fbff
+  metadata.gz: a7f5db5f4147dbc412eb503f812b30cc223a9e3f6464c5ce08b5bc9f398bf5dae76dbc42a271b03b067becfa742356093305a607c1f16eafe0105ba87eebff94
+  data.tar.gz: f21fc2d475838dbb4302c8bcb498a6e69eefec2e1aed6f27facbac5ef091ec5d16c74bdb4570f4cd66b1c612a42a79ff4bc21df9892bd3c27935c749b2712de8

data/lib/jerakia/cli.rb

@@ -37,19 +37,36 @@ class Jerakia
            aliases: :l,
            type: :string,
            desc: 'Log level'
+    option :debug,
+           aliases: :D,
+           type: :boolean,
+           desc: 'Debug information to console, implies --log-level debug'
     option :metadata,
            aliases: :d,
            type: :hash,
            desc: 'Key/value pairs to be used as metadata for the lookup'
     def lookup(key)
-      jac = Jerakia.new({:config => options[:config]})
+
+      if options[:debug]
+        loglevel = "debug"
+        logfile = STDOUT
+      else
+        logfile = nil
+        loglevel = options[:log_level]
+      end
+
+      jac = Jerakia.new({
+        :config   => options[:config],
+        :loglevel => options[:log_level],
+        :logfile  => logfile,
+        :loglevel => loglevel,
+      })
       req = Jerakia::Request.new(
         :key         => key,
         :namespace   => options[:namespace].split(/::/),
         :policy      => options[:policy].to_sym,
         :lookup_type => options[:type].to_sym,
         :merge       => options[:merge_type].to_sym,
-        :loglevel    => options[:log_level],
         :metadata    => options[:metadata]
       )
 

data/lib/jerakia/log.rb

@@ -1,9 +1,8 @@
 class Jerakia::Log < Jerakia
 
   require 'logger'
-  def initialize(level=:info)
-    @@logfile ||= config[:logfile] || '/var/log/jerakia.log'
-    @@logger ||= Logger.new(@@logfile)
+  def initialize(level=:info,file='/var/log/jerakia.log')
+    @@logger ||= Logger.new(file)
     @@level ||= level
     case @@level
     when :info

data/lib/jerakia/version.rb

@@ -4,6 +4,6 @@ class Jerakia
   #
   # This should be updated when a new gem is released and it is read from the gemspec file
   #
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 
 end

data/lib/jerakia.rb

@@ -20,7 +20,8 @@ class Jerakia
 
     @@filecache = {}
     loglevel = options[:loglevel] || @@config["loglevel"] || "info"
-    @@log = Jerakia::Log.new(loglevel.to_sym)
+    logfile = options[:logfile] || @@config["logfile"] || "/var/log/jerakia.log"
+    @@log = Jerakia::Log.new(loglevel.to_sym, logfile)
     @@log.debug("Jerakia initialized")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,7 +80,7 @@ files:
 - lib/jerakia/version.rb
 - lib/puppet/indirector/data_binding/jerakia.rb
 - lib/puppet/indirector/data_binding/jerakia_rest.rb
-homepage: http://github.com/crayfishx/jerakia
+homepage: http://jerakia.io
 licenses:
 - Apache 2.0
 metadata: {}