summaryrefslogtreecommitdiff
path: root/lib/oxidized/source
diff options
context:
space:
mode:
authorSaku Ytti <saku@ytti.fi>2018-06-22 19:37:52 +0300
committerSaku Ytti <saku@ytti.fi>2018-06-22 19:37:52 +0300
commitd83eb5dd21c259bb2f81aa2cb1a92ed00a80c9a7 (patch)
treea753f89669654f570196018ba196725015d281da /lib/oxidized/source
parent428708ef376884c3dc35aee1951cb8e1c55fac9f (diff)
parent04ffb2c68ac7f069bd9f33f39c77095c979aaec1 (diff)
Merge branch 'refactor-smells'
Diffstat (limited to 'lib/oxidized/source')
-rw-r--r--lib/oxidized/source/csv.rb4
-rw-r--r--lib/oxidized/source/http.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index 769b1f7..5b43352 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -20,7 +20,7 @@ module Oxidized
def load _node_want = nil
nodes = []
- get_file.each_line do |line|
+ open_file.each_line do |line|
next if line.match(/^\s*#/)
data = line.chomp.split(@cfg.delimiter, -1)
next if data.empty?
@@ -45,7 +45,7 @@ module Oxidized
private
- def get_file
+ def open_file
file = File.expand_path(@cfg.file)
if @cfg.gpg?
crypto = GPGME::Crypto.new password: @cfg.gpg_password
diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 36fa764..26c9e05 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -17,7 +17,7 @@ module Oxidized
def load node_want = nil
nodes = []
- data = JSON.parse(get_http)
+ data = JSON.parse(read_http(node_want))
data = string_navigate(data, @cfg.hosts_location) if @cfg.hosts_location?
data.each do |node|
next if node.empty?
@@ -52,7 +52,7 @@ module Oxidized
object
end
- def get_http
+ def read_http node_want
uri = URI.parse(@cfg.url)
http = Net::HTTP.new(uri.host, uri.port)
http.use_ssl = true if uri.scheme == 'https'