You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2017/07/05 22:26:32 UTC
[1/2] mesos git commit: Updated bundled ruby dependencies.
Repository: mesos
Updated Branches:
refs/heads/master 2c1be9ced -> b153cb95d
Updated bundled ruby dependencies.
This commit updates to locked ruby dependencies in the 'Gemfile.lock'
to the lastest versions.
This e.g., updates eventmachine from 1.0.3 to 1.2.3. We need to
require a more recent version of eventmachine to be able to install
this bundle (which has native extension) on recent macOS.
Review: https://reviews.apache.org/r/60651/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/80b0571a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/80b0571a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/80b0571a
Branch: refs/heads/master
Commit: 80b0571a726599a250cd5e4f252194563cb6976b
Parents: 2c1be9c
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Wed Jul 5 15:25:42 2017 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Wed Jul 5 15:25:42 2017 -0700
----------------------------------------------------------------------
site/Gemfile.lock | 95 +++++++++++++++++++++++++++-----------------------
1 file changed, 51 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/80b0571a/site/Gemfile.lock
----------------------------------------------------------------------
diff --git a/site/Gemfile.lock b/site/Gemfile.lock
index 1393246..fcfff00 100644
--- a/site/Gemfile.lock
+++ b/site/Gemfile.lock
@@ -1,36 +1,43 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (3.2.15)
+ activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
- addressable (2.3.5)
- atomic (1.1.14)
- chunky_png (1.2.9)
+ addressable (2.3.8)
+ chunky_png (1.3.8)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.6.3)
- compass (0.12.2)
+ coffee-script-source (1.12.2)
+ compass (1.0.3)
chunky_png (~> 1.2)
- fssm (>= 0.2.7)
- sass (~> 3.1)
- em-websocket (0.5.0)
+ compass-core (~> 1.0.2)
+ compass-import-once (~> 1.0.5)
+ rb-fsevent (>= 0.9.3)
+ rb-inotify (>= 0.9)
+ sass (>= 3.3.13, < 3.5)
+ compass-core (1.0.3)
+ multi_json (~> 1.0)
+ sass (>= 3.3.0, < 3.5)
+ compass-import-once (1.0.5)
+ sass (>= 3.2, < 3.5)
+ em-websocket (0.5.1)
eventmachine (>= 0.12.9)
- http_parser.rb (~> 0.5.3)
- eventmachine (1.0.3)
- execjs (1.4.0)
+ http_parser.rb (~> 0.6.0)
+ eventmachine (1.2.3)
+ execjs (1.4.1)
multi_json (~> 1.0)
- ffi (1.9.3)
- fssm (0.2.10)
- haml (4.0.4)
+ ffi (1.9.18)
+ haml (5.0.1)
+ temple (>= 0.8.0)
tilt
hike (1.2.3)
- htmlentities (4.3.2)
- http_parser.rb (0.5.3)
- i18n (0.6.5)
- kramdown (1.2.0)
- libv8 (3.16.14.15)
+ htmlentities (4.3.4)
+ http_parser.rb (0.6.0)
+ i18n (0.6.11)
+ kramdown (1.14.0)
+ libv8 (3.16.14.19)
listen (1.3.1)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
@@ -63,48 +70,48 @@ GEM
middleman-core (>= 3.0.2)
multi_json (~> 1.0)
rack-livereload
- middleman-sprockets (3.2.0)
- middleman-core (~> 3.2)
- sprockets (~> 2.1)
- sprockets-helpers (~> 1.0.0)
- sprockets-sass (~> 1.0.0)
+ middleman-sprockets (3.3.3)
+ middleman-core (>= 3.2)
+ sprockets (~> 2.2)
+ sprockets-helpers (~> 1.1.0)
+ sprockets-sass (~> 1.1.0)
middleman-syntax (1.2.1)
middleman-core (~> 3.0)
rouge (~> 0.3.0)
- multi_json (1.8.2)
- rack (1.5.2)
- rack-livereload (0.3.15)
+ multi_json (1.12.1)
+ rack (1.6.8)
+ rack-livereload (0.3.16)
rack
- rack-test (0.6.2)
+ rack-test (0.6.3)
rack (>= 1.0)
- rb-fsevent (0.9.3)
- rb-inotify (0.9.2)
- ffi (>= 0.5.0)
- rb-kqueue (0.2.0)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
+ rb-kqueue (0.2.5)
ffi (>= 0.5.0)
rdiscount (2.1.7)
ref (2.0.0)
rouge (0.3.10)
thor
- sass (3.2.12)
- sprockets (2.10.0)
+ sass (3.4.24)
+ sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-helpers (1.0.1)
+ sprockets-helpers (1.1.0)
sprockets (~> 2.0)
- sprockets-sass (1.0.2)
+ sprockets-sass (1.1.0)
sprockets (~> 2.0)
tilt (~> 1.1)
- therubyracer (0.12.2)
- libv8 (~> 3.16.14.0)
+ temple (0.8.0)
+ therubyracer (0.12.3)
+ libv8 (~> 3.16.14.15)
ref
- thor (0.18.1)
- thread_safe (0.1.3)
- atomic
+ thor (0.19.4)
+ thread_safe (0.3.6)
tilt (1.3.7)
- tzinfo (1.1.0)
+ tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (2.1.2)
execjs (>= 0.3.0)
@@ -123,4 +130,4 @@ DEPENDENCIES
therubyracer
BUNDLED WITH
- 1.12.4
+ 1.15.1
[2/2] mesos git commit: Bundled rake as part of managed ruby
dependencies of website.
Posted by vi...@apache.org.
Bundled rake as part of managed ruby dependencies of website.
While rake is available from the package manager on some flavors of
Linux, on e.g., macOS seems to currently only be available as a gem.
In order to provide a working website environment with minimal extra
configuration, bundle rake with bundler as well.
We also update the existing website tooling to use the now bundled
version of rake.
Review: https://reviews.apache.org/r/60652/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b153cb95
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b153cb95
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b153cb95
Branch: refs/heads/master
Commit: b153cb95d8911d88411953c5679ea8a1963d4fe9
Parents: 80b0571
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Wed Jul 5 15:25:57 2017 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Wed Jul 5 15:25:57 2017 -0700
----------------------------------------------------------------------
site/Dockerfile | 2 +-
site/Gemfile | 8 +++++---
site/Gemfile.lock | 2 ++
site/build.sh | 4 ++--
4 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b153cb95/site/Dockerfile
----------------------------------------------------------------------
diff --git a/site/Dockerfile b/site/Dockerfile
index 8ba0be0..230cfc7 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER "dev@mesos.apache.org"
LABEL Description="This image is used for generating Mesos web site from local sources and serving it on port 4567 (livereload on port 35729)."
-RUN yum install -y gcc-c++ make ruby ruby-devel rake doxygen java-1.7.0-openjdk-devel
+RUN yum install -y gcc-c++ make ruby ruby-devel doxygen java-1.7.0-openjdk-devel
RUN gem install bundler
ENV LANG en_US.UTF-8
http://git-wip-us.apache.org/repos/asf/mesos/blob/b153cb95/site/Gemfile
----------------------------------------------------------------------
diff --git a/site/Gemfile b/site/Gemfile
index 4dcd0a5..877fe91 100644
--- a/site/Gemfile
+++ b/site/Gemfile
@@ -5,8 +5,10 @@ gem 'middleman-livereload', '3.1.0'
gem 'middleman-syntax', '1.2.1'
gem 'middleman-blog', '3.5.1'
-gem "rdiscount", '2.1.7'
+gem 'rdiscount', '2.1.7'
-gem "htmlentities"
+gem 'htmlentities'
-gem "therubyracer"
\ No newline at end of file
+gem 'therubyracer'
+
+gem 'rake'
http://git-wip-us.apache.org/repos/asf/mesos/blob/b153cb95/site/Gemfile.lock
----------------------------------------------------------------------
diff --git a/site/Gemfile.lock b/site/Gemfile.lock
index fcfff00..909f3f3 100644
--- a/site/Gemfile.lock
+++ b/site/Gemfile.lock
@@ -84,6 +84,7 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
+ rake (12.0.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
@@ -126,6 +127,7 @@ DEPENDENCIES
middleman-blog (= 3.5.1)
middleman-livereload (= 3.1.0)
middleman-syntax (= 1.2.1)
+ rake
rdiscount (= 2.1.7)
therubyracer
http://git-wip-us.apache.org/repos/asf/mesos/blob/b153cb95/site/build.sh
----------------------------------------------------------------------
diff --git a/site/build.sh b/site/build.sh
index 11f15e1..06b1b32 100755
--- a/site/build.sh
+++ b/site/build.sh
@@ -20,9 +20,9 @@
function exit_hook {
# Remove generated documents when exit.
- rake clean_docs
+ bundle exec rake clean_docs
}
trap exit_hook EXIT
-bundle install && rake && rake dev
\ No newline at end of file
+bundle install && bundle exec rake && bundle exec rake dev