adlint 2.6.12 → 2.6.14

data/bin/adlintize

@@ -31,20 +31,12 @@
 #
 #++
 
-require "pathname"
-
-$bindir = Pathname.new(__FILE__).realpath.dirname
-$prefix = Pathname.new("..").expand_path($bindir)
-$libdir = Pathname.new("lib").expand_path($prefix)
-$etcdir = Pathname.new("etc").expand_path($prefix)
-
-$:.unshift($libdir.to_s)
-
+$LOAD_PATH.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 require "adlint"
 
-$version = "AdLint project generator #{AdLint::VERSION}"
+version = "AdLint project generator #{AdLint::VERSION}"
 
-$usage = <<EOS
+usage = <<EOS
 Usage: adlintize [options] [project-name]
 Options:
   -t FILE, --traits FILE         Write traits to FILE
@@ -74,13 +66,15 @@ Options:
 EOS
 
 def print_environments
-  Dir.entries(Pathname.new("conf.d").expand_path($etcdir)).each do |dirent|
+  conf_dpath = Pathname.new("conf.d").expand_path(AdLint::Config[:etcdir])
+  Dir.entries(conf_dpath).each do |dirent|
     case dirent
     when ".", "..", "fallback", "noarch"
       next
     end
 
-    Dir.glob("#{$etcdir}/conf.d/#{dirent}/traits-*.erb").each do |traits_fpath|
+    traits_pattern = "#{AdLint::Config[:etcdir]}/conf.d/#{dirent}/traits-*.erb"
+    Dir.glob(traits_pattern).each do |traits_fpath|
       basename = File.basename(traits_fpath, ".erb")
       puts "#{dirent}-#{basename.sub(/\Atraits-/, "")}"
     end
@@ -269,33 +263,35 @@ end
 
 require "getoptlong"
 
-parser = GetoptLong.new(["--traits", "-t", GetoptLong::REQUIRED_ARGUMENT],
-                        ["--pinit-hdr", "-p", GetoptLong::REQUIRED_ARGUMENT],
-                        ["--cinit-hdr", "-c", GetoptLong::REQUIRED_ARGUMENT],
-                        ["--list-file", "-l", GetoptLong::REQUIRED_ARGUMENT],
-                        ["--makefile", "-m", GetoptLong::REQUIRED_ARGUMENT],
-                        ["--sh-script", "-s", GetoptLong::REQUIRED_ARGUMENT],
-                        ["--bat-file", "-b", GetoptLong::REQUIRED_ARGUMENT],
-                        ["--output-dir", "-o", GetoptLong::REQUIRED_ARGUMENT],
-                        ["--environment", "-e", GetoptLong::REQUIRED_ARGUMENT],
-                        ["--list-environment", "-L", GetoptLong::NO_ARGUMENT],
-                        ["--force", "-f", GetoptLong::NO_ARGUMENT],
-                        ["--version", GetoptLong::NO_ARGUMENT],
-                        ["--copyright", GetoptLong::NO_ARGUMENT],
-                        ["--prefix", GetoptLong::NO_ARGUMENT],
-                        ["--migrate", GetoptLong::REQUIRED_ARGUMENT],
-                        ["--help", "-h", GetoptLong::NO_ARGUMENT])
+parser = GetoptLong.new(
+  ["--traits",           "-t", GetoptLong::REQUIRED_ARGUMENT],
+  ["--pinit-hdr",        "-p", GetoptLong::REQUIRED_ARGUMENT],
+  ["--cinit-hdr",        "-c", GetoptLong::REQUIRED_ARGUMENT],
+  ["--list-file",        "-l", GetoptLong::REQUIRED_ARGUMENT],
+  ["--makefile",         "-m", GetoptLong::REQUIRED_ARGUMENT],
+  ["--sh-script",        "-s", GetoptLong::REQUIRED_ARGUMENT],
+  ["--bat-file",         "-b", GetoptLong::REQUIRED_ARGUMENT],
+  ["--output-dir",       "-o", GetoptLong::REQUIRED_ARGUMENT],
+  ["--environment",      "-e", GetoptLong::REQUIRED_ARGUMENT],
+  ["--list-environment", "-L", GetoptLong::NO_ARGUMENT],
+  ["--force",            "-f", GetoptLong::NO_ARGUMENT],
+  ["--version",                GetoptLong::NO_ARGUMENT],
+  ["--copyright",              GetoptLong::NO_ARGUMENT],
+  ["--prefix",                 GetoptLong::NO_ARGUMENT],
+  ["--migrate",                GetoptLong::REQUIRED_ARGUMENT],
+  ["--help",             "-h", GetoptLong::NO_ARGUMENT]
+)
 
 begin
