From 9c443e48655944b6448135659befe3d73fb89269 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 12 Nov 2014 21:32:21 -0500 Subject: year set 2015 (prepare for the new year) --- bin/sisu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index a8ecb70e..1d885b66 100644 --- a/bin/sisu +++ b/bin/sisu @@ -1,6 +1,6 @@ #!/usr/bin/env ruby # encoding: utf-8 -#SiSU: copyright (C) 1997 - 2014 Ralph Amissah; License GPL 3, see appended program information +#SiSU: copyright (C) 1997 - 2015 Ralph Amissah; License GPL 3, see appended program information class Orient require 'singleton' include Singleton @@ -306,7 +306,7 @@ __END__ * Author: Ralph Amissah * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Ralph Amissah, + 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: -- cgit v1.2.3 From 98c8c90b52343f6136a31f932d86273c30b59a41 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 12 Nov 2014 22:51:42 -0500 Subject: v5 v6: code headers reformatted for viewing as org-mode files --- bin/sisu | 78 +++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 38 insertions(+), 40 deletions(-) (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index 1d885b66..317d036d 100644 --- a/bin/sisu +++ b/bin/sisu @@ -299,58 +299,56 @@ rescue #% - end __END__ - * Name: SiSU +* Name: SiSU - * Description: a framework for document structuring, publishing and search +** Description: documents, structuring, processing, publishing, search - * Author: Ralph Amissah +** Author: Ralph Amissah + + - * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah, - All Rights Reserved. +** Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Ralph Amissah, + All Rights Reserved. - * License: GPL 3 or later: +** License: GPL 3 or later: - SiSU, a framework for document structuring, publishing and search + SiSU, a framework for document structuring, publishing and search - Copyright (C) Ralph Amissah + Copyright (C) Ralph Amissah - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation, either version 3 of the License, or (at your option) - any later version. + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation, either version 3 of the License, or (at your option) + any later version. - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. - You should have received a copy of the GNU General Public License along with - this program. If not, see . + You should have received a copy of the GNU General Public License along with + this program. If not, see . - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - + 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 +** SiSU uses: + * Standard SiSU markup syntax, + * Standard SiSU meta-markup syntax, and the + * Standard SiSU object citation numbering and system - * Hompages: - - +** Hompages: + + - * Download: - +** Download: + - * Git - - - - * Ralph Amissah - - +** Git + + -- cgit v1.2.3 From 4db4dcc886b85bf9db43d66025452fb33c94a9dd Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 26 Nov 2014 09:12:11 -0500 Subject: c&d: project dir structure, libs moved under new branch names * libs & version files under new branch names: current & develop * previously under branch version numbers (v5|v6) * version .yml files moved * associated adjustments made as required, notably to: bin/sisu se* qi* (file headers); breakage potential, testing required * [on dir names, want release to (alphabetically) precede next/development, considered (cur|dev) (current|(dev|development|progress|next)) (stable|unstable), alpha sorting fail (release|(next|develop))] --- bin/sisu | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index 317d036d..d96f8a7c 100644 --- a/bin/sisu +++ b/bin/sisu @@ -18,6 +18,12 @@ class Orient def default stable end + def current + 'current' + end + def next + 'next' + end self end def sisu_called_from_directory @@ -57,6 +63,12 @@ class Orient def default 'v' + version.default end + def current + 'current' + end + def next + 'develop' + end def stable_bin_file_regex %r{\bsisu#{version.stable}$} end @@ -70,10 +82,10 @@ class Orient %r{\/sisu-#{version.unstable}\.(?:\d+|[a-z])\.(?:\d+|[a-z])\/} end def stable_modifier_regex - %r{"(?:--v#{version.stable}|--current|--stable)"} + %r{"(?:--v#{version.stable}|--current|--stable|--release)"} end def unstable_modifier_regex - %r{"(?:--v#{version.unstable}|--current|--stable)"} + %r{"(?:--v#{version.unstable}|--next|--unstable|--dev)"} end self end @@ -88,28 +100,28 @@ class Orient end end def sisu_version_info_path - "#{sisu_path_base_system_data}/#{select_version_check}/v/version.yml" + "#{sisu_path_base_system_data}/version/#{select_version_check}.yml" end def select_version_check if sisu_run_from == :full_path_to_sisu_bin_in_sisu_dir_tree \ or sisu_run_from == :system_install case processing.called_as - when processing.stable_bin_file_regex then processing.stable - when processing.unstable_bin_file_regex then processing.unstable + when processing.stable_bin_file_regex then processing.current + when processing.unstable_bin_file_regex then processing.next else case processing.argv_str - when processing.stable_modifier_regex then processing.stable - when processing.unstable_modifier_regex then processing.unstable - else processing.default + when processing.stable_modifier_regex then processing.current + when processing.unstable_modifier_regex then processing.next + else processing.current end end elsif sisu_run_from == :gem_install case processing.file_full_path - when processing.stable_gem_regex then processing.stable - when processing.unstable_gem_regex then processing.unstable - else processing.default + when processing.stable_gem_regex then processing.current + when processing.unstable_gem_regex then processing.next + else processing.current end - else processing.default + else processing.current end end def paths_set -- cgit v1.2.3 From 71badaf7b2374edcc05268ee79db2fbfd2d7fbb1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 5 Dec 2014 23:41:05 -0500 Subject: c&d: version & branch info, changes related to move of lib dirs --- bin/sisu | 47 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-) (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index d96f8a7c..276b8ed8 100644 --- a/bin/sisu +++ b/bin/sisu @@ -29,7 +29,7 @@ class Orient def sisu_called_from_directory @@sisu_called_from_directory ||= Dir.pwd end - def sisu_run_from + def sisu_run_from? if processing.called_as == processing.file_full_path \ and File.dirname(processing.file_full_path) != Config::CONFIG['bindir'] :full_path_to_sisu_bin_in_sisu_dir_tree @@ -90,7 +90,7 @@ class Orient self end def sisu_lib - "sisu/#{select_version_check}" + "sisu/#{branch_name?}" end def sisu_path_lib if sisu_path_specified_lib \ @@ -100,11 +100,11 @@ class Orient end end def sisu_version_info_path - "#{sisu_path_base_system_data}/version/#{select_version_check}.yml" + "#{sisu_path_base_system_data}/version/#{branch_name?}.yml" end - def select_version_check - if sisu_run_from == :full_path_to_sisu_bin_in_sisu_dir_tree \ - or sisu_run_from == :system_install + def branch_name? + if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ + or sisu_run_from? == :system_install case processing.called_as when processing.stable_bin_file_regex then processing.current when processing.unstable_bin_file_regex then processing.next @@ -115,7 +115,7 @@ class Orient else processing.current end end - elsif sisu_run_from == :gem_install + elsif sisu_run_from? == :gem_install case processing.file_full_path when processing.stable_gem_regex then processing.current when processing.unstable_gem_regex then processing.next @@ -124,19 +124,41 @@ class Orient else processing.current end end + def branch_version? + if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ + or sisu_run_from? == :system_install + case processing.called_as + when processing.stable_bin_file_regex then processing.stable + when processing.unstable_bin_file_regex then processing.unstable + else + case processing.argv_str + when processing.stable_modifier_regex then processing.stable + when processing.unstable_modifier_regex then processing.unstable + else processing.stable + end + end + elsif sisu_run_from? == :gem_install + case processing.file_full_path + when processing.stable_gem_regex then processing.stable + when processing.unstable_gem_regex then processing.unstable + else processing.stable + end + else processing.stable + end + end def paths_set - if sisu_run_from == :system_install \ + if sisu_run_from? == :system_install \ and processing.called_as \ =~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ :set_path_system - elsif sisu_run_from == :full_path_to_sisu_bin_in_sisu_dir_tree \ + elsif sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ and processing.called_as \ !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \ && File.expand_path(processing.called_as) \ =~ /bin\/sisu[#{version.stable}#{version.unstable}]?$/ \ && FileTest.file?(processing.called_as) :set_dir_tree_full_path - elsif sisu_run_from==:gem_install + elsif sisu_run_from? ==:gem_install :set_gem_path else nil end @@ -184,8 +206,9 @@ class Orient end def sisu_is { - run_from: sisu_run_from, - version_dir: select_version_check, + run_from: sisu_run_from?, + branch_name: branch_name?, + branch_version: branch_version?, path_base: sisu_path_base, path_base_system_data: sisu_path_base_system_data, path_lib: sisu_path_lib, -- cgit v1.2.3 From b2ccc63796ce0bf17a8c75e857073c8440ee3955 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 Jan 2015 09:59:35 -0500 Subject: bin + c&d: RbConfig (instead of Config, switch) --- bin/sisu | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index 276b8ed8..80436d2a 100644 --- a/bin/sisu +++ b/bin/sisu @@ -31,7 +31,7 @@ class Orient end def sisu_run_from? if processing.called_as == processing.file_full_path \ - and File.dirname(processing.file_full_path) != Config::CONFIG['bindir'] + and File.dirname(processing.file_full_path) != RbConfig::CONFIG['bindir'] :full_path_to_sisu_bin_in_sisu_dir_tree elsif processing.file_full_path =~/\/gems\// \ and processing.file_full_path \ @@ -149,11 +149,11 @@ class Orient def paths_set if sisu_run_from? == :system_install \ and processing.called_as \ - =~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ + =~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ :set_path_system elsif sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ and processing.called_as \ - !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \ + !~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \ && File.expand_path(processing.called_as) \ =~ /bin\/sisu[#{version.stable}#{version.unstable}]?$/ \ && FileTest.file?(processing.called_as) @@ -166,7 +166,7 @@ class Orient def sisu_path_base case paths_set when :set_path_system - Config::CONFIG['datadir'] + '/sisu' + RbConfig::CONFIG['datadir'] + '/sisu' when :set_dir_tree_full_path File.expand_path(processing.called_as). sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'') @@ -178,7 +178,7 @@ class Orient def sisu_path_base_system_data case paths_set when :set_path_system - Config::CONFIG['datadir'] + '/sisu' + RbConfig::CONFIG['datadir'] + '/sisu' when :set_dir_tree_full_path File.expand_path(processing.called_as). sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'/data/sisu') @@ -189,7 +189,7 @@ class Orient end def sisu_path_specified_lib if (processing.called_as \ - !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/) + !~ /^#{RbConfig::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/) File.expand_path(processing.called_as). sub(/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'lib') else nil @@ -320,10 +320,10 @@ rescue #% - puts %{ #{%x{ruby -v}.strip.to_s} #{RUBY_VERSION} - ruby version: #{Config::CONFIG['RUBY_PROGRAM_VERSION']}p#{Config::CONFIG['PATCHLEVEL']} - ruby named: #{Config::CONFIG['ruby_version']} - rubylib: #{Config::CONFIG['rubylibdir']} - rubylib local: #{Config::CONFIG['sitelibdir']} + ruby version: #{RbConfig::CONFIG['RUBY_PROGRAM_VERSION']}p#{RbConfig::CONFIG['PATCHLEVEL']} + ruby named: #{RbConfig::CONFIG['ruby_version']} + rubylib: #{RbConfig::CONFIG['rubylibdir']} + rubylib local: #{RbConfig::CONFIG['sitelibdir']} gem dir: #{Gem.dir} gem path: #{Gem.path} } -- cgit v1.2.3 From 802bf61f72cf3cff29298b1816a79bb2b8d1dacf Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 11 Jan 2015 21:18:06 -0500 Subject: bin/sisu + c&d: SiSU_is now methods (instead of hash) --- bin/sisu | 51 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 16 deletions(-) (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index 80436d2a..b5751d66 100644 --- a/bin/sisu +++ b/bin/sisu @@ -90,7 +90,7 @@ class Orient self end def sisu_lib - "sisu/#{branch_name?}" + "sisu/#{branch_name_}" end def sisu_path_lib if sisu_path_specified_lib \ @@ -102,7 +102,7 @@ class Orient def sisu_version_info_path "#{sisu_path_base_system_data}/version/#{branch_name?}.yml" end - def branch_name? + def branch_name_ if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ or sisu_run_from? == :system_install case processing.called_as @@ -124,7 +124,7 @@ class Orient else processing.current end end - def branch_version? + def branch_version_ if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ or sisu_run_from? == :system_install case processing.called_as @@ -205,18 +205,37 @@ class Orient self end def sisu_is - { - run_from: sisu_run_from?, - branch_name: branch_name?, - branch_version: branch_version?, - path_base: sisu_path_base, - path_base_system_data: sisu_path_base_system_data, - path_lib: sisu_path_lib, - version_info_path: sisu_version_info_path, - language_list: language_list.codes, - language_list_regex: language_list.regex, - called_from: sisu_called_from_directory, - } + def run_from? + sisu_run_from? + end + def branch_name? + branch_name_ + end + def branch_version? + branch_version_ + end + def path_base? + sisu_path_base + end + def path_base_system_data? + sisu_path_base_system_data + end + def path_lib? + sisu_path_lib + end + def version_info_path? + sisu_version_info_path + end + def language_list? + language_list.codes + end + def language_list_regex? + language_list.regex + end + def called_from? + sisu_called_from_directory + end + self end def get_processing_info def sortout @@ -258,7 +277,7 @@ class Orient self end def control - require "#{sisu_is[:path_lib]}/hub" + require "#{sisu_is.path_lib?}/hub" sisu_called_from_directory begin if get_processing_info.processing_files.length > 0 -- cgit v1.2.3 From b36588c9f9f5762a8c8e924c6be716a44816b44d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 12 Jan 2015 10:17:45 -0500 Subject: bin/sisu-misc-utils + c&d: lib sisu_thor_lib currently only po4a * uses po4a to create po files with empty translation strings * in appropriately configured directory e.g. "data/doc/sisu/markup-samples/manual" have file named: "languages_source_and_targets" containing e.g.: source: en targets: de fr es ja ru zh command examples: ruby ~snx/bin/sisu-misc-utils po4a --next --clean ruby ~snx/bin/sisu-misc-utils po4a --next --distclean ruby ~snx/bin/sisu-misc-utils po4a --next --make --- bin/sisu-misc-utils | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 bin/sisu-misc-utils (limited to 'bin') diff --git a/bin/sisu-misc-utils b/bin/sisu-misc-utils new file mode 100644 index 00000000..e5be5c09 --- /dev/null +++ b/bin/sisu-misc-utils @@ -0,0 +1,228 @@ +#!/usr/bin/env ruby +begin + require 'thor' +rescue LoadError + puts 'thor (package ruby-thor) not found' +end +require 'find' +require 'fileutils' + include FileUtils +require 'pathname' +require 'rbconfig.rb' +module SiSUconf + class LanguageCodes + def language_list + def codes + %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 ja ko 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 zh] + end + def regex + codes.join('|') + end + self + end + end + class DetermineLibsPath + def version + def stable + '5' + end + def unstable + '6' + end + self + end + def processing + def called_as + $0 + #$called_as + end + def called_as_exe + File.basename(called_as) + end + def called_as_exe_strip_current_develop + File.basename(called_as).gsub(/-(?:current|develop)/,'') + end + def argv + $* + #$argv + end + def argv_str + argv.inspect + end + def file_full_path + __FILE__ + end + def current + 'current' + end + def next + 'develop' + end + def stable_bin_file_regex + %r{\bsisu#{version.stable}$} + end + def unstable_bin_file_regex + %r{\bsisu#{version.unstable}$} + end + def stable_modifier_regex + %r{"(?:--v#{version.stable}|--current|--stable)"} + end + def unstable_modifier_regex + %r{"(?:--v#{version.unstable}|--next|--unstable)"} + end + def lib_filename + 'sisu_thor_lib' + end + self + end + def sisu_run_from? + if processing.called_as == processing.file_full_path \ + and File.dirname(processing.file_full_path) != RbConfig::CONFIG['bindir'] + :full_path_to_sisu_bin_in_sisu_dir_tree + elsif processing.file_full_path =~/\/gems\// \ + and processing.file_full_path \ + =~ /\/#{called_as_exe_strip_current_develop}(?:-(?:current|develop))\.(?:\d+|[a-z])\.(?:\d+|[a-z])\// + :gem_install + else + :system_install + end + end + def branch_name_ + if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ + or sisu_run_from? == :system_install + case processing.called_as + when processing.stable_bin_file_regex then processing.current + when processing.unstable_bin_file_regex then processing.next + else + case processing.argv_str + when processing.stable_modifier_regex then processing.current + when processing.unstable_modifier_regex then processing.next + else processing.current + end + end + elsif sisu_run_from? == :gem_install + case processing.file_full_path + when processing.stable_gem_regex then processing.current + when processing.unstable_gem_regex then processing.next + else processing.current + end + else processing.current + end + end + def sisu_path_specified_lib + if (processing.called_as \ + !~ /^#{RbConfig::CONFIG['bindir']}\/#{called_as_exe_strip_current_develop}(?:-(?:current|develop))?$/) + File.expand_path(processing.called_as). + sub(/bin\/#{called_as_exe_strip_current_develop}(?:-(?:current|develop))?$/,'lib') + else nil + end + end + def sisu_lib + "sisu/#{branch_name_}" + end + def sisu_path_lib + if sisu_path_specified_lib \ + && FileTest.file?("#{sisu_path_specified_lib}/#{sisu_lib}/#{lib_filename}.rb") + "#{sisu_path_specified_lib}/#{sisu_lib}" + else sisu_lib + end + end + end + class Configure < Thor + $SiSU_Language_Codes=LanguageCodes.new + lib_filename='sisu_thor_lib' + #p "#{DetermineLibsPath.new.sisu_path_lib}/#{lib_filename}" + require "#{DetermineLibsPath.new.sisu_path_lib}/#{lib_filename}" # sisu_thor_lib.rb + @@source=@@targets=nil + include SiSU_Po4a_Actions + class_option :verbose, :type => :boolean +# rake help clean default distclean make manpage readme rebuild + desc 'po4a', + 'place SiSU translations under po4a management' \ + + 'assist with having sisu markup files managed by po4a' \ + + 'create configuration files, and language directories and' \ + + 'populate them with po4a pot & po files for translation and' \ + + 'from those (as translated) create translated sisu markup' \ + + '.ssm .sst & .ssi files in corresponding language sub-directories' \ + + '*WARNING* creates, destroys, overwrites directories not managed by po4a' + options \ + :help => :boolean, + :clean => :boolean, + #:default => :boolean, + :distclean => :boolean, + :make => :boolean, + :lang_source => :string, + :lang_targets => :array, + :manpage => :boolean, + :readme => :boolean, + :rebuild => :boolean, + :current => :string, + :next => :string, + :stable => :string, + :unstable => :string + def po4a + @@source=source=if options[:lang_source] \ + and not options[:lang_source].empty? + options[:lang_source] + else nil + end + @@targets=targets=if options[:lang_targets] + options[:lang_targets] + else nil + end + language.translation_languages_selected(targets) + language.source_language_selected(source) + if options[:help] + notice.project_help + end + if options[:clean] + notice.default(:clean) + project.clean + end + #if options[:default] + # notice.project_help + #end + if options[:distclean] + notice.default(:distclean) + project.distclean + end + if options[:make] + notice.default(:make) + project.make + end + if options[:manpage] + generate.manpage + end + if options[:readme] + generate.readme + end + if options[:rebuild] + notice.default(:rebuild) + project.distclean + project.make + end + end + end +end +begin + require 'rbconfig' + $called_as,$argv=$0,$* + SiSUconf::Configure.start(ARGV) +rescue +end +__END__ + +** Description: + +** Homepage: + +** Download: + +** Copyright: (C) 2007 - 2015 Ralph Amissah + +** License: + +** Ralph Amissah + Ralph Amissah + +#% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file) -- cgit v1.2.3 From 45d6d69d89fb6a8ad36be13f22c6af0b2a7cbc9a Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 15 Jan 2015 23:38:04 -0500 Subject: d: po4a, initialize either directly with sst or passed through ao * creates source language directory with source markup files (.sst .ssm .ssi) & the po4a.cfg configuration file, then runs po4a to place the markup source under po4a translation management * --po4a-sst uses original sisu markup source as described above * --po4a-ao passes sisu source markup through document abstraction before converting back to a sisu markup source markup equivalent of the original document, it does this in an attempt to get more uniform output, and put footnotes for example if any in a form that is easier to translate --po4a-ao -v --trans-en:fr,es en/live-manual.ssm --po4a-ao -v --trans-en:fr,es en/live-manual.ssm \ es/live-manual.ssm in the latter example also runs sisu marked up "es" document through document abstraction and returns a sisu markup source version of the document, and against this gettext is (or can be run) to (attempt to) have the source and target languages together in the po/es file * all quite rough, will need to be revisited, * these for now replace the renamed --po4a-shelf (formerly --po4a) --- bin/sisu-misc-utils | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/sisu-misc-utils b/bin/sisu-misc-utils index e5be5c09..621d1442 100644 --- a/bin/sisu-misc-utils +++ b/bin/sisu-misc-utils @@ -130,9 +130,9 @@ module SiSUconf end class Configure < Thor $SiSU_Language_Codes=LanguageCodes.new - lib_filename='sisu_thor_lib' - #p "#{DetermineLibsPath.new.sisu_path_lib}/#{lib_filename}" - require "#{DetermineLibsPath.new.sisu_path_lib}/#{lib_filename}" # sisu_thor_lib.rb + paths= DetermineLibsPath.new + #p "#{paths.sisu_path_lib}/#{paths.processing.lib_filename}" + require "#{paths.sisu_path_lib}/#{paths.processing.lib_filename}" # sisu_thor_lib.rb @@source=@@targets=nil include SiSU_Po4a_Actions class_option :verbose, :type => :boolean -- cgit v1.2.3 From 9a05bd6dd052174d5264e9fef9ef2d4fbee1e52b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 19 Mar 2015 17:51:40 -0400 Subject: c&d: misc, largely but not entirely cosmetic --- bin/sisu-misc-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/sisu-misc-utils b/bin/sisu-misc-utils index 621d1442..47d8f32b 100644 --- a/bin/sisu-misc-utils +++ b/bin/sisu-misc-utils @@ -220,7 +220,7 @@ __END__ ** Copyright: (C) 2007 - 2015 Ralph Amissah -** License: +** License: GPL3+ ** Ralph Amissah Ralph Amissah -- cgit v1.2.3 From 906634e9ac9793110f2fd6bd6e215a66c84932cd Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 6 Apr 2015 22:34:28 -0400 Subject: c&d: pass info needed make run better without install --- bin/sisu | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index b5751d66..dc399737 100644 --- a/bin/sisu +++ b/bin/sisu @@ -30,11 +30,11 @@ class Orient @@sisu_called_from_directory ||= Dir.pwd end def sisu_run_from? - if processing.called_as == processing.file_full_path \ - and File.dirname(processing.file_full_path) != RbConfig::CONFIG['bindir'] + if processing.called_as == processing.sisu_runtime_path \ + and File.dirname(processing.sisu_runtime_path) != RbConfig::CONFIG['bindir'] :full_path_to_sisu_bin_in_sisu_dir_tree - elsif processing.file_full_path =~/\/gems\// \ - and processing.file_full_path \ + elsif processing.sisu_runtime_path =~/\/gems\// \ + and processing.sisu_runtime_path \ =~ /\/sisu-[#{version.stable}#{version.unstable}]\.(?:\d+|[a-z])\.(?:\d+|[a-z])\// :gem_install else @@ -51,7 +51,7 @@ class Orient def argv_str argv.inspect end - def file_full_path + def sisu_runtime_path __FILE__ end def stable @@ -116,7 +116,7 @@ class Orient end end elsif sisu_run_from? == :gem_install - case processing.file_full_path + case processing.sisu_runtime_path when processing.stable_gem_regex then processing.current when processing.unstable_gem_regex then processing.next else processing.current @@ -138,7 +138,7 @@ class Orient end end elsif sisu_run_from? == :gem_install - case processing.file_full_path + case processing.sisu_runtime_path when processing.stable_gem_regex then processing.stable when processing.unstable_gem_regex then processing.unstable else processing.stable @@ -205,9 +205,15 @@ class Orient self end def sisu_is - def run_from? + def runtime_path? + sisu_runtime_path + end + def runtime_type? sisu_run_from? end + def called_from? + sisu_called_from_directory + end def branch_name? branch_name_ end @@ -232,8 +238,12 @@ class Orient def language_list_regex? language_list.regex end - def called_from? - sisu_called_from_directory + def runtime? + { + call_path: called_from?, + runtime_path: runtime_path?, + runtime_type: runtime_type?, + } end self end @@ -290,7 +300,7 @@ class Orient Dir.chdir(markup_dir) $sisu_document_markup_directory_base_fixed_path= Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'') - SiSU::HubMaster.new(argv_sub,sisu_called_from_directory) + SiSU::HubMaster.new(argv_sub,sisu_is.runtime?) elsif markup_dir =~/https?:/ markup_file.each do |mf| (FileTest.file?(mf)) \ @@ -301,7 +311,7 @@ class Orient $sisu_document_markup_directory_base_fixed_path= Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'') argv_sub=command_line_modifiers + markup_file - SiSU::HubMaster.new(argv_sub,sisu_called_from_directory) + SiSU::HubMaster.new(argv_sub,sisu_is.runtime?) else p "Error directory specified #{markup_dir} not found" end ensure @@ -313,7 +323,7 @@ class Orient $sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'') $sisu_document_markup_directory_base_fixed_path= Dir.pwd.gsub(/(^|\/)(?:#{language_list.regex})$/,'') - SiSU::HubMaster.new(processing.argv,sisu_called_from_directory) + SiSU::HubMaster.new(processing.argv,sisu_is.runtime?) end rescue ensure -- cgit v1.2.3 From d0ad76e346541c7ed532c49f31d2f671c81eb175 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 12 Apr 2015 15:56:19 -0400 Subject: bin/sisu when run from dir tree, check git describe version info --- bin/sisu | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index dc399737..9bb41736 100644 --- a/bin/sisu +++ b/bin/sisu @@ -163,6 +163,25 @@ class Orient else nil end end + def git_version + if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ + && FileTest.file?('/usr/bin/git') \ + && FileTest.directory?(processing.sisu_runtime_path.gsub(/\/bin\/sisu\S*/,'/.git')) + bin_base=processing.sisu_runtime_path.gsub(/\/bin\/sisu\S*/,'') + pwd=Dir.pwd + Dir.chdir(bin_base) + x=`git describe --long --tags 2>&1`.strip. + gsub(/^[a-z_-]*([0-9.]+)/,'\1'). + gsub(/([^-]*-g)/,'r\1'). + gsub(/-/,'.') + x=(x=~/^[0-9]+\.[0-9]+\.[0-9]+\.r[0-9]+\.g[0-9a-f]{7}/) \ + ? x + : nil + Dir.chdir(pwd) + x + else nil + end + end def sisu_path_base case paths_set when :set_path_system @@ -238,6 +257,9 @@ class Orient def language_list_regex? language_list.regex end + def git_version_info? + git_version + end def runtime? { call_path: called_from?, -- cgit v1.2.3