From d0ceee3119c6bed619d89ebc2705a1287fa490b5 Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 14 Sep 2015 11:52:55 -0700 Subject: [PATCH 1/6] [remove] unavailable installation instructions --- README.txt | 21 --------------------- doc/users-guide.html | 22 ---------------------- doc/users-guide.txt | 20 -------------------- 3 files changed, 63 deletions(-) diff --git a/README.txt b/README.txt index f2053b5..d714bf1 100644 --- a/README.txt +++ b/README.txt @@ -32,27 +32,6 @@ See doc/users-guide.html for details. $ sudo gem install erubis -* Else install abstract[http://rubyforge.org/projects/abstract/] at first, - and download erubis_X.X.X.tar.bz2 and install it by setup.rb. - - $ tar xjf abstract_X.X.X.tar.bz2 - $ cd abstract_X.X.X/ - $ sudo ruby setup.rb - $ cd .. - $ tar xjf erubis_X.X.X.tar.bz2 - $ cd erubis_X.X.X/ - $ sudo ruby setup.rb - -* (Optional) It is able to merge 'lib/**/*.rb' into 'bin/erubis' by - 'contrib/inline-require' script. - - $ tar xjf erubis_X.X.X.tar.bz2 - $ cd erubis_X.X.X/ - $ cp /tmp/abstract_X.X.X/lib/abstract.rb lib - $ unset RUBYLIB - $ contrib/inline-require -I lib bin/erubis > contrib/erubis - - == Ruby on Rails Support diff --git a/doc/users-guide.html b/doc/users-guide.html index 53d4b62..071ca94 100644 --- a/doc/users-guide.html +++ b/doc/users-guide.html @@ -209,28 +209,6 @@

Installation

- -
diff --git a/doc/users-guide.txt b/doc/users-guide.txt index f1d61bb..57e19d2 100644 --- a/doc/users-guide.txt +++ b/doc/users-guide.txt @@ -55,18 +55,6 @@ Erubis now supports Ruby 1.9. $ sudo gem install --remote erubis .==================== -.* Else install {{}} at first, - and download erubis_X.X.X.tar.bz2 and install it by setup.rb. - .==================== - $ tar xjf abstract_X.X.X.tar.bz2 - $ cd abstract_X.X.X/ - $ sudo ruby setup.rb - $ cd .. - $ tar xjf erubis_X.X.X.tar.bz2 - $ cd erubis_X.X.X/ - $ sudo ruby setup.rb - .==================== - .#.* Or if you can be root user, download erubis_X.X.X.tar.bz2 and install by setup.rb. .# .==================== .# $ tar xjf erubis-X.X.X.tar.bz2 @@ -85,14 +73,6 @@ Erubis now supports Ruby 1.9. .# $ cp bin/erubis /usr/local/bin .# .==================== -.* (Optional) 'contrib/inline-require' enables you to merge 'lib/**/*.rb' into 'bin/erubis'. - .==================== - $ tar xjf erubis_X.X.X.tar.bz2 - $ cd erubis_X.X.X/ - $ unset RUBYLIB - $ contrib/inline-require -I lib bin/erubis > contrib/erubis - .==================== - .$ Tutorial | tutorial From e97553a13da8491f5ce759b42122a913c3d0f55d Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 14 Sep 2015 11:53:05 -0700 Subject: [PATCH 2/6] [remove] rubyforge project from gemspec --- erubis.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/erubis.gemspec b/erubis.gemspec index c9530bb..23bfc48 100644 --- a/erubis.gemspec +++ b/erubis.gemspec @@ -16,7 +16,6 @@ spec = Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.homepage = "http://www.kuwata-lab.com/erubis/" s.summary = "a fast and extensible eRuby implementation which supports multi-language" - s.rubyforge_project = 'erubis' s.description = <<-'END' Erubis is an implementation of eRuby and has the following features: From 6d494d26132e57fc8fb37437e5853535cd5c01e8 Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 14 Sep 2015 11:54:52 -0700 Subject: [PATCH 3/6] [remove] setup.rb; use gem instead --- Rookbook.yaml | 2 +- doc/users-guide.txt | 10 - erubis.gemspec | 2 +- setup.rb | 1331 ------------------------------------------- 4 files changed, 2 insertions(+), 1343 deletions(-) delete mode 100644 setup.rb diff --git a/Rookbook.yaml b/Rookbook.yaml index 39d1e06..2c5ca16 100644 --- a/Rookbook.yaml +++ b/Rookbook.yaml @@ -10,7 +10,7 @@ properties: parameters: - project : erubis - - text_files : [CHANGES.txt, README.txt, MIT-LICENSE, setup.rb, erubis.gemspec] + - text_files : [CHANGES.txt, README.txt, MIT-LICENSE, erubis.gemspec] - guide : doc/users-guide.html - doc_files : [$(guide), doc/docstyle.css] - apidocdir : doc-api diff --git a/doc/users-guide.txt b/doc/users-guide.txt index 57e19d2..ba89bc4 100644 --- a/doc/users-guide.txt +++ b/doc/users-guide.txt @@ -55,16 +55,6 @@ Erubis now supports Ruby 1.9. $ sudo gem install --remote erubis .==================== -.#.* Or if you can be root user, download erubis_X.X.X.tar.bz2 and install by setup.rb. -.# .==================== -.# $ tar xjf erubis-X.X.X.tar.bz2 -.# $ cd erubis_X.X.X/ -.# $ ruby setup.rb -.# .#$ ruby setup.rb config -.# .#$ ruby setup.rb setup -.# .#$ sudo ruby setup.rb install -.# .==================== -.# .#.* Else you should copy 'lib/erubis.rb', 'lib/erubis/', and 'bin/erubis' into proper directory manually. .# .==================== .# $ tar xjf erubis-X.X.X.tar.bz2 diff --git a/erubis.gemspec b/erubis.gemspec index 23bfc48..dd060db 100644 --- a/erubis.gemspec +++ b/erubis.gemspec @@ -38,7 +38,7 @@ spec = Gem::Specification.new do |s| files += Dir.glob('examples/**/*') files += Dir.glob('test/**/*') files += Dir.glob('doc/**/*') - files += %w[README.txt CHANGES.txt MIT-LICENSE setup.rb] + files += %w[README.txt CHANGES.txt MIT-LICENSE] files += Dir.glob('contrib/**/*') files += Dir.glob('benchmark/**/*') files += Dir.glob('doc-api/**/*') diff --git a/setup.rb b/setup.rb deleted file mode 100644 index f1c9d9a..0000000 --- a/setup.rb +++ /dev/null @@ -1,1331 +0,0 @@ -# -# setup.rb -# -# Copyright (c) 2000-2004 Minero Aoki -# -# This program is free software. -# You can distribute/modify this program under the terms of -# the GNU Lesser General Public License version 2.1. -# - -# -# For backward compatibility -# - -unless Enumerable.method_defined?(:map) - module Enumerable - alias map collect - end -end - -unless Enumerable.method_defined?(:detect) - module Enumerable - alias detect find - end -end - -unless Enumerable.method_defined?(:select) - module Enumerable - alias select find_all - end -end - -unless Enumerable.method_defined?(:reject) - module Enumerable - def reject - result = [] - each do |i| - result.push i unless yield(i) - end - result - end - end -end - -unless Enumerable.method_defined?(:inject) - module Enumerable - def inject(result) - each do |i| - result = yield(result, i) - end - result - end - end -end - -unless Enumerable.method_defined?(:any?) - module Enumerable - def any? - each do |i| - return true if yield(i) - end - false - end - end -end - -unless File.respond_to?(:read) - def File.read(fname) - open(fname) {|f| - return f.read - } - end -end - -# -# Application independent utilities -# - -def File.binread(fname) - open(fname, 'rb') {|f| - return f.read - } -end - -# for corrupted windows stat(2) -def File.dir?(path) - File.directory?((path[-1,1] == '/') ? path : path + '/') -end - -# -# Config -# - -if arg = ARGV.detect{|arg| /\A--rbconfig=/ =~ arg } - ARGV.delete(arg) - require arg.split(/=/, 2)[1] - $".push 'rbconfig.rb' -else - require 'rbconfig' -end - -def multipackage_install? - FileTest.directory?(File.dirname($0) + '/packages') -end - - -class ConfigTable - - c = ::Config::CONFIG - - rubypath = c['bindir'] + '/' + c['ruby_install_name'] - - major = c['MAJOR'].to_i - minor = c['MINOR'].to_i - teeny = c['TEENY'].to_i - version = "#{major}.#{minor}" - - # ruby ver. >= 1.4.4? - newpath_p = ((major >= 2) or - ((major == 1) and - ((minor >= 5) or - ((minor == 4) and (teeny >= 4))))) - - subprefix = lambda {|path| - path.sub(/\A#{Regexp.quote(c['prefix'])}/o, '$prefix') - } - - if c['rubylibdir'] - # V < 1.6.3 - stdruby = subprefix.call(c['rubylibdir']) - siteruby = subprefix.call(c['sitedir']) - versite = subprefix.call(c['sitelibdir']) - sodir = subprefix.call(c['sitearchdir']) - elsif newpath_p - # 1.4.4 <= V <= 1.6.3 - stdruby = "$prefix/lib/ruby/#{version}" - siteruby = subprefix.call(c['sitedir']) - versite = siteruby + '/' + version - sodir = "$site-ruby/#{c['arch']}" - else - # V < 1.4.4 - stdruby = "$prefix/lib/ruby/#{version}" - siteruby = "$prefix/lib/ruby/#{version}/site_ruby" - versite = siteruby - sodir = "$site-ruby/#{c['arch']}" - end - - if arg = c['configure_args'].split.detect {|arg| /--with-make-prog=/ =~ arg } - makeprog = arg.sub(/'/, '').split(/=/, 2)[1] - else - makeprog = 'make' - end - - common_descripters = [ - [ 'prefix', [ c['prefix'], - 'path', - 'path prefix of target environment' ] ], - [ 'std-ruby', [ stdruby, - 'path', - 'the directory for standard ruby libraries' ] ], - [ 'site-ruby-common', [ siteruby, - 'path', - 'the directory for version-independent non-standard ruby libraries' ] ], - [ 'site-ruby', [ versite, - 'path', - 'the directory for non-standard ruby libraries' ] ], - [ 'bin-dir', [ '$prefix/bin', - 'path', - 'the directory for commands' ] ], - [ 'rb-dir', [ '$site-ruby', - 'path', - 'the directory for ruby scripts' ] ], - [ 'so-dir', [ sodir, - 'path', - 'the directory for ruby extentions' ] ], - [ 'data-dir', [ '$prefix/share', - 'path', - 'the directory for shared data' ] ], - [ 'ruby-path', [ rubypath, - 'path', - 'path to set to #! line' ] ], - [ 'ruby-prog', [ rubypath, - 'name', - 'the ruby program using for installation' ] ], - [ 'make-prog', [ makeprog, - 'name', - 'the make program to compile ruby extentions' ] ], - [ 'without-ext', [ 'no', - 'yes/no', - 'does not compile/install ruby extentions' ] ] - ] - multipackage_descripters = [ - [ 'with', [ '', - 'name,name...', - 'package names that you want to install', - 'ALL' ] ], - [ 'without', [ '', - 'name,name...', - 'package names that you do not want to install', - 'NONE' ] ] - ] - if multipackage_install? - DESCRIPTER = common_descripters + multipackage_descripters - else - DESCRIPTER = common_descripters - end - - SAVE_FILE = 'config.save' - - def ConfigTable.each_name(&block) - keys().each(&block) - end - - def ConfigTable.keys - DESCRIPTER.map {|name, *dummy| name } - end - - def ConfigTable.each_definition(&block) - DESCRIPTER.each(&block) - end - - def ConfigTable.get_entry(name) - name, ent = DESCRIPTER.assoc(name) - ent - end - - def ConfigTable.get_entry!(name) - get_entry(name) or raise ArgumentError, "no such config: #{name}" - end - - def ConfigTable.add_entry(name, vals) - ConfigTable::DESCRIPTER.push [name,vals] - end - - def ConfigTable.remove_entry(name) - get_entry(name) or raise ArgumentError, "no such config: #{name}" - DESCRIPTER.delete_if {|n, arr| n == name } - end - - def ConfigTable.config_key?(name) - get_entry(name) ? true : false - end - - def ConfigTable.bool_config?(name) - ent = get_entry(name) or return false - ent[1] == 'yes/no' - end - - def ConfigTable.value_config?(name) - ent = get_entry(name) or return false - ent[1] != 'yes/no' - end - - def ConfigTable.path_config?(name) - ent = get_entry(name) or return false - ent[1] == 'path' - end - - - class << self - alias newobj new - end - - def ConfigTable.new - c = newobj() - c.initialize_from_table - c - end - - def ConfigTable.load - c = newobj() - c.initialize_from_file - c - end - - def initialize_from_table - @table = {} - DESCRIPTER.each do |k, (default, vname, desc, default2)| - @table[k] = default - end - end - - def initialize_from_file - raise InstallError, "#{File.basename $0} config first"\ - unless File.file?(SAVE_FILE) - @table = {} - File.foreach(SAVE_FILE) do |line| - k, v = line.split(/=/, 2) - @table[k] = v.strip - end - end - - def save - File.open(SAVE_FILE, 'w') {|f| - @table.each do |k, v| - f.printf "%s=%s\n", k, v if v - end - } - end - - def []=(k, v) - raise InstallError, "unknown config option #{k}"\ - unless ConfigTable.config_key?(k) - @table[k] = v - end - - def [](key) - return nil unless @table[key] - @table[key].gsub(%r<\$([^/]+)>) { self[$1] } - end - - def set_raw(key, val) - @table[key] = val - end - - def get_raw(key) - @table[key] - end - -end - - -module MetaConfigAPI - - def eval_file_ifexist(fname) - instance_eval File.read(fname), fname, 1 if File.file?(fname) - end - - def config_names - ConfigTable.keys - end - - def config?(name) - ConfigTable.config_key?(name) - end - - def bool_config?(name) - ConfigTable.bool_config?(name) - end - - def value_config?(name) - ConfigTable.value_config?(name) - end - - def path_config?(name) - ConfigTable.path_config?(name) - end - - def add_config(name, argname, default, desc) - ConfigTable.add_entry name,[default,argname,desc] - end - - def add_path_config(name, default, desc) - add_config name, 'path', default, desc - end - - def add_bool_config(name, default, desc) - add_config name, 'yes/no', default ? 'yes' : 'no', desc - end - - def set_config_default(name, default) - if bool_config?(name) - ConfigTable.get_entry!(name)[0] = (default ? 'yes' : 'no') - else - ConfigTable.get_entry!(name)[0] = default - end - end - - def remove_config(name) - ent = ConfigTable.get_entry(name) - ConfigTable.remove_entry name - ent - end - -end - -# -# File Operations -# - -module FileOperations - - def mkdir_p(dirname, prefix = nil) - dirname = prefix + dirname if prefix - $stderr.puts "mkdir -p #{dirname}" if verbose? - return if no_harm? - - # does not check '/'... it's too abnormal case - dirs = dirname.split(%r<(?=/)>) - if /\A[a-z]:\z/i =~ dirs[0] - disk = dirs.shift - dirs[0] = disk + dirs[0] - end - dirs.each_index do |idx| - path = dirs[0..idx].join('') - Dir.mkdir path unless File.dir?(path) - end - end - - def rm_f(fname) - $stderr.puts "rm -f #{fname}" if verbose? - return if no_harm? - - if File.exist?(fname) or File.symlink?(fname) - File.chmod 0777, fname - File.unlink fname - end - end - - def rm_rf(dn) - $stderr.puts "rm -rf #{dn}" if verbose? - return if no_harm? - - Dir.chdir dn - Dir.foreach('.') do |fn| - next if fn == '.' - next if fn == '..' - if File.dir?(fn) - verbose_off { - rm_rf fn - } - else - verbose_off { - rm_f fn - } - end - end - Dir.chdir '..' - Dir.rmdir dn - end - - def move_file(src, dest) - File.unlink dest if File.exist?(dest) - begin - File.rename src, dest - rescue - File.open(dest, 'wb') {|f| f.write File.binread(src) } - File.chmod File.stat(src).mode, dest - File.unlink src - end - end - - def install(from, dest, mode, prefix = nil) - $stderr.puts "install #{from} #{dest}" if verbose? - return if no_harm? - - realdest = prefix + dest if prefix - realdest = File.join(realdest, File.basename(from)) if File.dir?(realdest) - str = File.binread(from) - if diff?(str, realdest) - verbose_off { - rm_f realdest if File.exist?(realdest) - } - File.open(realdest, 'wb') {|f| - f.write str - } - File.chmod mode, realdest - - File.open("#{objdir_root()}/InstalledFiles", 'a') {|f| - if prefix - f.puts realdest.sub(prefix, '') - else - f.puts realdest - end - } - end - end - - def diff?(new_content, path) - return true unless File.exist?(path) - new_content != File.binread(path) - end - - def command(str) - $stderr.puts str if verbose? - system str or raise RuntimeError, "'system #{str}' failed" - end - - def ruby(str) - command config('ruby-prog') + ' ' + str - end - - def make(task = '') - command config('make-prog') + ' ' + task - end - - def extdir?(dir) - File.exist?(dir + '/MANIFEST') - end - - def all_files_in(dirname) - Dir.open(dirname) {|d| - return d.select {|ent| File.file?("#{dirname}/#{ent}") } - } - end - - REJECT_DIRS = %w( - CVS SCCS RCS CVS.adm - ) - - def all_dirs_in(dirname) - Dir.open(dirname) {|d| - return d.select {|n| File.dir?("#{dirname}/#{n}") } - %w(. ..) - REJECT_DIRS - } - end - -end - -# -# Main Installer -# - -class InstallError < StandardError; end - - -module HookUtils - - def run_hook(name) - try_run_hook "#{curr_srcdir()}/#{name}" or - try_run_hook "#{curr_srcdir()}/#{name}.rb" - end - - def try_run_hook(fname) - return false unless File.file?(fname) - begin - instance_eval File.read(fname), fname, 1 - rescue - raise InstallError, "hook #{fname} failed:\n" + $!.message - end - true - end - -end - - -module HookScriptAPI - - def get_config(key) - @config[key] - end - - alias config get_config - - def set_config(key, val) - @config[key] = val - end - - # - # srcdir/objdir (works only in the package directory) - # - - #abstract srcdir_root - #abstract objdir_root - #abstract relpath - - def curr_srcdir - "#{srcdir_root()}/#{relpath()}" - end - - def curr_objdir - "#{objdir_root()}/#{relpath()}" - end - - def srcfile(path) - "#{curr_srcdir()}/#{path}" - end - - def srcexist?(path) - File.exist?(srcfile(path)) - end - - def srcdirectory?(path) - File.dir?(srcfile(path)) - end - - def srcfile?(path) - File.file? srcfile(path) - end - - def srcentries(path = '.') - Dir.open("#{curr_srcdir()}/#{path}") {|d| - return d.to_a - %w(. ..) - } - end - - def srcfiles(path = '.') - srcentries(path).select {|fname| - File.file?(File.join(curr_srcdir(), path, fname)) - } - end - - def srcdirectories(path = '.') - srcentries(path).select {|fname| - File.dir?(File.join(curr_srcdir(), path, fname)) - } - end - -end - - -class ToplevelInstaller - - Version = '3.2.4' - Copyright = 'Copyright (c) 2000-2004 Minero Aoki' - - TASKS = [ - [ 'config', 'saves your configurations' ], - [ 'show', 'shows current configuration' ], - [ 'setup', 'compiles ruby extentions and others' ], - [ 'install', 'installs files' ], - [ 'clean', "does `make clean' for each extention" ], - [ 'distclean',"does `make distclean' for each extention" ] - ] - - def ToplevelInstaller.invoke - instance().invoke - end - - @singleton = nil - - def ToplevelInstaller.instance - @singleton ||= new(File.dirname($0)) - @singleton - end - - include MetaConfigAPI - - def initialize(ardir_root) - @config = nil - @options = { 'verbose' => true } - @ardir = File.expand_path(ardir_root) - end - - def inspect - "#<#{self.class} #{__id__()}>" - end - - def invoke - run_metaconfigs - task = parsearg_global() - @config = load_config(task) - __send__ "parsearg_#{task}" - init_installers - __send__ "exec_#{task}" - end - - def run_metaconfigs - eval_file_ifexist "#{@ardir}/metaconfig" - end - - def load_config(task) - case task - when 'config' - ConfigTable.new - when 'clean', 'distclean' - if File.exist?('config.save') - then ConfigTable.load - else ConfigTable.new - end - else - ConfigTable.load - end - end - - def init_installers - @installer = Installer.new(@config, @options, @ardir, File.expand_path('.')) - end - - # - # Hook Script API bases - # - - def srcdir_root - @ardir - end - - def objdir_root - '.' - end - - def relpath - '.' - end - - # - # Option Parsing - # - - def parsearg_global - valid_task = /\A(?:#{TASKS.map {|task,desc| task }.join '|'})\z/ - - while arg = ARGV.shift - case arg - when /\A\w+\z/ - raise InstallError, "invalid task: #{arg}" unless valid_task =~ arg - return arg - - when '-q', '--quiet' - @options['verbose'] = false - - when '--verbose' - @options['verbose'] = true - - when '-h', '--help' - print_usage $stdout - exit 0 - - when '-v', '--version' - puts "#{File.basename($0)} version #{Version}" - exit 0 - - when '--copyright' - puts Copyright - exit 0 - - else - raise InstallError, "unknown global option '#{arg}'" - end - end - - raise InstallError, <" - out.puts " ruby #{File.basename $0} [] []" - - fmt = " %-20s %s\n" - out.puts - out.puts 'Global options:' - out.printf fmt, '-q,--quiet', 'suppress message outputs' - out.printf fmt, ' --verbose', 'output messages verbosely' - out.printf fmt, '-h,--help', 'print this message' - out.printf fmt, '-v,--version', 'print version and quit' - out.printf fmt, ' --copyright', 'print copyright and quit' - - out.puts - out.puts 'Tasks:' - TASKS.each do |name, desc| - out.printf " %-10s %s\n", name, desc - end - - out.puts - out.puts 'Options for config:' - ConfigTable.each_definition do |name, (default, arg, desc, default2)| - out.printf " %-20s %s [%s]\n", - '--'+ name + (ConfigTable.bool_config?(name) ? '' : '='+arg), - desc, - default2 || default - end - out.printf " %-20s %s [%s]\n", - '--rbconfig=path', 'your rbconfig.rb to load', "running ruby's" - - out.puts - out.puts 'Options for install:' - out.printf " %-20s %s [%s]\n", - '--no-harm', 'only display what to do if given', 'off' - out.printf " %-20s %s [%s]\n", - '--prefix', 'install path prefix', '$prefix' - - out.puts - end - - # - # Task Handlers - # - - def exec_config - @installer.exec_config - @config.save # must be final - end - - def exec_setup - @installer.exec_setup - end - - def exec_install - @installer.exec_install - end - - def exec_show - ConfigTable.each_name do |k| - v = @config.get_raw(k) - if not v or v.empty? - v = '(not specified)' - end - printf "%-10s %s\n", k, v - end - end - - def exec_clean - @installer.exec_clean - end - - def exec_distclean - @installer.exec_distclean - end - -end - - -class ToplevelInstallerMulti < ToplevelInstaller - - include HookUtils - include HookScriptAPI - include FileOperations - - def initialize(ardir) - super - @packages = all_dirs_in("#{@ardir}/packages") - raise 'no package exists' if @packages.empty? - end - - def run_metaconfigs - eval_file_ifexist "#{@ardir}/metaconfig" - @packages.each do |name| - eval_file_ifexist "#{@ardir}/packages/#{name}/metaconfig" - end - end - - def init_installers - @installers = {} - @packages.each do |pack| - @installers[pack] = Installer.new(@config, @options, - "#{@ardir}/packages/#{pack}", - "packages/#{pack}") - end - - with = extract_selection(config('with')) - without = extract_selection(config('without')) - @selected = @installers.keys.select {|name| - (with.empty? or with.include?(name)) \ - and not without.include?(name) - } - end - - def extract_selection(list) - a = list.split(/,/) - a.each do |name| - raise InstallError, "no such package: #{name}" \ - unless @installers.key?(name) - end - a - end - - def print_usage(f) - super - f.puts 'Inluded packages:' - f.puts ' ' + @packages.sort.join(' ') - f.puts - end - - # - # multi-package metaconfig API - # - - attr_reader :packages - - def declare_packages(list) - raise 'package list is empty' if list.empty? - list.each do |name| - raise "directory packages/#{name} does not exist"\ - unless File.dir?("#{@ardir}/packages/#{name}") - end - @packages = list - end - - # - # Task Handlers - # - - def exec_config - run_hook 'pre-config' - each_selected_installers {|inst| inst.exec_config } - run_hook 'post-config' - @config.save # must be final - end - - def exec_setup - run_hook 'pre-setup' - each_selected_installers {|inst| inst.exec_setup } - run_hook 'post-setup' - end - - def exec_install - run_hook 'pre-install' - each_selected_installers {|inst| inst.exec_install } - run_hook 'post-install' - end - - def exec_clean - rm_f 'config.save' - run_hook 'pre-clean' - each_selected_installers {|inst| inst.exec_clean } - run_hook 'post-clean' - end - - def exec_distclean - rm_f 'config.save' - run_hook 'pre-distclean' - each_selected_installers {|inst| inst.exec_distclean } - run_hook 'post-distclean' - end - - # - # lib - # - - def each_selected_installers - Dir.mkdir 'packages' unless File.dir?('packages') - @selected.each do |pack| - $stderr.puts "Processing the package `#{pack}' ..." if @options['verbose'] - Dir.mkdir "packages/#{pack}" unless File.dir?("packages/#{pack}") - Dir.chdir "packages/#{pack}" - yield @installers[pack] - Dir.chdir '../..' - end - end - - def verbose? - @options['verbose'] - end - - def no_harm? - @options['no-harm'] - end - -end - - -class Installer - - FILETYPES = %w( bin lib ext data ) - - include HookScriptAPI - include HookUtils - include FileOperations - - def initialize(config, opt, srcroot, objroot) - @config = config - @options = opt - @srcdir = File.expand_path(srcroot) - @objdir = File.expand_path(objroot) - @currdir = '.' - end - - def inspect - "#<#{self.class} #{File.basename(@srcdir)}>" - end - - # - # Hook Script API bases - # - - def srcdir_root - @srcdir - end - - def objdir_root - @objdir - end - - def relpath - @currdir - end - - # - # configs/options - # - - def no_harm? - @options['no-harm'] - end - - def verbose? - @options['verbose'] - end - - def verbose_off - begin - save, @options['verbose'] = @options['verbose'], false - yield - ensure - @options['verbose'] = save - end - end - - # - # TASK config - # - - def exec_config - exec_task_traverse 'config' - end - - def config_dir_bin(rel) - end - - def config_dir_lib(rel) - end - - def config_dir_ext(rel) - extconf if extdir?(curr_srcdir()) - end - - def extconf - opt = @options['config-opt'].join(' ') - command "#{config('ruby-prog')} #{curr_srcdir()}/extconf.rb #{opt}" - end - - def config_dir_data(rel) - end - - # - # TASK setup - # - - def exec_setup - exec_task_traverse 'setup' - end - - def setup_dir_bin(rel) - all_files_in(curr_srcdir()).each do |fname| - adjust_shebang "#{curr_srcdir()}/#{fname}" - end - end - - # modify: #!/usr/bin/ruby - # modify: #! /usr/bin/ruby - # modify: #!ruby - # not modify: #!/usr/bin/env ruby - SHEBANG_RE = /\A\#!\s*\S*ruby\S*/ - - def adjust_shebang(path) - return if no_harm? - - tmpfile = File.basename(path) + '.tmp' - begin - File.open(path, 'rb') {|r| - File.open(tmpfile, 'wb') {|w| - first = r.gets - return unless SHEBANG_RE =~ first - - $stderr.puts "adjusting shebang: #{File.basename path}" if verbose? - w.print first.sub(SHEBANG_RE, '#!' + config('ruby-path')) - w.write r.read - } - } - move_file tmpfile, File.basename(path) - ensure - File.unlink tmpfile if File.exist?(tmpfile) - end - end - - def setup_dir_lib(rel) - end - - def setup_dir_ext(rel) - make if extdir?(curr_srcdir()) - end - - def setup_dir_data(rel) - end - - # - # TASK install - # - - def exec_install - exec_task_traverse 'install' - end - - def install_dir_bin(rel) - install_files collect_filenames_auto(), "#{config('bin-dir')}/#{rel}", 0755 - end - - def install_dir_lib(rel) - install_files ruby_scripts(), "#{config('rb-dir')}/#{rel}", 0644 - end - - def install_dir_ext(rel) - return unless extdir?(curr_srcdir()) - install_files ruby_extentions('.'), - "#{config('so-dir')}/#{File.dirname(rel)}", - 0555 - end - - def install_dir_data(rel) - install_files collect_filenames_auto(), "#{config('data-dir')}/#{rel}", 0644 - end - - def install_files(list, dest, mode) - mkdir_p dest, @options['install-prefix'] - list.each do |fname| - install fname, dest, mode, @options['install-prefix'] - end - end - - def ruby_scripts - collect_filenames_auto().select {|n| /\.rb\z/ =~ n } - end - - # picked up many entries from cvs-1.11.1/src/ignore.c - reject_patterns = %w( - core RCSLOG tags TAGS .make.state - .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb - *~ *.old *.bak *.BAK *.orig *.rej _$* *$ - - *.org *.in .* - ) - mapping = { - '.' => '\.', - '$' => '\$', - '#' => '\#', - '*' => '.*' - } - REJECT_PATTERNS = Regexp.new('\A(?:' + - reject_patterns.map {|pat| - pat.gsub(/[\.\$\#\*]/) {|ch| mapping[ch] } - }.join('|') + - ')\z') - - def collect_filenames_auto - mapdir((existfiles() - hookfiles()).reject {|fname| - REJECT_PATTERNS =~ fname - }) - end - - def existfiles - all_files_in(curr_srcdir()) | all_files_in('.') - end - - def hookfiles - %w( pre-%s post-%s pre-%s.rb post-%s.rb ).map {|fmt| - %w( config setup install clean ).map {|t| sprintf(fmt, t) } - }.flatten - end - - def mapdir(filelist) - filelist.map {|fname| - if File.exist?(fname) # objdir - fname - else # srcdir - File.join(curr_srcdir(), fname) - end - } - end - - def ruby_extentions(dir) - _ruby_extentions(dir) or - raise InstallError, "no ruby extention exists: 'ruby #{$0} setup' first" - end - - DLEXT = /\.#{ ::Config::CONFIG['DLEXT'] }\z/ - - def _ruby_extentions(dir) - Dir.open(dir) {|d| - return d.select {|fname| DLEXT =~ fname } - } - end - - # - # TASK clean - # - - def exec_clean - exec_task_traverse 'clean' - rm_f 'config.save' - rm_f 'InstalledFiles' - end - - def clean_dir_bin(rel) - end - - def clean_dir_lib(rel) - end - - def clean_dir_ext(rel) - return unless extdir?(curr_srcdir()) - make 'clean' if File.file?('Makefile') - end - - def clean_dir_data(rel) - end - - # - # TASK distclean - # - - def exec_distclean - exec_task_traverse 'distclean' - rm_f 'config.save' - rm_f 'InstalledFiles' - end - - def distclean_dir_bin(rel) - end - - def distclean_dir_lib(rel) - end - - def distclean_dir_ext(rel) - return unless extdir?(curr_srcdir()) - make 'distclean' if File.file?('Makefile') - end - - # - # lib - # - - def exec_task_traverse(task) - run_hook "pre-#{task}" - FILETYPES.each do |type| - if config('without-ext') == 'yes' and type == 'ext' - $stderr.puts 'skipping ext/* by user option' if verbose? - next - end - traverse task, type, "#{task}_dir_#{type}" - end - run_hook "post-#{task}" - end - - def traverse(task, rel, mid) - dive_into(rel) { - run_hook "pre-#{task}" - __send__ mid, rel.sub(%r[\A.*?(?:/|\z)], '') - all_dirs_in(curr_srcdir()).each do |d| - traverse task, "#{rel}/#{d}", mid - end - run_hook "post-#{task}" - } - end - - def dive_into(rel) - return unless File.dir?("#{@srcdir}/#{rel}") - - dir = File.basename(rel) - Dir.mkdir dir unless File.dir?(dir) - prevdir = Dir.pwd - Dir.chdir dir - $stderr.puts '---> ' + rel if verbose? - @currdir = rel - yield - Dir.chdir prevdir - $stderr.puts '<--- ' + rel if verbose? - @currdir = File.dirname(rel) - end - -end - - -if $0 == __FILE__ - begin - if multipackage_install? - ToplevelInstallerMulti.invoke - else - ToplevelInstaller.invoke - end - rescue - raise if $DEBUG - $stderr.puts $!.message - $stderr.puts "Try 'ruby #{$0} --help' for detailed usage." - exit 1 - end -end From 0849beebca4bd55ab912a7351f8f4597f1da090f Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 14 Sep 2015 12:10:59 -0700 Subject: [PATCH 4/6] [change] replace $Copyright$ --- CHANGES.txt | 2 +- MIT-LICENSE | 2 +- README.txt | 2 +- benchmark/bench.rb | 2 +- bin/erubis | 2 +- erubis.gemspec | 2 +- lib/erubis.rb | 2 +- lib/erubis/context.rb | 2 +- lib/erubis/converter.rb | 2 +- lib/erubis/engine.rb | 2 +- lib/erubis/engine/ec.rb | 2 +- lib/erubis/engine/ecpp.rb | 2 +- lib/erubis/engine/ejava.rb | 2 +- lib/erubis/engine/ejavascript.rb | 2 +- lib/erubis/engine/enhanced.rb | 2 +- lib/erubis/engine/eperl.rb | 2 +- lib/erubis/engine/ephp.rb | 2 +- lib/erubis/engine/eruby.rb | 2 +- lib/erubis/engine/escheme.rb | 2 +- lib/erubis/engine/optimized.rb | 2 +- lib/erubis/enhancer.rb | 2 +- lib/erubis/error.rb | 2 +- lib/erubis/evaluator.rb | 2 +- lib/erubis/generator.rb | 2 +- lib/erubis/helper.rb | 2 +- lib/erubis/helpers/rails_form_helper.rb | 2 +- lib/erubis/helpers/rails_helper.rb | 2 +- lib/erubis/local-setting.rb | 2 +- lib/erubis/main.rb | 2 +- lib/erubis/preprocessing.rb | 2 +- lib/erubis/tiny.rb | 2 +- lib/erubis/util.rb | 2 +- test/assert-text-equal.rb | 2 +- test/test-engines.rb | 2 +- test/test-enhancers.rb | 2 +- test/test-erubis.rb | 2 +- test/test-index-cgi.rb | 2 +- test/test-users-guide.rb | 2 +- test/test.rb | 2 +- test/testutil.rb | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 7b100a2..1d774b0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # $Release:$ -# $Copyright$ +# copyright(c) 2006-2011 kuwata-lab.com all rights reserved. - release: 2.7.0 date: 2011-04-01 diff --git a/MIT-LICENSE b/MIT-LICENSE index 3596db9..c0e8bda 100644 --- a/MIT-LICENSE +++ b/MIT-LICENSE @@ -1,4 +1,4 @@ -$Copyright$ +copyright(c) 2006-2011 kuwata-lab.com all rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.txt b/README.txt index d714bf1..634b475 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ = README release:: $Release$ -copyright:: $Copyright$ +copyright:: copyright(c) 2006-2011 kuwata-lab.com all rights reserved. diff --git a/benchmark/bench.rb b/benchmark/bench.rb index 3600001..1f612ed 100644 --- a/benchmark/bench.rb +++ b/benchmark/bench.rb @@ -2,7 +2,7 @@ ### ### $Release:$ -### $Copyright$ +### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### require 'erb' diff --git a/bin/erubis b/bin/erubis index b918ceb..35e18fd 100755 --- a/bin/erubis +++ b/bin/erubis @@ -2,7 +2,7 @@ ### ### $Release:$ -### $Copyright$ +### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### require 'erubis/main' diff --git a/erubis.gemspec b/erubis.gemspec index dd060db..a0f94e9 100644 --- a/erubis.gemspec +++ b/erubis.gemspec @@ -2,7 +2,7 @@ ### ### $Release: $ -### $Copyright$ +### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### require 'rubygems' unless defined?(Gem) diff --git a/lib/erubis.rb b/lib/erubis.rb index 92d6507..01eb5e2 100644 --- a/lib/erubis.rb +++ b/lib/erubis.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## ## diff --git a/lib/erubis/context.rb b/lib/erubis/context.rb index f4895c6..9142c0a 100644 --- a/lib/erubis/context.rb +++ b/lib/erubis/context.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/converter.rb b/lib/erubis/converter.rb index 8687136..a3616d4 100644 --- a/lib/erubis/converter.rb +++ b/lib/erubis/converter.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/util' diff --git a/lib/erubis/engine.rb b/lib/erubis/engine.rb index 1df7e28..f1832a9 100644 --- a/lib/erubis/engine.rb +++ b/lib/erubis/engine.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine/ec.rb b/lib/erubis/engine/ec.rb index ea8e2ef..fe236eb 100644 --- a/lib/erubis/engine/ec.rb +++ b/lib/erubis/engine/ec.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/engine' diff --git a/lib/erubis/engine/ecpp.rb b/lib/erubis/engine/ecpp.rb index cb3b2c3..8542ed6 100644 --- a/lib/erubis/engine/ecpp.rb +++ b/lib/erubis/engine/ecpp.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/engine' diff --git a/lib/erubis/engine/ejava.rb b/lib/erubis/engine/ejava.rb index e5aabe5..a066329 100644 --- a/lib/erubis/engine/ejava.rb +++ b/lib/erubis/engine/ejava.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/engine' diff --git a/lib/erubis/engine/ejavascript.rb b/lib/erubis/engine/ejavascript.rb index 8ec7714..44a1b60 100644 --- a/lib/erubis/engine/ejavascript.rb +++ b/lib/erubis/engine/ejavascript.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/engine' diff --git a/lib/erubis/engine/enhanced.rb b/lib/erubis/engine/enhanced.rb index d306db7..a57e77c 100644 --- a/lib/erubis/engine/enhanced.rb +++ b/lib/erubis/engine/enhanced.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/enhancer' diff --git a/lib/erubis/engine/eperl.rb b/lib/erubis/engine/eperl.rb index 2c9fbda..97aec0f 100644 --- a/lib/erubis/engine/eperl.rb +++ b/lib/erubis/engine/eperl.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/engine' diff --git a/lib/erubis/engine/ephp.rb b/lib/erubis/engine/ephp.rb index c7f13df..8d8086c 100644 --- a/lib/erubis/engine/ephp.rb +++ b/lib/erubis/engine/ephp.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/engine' diff --git a/lib/erubis/engine/eruby.rb b/lib/erubis/engine/eruby.rb index 64eeb76..13d74d8 100644 --- a/lib/erubis/engine/eruby.rb +++ b/lib/erubis/engine/eruby.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/engine' diff --git a/lib/erubis/engine/escheme.rb b/lib/erubis/engine/escheme.rb index f7be404..241bb03 100644 --- a/lib/erubis/engine/escheme.rb +++ b/lib/erubis/engine/escheme.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/engine' diff --git a/lib/erubis/engine/optimized.rb b/lib/erubis/engine/optimized.rb index f1190a7..12ee282 100644 --- a/lib/erubis/engine/optimized.rb +++ b/lib/erubis/engine/optimized.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/enhancer.rb b/lib/erubis/enhancer.rb index 90d94a5..f4e73a4 100644 --- a/lib/erubis/enhancer.rb +++ b/lib/erubis/enhancer.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/error.rb b/lib/erubis/error.rb index 23081d8..376016b 100644 --- a/lib/erubis/error.rb +++ b/lib/erubis/error.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## module Erubis diff --git a/lib/erubis/evaluator.rb b/lib/erubis/evaluator.rb index 88ab6f9..ca4b888 100644 --- a/lib/erubis/evaluator.rb +++ b/lib/erubis/evaluator.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/error' diff --git a/lib/erubis/generator.rb b/lib/erubis/generator.rb index 8299eba..fdf8b44 100644 --- a/lib/erubis/generator.rb +++ b/lib/erubis/generator.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require 'erubis/util' diff --git a/lib/erubis/helper.rb b/lib/erubis/helper.rb index 0e853f1..63fb7c0 100644 --- a/lib/erubis/helper.rb +++ b/lib/erubis/helper.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/helpers/rails_form_helper.rb b/lib/erubis/helpers/rails_form_helper.rb index a0a2243..47b7506 100644 --- a/lib/erubis/helpers/rails_form_helper.rb +++ b/lib/erubis/helpers/rails_form_helper.rb @@ -1,6 +1,6 @@ ### ### $Release: $ -### $Copyright$ +### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### diff --git a/lib/erubis/helpers/rails_helper.rb b/lib/erubis/helpers/rails_helper.rb index 6e724d9..7fb3451 100644 --- a/lib/erubis/helpers/rails_helper.rb +++ b/lib/erubis/helpers/rails_helper.rb @@ -1,6 +1,6 @@ ### ### $Release:$ -### $Copyright$ +### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### diff --git a/lib/erubis/local-setting.rb b/lib/erubis/local-setting.rb index abea984..c6427ab 100644 --- a/lib/erubis/local-setting.rb +++ b/lib/erubis/local-setting.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## ## diff --git a/lib/erubis/main.rb b/lib/erubis/main.rb index dbbbecd..63500ae 100644 --- a/lib/erubis/main.rb +++ b/lib/erubis/main.rb @@ -1,6 +1,6 @@ ### ### $Release:$ -### $Copyright$ +### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### require 'yaml' diff --git a/lib/erubis/preprocessing.rb b/lib/erubis/preprocessing.rb index 09ab5e9..587ad7f 100644 --- a/lib/erubis/preprocessing.rb +++ b/lib/erubis/preprocessing.rb @@ -1,6 +1,6 @@ ### ### $Release:$ -### $Copyright$ +### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### require 'cgi' diff --git a/lib/erubis/tiny.rb b/lib/erubis/tiny.rb index 3eb9547..0d6cc7d 100644 --- a/lib/erubis/tiny.rb +++ b/lib/erubis/tiny.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## module Erubis diff --git a/lib/erubis/util.rb b/lib/erubis/util.rb index d1611ce..271be96 100644 --- a/lib/erubis/util.rb +++ b/lib/erubis/util.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## module Kernel diff --git a/test/assert-text-equal.rb b/test/assert-text-equal.rb index bf49b80..9423e57 100644 --- a/test/assert-text-equal.rb +++ b/test/assert-text-equal.rb @@ -1,6 +1,6 @@ ### ### $Release:$ -### $Copyright$ +### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### require 'test/unit' diff --git a/test/test-engines.rb b/test/test-engines.rb index 8f0705a..748af6b 100644 --- a/test/test-engines.rb +++ b/test/test-engines.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require "#{File.dirname(__FILE__)}/test.rb" diff --git a/test/test-enhancers.rb b/test/test-enhancers.rb index 3b46721..1760564 100644 --- a/test/test-enhancers.rb +++ b/test/test-enhancers.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require "#{File.dirname(__FILE__)}/test.rb" diff --git a/test/test-erubis.rb b/test/test-erubis.rb index ad00e5e..9b799ea 100644 --- a/test/test-erubis.rb +++ b/test/test-erubis.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require "#{File.dirname(__FILE__)}/test.rb" diff --git a/test/test-index-cgi.rb b/test/test-index-cgi.rb index d22f8d1..e112728 100644 --- a/test/test-index-cgi.rb +++ b/test/test-index-cgi.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## require "#{File.dirname(__FILE__)}/test.rb" diff --git a/test/test-users-guide.rb b/test/test-users-guide.rb index 2687a83..437c85a 100644 --- a/test/test-users-guide.rb +++ b/test/test-users-guide.rb @@ -1,6 +1,6 @@ ### ### $Release:$ -### $Copyright$ +### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### require "#{File.dirname(__FILE__)}/test.rb" diff --git a/test/test.rb b/test/test.rb index 04d8865..aa95b70 100644 --- a/test/test.rb +++ b/test/test.rb @@ -1,6 +1,6 @@ ## ## $Release:$ -## $Copyright$ +## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/test/testutil.rb b/test/testutil.rb index e5293a5..d83d483 100644 --- a/test/testutil.rb +++ b/test/testutil.rb @@ -1,6 +1,6 @@ ### ### $Release:$ -### $Copyright$ +### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### require 'yaml' From affcbdfe68cd3cbf3bc32df1980b731b451ec5cb Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 14 Sep 2015 12:55:54 -0700 Subject: [PATCH 5/6] [remove] $Release$ --- CHANGES.txt | 1 - README.txt | 1 - benchmark/bench.rb | 1 - bin/erubis | 1 - erubis.gemspec | 1 - lib/erubis.rb | 1 - lib/erubis/context.rb | 1 - lib/erubis/converter.rb | 1 - lib/erubis/engine.rb | 1 - lib/erubis/engine/ec.rb | 1 - lib/erubis/engine/ecpp.rb | 1 - lib/erubis/engine/ejava.rb | 1 - lib/erubis/engine/ejavascript.rb | 1 - lib/erubis/engine/enhanced.rb | 1 - lib/erubis/engine/eperl.rb | 1 - lib/erubis/engine/ephp.rb | 1 - lib/erubis/engine/eruby.rb | 1 - lib/erubis/engine/escheme.rb | 1 - lib/erubis/engine/optimized.rb | 1 - lib/erubis/enhancer.rb | 1 - lib/erubis/error.rb | 1 - lib/erubis/evaluator.rb | 1 - lib/erubis/generator.rb | 1 - lib/erubis/helper.rb | 1 - lib/erubis/helpers/rails_form_helper.rb | 1 - lib/erubis/helpers/rails_helper.rb | 1 - lib/erubis/local-setting.rb | 1 - lib/erubis/main.rb | 1 - lib/erubis/preprocessing.rb | 1 - lib/erubis/tiny.rb | 1 - lib/erubis/util.rb | 1 - test/assert-text-equal.rb | 1 - test/test-engines.rb | 1 - test/test-enhancers.rb | 1 - test/test-erubis.rb | 1 - test/test-index-cgi.rb | 1 - test/test-main.rb | 1 - test/test-users-guide.rb | 1 - test/test.rb | 1 - test/testutil.rb | 1 - 40 files changed, 40 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 1d774b0..9a8007f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# $Release:$ # copyright(c) 2006-2011 kuwata-lab.com all rights reserved. - release: 2.7.0 diff --git a/README.txt b/README.txt index 634b475..86da29a 100644 --- a/README.txt +++ b/README.txt @@ -1,6 +1,5 @@ = README -release:: $Release$ copyright:: copyright(c) 2006-2011 kuwata-lab.com all rights reserved. diff --git a/benchmark/bench.rb b/benchmark/bench.rb index 1f612ed..06672cb 100644 --- a/benchmark/bench.rb +++ b/benchmark/bench.rb @@ -1,7 +1,6 @@ #!/usr/bin/env ruby ### -### $Release:$ ### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### diff --git a/bin/erubis b/bin/erubis index 35e18fd..ab4ba1d 100755 --- a/bin/erubis +++ b/bin/erubis @@ -1,7 +1,6 @@ #!/usr/bin/env ruby ### -### $Release:$ ### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### diff --git a/erubis.gemspec b/erubis.gemspec index a0f94e9..bd1d784 100644 --- a/erubis.gemspec +++ b/erubis.gemspec @@ -1,7 +1,6 @@ #!/usr/bin/ruby ### -### $Release: $ ### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### diff --git a/lib/erubis.rb b/lib/erubis.rb index 01eb5e2..295538e 100644 --- a/lib/erubis.rb +++ b/lib/erubis.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/context.rb b/lib/erubis/context.rb index 9142c0a..1a2f932 100644 --- a/lib/erubis/context.rb +++ b/lib/erubis/context.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/converter.rb b/lib/erubis/converter.rb index a3616d4..cfb6895 100644 --- a/lib/erubis/converter.rb +++ b/lib/erubis/converter.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine.rb b/lib/erubis/engine.rb index f1832a9..ad6fd43 100644 --- a/lib/erubis/engine.rb +++ b/lib/erubis/engine.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine/ec.rb b/lib/erubis/engine/ec.rb index fe236eb..8934802 100644 --- a/lib/erubis/engine/ec.rb +++ b/lib/erubis/engine/ec.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine/ecpp.rb b/lib/erubis/engine/ecpp.rb index 8542ed6..7abf622 100644 --- a/lib/erubis/engine/ecpp.rb +++ b/lib/erubis/engine/ecpp.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine/ejava.rb b/lib/erubis/engine/ejava.rb index a066329..46bb563 100644 --- a/lib/erubis/engine/ejava.rb +++ b/lib/erubis/engine/ejava.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine/ejavascript.rb b/lib/erubis/engine/ejavascript.rb index 44a1b60..6341d2e 100644 --- a/lib/erubis/engine/ejavascript.rb +++ b/lib/erubis/engine/ejavascript.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine/enhanced.rb b/lib/erubis/engine/enhanced.rb index a57e77c..adf1c56 100644 --- a/lib/erubis/engine/enhanced.rb +++ b/lib/erubis/engine/enhanced.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine/eperl.rb b/lib/erubis/engine/eperl.rb index 97aec0f..1e667ed 100644 --- a/lib/erubis/engine/eperl.rb +++ b/lib/erubis/engine/eperl.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine/ephp.rb b/lib/erubis/engine/ephp.rb index 8d8086c..a99108d 100644 --- a/lib/erubis/engine/ephp.rb +++ b/lib/erubis/engine/ephp.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine/eruby.rb b/lib/erubis/engine/eruby.rb index 13d74d8..0ba4207 100644 --- a/lib/erubis/engine/eruby.rb +++ b/lib/erubis/engine/eruby.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine/escheme.rb b/lib/erubis/engine/escheme.rb index 241bb03..92aa4a9 100644 --- a/lib/erubis/engine/escheme.rb +++ b/lib/erubis/engine/escheme.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/engine/optimized.rb b/lib/erubis/engine/optimized.rb index 12ee282..c97ae24 100644 --- a/lib/erubis/engine/optimized.rb +++ b/lib/erubis/engine/optimized.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/enhancer.rb b/lib/erubis/enhancer.rb index f4e73a4..7d4d823 100644 --- a/lib/erubis/enhancer.rb +++ b/lib/erubis/enhancer.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/error.rb b/lib/erubis/error.rb index 376016b..f08ec18 100644 --- a/lib/erubis/error.rb +++ b/lib/erubis/error.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/evaluator.rb b/lib/erubis/evaluator.rb index ca4b888..8213435 100644 --- a/lib/erubis/evaluator.rb +++ b/lib/erubis/evaluator.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/generator.rb b/lib/erubis/generator.rb index fdf8b44..20257de 100644 --- a/lib/erubis/generator.rb +++ b/lib/erubis/generator.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/helper.rb b/lib/erubis/helper.rb index 63fb7c0..8dc1046 100644 --- a/lib/erubis/helper.rb +++ b/lib/erubis/helper.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/helpers/rails_form_helper.rb b/lib/erubis/helpers/rails_form_helper.rb index 47b7506..528ef79 100644 --- a/lib/erubis/helpers/rails_form_helper.rb +++ b/lib/erubis/helpers/rails_form_helper.rb @@ -1,5 +1,4 @@ ### -### $Release: $ ### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### diff --git a/lib/erubis/helpers/rails_helper.rb b/lib/erubis/helpers/rails_helper.rb index 7fb3451..8255276 100644 --- a/lib/erubis/helpers/rails_helper.rb +++ b/lib/erubis/helpers/rails_helper.rb @@ -1,5 +1,4 @@ ### -### $Release:$ ### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### diff --git a/lib/erubis/local-setting.rb b/lib/erubis/local-setting.rb index c6427ab..bcabb06 100644 --- a/lib/erubis/local-setting.rb +++ b/lib/erubis/local-setting.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/main.rb b/lib/erubis/main.rb index 63500ae..66d91fd 100644 --- a/lib/erubis/main.rb +++ b/lib/erubis/main.rb @@ -1,5 +1,4 @@ ### -### $Release:$ ### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### diff --git a/lib/erubis/preprocessing.rb b/lib/erubis/preprocessing.rb index 587ad7f..26644a7 100644 --- a/lib/erubis/preprocessing.rb +++ b/lib/erubis/preprocessing.rb @@ -1,5 +1,4 @@ ### -### $Release:$ ### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### diff --git a/lib/erubis/tiny.rb b/lib/erubis/tiny.rb index 0d6cc7d..b658b54 100644 --- a/lib/erubis/tiny.rb +++ b/lib/erubis/tiny.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/lib/erubis/util.rb b/lib/erubis/util.rb index 271be96..3b6df68 100644 --- a/lib/erubis/util.rb +++ b/lib/erubis/util.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/test/assert-text-equal.rb b/test/assert-text-equal.rb index 9423e57..9073de8 100644 --- a/test/assert-text-equal.rb +++ b/test/assert-text-equal.rb @@ -1,5 +1,4 @@ ### -### $Release:$ ### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### diff --git a/test/test-engines.rb b/test/test-engines.rb index 748af6b..7c9e81e 100644 --- a/test/test-engines.rb +++ b/test/test-engines.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/test/test-enhancers.rb b/test/test-enhancers.rb index 1760564..a8cc8fc 100644 --- a/test/test-enhancers.rb +++ b/test/test-enhancers.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/test/test-erubis.rb b/test/test-erubis.rb index 9b799ea..83dff3d 100644 --- a/test/test-erubis.rb +++ b/test/test-erubis.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/test/test-index-cgi.rb b/test/test-index-cgi.rb index e112728..262d06a 100644 --- a/test/test-index-cgi.rb +++ b/test/test-index-cgi.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/test/test-main.rb b/test/test-main.rb index 0e63229..d8edeea 100644 --- a/test/test-main.rb +++ b/test/test-main.rb @@ -1,6 +1,5 @@ ## ## $Rev$ -## $Release:$ ## $Date$ ## diff --git a/test/test-users-guide.rb b/test/test-users-guide.rb index 437c85a..45b98cb 100644 --- a/test/test-users-guide.rb +++ b/test/test-users-guide.rb @@ -1,5 +1,4 @@ ### -### $Release:$ ### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### diff --git a/test/test.rb b/test/test.rb index aa95b70..6723cc8 100644 --- a/test/test.rb +++ b/test/test.rb @@ -1,5 +1,4 @@ ## -## $Release:$ ## copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ## diff --git a/test/testutil.rb b/test/testutil.rb index d83d483..ad80d14 100644 --- a/test/testutil.rb +++ b/test/testutil.rb @@ -1,5 +1,4 @@ ### -### $Release:$ ### copyright(c) 2006-2011 kuwata-lab.com all rights reserved. ### From 9eb93b1dea135eb4cc977df0ce2148ff253d3eb4 Mon Sep 17 00:00:00 2001 From: Chulki Lee Date: Mon, 14 Sep 2015 12:57:48 -0700 Subject: [PATCH 6/6] [change] set version to 2.7.0 in code --- erubis.gemspec | 2 +- lib/erubis.rb | 2 +- test/test-main.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erubis.gemspec b/erubis.gemspec index bd1d784..55cfc14 100644 --- a/erubis.gemspec +++ b/erubis.gemspec @@ -11,7 +11,7 @@ spec = Gem::Specification.new do |s| s.name = "erubis" s.author = "makoto kuwata" s.email = "kwa(at)kuwata-lab.com" - s.version = "$Release$" + s.version = "2.7.0" s.platform = Gem::Platform::RUBY s.homepage = "http://www.kuwata-lab.com/erubis/" s.summary = "a fast and extensible eRuby implementation which supports multi-language" diff --git a/lib/erubis.rb b/lib/erubis.rb index 295538e..051317c 100644 --- a/lib/erubis.rb +++ b/lib/erubis.rb @@ -46,7 +46,7 @@ module Erubis - VERSION = ('$Release: 0.0.0 $' =~ /([.\d]+)/) && $1 + VERSION = '2.7.0' end require 'erubis/engine' diff --git a/test/test-main.rb b/test/test-main.rb index d8edeea..f4cf9f2 100644 --- a/test/test-main.rb +++ b/test/test-main.rb @@ -186,7 +186,7 @@ def test_help # -h def test_version # -v @options = '-v' - @expected = (("$Release: 0.0.0 $" =~ /[.\d]+/) && $&) + "\n" + @expected = "2.7.0\n" @filename = false _test() end