diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-03-02 22:54:28 -0500 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-03-02 22:54:28 -0500 |
commit | 0569fd776ab4ce33689ca3337acd62f2415b6348 (patch) | |
tree | 4644037b28d876d8637a610f5df1a29535a4ef9a /lib/sisu/v3/hub.rb | |
parent | debian/changelog (3.0.1-1) (diff) | |
parent | CHANGELOG_v{1,2,3}, syslink, avoid duplication (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/hub.rb')
-rw-r--r-- | lib/sisu/v3/hub.rb | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/lib/sisu/v3/hub.rb b/lib/sisu/v3/hub.rb index 5e86ea76..7794c08c 100644 --- a/lib/sisu/v3/hub.rb +++ b/lib/sisu/v3/hub.rb @@ -1,4 +1,4 @@ -# coding: utf-8 +# encoding: utf-8 =begin * Name: SiSU @@ -58,8 +58,8 @@ =end module SiSU - require "#{SiSU_lib}/constants" # constants.rb - require "#{SiSU_lib}/sysenv" # sysenv.rb + require_relative 'constants' # constants.rb + require_relative 'sysenv' # sysenv.rb include SiSU_Screen @@pwd_the=Dir.pwd class Op @@ -85,7 +85,7 @@ module SiSU Dir.chdir(@pwd) end def select - require "#{SiSU_lib}/#{@req}" + require_relative @req if @req =~/^conf$/ # -C SiSU_Initialize::Source.new(@opt).read end @@ -94,7 +94,7 @@ module SiSU env=SiSU_Env::Info_env.new(fns) if fns =~ /sisupod(?:\.zip)?|\S+?(?:\.ss[mt]\.zip|\.ssp)$/ # env=SiSU_Env::Info_env.new(fns) - require "#{SiSU_lib}/remote" # remote.rb #check + require_relative 'remote' # remote.rb #check pod_name=SiSU_Remote::Remote_download.new(fns).pod.name SiSU_Screen::Ansi.new(@opt.cmd,pod_name).puts_blue unless @opt.cmd =~/q/ @opt.files.shift @@ -111,13 +111,13 @@ module SiSU if @req !~/(?:urls|remote)$/ if @opt.cmd.inspect =~/-P/\ and @req =~ /^po4a$/ - require "#{SiSU_lib}/composite" # composite.rb #pre-processing - SiSU_po4a::Source.new(@opt).read # -P + require_relative 'composite' # composite.rb #pre-processing + SiSU_po4a::Source.new(@opt).read # -P po4a.rb elsif @req=~/^dal$/ \ and FileTest.file?(@opt.fns) \ and @opt.fns =~ /\.(?:(?:-|ssm\.)?sst|ssm)$/ if fns =~ /\.ssm$/ - require "#{SiSU_lib}/composite" # composite.rb #pre-processing + require_relative 'composite' # composite.rb #pre-processing SiSU_Assemble::Composite.new(@opt).read @opt.fns=fns.gsub(/\.ssm$/,'.ssm.sst') end @@ -128,37 +128,37 @@ module SiSU case @req when /^dal$/ if fns =~ /\.ssm$/ - require "#{SiSU_lib}/composite" # composite.rb #pre-processing + require_relative 'composite' # composite.rb #pre-processing SiSU_Assemble::Composite.new(@opt).read @opt.fns=fns.gsub(/\.ssm$/,'.ssm.sst') end - SiSU_DAL::Source.new(@opt).read # -m - when /^git$/; SiSU_Git::Source.new(@opt).read # -g - when /^concordance$/; SiSU_Concordance::Source.new(@opt).read # -w - when /^share_src$/; SiSU_Markup::Source.new(@opt).read # -s - when /^sisupod_make$/; SiSU_Doc::Source.new(@opt).read # -S - when /^source_kdissert$/; SiSU_Kdi_source::Source.new(@opt).read ## -S - when /^digests$/; SiSU_Digest_view::Source.new(@opt).read # -N - when /^xml_scaffold$/; SiSU_XML_scaffold::Source.new(@opt).read # -k - when /^plaintext$/; SiSU_Plaintext::Source.new(@opt).read # -t -a -# when /^po4a$/; SiSU_po4a::Source.new(@opt).read # -P - #when /^wikispeak$/; SiSU_Wikispeak::Source.new(@opt).read # -g - when /^epub$/; SiSU_EPUB::Source.new(@opt).read # -e - when /^odf$/; SiSU_ODF::Source.new(@opt).read # -o - when /^xml_md_oai_pmh_dc$/; SiSU_XML_metadata::OAI_PMH.new(@opt).read # -O - when /^texpdf$/; SiSU_TeX::Source.new(@opt).read # -p - when /^manpage$/; SiSU_Manpage::Source.new(@opt).read # -i - when /^texinfo$/; SiSU_TexInfo::Source.new(@opt).read # -I - when /^html$/; SiSU_HTML::Source.new(@opt).read # -h -H - when /^xml$/; SiSU_XML_SAX::Source.new(@opt).read # -x - when /^xml_dom$/; SiSU_XML_DOM::Source.new(@opt).read # -X - when /^xml_fictionbook$/; SiSU_XML_Fictionbook::Source.new(@opt).read # -f - when /^xhtml$/; SiSU_XHTML::Source.new(@opt).read # -b - when /^embedded$/; SiSU_Embedded::Source.new(@opt).read # -m (image and other content) - when /^manifest$/; SiSU_Manifest::Source.new(@opt).read # -y - when /^sitemaps$/; SiSU_Sitemaps::Source.new(@opt).read # -Y - when /^zap$/; SiSU_Zap::Source.new(@opt).read # -Z - when /^dbi$/; SiSU_DBI::SiSU_SQL.new(@opt).connect # -D -d + SiSU_DAL::Source.new(@opt).read # -m dal.rb + when /^git$/; SiSU_Git::Source.new(@opt).read # -g git.rb + when /^concordance$/; SiSU_Concordance::Source.new(@opt).read # -w concordance.rb + when /^share_src$/; SiSU_Markup::Source.new(@opt).read # -s share_src.rb + when /^sisupod_make$/; SiSU_Doc::Source.new(@opt).read # -S sisupod_make.rb +# when /^source_kdissert$/; SiSU_Kdi_source::Source.new(@opt).read # -S share_src_kdissert.rb + when /^digests$/; SiSU_Digest_view::Source.new(@opt).read # -N digests.rb + when /^plaintext$/; SiSU_Plaintext::Source.new(@opt).read # -t -a plaintext.rb +# when /^po4a$/; SiSU_po4a::Source.new(@opt).read # -P po4a.rb + #when /^wikispeak$/; SiSU_Wikispeak::Source.new(@opt).read # -g + when /^epub$/; SiSU_EPUB::Source.new(@opt).read # -e epub.rb + when /^odf$/; SiSU_ODF::Source.new(@opt).read # -o odf.rb + when /^xml_md_oai_pmh_dc$/; SiSU_XML_metadata::OAI_PMH.new(@opt).read # -O + when /^texpdf$/; SiSU_TeX::Source.new(@opt).read # -p texpdf.rb + when /^manpage$/; SiSU_Manpage::Source.new(@opt).read # -i manpage.rb + when /^texinfo$/; SiSU_TexInfo::Source.new(@opt).read # -I texinfo.rb + when /^html$/; SiSU_HTML::Source.new(@opt).read # -h -H html.rb + when /^xhtml$/; SiSU_XHTML::Source.new(@opt).read # -b xhtml.rb + when /^xml$/; SiSU_XML_SAX::Source.new(@opt).read # -x xml.rb + when /^xml_dom$/; SiSU_XML_DOM::Source.new(@opt).read # -X xml_dom.rb + when /^xml_fictionbook$/; SiSU_XML_Fictionbook::Source.new(@opt).read # -f + when /^xml_scaffold$/; SiSU_XML_scaffold::Source.new(@opt).read # -k xml_scaffold.rb + when /^embedded$/; SiSU_Embedded::Source.new(@opt).read # -m embedded.rb (image and other content) #check + when /^manifest$/; SiSU_Manifest::Source.new(@opt).read # -y manifest.rb + when /^sitemaps$/; SiSU_Sitemaps::Source.new(@opt).read # -Y sitemaps.rb + when /^zap$/; SiSU_Zap::Source.new(@opt).read # -Z zap.rb + when /^dbi$/; SiSU_DBI::SiSU_SQL.new(@opt).connect # -D -d dbi.rb end @n_do=@n_do+1 SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed").files_processed if @opt.cmd =~/[MVv]/ @@ -206,30 +206,30 @@ module SiSU end def remote_put_base_site_rsync # -CR p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ - require "#{SiSU_lib}/remote" # remote.rb + require_relative 'remote' # remote.rb SiSU_Remote::Put.new(@opt).rsync_base end def remote_put_base_site_rsync_match # -CCRZ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ - require "#{SiSU_lib}/remote" # remote.rb + require_relative 'remote' # remote.rb SiSU_Remote::Put.new(@opt).rsync_base_sync end def remote_put_base_site # -Cr p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ - require "#{SiSU_lib}/remote" # remote.rb + require_relative 'remote' # remote.rb SiSU_Remote::Put.new(@opt).scp_base end def remote_put_base_site_all # -CCr p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ - require "#{SiSU_lib}/remote" # remote.rb + require_relative 'remote' # remote.rb SiSU_Remote::Put.new(@opt).scp_base_all end def cgi # -F - require "#{SiSU_lib}/cgi" # cgi.rb + require_relative 'cgi' # cgi.rb SiSU_CGI::SiSU_search.new(@opt).read end def encoding # -K build character encoding db (uses KirbyBase) - require "#{SiSU_lib}/character_encoding" # character_encoding.rb + require_relative 'character_encoding' # character_encoding.rb SiSU_character_encode::Create.new.db end def termsheet # -t @@ -288,10 +288,10 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ require 'profile' end if @opt.mod.inspect =~/--harvest/ - require "#{SiSU_lib}/harvest" # harvest.rb + require_relative 'harvest' # harvest.rb end if @opt.mod.inspect =~/--convert|--to|--from/ - require "#{SiSU_lib}/sst_convert_markup" # sst_convert_markup.rb + require_relative 'sst_convert_markup' # sst_convert_markup.rb end if @opt.cmd =~/([AabCcDdeFfGgHhIiJjkLMmNnOoPpQqRrSsTtUuVvwWXxYyZ_0-9])/ \ and @opt.cmd =~/^-/ \ @@ -401,12 +401,12 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ end end if @get_s.length > 0 #% remote markup file .sst - require "#{SiSU_lib}/remote" # remote.rb + require_relative 'remote' # remote.rb SiSU_Remote::Get.new(@opt,@get_s).fns Operations.new.counter end if @get_p.length > 0 #% remote sisupod - require "#{SiSU_lib}/remote" # remote.rb + require_relative 'remote' # remote.rb SiSU_Remote::Get.new(@opt,@get_p).sisupod end rescue @@ -504,18 +504,18 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ op('urls','urls') @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil unless @opt.cmd =~/q/ @tell.call.print_brown if @opt.cmd =~/[uUvVM]/ unless @opt.files.join.empty? - if defined? @@env.path.processing \ + if defined? @@env.processing_path.processing \ and @@env.user \ - and FileTest.directory?(@@env.path.processing) \ - and @@env.path.processing =~/#{@@env.user}$/ #clean temporary processing directory of content as is located in public area - cd(@@env.path.processing_base_tmp) do + and FileTest.directory?(@@env.processing_path.processing) \ + and @@env.processing_path.processing =~/#{@@env.user}$/ #clean temporary processing directory of content as is located in public area + cd(@@env.processing_path.processing_base_tmp) do rm_rf(@@env.user) unless @opt.cmd =~/M/ end end elsif @opt.mod.inspect =~/--query/ - require "#{SiSU_lib}/sst_identify_markup" # sst_identify_markup.rb + require_relative 'sst_identify_markup' # sst_identify_markup.rb puts SiSU_Markup::Markup_history.new(@opt).query elsif @opt.mod.inspect =~/--identify/ - require "#{SiSU_lib}/sst_identify_markup" # sst_identify_markup.rb + require_relative 'sst_identify_markup' # sst_identify_markup.rb markup_version=SiSU_Markup::Markup_identify.new(@opt).markup_version? elsif @opt.mod.inspect =~/--about/ #% help instructions if @opt.mod.inspect =~/--about/ \ @@ -524,10 +524,10 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ else SiSU_Help::Help.new('list','color_off').help_request end elsif @opt.mod.inspect =~/--sitemaps/ #% sitemaps - require "#{SiSU_lib}/sitemaps" # sitemaps.rb + require_relative 'sitemaps' # sitemaps.rb SiSU_Sitemaps::Source.new(@opt).read if @opt.cmd =~/R/ - require "#{SiSU_lib}/remote" # remote.rb + require_relative 'remote' # remote.rb SiSU_Remote::Put.new(@opt).rsync_sitemaps end else #% help instructions @@ -571,15 +571,15 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ require 'jcode' $KCODE='UTF8' end - require "#{SiSU_lib}/constants" # constants.rb - require "#{SiSU_lib}/options" # options.rb - require "#{SiSU_lib}/sysenv" # sysenv.rb + require_relative 'constants' # constants.rb + require_relative 'options' # options.rb + require_relative 'sysenv' # sysenv.rb include SiSU_Env; include SiSU_Screen - require "#{SiSU_lib}/param" # param.rb + require_relative 'param' # param.rb include SiSU_Param - require "#{SiSU_lib}/defaults" # defaults.rb + require_relative 'defaults' # defaults.rb include SiSU_Viz - require "#{SiSU_lib}/help" # help.rb + require_relative 'help' # help.rb include SiSU_Help require 'uri' home=ENV['HOME'] |