jerakia 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 720b8d35cb80a854ba236ca1c4d7bcf1b0c3f1c5
-  data.tar.gz: 8437f36c2f1e02dd0b0b6210ad5850055f7cc994
+  metadata.gz: 2d60cfa4acc9acaa66de455ac86989fd4b13a7f1
+  data.tar.gz: 301df6f518a33f3a04b6149094a7e5a89ac9e174
 SHA512:
-  metadata.gz: 208410b58d4efadccbcf853d077d8594f9514d3bbfc6a3b2bb4c5a4037ceded7ed722856f145ef4f408bea614eaf311faa36c845be8fc03698b2808ac02e3f04
-  data.tar.gz: 358407a6611a4e2c05a1a6bb9a0500532523108ef4e69b59cd221b7901e14c62a67ab537cedb3841550a53dde0bb28cf4972ae455c12a8ef17432fa8b5066556
+  metadata.gz: f23a7ff628bedf5d28e6d7388a36965a04d7772b8f105f1562d7735721df7588595abd79d25915a1e02c38f05f5d4afb7ad5fd42d88adc6047dc00e2cd39040b
+  data.tar.gz: 87c327d5e699a47e3b46936fa05ff0ea9e09977574158067bab102ebee9c369a5029476ba993eacbb0c1a8cf6c92298ebff5cc57771e19423808cacde0174a7a

data/lib/jerakia.rb

@@ -42,6 +42,7 @@ class Jerakia
   end
 
   def lookup(request)
+    raise Jerakia::PolicyError, "Policy '#{request.policy}' not defined" unless launcher.policy_exists?(request.policy)
     launcher.policies[request.policy.to_sym].run(request)
   end
 

data/lib/jerakia/cli.rb

@@ -6,6 +6,7 @@ require 'jerakia/cli/server'
 require 'jerakia/cli/token'
 require 'jerakia/cli/lookup'
 require 'jerakia/cli/secret'
+require 'jerakia/cli/config'
 
 class Jerakia
   class CLI < Thor
@@ -13,6 +14,7 @@ class Jerakia
     include Jerakia::CLI::Lookup
     include Jerakia::CLI::Token
     include Jerakia::CLI::Secret
+    include Jerakia::CLI::Config
 
 
     desc 'version', 'Version information'

data/lib/jerakia/cli/config.rb

@@ -0,0 +1,20 @@
+class Jerakia
+  class CLI < Thor
+    module Config
+      def self.included(thor)
+        thor.class_eval do
+          desc 'config <options>', 'Print the runtime configuration options'
+          option :config,
+                 aliases: :c,
+                 type: :string,
+                 desc: 'Configuration file'
+          def config
+            require 'yaml'
+            jerakia = Jerakia.new(:config => options[:config])
+            puts jerakia.config.to_hash.to_yaml
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jerakia/cli/server.rb

@@ -3,7 +3,7 @@ class Jerakia
     module Server
       def self.included(thor)
         thor.class_eval do
-          desc 'server', 'Start the Jerakia REST server'
+          desc 'server <options>', 'Start the Jerakia REST server'
           option :config,
                  aliases: :c,
                  type: :string,
@@ -15,11 +15,11 @@ class Jerakia
           option :verbose,
                  aliases: :v,
                  type: :boolean,
-                 desc: 'Print verbose information'
+                 desc: 'Log to STDOUT in verbose mode'
           option :debug,
                  aliases: :D,
                  type: :boolean,
-                 desc: 'Debug information to console, implies --log-level debug'
+                 desc: 'Log to STDOUT in debug mode'
           def server
             case true
             when options[:verbose]

data/lib/jerakia/config.rb

@@ -20,6 +20,7 @@ class Jerakia::Config
   def defaults
     {
       'policydir'     => '/etc/jerakia/policy.d',
+      'plugindir'     => '/var/lib/jerakia/plugins',
       'logfile'       => '/var/log/jerakia/jerakia.log',
       'databasedir'   => '/var/db/jerakia',
       'loglevel'      => 'info',
@@ -29,6 +30,10 @@ class Jerakia::Config
     }
   end
 
+  def to_hash
+    @configdata
+  end
+
   def [](key)
     @configdata[key.to_s]
   end

data/lib/jerakia/launcher.rb

@@ -19,6 +19,10 @@ class Jerakia
       end
     end
 
+    def policy_exists?(policy)
+      @policies.has_key?(policy.to_sym)
+    end
+
     def policy_dir
       Jerakia.config.policydir
     end

data/lib/jerakia/version.rb

@@ -3,5 +3,5 @@ class Jerakia
   #
   # This should be updated when a new gem is released and it is read from the gemspec file
   #
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -122,6 +122,7 @@ files:
 - lib/jerakia/cache/entry.rb
 - lib/jerakia/cache/file.rb
 - lib/jerakia/cli.rb
+- lib/jerakia/cli/config.rb
 - lib/jerakia/cli/lookup.rb
 - lib/jerakia/cli/secret.rb
 - lib/jerakia/cli/server.rb
@@ -166,7 +167,7 @@ files:
 - lib/jerakia/version.rb
 homepage: http://jerakia.io
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []