From 5102422f1417d5f0a4215965dcd18ef6596ab782 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 26 Apr 2011 20:27:52 -0400
Subject: v2 v3: bin/ improved ruby version check
---
bin/sisu_webrick | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
(limited to 'bin/sisu_webrick')
diff --git a/bin/sisu_webrick b/bin/sisu_webrick
index 8f79a51f..4abcaff4 100644
--- a/bin/sisu_webrick
+++ b/bin/sisu_webrick
@@ -2,17 +2,16 @@
# encoding: utf-8
#SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information
begin
- def check_sisu_stable_ruby_version?
- rbv_sisu_stable='1.8.7'
- if RUBY_VERSION < rbv_sisu_stable
- raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}"
- else check_incompatible_ruby_build?
- end
- end
- def check_sisu_dev_ruby_version?
- rbv_sisu_dev='1.9.2'
- if RUBY_VERSION < rbv_sisu_dev
- raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}"
+ def ruby_version_ok?(base_version)
+ @v ||=RUBY_VERSION.scan(/\d+/)
+ vb=base_version.scan(/\d+/)
+ if @v[0] < vb[0] \
+ or @v[0] == vb[0] \
+ && @v[1] < vb[1] \
+ or @v[0] == vb[0] \
+ && @v[1] == vb[1] \
+ && @v[1] < vb[2]
+ raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}"
else check_incompatible_ruby_build?
end
end
@@ -30,6 +29,14 @@ current version #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']}
WOK
end
end
+ def check_sisu_stable_ruby_version?
+ rbv_sisu_stable='1.8.7'
+ ruby_version_ok?(rbv_sisu_stable)
+ end
+ def check_sisu_dev_ruby_version?
+ rbv_sisu_dev='1.9.2'
+ ruby_version_ok?(rbv_sisu_dev)
+ end
$VERBOSE=nil
argv=$*
SiSU_version_dir=case argv.inspect
--
cgit v1.2.3
From 03073b714c0d0821003b0491b4a19c1a67d3a98d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 27 Apr 2011 20:32:05 -0400
Subject: v2 v3: bin/ type fix for ruby version check
---
bin/sisu_webrick | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'bin/sisu_webrick')
diff --git a/bin/sisu_webrick b/bin/sisu_webrick
index 4abcaff4..ca678acd 100644
--- a/bin/sisu_webrick
+++ b/bin/sisu_webrick
@@ -5,12 +5,12 @@ begin
def ruby_version_ok?(base_version)
@v ||=RUBY_VERSION.scan(/\d+/)
vb=base_version.scan(/\d+/)
- if @v[0] < vb[0] \
- or @v[0] == vb[0] \
- && @v[1] < vb[1] \
- or @v[0] == vb[0] \
- && @v[1] == vb[1] \
- && @v[1] < vb[2]
+ 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
--
cgit v1.2.3
From 6a20d40eadbdafa95cf6c77c42d146d05844d1c4 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 4 May 2011 21:24:43 -0400
Subject: v2 v3: bin/ cosmetic
---
bin/sisu_webrick | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'bin/sisu_webrick')
diff --git a/bin/sisu_webrick b/bin/sisu_webrick
index ca678acd..b9ac031a 100644
--- a/bin/sisu_webrick
+++ b/bin/sisu_webrick
@@ -19,7 +19,7 @@ begin
require 'rbconfig'
e=Config::CONFIG
if RUBY_VERSION == '1.9.2' \
- and e['PATCHLEVEL'].to_i < 180
+ && e['PATCHLEVEL'].to_i < 180
raise <<WOK
There are known issues with early versions of ruby1.9.2.
Please, use Ruby 1.9.2p180 or later,
--
cgit v1.2.3