[whimsy] branch master updated: Drop .ruby-version from Git
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 The following commit(s) were added to refs/heads/master by this push: new 10248c9 Drop .ruby-version from Git 10248c9 is described below commit 10248c91295b8baa8b7b5e847e807e6d6843f7f0 Author: Sebb AuthorDate: Sun Aug 8 02:00:34 2021 +0100 Drop .ruby-version from Git --- .gitignore| 1 + .ruby-version | 1 - MACOSX.md | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e8682a0..8995b92 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ work .subversion .rakeTasks assets/ +.ruby-version \ No newline at end of file diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 005119b..000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.4.1 diff --git a/MACOSX.md b/MACOSX.md index 5a0d978..29745de 100644 --- a/MACOSX.md +++ b/MACOSX.md @@ -61,6 +61,7 @@ $ rbenv init Follow directions to ensure rbenv is setup in your shell(s), and double-check your ruby version. Note the PATH changes that `rbenv init -` configures; you'll need to duplicate it in your httpd conf later. To use this globally when invoked through rbenv shims, you can use `rbenv global $VERSION` to set that where `$VERSION` is the version in `/srv/whimsy/.ruby-version`. +[TODO: describe how to set .ruby-version] To set this system-wide, you can link the specific versions of `ruby` and `gem` in rbenv to `/usr/local/bin` like so: ```
[whimsy] branch master updated: Explain Passenger restart
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
The following commit(s) were added to refs/heads/master by this push:
new 0c87e7f Explain Passenger restart
0c87e7f is described below
commit 0c87e7f3e46d09f7d160c7f501364ceb442fdffd
Author: Sebb
AuthorDate: Sun Aug 8 01:53:12 2021 +0100
Explain Passenger restart
---
Rakefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Rakefile b/Rakefile
index 0ef9451..12850ee 100644
--- a/Rakefile
+++ b/Rakefile
@@ -16,6 +16,8 @@ task :update, [:command] do |task, args|
lib_update = Dir['lib/**/*'].map {|n| File.mtime n rescue Time.at(0)}.max
# restart passenger applications that have changed since the last update
+ # If a Gem is later updated below, any passenger app is restarted again.
+ # Most of the time, no Gems are installed, so this deploys changes quicker
Dir['**/config.ru'].each do |rackapp|
Dir.chdir File.dirname(rackapp) do
old_baseline = File.mtime('tmp/restart.txt') rescue Time.at(0)
@@ -89,7 +91,7 @@ task :update, [:command] do |task, args|
bundler = 'bundle' unless File.exist?(bundler)
system(bundler, args.command || 'update')
- # if new gems were istalled and this directory contains a passenger
+ # if new gems were installed and this directory contains a passenger
# application, restart it
if (File.mtime('Gemfile.lock') rescue Time.at(0)) != locktime
if File.exist?('tmp/restart.txt')
[whimsy] branch master updated: Travis needs relative path
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
The following commit(s) were added to refs/heads/master by this push:
new a9f3e18 Travis needs relative path
a9f3e18 is described below
commit a9f3e184c14ace9af6fd3c2200732e6527c471cf
Author: Sebb
AuthorDate: Sat Aug 7 23:40:46 2021 +0100
Travis needs relative path
---
www/board/agenda/Rakefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/www/board/agenda/Rakefile b/www/board/agenda/Rakefile
index a66..079d0fd 100644
--- a/www/board/agenda/Rakefile
+++ b/www/board/agenda/Rakefile
@@ -1,4 +1,6 @@
-$LOAD_PATH.unshift '/srv/whimsy/lib'
+# Need relative path for CI such as Travis
+lib = File.expand_path('../' * 3 + 'lib', __dir__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
# Remove world writable directories that Travis may insert into the PATH,
# as these cause security errors during testing
[whimsy] branch master updated: Simplify; no need fo whimsy gem here
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
The following commit(s) were added to refs/heads/master by this push:
new bb33a54 Simplify; no need fo whimsy gem here
bb33a54 is described below
commit bb33a541e9004a00c5e4a1cad0859a1306ac0db5
Author: Sebb
AuthorDate: Sat Aug 7 23:32:15 2021 +0100
Simplify; no need fo whimsy gem here
---
lib/Gemfile | 2 --
lib/spec/spec_helper.rb | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/Gemfile b/lib/Gemfile
index 6fd3ef8..bc81476 100644
--- a/lib/Gemfile
+++ b/lib/Gemfile
@@ -1,6 +1,5 @@
source 'https://rubygems.org'
-root = '../..'
# lib needs these at run-time
gem 'json'
gem 'nokogiri'
@@ -11,6 +10,5 @@ gem 'pdf-reader'
# For Travis testing
group :test do
- gem 'whimsy-asf', path: File.expand_path('..', __dir__)
gem 'rspec'
end
diff --git a/lib/spec/spec_helper.rb b/lib/spec/spec_helper.rb
index 44009d5..634d8c3 100644
--- a/lib/spec/spec_helper.rb
+++ b/lib/spec/spec_helper.rb
@@ -1,4 +1,6 @@
-$LOAD_PATH.unshift '/srv/whimsy/lib'
+# Use relative paths for CI such as Travis
+lib = File.expand_path('..', __dir__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
require 'whimsy/asf'
require 'whimsy/asf/config' # must be loaded before updating config
[whimsy] branch master updated: Not a Gem
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 The following commit(s) were added to refs/heads/master by this push: new 6e431fa Not a Gem 6e431fa is described below commit 6e431fa3b72b4ca2ee71be331d786c9425324b65 Author: Sebb AuthorDate: Sat Aug 7 23:23:46 2021 +0100 Not a Gem --- www/board/agenda/models/agenda.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/board/agenda/models/agenda.rb b/www/board/agenda/models/agenda.rb index de13d16..56be0b1 100755 --- a/www/board/agenda/models/agenda.rb +++ b/www/board/agenda/models/agenda.rb @@ -1,7 +1,7 @@ # Aggressively cache agendas. # -# Most of the heavy lifting is done by ASF::Board::Agenda in the whimsy-asf -# gem. This class is mainly focused on caching the results. +# Most of the heavy lifting is done by the ASF::Board::Agenda class +# This class is mainly focused on caching the results. # # This code also maintains a "working copy" of agendas when updates are # made that may not yet be reflected in the local svn checkout.
[whimsy] branch master updated: Has not been needed for a while
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 The following commit(s) were added to refs/heads/master by this push: new 64db440 Has not been needed for a while 64db440 is described below commit 64db440ac26e94010204a6938cbe4b01fed17bc5 Author: Sebb AuthorDate: Sat Aug 7 23:22:42 2021 +0100 Has not been needed for a while --- DEVELOPMENT.md | 4 ++-- examples/Dockerfile | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 098870e..fab2c18 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -88,9 +88,9 @@ or read the [detailed MACOSX setup steps](MACOSX.md). 3. [Ruby Version Manager - rvm](https://rvm.io/) -2. **Install ruby gems:** `whimsy-asf` and `bundler`: +2. **Install ruby gems:** `bundler`: - `gem install whimsy-asf bundler` (mail and listen may be needed too) + `gem install bundler` (mail and listen may be needed too) - If you're using [Mac OS El Capitan or higher](MACOSX.md), you may need to do this: diff --git a/examples/Dockerfile b/examples/Dockerfile index 2a3bce6..e1676b0 100644 --- a/examples/Dockerfile +++ b/examples/Dockerfile @@ -21,7 +21,6 @@ RUN apt-get install -y software-properties-common && \ apt-get install -y libsasl2-dev # board example -RUN gem install whimsy-asf RUN ruby -r whimsy/asf -e "ASF::LDAP.configure" ADD . /home/board WORKDIR /home/board
[whimsy] branch whimsy-nogem updated: Rakefile also needs relative path
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch whimsy-nogem
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/whimsy-nogem by this push:
new 741e2b1 Rakefile also needs relative path
741e2b1 is described below
commit 741e2b11a8bb0b5dc14e2e4eb200b28bc18da0f9
Author: Sebb
AuthorDate: Sat Aug 7 22:48:05 2021 +0100
Rakefile also needs relative path
---
www/board/agenda/Rakefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/www/board/agenda/Rakefile b/www/board/agenda/Rakefile
index a66..079d0fd 100644
--- a/www/board/agenda/Rakefile
+++ b/www/board/agenda/Rakefile
@@ -1,4 +1,6 @@
-$LOAD_PATH.unshift '/srv/whimsy/lib'
+# Need relative path for CI such as Travis
+lib = File.expand_path('../' * 3 + 'lib', __dir__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
# Remove world writable directories that Travis may insert into the PATH,
# as these cause security errors during testing
[whimsy] branch whimsy-nogem updated: Fingers crossed
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch whimsy-nogem
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/whimsy-nogem by this push:
new 3954dc3 Fingers crossed
3954dc3 is described below
commit 3954dc374cd5d01320ddf61da0b8b011365e716b
Author: Sebb
AuthorDate: Sat Aug 7 21:51:48 2021 +0100
Fingers crossed
---
lib/Rakefile| 2 --
lib/spec/spec_helper.rb | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/Rakefile b/lib/Rakefile
index 6665d7f..5d632d8 100644
--- a/lib/Rakefile
+++ b/lib/Rakefile
@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift __dir__
-
require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:spec)
diff --git a/lib/spec/spec_helper.rb b/lib/spec/spec_helper.rb
index 44009d5..2c91c21 100644
--- a/lib/spec/spec_helper.rb
+++ b/lib/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift '/srv/whimsy/lib'
+$LOAD_PATH.unshift File.expand_path('..', __dir__) # need relative path for
Travis
require 'whimsy/asf'
require 'whimsy/asf/config' # must be loaded before updating config
[whimsy] branch whimsy-nogem updated: Getting there?
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch whimsy-nogem in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/whimsy-nogem by this push: new 4415f9f Getting there? 4415f9f is described below commit 4415f9fc7b5c906d0ebbfb505b165cb44a9365e1 Author: Sebb AuthorDate: Sat Aug 7 21:42:13 2021 +0100 Getting there? --- lib/Rakefile | 2 ++ lib/spec/lib/committee_spec.rb | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Rakefile b/lib/Rakefile index 5d632d8..6665d7f 100644 --- a/lib/Rakefile +++ b/lib/Rakefile @@ -1,3 +1,5 @@ +$LOAD_PATH.unshift __dir__ + require 'rspec/core/rake_task' RSpec::Core::RakeTask.new(:spec) diff --git a/lib/spec/lib/committee_spec.rb b/lib/spec/lib/committee_spec.rb index 53c6910..368c671 100644 --- a/lib/spec/lib/committee_spec.rb +++ b/lib/spec/lib/committee_spec.rb @@ -1,8 +1,6 @@ # encoding: utf-8 # frozen_string_literal: true -$LOAD_PATH.unshift '/home/travis/build/apache/whimsy/lib' - require 'spec_helper' require 'whimsy/asf'
[whimsy] branch whimsy-nogem updated: Another try
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch whimsy-nogem
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/whimsy-nogem by this push:
new d6463d2 Another try
d6463d2 is described below
commit d6463d28eef4ec6bd014130135c48fc2bc30af05
Author: Sebb
AuthorDate: Sat Aug 7 21:24:11 2021 +0100
Another try
---
lib/Gemfile| 2 +-
lib/spec/lib/committee_spec.rb | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/Gemfile b/lib/Gemfile
index b4c0e17..8af3b9d 100644
--- a/lib/Gemfile
+++ b/lib/Gemfile
@@ -11,5 +11,5 @@ gem 'pdf-reader'
# For Travis testing
group :test do
gem 'rspec'
- gem 'whimsy-asf', path: File.expand_path('..', __dir__)
+ # gem 'whimsy-asf', path: File.expand_path('..', __dir__)
end
diff --git a/lib/spec/lib/committee_spec.rb b/lib/spec/lib/committee_spec.rb
index 368c671..53c6910 100644
--- a/lib/spec/lib/committee_spec.rb
+++ b/lib/spec/lib/committee_spec.rb
@@ -1,6 +1,8 @@
# encoding: utf-8
# frozen_string_literal: true
+$LOAD_PATH.unshift '/home/travis/build/apache/whimsy/lib'
+
require 'spec_helper'
require 'whimsy/asf'
[whimsy] branch master updated: Add resolutionLink and URL to hash output
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 The following commit(s) were added to refs/heads/master by this push: new 16084ca Add resolutionLink and URL to hash output 16084ca is described below commit 16084ca503bdc5291fc543f6cb00d34c274007af Author: Sebb AuthorDate: Sat Aug 7 21:14:24 2021 +0100 Add resolutionLink and URL to hash output This fixes #123 --- lib/whimsy/asf/podling.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/whimsy/asf/podling.rb b/lib/whimsy/asf/podling.rb index 8bd39db..92c5ec3 100644 --- a/lib/whimsy/asf/podling.rb +++ b/lib/whimsy/asf/podling.rb @@ -389,6 +389,8 @@ module ASF hash[:sponsor] = @sponsor if @sponsor hash[:duration] = self.duration hash[:podlingStatus] = podlingStatus + hash[:resolutionLink] = resolutionLink if resolutionLink + hash[:resolutionURL] = resolutionURL if resolutionURL hash end
[whimsy] branch family-first updated (acd3aa0 -> 5809389)
This is an automated email from the ASF dual-hosted git repository. clr pushed a change to branch family-first in repository https://gitbox.apache.org/repos/asf/whimsy.git. from acd3aa0 Family first flag implementation for review after testing add c3d2a04 WHIMSY-368 - return last certificate found add fef8928 Add support for CLI aliases etc add 0e3b9d0 Oops - accidental commit add e166623 WHIMSY-366 - don't rely on Infra puppet repo add 11e3739 Docco add fda2740 Update Gemfile add cce314e Merge pull request #121 from apache/remove-puma-gem-from-configuration add 5809389 Merge branch 'master' into family-first No new revisions were added by this update. Summary of changes: DOCKER.md | 5 - Rakefile| 5 + lib/whimsy/asf/auth.rb | 1 + lib/whimsy/asf/git.rb | 14 -- lib/whimsy/asf/ldap.rb | 24 +--- www/secretary/workbench/Gemfile | 1 - 6 files changed, 15 insertions(+), 35 deletions(-)
[whimsy] branch family-first updated (10ef9fa -> acd3aa0)
This is an automated email from the ASF dual-hosted git repository.
clr pushed a change to branch family-first
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from 10ef9fa Make split of public name explicit split(" ")
add 99b7055 Make it easier to tidy api dir
add 6fd236e Only want whimsy dir, not test or spec
add 734f545 Non-standard list name
add 468b9b9 Add draft method to convert cn to sn + givenName
add cf561d9 Simplify; add doc note
add d04a9cd Simplify: move docker to top level
add 82bdb44 chore: fix spelling (#113)
add a2708cc More explanation
add ffd60ef Drop .gitconfig
add 56952f7 Typo
add 3e38a02 No point showing claRef without file link
add 48fdcf7 Fix caching issue
add 13568cd Drop cache; restore secretary access
add 8143c76 Use previously fetched list
add a75728a Attic issues don't apply to non-PMC
add a968588 Patience...
add 9eafd51 Use public name
add 0e90590 Try to find duplicate ICLAs
add 4316de7 Link to new check
add 762cbaa Add Public Name
add a28206d Look for additional matches of first/last names
add 03c3e65 Don't save an empty line
add eb17ee4 Don't save an empty line
add 75b1959 Don't create PDFProject key unnecessarily
add 6f8c47f Handle widgets as well
add 2e02dd4 Look for ICLA duplicates
add f30c630 Linkify warnings
add ba227ab Unused
add 5feaeae Don't init ldap unnecessarily
add f95c56a Show LDAP hosts for members
add af806b7 Update to Wunderbar 1.5.0
add a4fe8af Don't pin any gems
add d8be3c8 make post.js parseable with latest version of Ruby parser
add 14bf617 avoid name collisions
add 677a244 Obsolete reference
add b4d6016 Not needed ?
add 4bdab1f Merge branch 'master' into family-first way old
add 03f838b remove dependency on puma
add acd3aa0 Family first flag implementation for review after testing
No new revisions were added by this update.
Summary of changes:
.dockerignore | 6 ++
DEPLOYMENT.md | 2 +-
DOCKER.md | 24 +++--
docker/Dockerfile => Dockerfile| 5 +-
Gemfile| 3 +-
MACOSX.md | 4 +-
README.md | 2 +-
Rakefile | 81 ++--
asf.gemspec| 4 +-
docker/docker-compose.yaml => docker-compose.yaml | 9 +-
lib/Gemfile| 3 +-
lib/spec/lib/mail/mlist_spec.rb| 1 +
lib/spec/lib/person_spec.rb| 38
lib/whimsy/asf/icla.rb | 30 ++
lib/whimsy/asf/person.rb | 19
lib/whimsy/logparser.rb| 1 -
ruby2js.version| 1 -
secmail.py | 2 +-
tools/Gemfile | 3 +-
tools/toccomments.sh | 2 +-
wunderbar.version | 1 -
www/board/agenda/Gemfile | 6 +-
www/board/agenda/README.md | 22 ++---
.../agenda/test/data/board_agenda_2015_01_21.txt | 2 +-
.../agenda/test/data/board_agenda_2015_02_18.txt | 20 ++--
.../agenda/test/data/board_minutes_2015_01_21.txt | 6 +-
www/board/agenda/views/buttons/post.js.rb | 4 +-
www/board/agenda/views/models/agenda.js.rb | 10 +-
www/brand/replyedit.cgi| 2 +-
www/brand/replyui.cgi | 2 +-
www/committers/Gemfile | 3 +-
www/docs/.gitignore| 1 +
www/docs/api/.gitignore| 2 -
www/fundraising/invoice.cgi| 2 +-
www/index.html | 1 +
www/members/Gemfile| 3 +-
www/project/icla/Gemfile | 8 +-
www/roster/Gemfile | 6 +-
www/roster/main.rb | 63
www/roster/models/nonpmc.rb| 2 +-
www/roster/public/javascript/es6-promise.js| 3 +-
www/roster/public_json_common.rb | 1 -
www/roster/public_ldap_people.rb | 2 +-
www/roster/views/AAREADME.txt | 2 +-
www/roster/views/iclaSearch.js.rb | 9 +-
www/roster/views/nonpmc/main.js.rb | 19 +---
www/secretary/Gemfile | 6 +-
[whimsy] branch whimsy-nogem updated: Restore gem whimsy-asf reference
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch whimsy-nogem
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/whimsy-nogem by this push:
new 5b32846 Restore gem whimsy-asf reference
5b32846 is described below
commit 5b32846e3d859d0e9f6ec59b48fa2ad2e993985f
Author: Sebb
AuthorDate: Sat Aug 7 19:30:59 2021 +0100
Restore gem whimsy-asf reference
---
lib/Gemfile| 1 +
lib/Rakefile | 2 --
lib/spec/lib/committee_spec.rb | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/lib/Gemfile b/lib/Gemfile
index bc81476..b4c0e17 100644
--- a/lib/Gemfile
+++ b/lib/Gemfile
@@ -11,4 +11,5 @@ gem 'pdf-reader'
# For Travis testing
group :test do
gem 'rspec'
+ gem 'whimsy-asf', path: File.expand_path('..', __dir__)
end
diff --git a/lib/Rakefile b/lib/Rakefile
index dd8896d..5d632d8 100644
--- a/lib/Rakefile
+++ b/lib/Rakefile
@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift File.dirname(__FILE__)
-
require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:spec)
diff --git a/lib/spec/lib/committee_spec.rb b/lib/spec/lib/committee_spec.rb
index 7b17901..368c671 100644
--- a/lib/spec/lib/committee_spec.rb
+++ b/lib/spec/lib/committee_spec.rb
@@ -1,8 +1,6 @@
# encoding: utf-8
# frozen_string_literal: true
-$LOAD_PATH.unshift '/srv/whimsy/lib'
-
require 'spec_helper'
require 'whimsy/asf'
[whimsy] branch whimsy-nogem updated: Maybe this will work
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch whimsy-nogem in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/whimsy-nogem by this push: new f806247 Maybe this will work f806247 is described below commit f806247d7062c5490d29942ff45a843f4a7a7be4 Author: Sebb AuthorDate: Sat Aug 7 17:41:11 2021 +0100 Maybe this will work --- lib/Rakefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Rakefile b/lib/Rakefile index eb2717f..dd8896d 100644 --- a/lib/Rakefile +++ b/lib/Rakefile @@ -1,4 +1,7 @@ +$LOAD_PATH.unshift File.dirname(__FILE__) + require 'rspec/core/rake_task' + RSpec::Core::RakeTask.new(:spec) task :default => :spec task :test => :spec
[whimsy] branch whimsy-nogem updated: Try to fix Travis fail
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch whimsy-nogem in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/whimsy-nogem by this push: new 79afa17 Try to fix Travis fail 79afa17 is described below commit 79afa17a06896de9157af3dca4ba78d47e28a365 Author: Sebb AuthorDate: Sat Aug 7 16:59:17 2021 +0100 Try to fix Travis fail --- lib/spec/lib/committee_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/spec/lib/committee_spec.rb b/lib/spec/lib/committee_spec.rb index 368c671..7b17901 100644 --- a/lib/spec/lib/committee_spec.rb +++ b/lib/spec/lib/committee_spec.rb @@ -1,6 +1,8 @@ # encoding: utf-8 # frozen_string_literal: true +$LOAD_PATH.unshift '/srv/whimsy/lib' + require 'spec_helper' require 'whimsy/asf'
[whimsy] branch whimsy-nogem created (now 7474031)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch whimsy-nogem in repository https://gitbox.apache.org/repos/asf/whimsy.git. at 7474031 Removal of Whimsy Gem code This branch includes the following new commits: new 7474031 Removal of Whimsy Gem code The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[whimsy] 01/01: Removal of Whimsy Gem code
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch whimsy-nogem
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 747403128111381b77c9a80e1e415cf506409c03
Author: Sebb
AuthorDate: Sat Aug 7 16:08:23 2021 +0100
Removal of Whimsy Gem code
---
CONFIGURE.md | 3 ---
DEVELOPMENT.md| 4 ++--
Gemfile | 2 --
Rakefile | 13 -
asf.gemspec | 34 --
asf.version | 1 -
examples/Dockerfile | 1 -
lib/Gemfile | 2 --
tools/Gemfile | 4
www/board/agenda/Gemfile | 12 +---
www/board/agenda/config.ru| 2 ++
www/board/agenda/models/agenda.rb | 4 ++--
www/committers/Gemfile| 4
www/members/Gemfile | 4
www/project/icla/Gemfile | 13 +
www/project/icla/config.ru| 2 ++
www/roster/Gemfile| 13 +
www/roster/config.ru | 2 ++
www/secretary/Gemfile | 9 +
www/secretary/workbench/Gemfile | 12 +---
www/secretary/workbench/config.ru | 2 ++
www/status/Gemfile| 6 +-
www/treasurer/Gemfile | 4
23 files changed, 18 insertions(+), 135 deletions(-)
diff --git a/CONFIGURE.md b/CONFIGURE.md
index 177ea68..8bcc603 100644
--- a/CONFIGURE.md
+++ b/CONFIGURE.md
@@ -17,7 +17,6 @@ run either in a local environment or with a webserver.
- [Wunderbar](https://github.com/rubys/wunderbar) - HTML Generator and CGI
application support
- [Ruby-ldap](https://github.com/bearded/ruby-ldap) - LDAP for Ruby
- [nokogiri](https://github.com/sparklemotion/nokogiri) - HTML parser for
Ruby
- - Full gem dependencies in `asf.gemspec`
## Local Clients / Development
@@ -40,8 +39,6 @@ Whimsy can be run on a client or in a local container for
development use.
and `/var/log/apache2/error_log`
* **Development setup instructions** are in [DEVELOPMENT.md](DEVELOPMENT.md)
and [MACOSX.md](MACOSX.md).
-
-* **whimsy-asf Gem** is a set of the core lib/whimsy/asf model as a normal
Gem: [asf.gemspec](asf.gemspec)
* **Tool-specific configurations** can be found in config/ directory
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 098870e..fab2c18 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -88,9 +88,9 @@ or read the [detailed MACOSX setup steps](MACOSX.md).
3. [Ruby Version Manager - rvm](https://rvm.io/)
-2. **Install ruby gems:** `whimsy-asf` and `bundler`:
+2. **Install ruby gems:** `bundler`:
- `gem install whimsy-asf bundler` (mail and listen may be needed too)
+ `gem install bundler` (mail and listen may be needed too)
- If you're using [Mac OS El Capitan or higher](MACOSX.md), you may need to
do this:
diff --git a/Gemfile b/Gemfile
index cc7f05e..aa7d9b7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,4 @@
source 'https://rubygems.org'
-root = '..'
-gemspec
gem 'mime-types'
gem 'wunderbar'
diff --git a/Rakefile b/Rakefile
index 0ef9451..c29ca15 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,11 +1,5 @@
-require 'rubygems/package_task'
require 'open3'
-spec = eval(File.read('asf.gemspec'))
-Gem::PackageTask.new(spec) do |pkg|
- pkg.gem_spec = spec
-end
-
def mkdir_p?(path)
mkdir_p path unless Dir.exist? path
end
@@ -50,14 +44,7 @@ task :update, [:command] do |task, args|
gemlines = Dir['**/Gemfile'].
map {|file| File.read file}.join.scan(/^\s*gem\s.*/)
-if File.exist? "asf.gemspec"
- gemlines +=
-File.read("asf.gemspec").scan(/add_dependency\((.*)\)/).
-map {|(line)| "gem #{line}"}
-end
-
gems = gemlines.map {|line| [line[/['"](.*?)['"]/, 1], line.strip]}.to_h
-gems['whimsy-asf'].sub! /,.*/, ", path: #{Dir.pwd.inspect}"
# Also need to define version for wunderbar as per the asf.gemspec file
require 'tmpdir'
diff --git a/asf.gemspec b/asf.gemspec
deleted file mode 100644
index 6ac263a..000
--- a/asf.gemspec
+++ /dev/null
@@ -1,34 +0,0 @@
-version = File.read(File.expand_path('../asf.version', __FILE__)).strip
-
-Gem::Specification.new do |s|
-
- # Change these as appropriate
- s.name = "whimsy-asf"
- s.license= 'Apache License, Version 2.0'
- s.version= version
- s.summary= "Whimsy 'model' of the ASF"
- s.author = "Sam Ruby"
- s.email = "ru...@intertwingly.net"
- s.homepage = "https://whimsy.apache.org/;
- s.description= <<-EOD
-This package contains a set of classes which encapsulate access
-to a number of data sources such as LDAP, ICLAs, auth lists, etc.
- EOD
-
- # Add any extra files to include in the gem
- s.files = Dir.glob(["asf.*", "lib/**/*"])
- s.require_paths = ["lib"]
-
- # If you want to depend
