You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by Sebastian Bazley <se...@apache.org> on 2016/03/14 20:40:18 UTC
[whimsy.git] [1/1] Commit dccd39a: Stop treating Whimsy as a Gem
Commit dccd39aa9b28eeea869522311e7b984959e0a3bb:
Stop treating Whimsy as a Gem
Branch: refs/heads/master
Author: Sebb <se...@apache.org>
Committer: Sebb <se...@apache.org>
Pusher: sebb <se...@apache.org>
------------------------------------------------------------
www/Gemfile | -----
www/roster/Gemfile | -----------
www/roster/public_json_common.rb | + ---
------------------------------------------------------------
20 changes: 1 additions, 19 deletions.
------------------------------------------------------------
diff --git a/www/Gemfile b/www/Gemfile
deleted file mode 100644
index fee9d8e..0000000
--- a/www/Gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-asf_version = File.read(File.expand_path('../../asf.version', __FILE__)).chomp
-
-gem 'whimsy-asf', asf_version, path: File.expand_path('../..', __FILE__)
diff --git a/www/roster/Gemfile b/www/roster/Gemfile
index 855d59a..3d8995a 100644
--- a/www/roster/Gemfile
+++ b/www/roster/Gemfile
@@ -1,16 +1,5 @@
source 'https://rubygems.org'
-root = '../../..'
-version_file = File.expand_path("#{root}/asf.version", __FILE__)
-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)
- gem 'whimsy-asf'
-end
-
gem 'rake'
gem 'wunderbar', '>= 1.0.0'
gem 'ruby2js', '>= 2.0.0'
diff --git a/www/roster/public_json_common.rb b/www/roster/public_json_common.rb
index 5d3b57d..6ae56fe 100644
--- a/www/roster/public_json_common.rb
+++ b/www/roster/public_json_common.rb
@@ -7,13 +7,11 @@
# Status updates: https://whimsy-test.apache.org/status/
#
-require 'bundler/setup'
-
+$LOAD_PATH.unshift File.realpath(File.expand_path('../../../lib', __FILE__))
require 'whimsy/asf'
require 'json'
require 'open3'
-
require 'wunderbar'
Wunderbar.log_level = 'info' unless Wunderbar.logger.info? # try not to override CLI flags