This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit a4fe8af5025e3734617aa9c8ffaf66194f547785 Author: Sebb <[email protected]> AuthorDate: Thu Aug 5 15:59:13 2021 +0100 Don't pin any gems --- Gemfile | 3 +-- Rakefile | 4 ---- asf.gemspec | 4 +--- lib/Gemfile | 3 +-- ruby2js.version | 1 - tools/Gemfile | 3 +-- wunderbar.version | 1 - www/board/agenda/Gemfile | 6 ++---- www/committers/Gemfile | 3 +-- www/members/Gemfile | 3 +-- www/project/icla/Gemfile | 8 +++----- www/roster/Gemfile | 6 ++---- www/secretary/Gemfile | 6 ++---- www/secretary/workbench/Gemfile | 6 ++---- www/status/Gemfile | 3 +-- www/treasurer/Gemfile | 3 +-- 16 files changed, 19 insertions(+), 44 deletions(-) diff --git a/Gemfile b/Gemfile index 19be44c..cc7f05e 100644 --- a/Gemfile +++ b/Gemfile @@ -3,5 +3,4 @@ source 'https://rubygems.org' root = '..' gemspec gem 'mime-types' -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -gem 'wunderbar', wunderbar_version +gem 'wunderbar' diff --git a/Rakefile b/Rakefile index f092e63..715d8a6 100644 --- a/Rakefile +++ b/Rakefile @@ -60,15 +60,11 @@ task :update, [:command] do |task, args| gems['whimsy-asf'].sub! /,.*/, ", path: #{Dir.pwd.inspect}" # Also need to define version for wunderbar as per the asf.gemspec file - wunderbar_version = File.read(File.expand_path('wunderbar.version', __dir__)).chomp - ruby2js_version = File.read(File.expand_path('ruby2js.version', __dir__)).chomp require 'tmpdir' Dir.mktmpdir do |dir| Dir.chdir dir do contents = [ "source 'https://rubygems.org'", - "wunderbar_version = '#{wunderbar_version}'", - "ruby2js_version = '#{ruby2js_version}'", gems.values ].join("\n") File.write "Gemfile", contents diff --git a/asf.gemspec b/asf.gemspec index 29d8f49..6ac263a 100644 --- a/asf.gemspec +++ b/asf.gemspec @@ -1,6 +1,4 @@ version = File.read(File.expand_path('../asf.version', __FILE__)).strip -# must agree with Rakefile: -wunderbar_version = File.read(File.expand_path('wunderbar.version', __dir__)).chomp Gem::Specification.new do |s| @@ -28,7 +26,7 @@ Gem::Specification.new do |s| s.add_dependency("ruby-ldap") s.add_dependency("tzinfo") s.add_dependency("tzinfo-data") - s.add_dependency("wunderbar", wunderbar_version) + s.add_dependency("wunderbar") s.add_dependency("rdoc") # If your tests use any gems, include them here diff --git a/lib/Gemfile b/lib/Gemfile index 8d08e34..6fd3ef8 100644 --- a/lib/Gemfile +++ b/lib/Gemfile @@ -6,8 +6,7 @@ gem 'json' gem 'nokogiri' gem 'rake' gem 'ruby-ldap' -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -gem 'wunderbar', wunderbar_version +gem 'wunderbar' gem 'pdf-reader' # For Travis testing diff --git a/ruby2js.version b/ruby2js.version deleted file mode 100644 index 084e244..0000000 --- a/ruby2js.version +++ /dev/null @@ -1 +0,0 @@ -3.6.0 \ No newline at end of file diff --git a/tools/Gemfile b/tools/Gemfile index 3ead2d9..a9c2921 100644 --- a/tools/Gemfile +++ b/tools/Gemfile @@ -5,5 +5,4 @@ asf_version = File.read(File.expand_path("#{root}/asf.version", __FILE__)).chomp gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__) gem 'builder' -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -gem 'wunderbar', wunderbar_version +gem 'wunderbar' diff --git a/wunderbar.version b/wunderbar.version deleted file mode 100644 index 3e1ad72..0000000 --- a/wunderbar.version +++ /dev/null @@ -1 +0,0 @@ -1.5.0 \ No newline at end of file diff --git a/www/board/agenda/Gemfile b/www/board/agenda/Gemfile index a3e8681..2c15597 100644 --- a/www/board/agenda/Gemfile +++ b/www/board/agenda/Gemfile @@ -12,10 +12,8 @@ else end gem 'rake' -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -gem 'wunderbar', wunderbar_version -ruby2js_version = File.read(File.expand_path("#{root}/ruby2js.version", __FILE__)).chomp -gem 'ruby2js', ruby2js_version +gem 'wunderbar' +gem 'ruby2js' gem 'sinatra', '~> 2.0' gem 'nokogumbo' gem 'execjs' diff --git a/www/committers/Gemfile b/www/committers/Gemfile index f09c350..65e7357 100644 --- a/www/committers/Gemfile +++ b/www/committers/Gemfile @@ -5,5 +5,4 @@ asf_version = File.read(File.expand_path("#{root}/asf.version", __FILE__)).chomp gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__) gem 'escape' -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -gem 'wunderbar', wunderbar_version +gem 'wunderbar' diff --git a/www/members/Gemfile b/www/members/Gemfile index b46d452..8e4ca78 100644 --- a/www/members/Gemfile +++ b/www/members/Gemfile @@ -5,5 +5,4 @@ asf_version = File.read(File.expand_path("#{root}/asf.version", __FILE__)).chomp gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__) gem 'mail' -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -gem 'wunderbar', wunderbar_version +gem 'wunderbar' diff --git a/www/project/icla/Gemfile b/www/project/icla/Gemfile index 059e88b..c287548 100644 --- a/www/project/icla/Gemfile +++ b/www/project/icla/Gemfile @@ -2,22 +2,20 @@ source 'https://rubygems.org' root = '../../../..' version_file = File.expand_path("#{root}/asf.version", __FILE__) -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -ruby2js_version = File.read(File.expand_path("#{root}/ruby2js.version", __FILE__)).chomp if File.exist? version_file # for deployment and local testing asf_version = File.read(version_file).chomp gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__) else - # for docker purposes (atleast for now) + # for docker purposes (at least for now) gem 'whimsy-asf' end gem 'mail' gem 'rake' -gem 'wunderbar', wunderbar_version -gem 'ruby2js', ruby2js_version +gem 'wunderbar' +gem 'ruby2js' gem 'sinatra' gem 'nokogumbo' gem 'execjs' diff --git a/www/roster/Gemfile b/www/roster/Gemfile index efca641..a77beab 100644 --- a/www/roster/Gemfile +++ b/www/roster/Gemfile @@ -13,10 +13,8 @@ else end gem 'rake' -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -gem 'wunderbar', wunderbar_version -ruby2js_version = File.read(File.expand_path("#{root}/ruby2js.version", __FILE__)).chomp -gem 'ruby2js', ruby2js_version +gem 'wunderbar' +gem 'ruby2js' gem 'sinatra', '~> 2.0' gem 'nokogumbo' gem 'mail' diff --git a/www/secretary/Gemfile b/www/secretary/Gemfile index 2ffe4ab..44bb1c6 100644 --- a/www/secretary/Gemfile +++ b/www/secretary/Gemfile @@ -8,10 +8,8 @@ if File.exist? version_file gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__) end -ruby2js_version = File.read(File.expand_path("#{root}/ruby2js.version", __FILE__)).chomp -gem 'ruby2js', ruby2js_version -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -gem 'wunderbar', wunderbar_version +gem 'ruby2js' +gem 'wunderbar' gem 'mail' gem 'mime-types' diff --git a/www/secretary/workbench/Gemfile b/www/secretary/workbench/Gemfile index dd64140..dc32b03 100644 --- a/www/secretary/workbench/Gemfile +++ b/www/secretary/workbench/Gemfile @@ -16,10 +16,8 @@ gem 'rake' gem 'zip' gem 'sinatra', '~> 2.0' gem 'sanitize' -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -gem 'wunderbar', wunderbar_version -ruby2js_version = File.read(File.expand_path("#{root}/ruby2js.version", __FILE__)).chomp -gem 'ruby2js', ruby2js_version +gem 'wunderbar' +gem 'ruby2js' gem 'execjs' gem 'listen' gem 'escape' diff --git a/www/status/Gemfile b/www/status/Gemfile index df3cda7..65324b0 100644 --- a/www/status/Gemfile +++ b/www/status/Gemfile @@ -7,5 +7,4 @@ gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__) gem 'passenger' gem 'mime-types' -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -gem 'wunderbar', wunderbar_version +gem 'wunderbar' diff --git a/www/treasurer/Gemfile b/www/treasurer/Gemfile index f09c350..65e7357 100644 --- a/www/treasurer/Gemfile +++ b/www/treasurer/Gemfile @@ -5,5 +5,4 @@ asf_version = File.read(File.expand_path("#{root}/asf.version", __FILE__)).chomp gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__) gem 'escape' -wunderbar_version = File.read(File.expand_path("#{root}/wunderbar.version", __FILE__)).chomp -gem 'wunderbar', wunderbar_version +gem 'wunderbar'
