aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2015-05-18 09:55:06 -0400
committerRalph Amissah <ralph@amissah.com>2015-05-18 09:55:06 -0400
commitbd3f4be045e9f1a34b4922e4b4eeb065a1c9191f (patch)
tree170e6aa01e2bf0cab4b47b2b93f0100173d734d1
parentdebian/changelog (7.1.0-1) (diff)
parentversion & changelog, tag for release (diff)
Merge tag 'sisu_7.1.1' into debian/sid
SiSU 7.1.1
-rwxr-xr-xbin/sisu21
-rw-r--r--data/doc/sisu/CHANGELOG_v77
-rw-r--r--data/sisu/version.yml6
-rwxr-xr-xqi5
-rw-r--r--setup/qi_libs.rb17
-rw-r--r--setup/sisu_version.rb2
6 files changed, 38 insertions, 20 deletions
diff --git a/bin/sisu b/bin/sisu
index 6b18e592..7a69dc5d 100755
--- a/bin/sisu
+++ b/bin/sisu
@@ -20,7 +20,7 @@ class Orient
:full_path_to_sisu_bin_in_sisu_dir_tree
elsif processing.sisu_runtime_path =~/\/gems\// \
and processing.sisu_runtime_path \
- =~ /\/sisu-(?:\d+|[a-z])\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
+ =~ /\/#{processing.gem_regex}\//
:gem_install
else
:system_install
@@ -43,7 +43,7 @@ class Orient
%r{\bsisu$}
end
def gem_regex
- %r{\/sisu-(?:\d+|[a-z])\.(?:\d+|[a-z])\.(?:\d+|[a-z])\/}
+ %r{sisu-[0-9]+\.[0-9]+\.[0-9]+(?:\.r[0-9]+\.g[0-9a-f]{7})?}
end
self
end
@@ -109,17 +109,20 @@ class Orient
File.expand_path(processing.called_as).
sub(/\/bin\/sisu$/,'/data/sisu')
when :set_path_gem
- Gem::Specification.find_by_name("sisu").gem_dir + '/data/sisu'
+ Gem::Specification.find_by_name("sisu").gem_dir \
+ + '/data/sisu'
else nil
end
end
def sisu_this_lib
- if processing.sisu_runtime_path =~/\/gems\// \
+ if not Gem::Specification.find_by_name("sisu").nil? \
+ and processing.sisu_runtime_path =~/\/gems\// \
and processing.sisu_runtime_path \
- =~ /\/sisu-(?:\d+|[a-z])\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
+ =~ /\/#{processing.gem_regex}\//
# gem sought
processing.sisu_runtime_path.
- gsub(/\/bin\/sisu[a-z0-7_-]*$/,'/lib/sisu')
+ gsub(/\/bin\/sisu[a-z0-9._-]*$/,
+ '/lib/sisu')
elsif (processing.called_as \
!~ /^#{RbConfig::CONFIG['bindir']}\/sisu$/)
# called off file system, project directory tree
@@ -128,12 +131,12 @@ class Orient
else
# distro installation
sisulib={
- vendorlib: RbConfig::CONFIG['vendordir'] + '/sisu',
+ vendorlib: RbConfig::CONFIG['vendorlibdir'] + '/sisu',
sitelib: RbConfig::CONFIG['sitelibdir'] + '/sisu',
}
- if FileTest.directory?(sisulib[:sitelib]) # Arch Linux; Debian local
+ if FileTest.directory?(sisulib[:sitelib]) # local install
sisulib[:sitelib]
- elsif FileTest.directory?(sisulib[:vendorlib]) # Debian GNU Linux system
+ elsif FileTest.directory?(sisulib[:vendorlib]) # system install
sisulib[:vendorlib]
else 'sisu' # assume lib paths work
end
diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7
index f7568f01..5d15cab7 100644
--- a/data/doc/sisu/CHANGELOG_v7
+++ b/data/doc/sisu/CHANGELOG_v7
@@ -20,6 +20,13 @@ Reverse Chronological:
--- HEAD ---
+* sisu_7.1.1.orig.tar.xz (2015-05-17:19/7)
+ http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.1
+
+ * qi (quick install) gem install git version option
+
+ * bin/sisu, install name check (stable & git versions)
+
* sisu_7.1.0.orig.tar.xz (2015-05-15:19/5)
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.0
diff --git a/data/sisu/version.yml b/data/sisu/version.yml
index dfd82c65..ae875481 100644
--- a/data/sisu/version.yml
+++ b/data/sisu/version.yml
@@ -1,5 +1,5 @@
---
:project: SiSU
-:version: 7.1.0
-:date_stamp: 2015w19/5
-:date: "2015-05-15"
+:version: 7.1.1
+:date_stamp: 2015w19/7
+:date: "2015-05-17"
diff --git a/qi b/qi
index b2956876..24d383b6 100755
--- a/qi
+++ b/qi
@@ -243,7 +243,10 @@ module SiSUconf
if options[:verbose]
end
if options[:install]
- Gemspecs::Current.install_stable
+ version=(options[:git_version_number]) \
+ ? :version_git
+ : :version_standard
+ Gemspecs::Current.install_stable(version)
puts 'installed gem, version: stable' \
if options[:verbose]
end
diff --git a/setup/qi_libs.rb b/setup/qi_libs.rb
index 5f325302..ec069fee 100644
--- a/setup/qi_libs.rb
+++ b/setup/qi_libs.rb
@@ -405,7 +405,7 @@ proceed? }
changelog_arr_current = IO.readlines(fn)
changelog_arr_next=changelog_arr_current.each.map do |line|
if line =~/^\*\s+sisu_[0-9]+\.[0-9]+\.[0-9]+(?:_pre_rel)?\.orig\.tar\.xz \(Open commit window: [0-9]{4}-[0-9]{2}-[0-9]{2}; Pre-Release\)\)$/
- "** sisu_#{vi[:version]}.orig.tar.xz " \
+ "* sisu_#{vi[:version]}.orig.tar.xz " \
+ "(#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})\n"
else line
end
@@ -437,7 +437,7 @@ proceed? }
def self.changelog_header_pre_release(vi)
vn=version_number(vi)
<<-WOK
-* #{vn}.orig.tar.xz (Open commit window: #{vi[:date]}; Pre-Release))
+* sisu_#{vn}.orig.tar.xz (Open commit window: #{vi[:date]}; Pre-Release))
http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vn}
WOK
end
@@ -616,9 +616,9 @@ end
def self.build(fn)
system(%{ gem build #{fn}.gemspec })
end
- def self.install(fn)
+ def self.install(vn)
system(%{
- sudo gem install --local --no-document --verbose #{fn}.gem
+ sudo gem install --local --no-document --verbose sisu-#{vn}.gem
})
end
module Current
@@ -651,8 +651,13 @@ end
def self.build_stable
Gemspecs.build(filename)
end
- def self.install_stable
- Gemspecs.install(filename_stable)
+ def self.install_stable(version=:version_standard)
+ vi=Version_info::Current.setting_stable
+ vn=((version==:version_git) \
+ && (Version_info.version_number_use(vi) != vi[:version_number])) \
+ ? (Version_info.version_number_use(vi))
+ : (vi[:version_number])
+ Gemspecs.install(vn)
end
end
end
diff --git a/setup/sisu_version.rb b/setup/sisu_version.rb
index b1d77053..106089d2 100644
--- a/setup/sisu_version.rb
+++ b/setup/sisu_version.rb
@@ -1,6 +1,6 @@
#% constants
module SiSUversion
- SiSU_version = '7.1.0'
+ SiSU_version = '7.1.1'
end
module Dev
GPGpubKey = '1BB4B289'