lib/import.rb in doit-1.0.2 vs lib/import.rb in doit-1.0.3
- old
+ new
@@ -1,13 +1,10 @@
-# rubocop: disable all
+require "pathname"
+require "erb"
-require 'pathname'
-require 'erb'
-
Import = Object.new
class << Import
-
def script
@script ||= nil
@script
end
@@ -15,44 +12,45 @@
@config ||= nil
@config
end
def init(name)
- @script = read(name)
- @config = ERB.new(read("#{name}.yml") || '').result
+ @script = read(name)
+ @config = ERB.new(read("#{name}.yml") || "").result
info
end
-# returns Hash { 'pull' => '/home/dk/.doit/pull', ... }
+ # returns Hash { "pull" => "/home/dk/.doit/pull", ... }
def list
@list ||= list2
end
def info
- return unless Doit.options[:verbose]
+ return unless Doit.options[:verbose]
- My.verbose 'SCRIPT', @script
- My.verbose 'CONFIG(yml)', @config
+ My.verbose "SCRIPT", @script
+ My.verbose "CONFIG(yml)", @config
end
- private
+ private
+
def list2
res = {}
Pathname.pwd.descend { |dir|
- doit_dir = dir + '.doit'
- next unless File.directory?(doit_dir)
+ doit_dir = dir + ".doit"
+ next unless File.directory?(doit_dir)
lst = []
Dir.entries(doit_dir).each { |name|
- name = File.join(doit_dir, name)
+ name = File.join(doit_dir, name)
- next unless File.executable?(name)
- next if File.directory?(name)
+ next unless File.executable?(name)
+ next if File.directory?(name)
- lst << name
+ lst << name
}
- lst.each { |itm| res[File.basename(itm)] = itm }
+ lst.each { |itm| res[File.basename(itm)] = itm }
}
res
end
def read(name)
@@ -60,11 +58,10 @@
end
def try_ascend(filename)
Pathname.pwd.ascend { |dir|
str = dir + filename
- return File.read(str) if File.exist?(str)
+ return File.read(str) if File.exist?(str)
}
nil
end
-
end