From f6bc7d81dee102b438a9118a66a2f2a86382c729 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 3 Oct 2012 00:16:59 -0400 Subject: v4: bin/sisu $*, hub, make possible to specify dir path for markup files * bin/sisu4 & bin/sisu3 now syslinks to bin/sisu --- bin/sisu | 82 ++++++++++++++++++++++++------ bin/sisu3 | 170 +------------------------------------------------------------ bin/sisu4 | 171 +------------------------------------------------------------- 3 files changed, 69 insertions(+), 354 deletions(-) mode change 100644 => 120000 bin/sisu3 mode change 100644 => 120000 bin/sisu4 (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index f49cf748..f8123e8c 100644 --- a/bin/sisu +++ b/bin/sisu @@ -53,19 +53,34 @@ WOK $VERBOSE=nil $KCODE='u' if RUBY_VERSION < '1.9' argv=$* - SiSU_version_dir=case argv.inspect - when /"(?:--v3)"/ - check_sisu_stable_ruby_version? - 'v3' - when /"(?:--v4)"/ - check_sisu_stable_ruby_version? - 'v4' - when /"(?:--dev)"/ - check_sisu_dev_ruby_version? - 'v4' + SiSU_called_from_directory=Dir.pwd + if $0 !~/\bsisu[34]$/ + SiSU_version_dir=case argv.inspect + when /"(?:--v3)"/ + check_sisu_stable_ruby_version? + 'v3' + when /"(?:--v4)"/ + check_sisu_stable_ruby_version? + 'v4' + when /"(?:--dev)"/ + check_sisu_dev_ruby_version? + 'v4' + else + check_sisu_stable_ruby_version? + 'v4' + end else - check_sisu_stable_ruby_version? - 'v4' + SiSU_version_dir=case $0 + when /\bsisu3$/ + check_sisu_stable_ruby_version? + 'v3' + when /\bsisu4$/ + check_sisu_stable_ruby_version? + 'v4' + else + check_sisu_stable_ruby_version? + 'v4' + end end #% $0 e=Config::CONFIG @@ -92,10 +107,47 @@ WOK nil end SiSU_path_lib="#{require_hub_path(sisu_path_specified_lib_)}" -#% - SiSU_lib="sisu/#{SiSU_version_dir}" +#% $* require "#{SiSU_path_lib}/hub" - SiSU::HubMaster.new(argv) + lng_lst = %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi] + lng_lst_rgx=lng_lst.join('|') + argv_sub_files={} + argv_sub_mods=[] + argv.each do |x| + if x =~/^-+/ + argv_sub_mods << x + elsif x =~/\.ss[tm]/ + if x =~/\// + markup_path,markup_file =(/(\S+\/)((?:#{lng_lst_rgx})?[^\/]+)/).match(x)[1,2] + if not argv_sub_files[markup_path] + argv_sub_files[markup_path]=[] + end + argv_sub_files[markup_path] << markup_file + else + if not argv_sub_files['./'] + argv_sub_files['./']=[] + end + argv_sub_files['./'] << x + end + end + end + if argv_sub_files.length > 0 + argv_sub_files.each_pair do |markup_dir,markup_file| + $sisu_document_markup_directory=markup_dir.gsub(/\/$/,'') + argv_sub=argv_sub_mods + markup_file + if FileTest.directory?(markup_dir) + system("cd #{markup_dir}") + Dir.chdir(markup_dir) + SiSU::HubMaster.new(argv_sub) + Dir.chdir(SiSU_called_from_directory) + system("cd #{SiSU_called_from_directory}") + else p "Error directory specified #{markup_dir} not found" + end + end + else + $sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'') + SiSU::HubMaster.new(argv) + end rescue STDERR.puts 'ERROR' STDERR.puts $! diff --git a/bin/sisu3 b/bin/sisu3 deleted file mode 100644 index e1d30570..00000000 --- a/bin/sisu3 +++ /dev/null @@ -1,169 +0,0 @@ -#!/usr/bin/env ruby -# encoding: utf-8 -#SiSU: copyright (C) 1997 - 2012 Ralph Amissah; License GPL, see appended program information -begin - def ruby_version_ok?(base_version) - @v ||=RUBY_VERSION.scan(/\d+/) - vb=base_version.scan(/\d+/) - if @v[0].to_i < vb[0].to_i \ - or @v[0].to_i == vb[0].to_i \ - && @v[1].to_i < vb[1].to_i \ - or @v[0].to_i == vb[0].to_i \ - && @v[1].to_i == vb[1].to_i \ - && @v[1].to_i < vb[2].to_i - raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" - else check_incompatible_ruby_build? - end - end - def check_incompatible_ruby_build? - require 'rbconfig' - e=Config::CONFIG - if RUBY_VERSION == '1.9.2' \ - && e['PATCHLEVEL'].to_i < 180 - raise <. - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Ralph Amissah - - diff --git a/bin/sisu3 b/bin/sisu3 new file mode 120000 index 00000000..b4999d51 --- /dev/null +++ b/bin/sisu3 @@ -0,0 +1 @@ +sisu \ No newline at end of file diff --git a/bin/sisu4 b/bin/sisu4 deleted file mode 100644 index ec515326..00000000 --- a/bin/sisu4 +++ /dev/null @@ -1,170 +0,0 @@ -#!/usr/bin/env ruby -# encoding: utf-8 -#SiSU: copyright (C) 1997 - 2012 Ralph Amissah; License GPL, see appended program information -begin - def ruby_version_ok?(base_version) - @v ||=RUBY_VERSION.scan(/\d+/) - vb=base_version.scan(/\d+/) - if @v[0].to_i < vb[0].to_i \ - or @v[0].to_i == vb[0].to_i \ - && @v[1].to_i < vb[1].to_i \ - or @v[0].to_i == vb[0].to_i \ - && @v[1].to_i == vb[1].to_i \ - && @v[1].to_i < vb[2].to_i - raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}" - else check_incompatible_ruby_build? - end - end - def check_incompatible_ruby_build? - require 'rbconfig' - e=Config::CONFIG - if RUBY_VERSION == '1.9.2' \ - && e['PATCHLEVEL'].to_i < 180 - raise <. - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Ralph Amissah - - diff --git a/bin/sisu4 b/bin/sisu4 new file mode 120000 index 00000000..b4999d51 --- /dev/null +++ b/bin/sisu4 @@ -0,0 +1 @@ +sisu \ No newline at end of file -- cgit v1.2.3