From 804a103722aa7731ca7f2062ee2ebf533607e6aa Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 3 Oct 2012 00:11:08 -0400 Subject: v4: 4.0.0 new branch & version & changelog "opened" --- bin/sisu | 14 +++-- bin/sisu-git | 2 - bin/sisu-po | 2 - bin/sisu-webrick | 2 + bin/sisu2 | 136 ------------------------------------------------ bin/sisu3 | 12 ++--- bin/sisu4 | 134 ++++++++++++++++++++++++++++++++++++++++++++++++ bin/sisu_termsheet | 148 ----------------------------------------------------- bin/sisu_webrick | 135 ------------------------------------------------ 9 files changed, 147 insertions(+), 438 deletions(-) delete mode 100644 bin/sisu-git delete mode 100644 bin/sisu-po create mode 100644 bin/sisu-webrick delete mode 100644 bin/sisu2 create mode 100644 bin/sisu4 delete mode 100644 bin/sisu_termsheet delete mode 100644 bin/sisu_webrick (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index f840f8bb..9d27ad6d 100644 --- a/bin/sisu +++ b/bin/sisu @@ -45,24 +45,22 @@ WOK $KCODE='u' if RUBY_VERSION < '1.9' argv=$* SiSU_version_dir=case argv.inspect - when /"(?:--v2)"/ - check_sisu_legacy_ruby_version? - 'v2' when /"(?:--v3)"/ check_sisu_stable_ruby_version? 'v3' + when /"(?:--v4)"/ + check_sisu_stable_ruby_version? + 'v4' when /"(?:--dev)"/ check_sisu_dev_ruby_version? - 'v3' + 'v4' else check_sisu_stable_ruby_version? - 'v3' + 'v4' end SiSU_lib="sisu/#{SiSU_version_dir}" require "#{SiSU_lib}/hub" - unless SiSU_version_dir == 'v2' - SiSU::HubMaster.new(argv) - end + SiSU::HubMaster.new(argv) rescue STDERR.puts 'ERROR' STDERR.puts $! diff --git a/bin/sisu-git b/bin/sisu-git deleted file mode 100644 index d38b10c5..00000000 --- a/bin/sisu-git +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -sisu -g ${@} diff --git a/bin/sisu-po b/bin/sisu-po deleted file mode 100644 index 9d0d1b95..00000000 --- a/bin/sisu-po +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -sisu --v3 --po4a ${@} diff --git a/bin/sisu-webrick b/bin/sisu-webrick new file mode 100644 index 00000000..75d97238 --- /dev/null +++ b/bin/sisu-webrick @@ -0,0 +1,2 @@ +#!/bin/sh +sisu -W ${@} diff --git a/bin/sisu2 b/bin/sisu2 deleted file mode 100644 index d8aac3dd..00000000 --- a/bin/sisu2 +++ /dev/null @@ -1,136 +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 index f840f8bb..f479fedc 100644 --- a/bin/sisu3 +++ b/bin/sisu3 @@ -45,24 +45,22 @@ WOK $KCODE='u' if RUBY_VERSION < '1.9' argv=$* SiSU_version_dir=case argv.inspect - when /"(?:--v2)"/ - check_sisu_legacy_ruby_version? - 'v2' when /"(?:--v3)"/ check_sisu_stable_ruby_version? 'v3' + when /"(?:--v4)"/ + check_sisu_stable_ruby_version? + 'v4' when /"(?:--dev)"/ check_sisu_dev_ruby_version? - 'v3' + 'v4' else check_sisu_stable_ruby_version? 'v3' end SiSU_lib="sisu/#{SiSU_version_dir}" require "#{SiSU_lib}/hub" - unless SiSU_version_dir == 'v2' - SiSU::HubMaster.new(argv) - end + SiSU::HubMaster.new(argv) rescue STDERR.puts 'ERROR' STDERR.puts $! diff --git a/bin/sisu4 b/bin/sisu4 new file mode 100644 index 00000000..9d27ad6d --- /dev/null +++ b/bin/sisu4 @@ -0,0 +1,134 @@ +#!/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/sisu_termsheet b/bin/sisu_termsheet deleted file mode 100644 index 73aa933e..00000000 --- a/bin/sisu_termsheet +++ /dev/null @@ -1,148 +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 - - - - ** Description: SiSU information Structuring Universe, specialised - pre-processing wrapper - - sisu -t x_bank.and.* - e.g. sisu -t x_bank.and.*.termsheet.rb - e.g. sisu_termsheet.rb -t x_bank.and.c*.termsheet.rb - program calls upon termsheet file with extension termsheet.rb - termsheet.rb calls upon relevant standard form files (to be used) with extension .sForm.rb - there is also a standard_terms.rb file - with terms/details that are constant - the file produced is named after the termsheet.rb with that extension replaced with .er30 - from there scribbler.rb is called upon its usual metaVerse html and pdf creation - ! :-) - to test run - termsheet.rb -f dev.export.import.trade.facility.termsheet.rb - the term sheet calls the standard form or template that is to be run against it. diff --git a/bin/sisu_webrick b/bin/sisu_webrick deleted file mode 100644 index c14ec31e..00000000 --- a/bin/sisu_webrick +++ /dev/null @@ -1,135 +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 - - - - ** Description: webrick share - note sisu by default does not link with file - suffixes, see man pages for options -- cgit v1.2.3