train-rest 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 807facd5f597c5fd42ed7044f360601931d8f2ca60cfd79b41969c777e0f631a
-  data.tar.gz: 87a040c1f16c24f1efe30f7252e02f2100717b4cb241e4cce974a61f9dba095d
+  metadata.gz: fd4a52ed234249cf9ae6c2de31b9883061ca31a9d34eb155a5f11e09b461b239
+  data.tar.gz: af4665c3c3637eb4c961f5419af4f145c85a2a60ff4125cfa9bc49800e21dae1
 SHA512:
-  metadata.gz: d08b4e78394e02f51701ac0927de49e541b38589508d8f28e4327579a296fb074049c706d56d302dd1cf1b03d930727f1b12720303bdceb986f06fb145e27888
-  data.tar.gz: e518d02e65d85cc826c29f19619250246038e8ed329b72a6e3e9825e8078f594bdc7cb1f971d632574b6f766b899d0aee81b01bd5e6dc074444f021b6f858c54
+  metadata.gz: db180b1416450c343f28be8d2223d5610b4a7ec75216d43f4343842250a47149bad30f5f2436e336bff1d3504e5cb817916ef44adf95ae9c65663f8cc56af0ef
+  data.tar.gz: 586b34568e078702c3ecabf1f40c6a61bdd4557cf95b953389813563f9d023d5239574d621870f319092e7d33bd436bfc8674a8ca8dc4635d52ef8564f125814

data/lib/train-rest/auth_handler/anonymous.rb

@@ -1,4 +1,4 @@
-require_relative "../auth_handler.rb"
+require_relative "../auth_handler"
 
 module TrainPlugins
   module Rest

data/lib/train-rest/auth_handler/basic.rb

@@ -1,4 +1,6 @@
-require_relative "../auth_handler.rb"
+require "base64" unless defined?(Base64)
+
+require_relative "../auth_handler"
 
 module TrainPlugins
   module Rest
@@ -11,8 +13,9 @@ module TrainPlugins
 
       def auth_parameters
         {
-          user: options[:username],
-          password: options[:password],
+          headers: {
+            "Authorization" => format("Basic %s", Base64.encode64(options[:username] + ":" + options[:password]).chomp),
+          },
         }
       end
     end

data/lib/train-rest/auth_handler/redfish.rb

@@ -1,4 +1,4 @@
-require_relative "../auth_handler.rb"
+require_relative "../auth_handler"
 
 module TrainPlugins
   module Rest

data/lib/train-rest/connection.rb

@@ -1,9 +1,9 @@
-require "json"
-require "ostruct"
-require "uri"
+require "json" unless defined?(JSON)
+require "ostruct" unless defined?(OpenStruct)
+require "uri" unless defined?(URI)
 
-require "rest-client"
-require "train"
+require "rest-client" unless defined?(RestClient)
+require "train" unless defined?(Train)
 
 module TrainPlugins
   module Rest
@@ -27,7 +27,7 @@ module TrainPlugins
       def setup_vcr
         return unless options[:vcr_cassette]
 
-        require "vcr"
+        require "vcr" unless defined?(VCR)
 
         # TODO: Starts from "/" :(
         library = options[:vcr_library]
@@ -62,10 +62,12 @@ module TrainPlugins
         components.to_s
       end
 
+      # Allow overwriting to refine the type of REST API
+      attr_writer :detected_os
+
       def inventory
-        # Faking it for Chef Target Mode only
         OpenStruct.new({
-          name: "rest",
+          name: @detected_os || "rest",
           release: TrainPlugins::Rest::VERSION,
           family_hierarchy: %w{rest api},
           family: "api",
@@ -98,8 +100,9 @@ module TrainPlugins
         parameters[:url] = full_url(path)
 
         if json_processing
+          parameters[:headers]["Accept"]       = "application/json"
           parameters[:headers]["Content-Type"] = "application/json"
-          parameters[:payload] = JSON.generate(data)
+          parameters[:payload] = JSON.generate(data) unless data.nil?
         else
           parameters[:payload] = data
         end
@@ -172,14 +175,14 @@ module TrainPlugins
       end
 
       def login
-        logger.info format("REST Login via %s authentication handler", auth_type.to_s) if auth_type != :anonymous
+        logger.info format("REST Login via %s authentication handler", auth_type.to_s) unless %i{anonymous basic}.include? auth_type
 
         auth_handler.options = options
         auth_handler.login
       end
 
       def logout
-        logger.info format("REST Logout via %s authentication handler", auth_type.to_s) if auth_type != :anonymous
+        logger.info format("REST Logout via %s authentication handler", auth_type.to_s) unless %i{anonymous basic}.include? auth_type
 
         auth_handler.logout
       end

data/lib/train-rest/transport.rb

@@ -1,4 +1,4 @@
-require "rubygems"
+require "rubygems" unless defined?(Gem)
 
 require "train-rest/connection"
 
@@ -10,7 +10,7 @@ module TrainPlugins
       option :endpoint, required: true
       option :verify_ssl, default: true
       option :proxy, default: nil
-      option :headers, default: nil
+      option :headers, default: {}
       option :timeout, default: 120
 
       option :auth_type, default: :anonymous

data/lib/train-rest/version.rb

@@ -1,5 +1,5 @@
 module TrainPlugins
   module Rest
-    VERSION = "0.3.0".freeze
+    VERSION = "0.3.1".freeze
   end
 end

data/train-rest.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "train-rest/version"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-rest
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Thomas Heinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train