aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v0/hub.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2007-10-15 02:09:59 +0100
committerRalph Amissah <ralph@amissah.com>2007-10-15 02:09:59 +0100
commit7c6478d290c854f26d4b954bb5ed47871ceefd62 (patch)
tree347b7fa55ed0412255757d1f081a5a32f9f02d49 /lib/sisu/v0/hub.rb
parentdefault image directories moved, more convenient/logical [test] (diff)
composite master renaming, and; multiple remote puts (rsync|scp)
* composite master files: eliminate ._sst, replace with .ssm.sst * multiple remote hosts ("distributed" rsyncing), yml config files remote now uses array with all recent changes (directory shunting) much testing is yet to be done, state is unstable some things are known not to work this instant, e.g. sisu -V
Diffstat (limited to 'lib/sisu/v0/hub.rb')
-rw-r--r--lib/sisu/v0/hub.rb20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/sisu/v0/hub.rb b/lib/sisu/v0/hub.rb
index db0bb2a2..9fe102e7 100644
--- a/lib/sisu/v0/hub.rb
+++ b/lib/sisu/v0/hub.rb
@@ -129,23 +129,23 @@ module SiSU
pod_output(pod_name)
break
else
- put=fns.gsub(/(.+)?\._sst$/,'\1.ssm')
+ put=fns.gsub(/(.+)?\.ssm\.sst$/,'\1.ssm')
@opt.fns=fns
if @req !~/(?:urls|remote)$/
- if @req=~/^dal$/ and FileTest.file?(@opt.fns) and @opt.fns =~ /\.(?:[_-]?sst|ssm)$/
+ if @req=~/^dal$/ and FileTest.file?(@opt.fns) and @opt.fns =~ /\.(?:(?:-|ssm\.)?sst|ssm)$/
if fns =~ /\.ssm$/; require "#{SiSU_lib}/composite" #pre-processing
SiSU_Assemble::Composite.new(@opt).read
- @opt.fns=fns.gsub(/\.ssm$/,'._sst')
+ @opt.fns=fns.gsub(/\.ssm$/,'.ssm.sst')
end
SiSU_DAL::Source.new(@opt).read # -m
elsif FileTest.file?(env.source_file_with_path)
case @opt.fns
- when /\.(?:[_-]?sst|ssm)$/
+ when /\.(?:(?:-|ssm\.)?sst|ssm)$/
case @req
when /^dal$/
if fns =~ /\.ssm$/; require "#{SiSU_lib}/composite" #pre-processing
SiSU_Assemble::Composite.new(@opt).read
- @opt.fns=fns.gsub(/\.ssm$/,'._sst')
+ @opt.fns=fns.gsub(/\.ssm$/,'.ssm.sst')
end
SiSU_DAL::Source.new(@opt).read # -m
when /^concordance$/; SiSU_Concordance::Source.new(@opt).read # -w
@@ -196,7 +196,7 @@ module SiSU
@n_do=@n_do+1
tell=SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed")
tell.files_processed unless @opt.cmd =~/q/
- else Operations.new(@opt).not_found
+ else Operations.new(@opt).not_found
end
end
end
@@ -409,7 +409,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
end
if @opt.cmd=~/m/; op('dal','dal') #% -m dal
end
- @opt.files=@opt.files.collect {|x| x=x.gsub(/\.ssm$/,'._sst') }
+ @opt.files=@opt.files.collect {|x| x=x.gsub(/\.ssm$/,'.ssm.sst') }
if @opt.cmd =~/S/
op('sisupod_make','sisupod (zip)') #% -S make sisupod
if @opt.fns=~/\.kdi._sst/
@@ -447,7 +447,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
when /\.(termsheet.rb)$/; Operations.new(@opt).termsheet
else #print "not processed --> ", fns, "\n"
end
- else Operations.new(@opt).not_found
+ else Operations.new(@opt).not_found
end
end
Operations.new.counter
@@ -517,14 +517,14 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
@opt.files.each do |fns|
if FileTest.file?(fns)
@opt.fns=fns
- unless @opt.fns =~ /(?:\.(?:[_-]?sst|ssm|ssp|sx[sdn]\.xml|termsheet.rb)|sisupod(?:\.zip)?)$/
+ unless @opt.fns =~ /(?:\.(?:(?:-|ssm\.)?sst|ssm|ssp|sx[sdn]\.xml|termsheet.rb)|sisupod(?:\.zip)?)$/
if @opt.fns=~/\.kdi$/ and @opt.mod.inspect =~/--(?:convert(?:-from)?|from)[=-]kdi/
elsif @opt.fns=~/\.sx[sdn]\.xml$/ and @opt.mod.inspect =~/--(?:(?:convert(?:-from)?|from)[=-])?(?:xml2sst|sxml)/
elsif @opt.fns=~/\.ssi$/ and @opt.mod.inspect =~/--identify/
else Operations.new(@opt).not_recognised
end
end
- if @opt.fns =~/\._sst$/ and @opt.cmd !~/[S_M]/ # rework necessry, revist, the _ flag is a hack, to keep ._sst files
+ if @opt.fns =~/\.ssm\.sst$/ and @opt.cmd !~/[S_M]/ # rework necessry, revist, the _ flag is a hack, to keep ._sst files
@msg,@msgs='temporary file removed',nil
@tell.call.warn unless @opt.cmd =~/V/
File.unlink(@opt.fns) if File.exist?(@opt.fns) #CONSIDER