diff --git a/share/rubygems/generate b/share/rubygems/generate index b23bd0d581..3e5fc77d2d 100755 --- a/share/rubygems/generate +++ b/share/rubygems/generate @@ -19,15 +19,15 @@ require 'fileutils' require 'tmpdir' -VERSION = "5.12.13" +VERSION = '5.12.13' def version v = VERSION - _, min, incr = v.split(".").collect{|e| e.to_i} + _, min, incr = v.split('.').collect {|e| e.to_i } if min >= 80 || incr >= 80 - v += ".pre" + v += '.pre' end v @@ -35,29 +35,29 @@ end DEFAULTS={ :version => version, - :date => Time.now.strftime("%Y-%m-%d"), + :date => Time.now.strftime('%Y-%m-%d'), :dependencies => [] } -TEMPLATE=< [ 'nokogiri', 'json', - 'rbvmomi' + 'rbvmomi', + 'treetop', # oneflow + 'ipaddress', # oneflow + 'parse-cron' # oneflow ] }, @@ -114,18 +121,18 @@ def sane_prefix(prefix) p=prefix - p.slice!(0) if p[0,1]=='/' - p<<'/' if p[-1,1]!='/' + p.slice!(0) if p[0, 1]=='/' + p<<'/' if p[-1, 1]!='/' p end def file_list(description) - files=Array.new + files=[] description[:files].each do |f, prefix, exclude| Dir.glob(f).each do |source| - next if (! exclude.nil?) and (source.match(exclude)) + next if !exclude.nil? and source.match(exclude) files << [source, sane_prefix(prefix)+File.basename(source)] end @@ -134,14 +141,14 @@ def file_list(description) files end -def copy_files(files, source_prefix='', destination_prefix='') +def copy_files(files, source_prefix = '', destination_prefix = '') files.each do |file| source=source_prefix+file[0] destination=destination_prefix+file[1] dir=File.dirname destination - FileUtils.mkdir_p(dir) if !File.exist?(dir) + FileUtils.mkdir_p(dir) unless File.exist?(dir) FileUtils.cp(source, destination) end @@ -154,10 +161,10 @@ def generate_gem_file_list(files) end def generate_gem_executable_list(files) - executables=files. - select {|f| f.last.match(/^bin\//) }. - map {|f| "'#{File.basename(f.last)}'" }. - join(", ") + executables=files + .select {|f| f.last.match(%r{^bin/}) } + .map {|f| "'#{File.basename(f.last)}'" } + .join(', ') if !executables.empty? " s.executables=[#{executables}]" @@ -168,9 +175,9 @@ end def generate_dependencies(dependencies) dependencies.map do |d| - line=" s.add_runtime_dependency " - if Array===d - line<