From e1559940eed40096bce292f626bac482d27c55c9 Mon Sep 17 00:00:00 2001 From: ldep30 Date: Fri, 10 Jun 2016 16:06:33 +0200 Subject: Update rest_client.rb to support 'rest' parameter --- extra/rest_client.rb | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'extra') diff --git a/extra/rest_client.rb b/extra/rest_client.rb index a16bd42..5809457 100644 --- a/extra/rest_client.rb +++ b/extra/rest_client.rb @@ -2,8 +2,32 @@ module Oxidized class RestClient require 'net/http' require 'json' - HOST = 'localhost' - PORT = 8888 + require 'uri' + require 'asetus' + + class Config + Root = File.join ENV['HOME'], '.config', 'oxidized' + end + + CFGS = Asetus.new :name=>'oxidized', :load=>false, :key_to_s=>true + CFGS.default.rest = '127.0.0.1:8888' + + begin + CFGS.load + rescue => error + raise InvalidConfig, "Error loading config: #{error.message}" + ensure + CFG = CFGS.cfg + end + + restcfg = CFG.rest + if ! restcfg.match(/^http:\/\//) + restcfg.insert(0, 'http://') + end + + HOST = URI(restcfg).host + PORT = URI(restcfg).port + PATH = URI(restcfg).path class << self def next opt={}, host=HOST, port=PORT @@ -18,7 +42,7 @@ module Oxidized def next opt data = JSON.dump opt - @web.put '/node/next/' + opt[:name].to_s, data + @web.put PATH + '/node/next/' + opt[:name].to_s, data end end -- cgit v1.2.1 From 47d2026800eb6f724626638609aa8cdaa05998b9 Mon Sep 17 00:00:00 2001 From: ldep30 Date: Wed, 15 Jun 2016 19:28:47 +0200 Subject: Update rest_client.rb --- extra/rest_client.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extra') diff --git a/extra/rest_client.rb b/extra/rest_client.rb index 5809457..90a64e4 100644 --- a/extra/rest_client.rb +++ b/extra/rest_client.rb @@ -6,7 +6,7 @@ module Oxidized require 'asetus' class Config - Root = File.join ENV['HOME'], '.config', 'oxidized' + Root = Root = ENV['OXIDIZED_HOME'] || File.join(ENV['HOME'], '.config', 'oxidized') end CFGS = Asetus.new :name=>'oxidized', :load=>false, :key_to_s=>true @@ -21,7 +21,7 @@ module Oxidized end restcfg = CFG.rest - if ! restcfg.match(/^http:\/\//) + unless restcfg.match(/^http:\/\//) restcfg.insert(0, 'http://') end -- cgit v1.2.1 From b5011707b9193ec4ecd4c4ee8df903b7becc1a6b Mon Sep 17 00:00:00 2001 From: ldep30 Date: Wed, 15 Jun 2016 20:21:51 +0200 Subject: Update rest_client.rb --- extra/rest_client.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'extra') diff --git a/extra/rest_client.rb b/extra/rest_client.rb index 90a64e4..35d93ae 100644 --- a/extra/rest_client.rb +++ b/extra/rest_client.rb @@ -16,11 +16,9 @@ module Oxidized CFGS.load rescue => error raise InvalidConfig, "Error loading config: #{error.message}" - ensure - CFG = CFGS.cfg end - restcfg = CFG.rest + restcfg = CFGS.cfg.rest unless restcfg.match(/^http:\/\//) restcfg.insert(0, 'http://') end -- cgit v1.2.1