-  traits_fpath = Pathname.new("adlint_traits.yml")
-  pinit_fpath = Pathname.new("adlint_pinit.h")
-  cinit_fpath = Pathname.new("adlint_cinit.h")
-  list_fpath = Pathname.new("adlint_files.txt")
-  make_fpath = Pathname.new("GNUmakefile")
-  sh_fpath = Pathname.new("adlint_all.sh")
-  bat_fpath = Pathname.new("adlint_all.bat")
-  output_dpath = Pathname.new(".")
-  environment = nil
+  traits_fpath    = Pathname.new("adlint_traits.yml")
+  pinit_fpath     = Pathname.new("adlint_pinit.h")
+  cinit_fpath     = Pathname.new("adlint_cinit.h")
+  list_fpath      = Pathname.new("adlint_files.txt")
+  make_fpath      = Pathname.new("GNUmakefile")
+  sh_fpath        = Pathname.new("adlint_all.sh")
+  bat_fpath       = Pathname.new("adlint_all.bat")
+  output_dpath    = Pathname.new(".")
+  environment     = nil
   force_overwrite = false
 
   parser.each do |option, value|
@@ -324,24 +320,24 @@ begin
     when "--force"
       force_overwrite = true
     when "--version"
-      puts $version, AdLint::AUTHOR
+      puts version, AdLint::AUTHOR
       exit 0
     when "--copyright"
       puts AdLint::COPYRIGHT
       exit 0
     when "--prefix"
-      puts $prefix
+      puts AdLint::Config[:prefix]
       exit 0
     when "--migrate"
       migrate_traits_schema(Pathname.new(value))
       exit 0
     when "--help"
-      puts $usage
+      puts usage
       exit 0
     end
   end
 rescue
-  $stderr.puts $usage
+  $stderr.puts usage
   exit 1
 end
 
@@ -351,38 +347,44 @@ FileUtils.mkdir_p(output_dpath) unless Dir.exist?(output_dpath)
 vpath = Pathname.pwd.relative_path_from(Pathname.new(output_dpath).realpath)
 
 traits_fpath = traits_fpath.expand_path(output_dpath)
-pinit_fpath = pinit_fpath.expand_path(output_dpath)
-cinit_fpath = cinit_fpath.expand_path(output_dpath)
-list_fpath = list_fpath.expand_path(output_dpath)
-make_fpath = make_fpath.expand_path(output_dpath)
-sh_fpath = sh_fpath.expand_path(output_dpath)
-bat_fpath = bat_fpath.expand_path(output_dpath)
+pinit_fpath  = pinit_fpath.expand_path(output_dpath)
+cinit_fpath  = cinit_fpath.expand_path(output_dpath)
+list_fpath   = list_fpath.expand_path(output_dpath)
+make_fpath   = make_fpath.expand_path(output_dpath)
+sh_fpath     = sh_fpath.expand_path(output_dpath)
+bat_fpath    = bat_fpath.expand_path(output_dpath)
 
 if environment
   arch, os, compiler = environment.split("-")
 
-  cinit_templ_fpath =
-    Pathname.new("#{$etcdir}/conf.d/#{arch}-#{os}/cinit-#{compiler}.erb")
+  cinit_templ_fpath = Pathname.new(
+    "#{AdLint::Config[:etcdir]}/conf.d/#{arch}-#{os}/cinit-#{compiler}.erb")
   unless File.readable?(cinit_templ_fpath)
     $stderr.puts "#{File.basename(__FILE__)}: no such preset build environment"
     exit 1
   end
 
-  traits_templ_fpath =
-    Pathname.new("#{$etcdir}/conf.d/#{arch}-#{os}/traits-#{compiler}.erb")
+  traits_templ_fpath = Pathname.new(
+    "#{AdLint::Config[:etcdir]}/conf.d/#{arch}-#{os}/traits-#{compiler}.erb")
   unless File.readable?(traits_templ_fpath)
     $stderr.puts "#{File.basename(__FILE__)}: no such preset build environment"
     exit 1
   end
 else
-  cinit_templ_fpath = Pathname.new("#{$etcdir}/conf.d/fallback/cinit.erb")
-  traits_templ_fpath = Pathname.new("#{$etcdir}/conf.d/fallback/traits.erb")
+  cinit_templ_fpath = Pathname.new(
+    "#{AdLint::Config[:etcdir]}/conf.d/fallback/cinit.erb")
+  traits_templ_fpath = Pathname.new(
+    "#{AdLint::Config[:etcdir]}/conf.d/fallback/traits.erb")
 end
 
-pinit_templ_fpath = Pathname.new("#{$etcdir}/conf.d/noarch/pinit.erb")
-make_templ_fpath = Pathname.new("#{$etcdir}/conf.d/noarch/GNUmakefile.erb")
-sh_templ_fpath = Pathname.new("#{$etcdir}/conf.d/noarch/adlint_all_sh.erb")
-bat_templ_fpath = Pathname.new("#{$etcdir}/conf.d/noarch/adlint_all_bat.erb")
+pinit_templ_fpath = Pathname.new(
+  "#{AdLint::Config[:etcdir]}/conf.d/noarch/pinit.erb")
+make_templ_fpath = Pathname.new(
+  "#{AdLint::Config[:etcdir]}/conf.d/noarch/GNUmakefile.erb")
+sh_templ_fpath = Pathname.new(
+  "#{AdLint::Config[:etcdir]}/conf.d/noarch/adlint_all_sh.erb")
+bat_templ_fpath = Pathname.new(
+  "#{AdLint::Config[:etcdir]}/conf.d/noarch/adlint_all_bat.erb")
 
 require "erb"