jerakia-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b71a936385fef4bf6308dde9bca65091f03ea86c
-  data.tar.gz: a4560a41ac5ba91e514b2d624b54bdf9861809a0
+  metadata.gz: cb472f0bd850812a8d6f370145eb5b30ef518e5b
+  data.tar.gz: 20d2ce38d618a390fe7ed4f5d9b159bf4339d5a5
 SHA512:
-  metadata.gz: 1adb502903d8e8384557ffe71f58e45e666461e49324ca8d53feb314c95789efaccf65bef008fcf4242673023fdc76ec6ded9390fbef0714875c10d251b38678
-  data.tar.gz: ac742e582b94a176584a5f45858353908c2cd00227e7ec315aea4692ed93d11df47dd22440358554ce7dc178c3cd7ef0404dfd1d32d297db72c7985685d28cef
+  metadata.gz: fa2cf1265b3d810f762e97b9fae3052cddc10795d8d33b3c7def030ccdd7f9626031a09f0347edd15e1b6f0ff7d6b3cdafb5d01cf791a3e9a94bb1e6df1d2f5f
+  data.tar.gz: 90265e423a15ac87cfd51283a6f102db1e21f860bf0733928430389591fe7537693d2b168ea47488322e14c9017a679ae0b310f9d51c0482783a381ce4cd58a1

data/bin/jerakia-client

@@ -1,8 +1,16 @@
 #!/usr/bin/env ruby
+#
+require 'json'
 
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'jerakia/client/cli'
 
-Jerakia::Client::CLI.start(ARGV)
+begin
+  Jerakia::Client::CLI.start(ARGV)
+rescue Jerakia::Client::Error => e
+  puts "Error: #{JSON.parse(e.message)['message']}"
+  exit(1)
+end
+

data/lib/jerakia/client/cli/lookup.rb

@@ -96,7 +96,7 @@ class Jerakia
                 :lookup_type   => options[:type].to_sym,
                 :merge         => options[:merge_type].to_sym,
                 :scope         => options[:scope].to_sym,
-                :use_schema    => options[:schema] 
+                :use_schema    => options[:schema]
               }
 
               if options[:metadata]

data/lib/jerakia/client/error.rb

@@ -5,5 +5,11 @@ class Jerakia
 
     class AuthorizationError < RuntimeError
     end
+
+    class NotFoundError < RuntimeError
+    end
+
+    class HTTPError < RuntimeError
+    end
   end
 end

data/lib/jerakia/client/version.rb

@@ -1,6 +1,6 @@
 class Jerakia
   class Client
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end
     

data/lib/jerakia/client.rb

@@ -14,13 +14,40 @@ class Jerakia
 
     attr_reader :config
     def initialize(opts={})
+      config_file_opts = self.class.load_config_from_file
       @config = default_config.merge(
-        opts.reject { |k,v| v.nil? }
+        config_file_opts.merge(
+          opts.reject { |k,v| v.nil? }
+        )
       )
       @token = nil
     end
 
-    def default_config 
+    def self.config_file
+      [
+        File.join(ENV['HOME'], '.jerakia', 'jerakia.yaml'),
+        '/etc/jerakia/jerakia.yaml'
+      ]. each do |filename|
+        return filename if File.exists?(filename)
+      end
+      return nil
+    end
+
+    def self.load_config_from_file
+      filename = config_file
+      confighash = {}
+      return {} unless filename
+      configdata = YAML.load(File.read(filename))
+      if configdata['client'].is_a?(Hash)
+        configdata['client'].each do |k, v|
+          confighash[k.to_sym] = v
+        end
+        return confighash
+      end
+      return {}
+    end
+
+    def default_config
       {
       :host => 'localhost',
       :port => 9843,
@@ -37,8 +64,7 @@ class Jerakia
     end
 
     def token
-      @token ||= @config[:token] 
-      @token ||= Jerakia::Client::Token.load_from_file
+      @token ||= @config[:token]
       raise Jerakia::Client::Error, "No authorization token available" if @token.nil?
       @token
     end
@@ -54,14 +80,19 @@ class Jerakia
       url = url_address + url_path + uri_params
       begin
         response = RestClient.get(url, headers)
+
       rescue RestClient::Unauthorized => e
         raise Jerakia::Client::AuthorizationError, "Request not authorized"
+      rescue RestClient::NotFound => e
+        return nil
+      rescue RestClient::Exception => e
+        raise Jerakia::Client::Error, e.response.body
       end
       return JSON.parse(response.body)
     end
 
     def put(url_path, params)
-      headers = { 
+      headers = {
         'X-Authentication' => token,
         :content_type => :json
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: CLI and ruby client libraries for Jerakia Server
 email: 
 executables: