You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/12/17 18:53:44 UTC
[07/50] [abbrv] incubator-brooklyn-site git commit: move Gemfile info
to _scripts directory
move Gemfile info to _scripts directory
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/commit/1d8d8a16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/tree/1d8d8a16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/diff/1d8d8a16
Branch: refs/heads/master
Commit: 1d8d8a16f288d11d5865881155350a39ff1fe675
Parents: 10ef0f9
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Oct 6 14:19:57 2014 -0700
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Dec 15 16:39:24 2014 +0000
----------------------------------------------------------------------
Gemfile | 8 -----
Gemfile.lock | 87 ----------------------------------------------
README.md | 17 +++++----
_scripts/Gemfile | 8 +++++
_scripts/Gemfile.lock | 87 ++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 106 insertions(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/1d8d8a16/Gemfile
----------------------------------------------------------------------
diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index bc46bf5..0000000
--- a/Gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-#ruby=ruby-2.1.2
-#ruby-gemset=incubator-brooklyn-site
-
-source 'https://rubygems.org'
-
-gem 'jekyll'
-gem 'therubyracer'
-gem 'link-checker'
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/1d8d8a16/Gemfile.lock
----------------------------------------------------------------------
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index cf69053..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,87 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- anemone (0.7.2)
- nokogiri (>= 1.3.0)
- robotex (>= 1.0.0)
- blankslate (2.1.2.4)
- celluloid (0.15.2)
- timers (~> 1.1.0)
- classifier (1.3.4)
- fast-stemmer (>= 1.0.0)
- coffee-script (2.2.0)
- coffee-script-source
- execjs
- coffee-script-source (1.7.0)
- colorator (0.1)
- colorize (0.5.8)
- execjs (2.2.1)
- fast-stemmer (1.0.2)
- ffi (1.9.3)
- jekyll (2.1.0)
- classifier (~> 1.3)
- colorator (~> 0.1)
- jekyll-coffeescript (~> 1.0)
- jekyll-gist (~> 1.0)
- jekyll-paginate (~> 1.0)
- jekyll-sass-converter (~> 1.0)
- jekyll-watch (~> 1.0)
- kramdown (~> 1.3)
- liquid (~> 2.6.1)
- mercenary (~> 0.3.3)
- pygments.rb (~> 0.6.0)
- redcarpet (~> 3.1)
- safe_yaml (~> 1.0)
- toml (~> 0.1.0)
- jekyll-coffeescript (1.0.0)
- coffee-script (~> 2.2)
- jekyll-gist (1.1.0)
- jekyll-paginate (1.0.0)
- jekyll-sass-converter (1.0.0)
- sass (~> 3.2)
- jekyll-watch (1.0.0)
- listen (~> 2.7)
- kramdown (1.4.0)
- libv8 (3.16.14.3)
- link-checker (0.7.2)
- anemone (~> 0.7.2)
- colorize (~> 0.5.8)
- nokogiri (~> 1.5.5)
- trollop (~> 2.0)
- liquid (2.6.1)
- listen (2.7.9)
- celluloid (>= 0.15.2)
- rb-fsevent (>= 0.9.3)
- rb-inotify (>= 0.9)
- mercenary (0.3.3)
- nokogiri (1.5.11)
- parslet (1.5.0)
- blankslate (~> 2.0)
- posix-spawn (0.3.8)
- pygments.rb (0.6.0)
- posix-spawn (~> 0.3.6)
- yajl-ruby (~> 1.1.0)
- rb-fsevent (0.9.4)
- rb-inotify (0.9.5)
- ffi (>= 0.5.0)
- redcarpet (3.1.2)
- ref (1.0.5)
- robotex (1.0.0)
- safe_yaml (1.0.3)
- sass (3.3.9)
- therubyracer (0.12.1)
- libv8 (~> 3.16.14.0)
- ref
- timers (1.1.0)
- toml (0.1.1)
- parslet (~> 1.5.0)
- trollop (2.0)
- yajl-ruby (1.1.0)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- jekyll
- link-checker
- therubyracer
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/1d8d8a16/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 2399f25..6cac8b0 100644
--- a/README.md
+++ b/README.md
@@ -29,10 +29,12 @@ gems.
At this point, close your shell session and start a new one, to get the new
environment that RVM has configured. Now change directory to the location where
-you checked out your repository; RVM should detect its configuration inside
-`Gemfile` and try to configure itself. Most likely it will report that the
-required version of Ruby is not installed; it will show the command that you
-need to run to install the correct version. Follow the instructions.
+you checked out your repository, and then to the `_scripts` subdirectory.
+
+RVM should detect its configuration inside `Gemfile` and try to configure itself.
+Most likely it will report that the required version of Ruby is not installed;
+it will show the command that you need to run to install the correct version.
+Follow these instructions.
Once the correct version of Ruby is installed, change to your home directory
(`cd ~`) and then change back to the repository again (`cd -`). This will cause
@@ -42,11 +44,14 @@ If you are running Ubuntu, there is a further dependency that is required:
sudo apt-get install libxslt-dev libxml2-dev
-Finally, run this command to install all the required Gems in the correct
-versions:
+Finally, run this command inside `_scripts` to install all the required Gems
+in the correct versions:
bundle install
+Anytime you need to reset your Ruby environment for jekyll to run correctly,
+return to the `_scripts` directory and re-run the above command.
+
Building and previewing the website
-----------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/1d8d8a16/_scripts/Gemfile
----------------------------------------------------------------------
diff --git a/_scripts/Gemfile b/_scripts/Gemfile
new file mode 100644
index 0000000..bc46bf5
--- /dev/null
+++ b/_scripts/Gemfile
@@ -0,0 +1,8 @@
+#ruby=ruby-2.1.2
+#ruby-gemset=incubator-brooklyn-site
+
+source 'https://rubygems.org'
+
+gem 'jekyll'
+gem 'therubyracer'
+gem 'link-checker'
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/1d8d8a16/_scripts/Gemfile.lock
----------------------------------------------------------------------
diff --git a/_scripts/Gemfile.lock b/_scripts/Gemfile.lock
new file mode 100644
index 0000000..cf69053
--- /dev/null
+++ b/_scripts/Gemfile.lock
@@ -0,0 +1,87 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ anemone (0.7.2)
+ nokogiri (>= 1.3.0)
+ robotex (>= 1.0.0)
+ blankslate (2.1.2.4)
+ celluloid (0.15.2)
+ timers (~> 1.1.0)
+ classifier (1.3.4)
+ fast-stemmer (>= 1.0.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.7.0)
+ colorator (0.1)
+ colorize (0.5.8)
+ execjs (2.2.1)
+ fast-stemmer (1.0.2)
+ ffi (1.9.3)
+ jekyll (2.1.0)
+ classifier (~> 1.3)
+ colorator (~> 0.1)
+ jekyll-coffeescript (~> 1.0)
+ jekyll-gist (~> 1.0)
+ jekyll-paginate (~> 1.0)
+ jekyll-sass-converter (~> 1.0)
+ jekyll-watch (~> 1.0)
+ kramdown (~> 1.3)
+ liquid (~> 2.6.1)
+ mercenary (~> 0.3.3)
+ pygments.rb (~> 0.6.0)
+ redcarpet (~> 3.1)
+ safe_yaml (~> 1.0)
+ toml (~> 0.1.0)
+ jekyll-coffeescript (1.0.0)
+ coffee-script (~> 2.2)
+ jekyll-gist (1.1.0)
+ jekyll-paginate (1.0.0)
+ jekyll-sass-converter (1.0.0)
+ sass (~> 3.2)
+ jekyll-watch (1.0.0)
+ listen (~> 2.7)
+ kramdown (1.4.0)
+ libv8 (3.16.14.3)
+ link-checker (0.7.2)
+ anemone (~> 0.7.2)
+ colorize (~> 0.5.8)
+ nokogiri (~> 1.5.5)
+ trollop (~> 2.0)
+ liquid (2.6.1)
+ listen (2.7.9)
+ celluloid (>= 0.15.2)
+ rb-fsevent (>= 0.9.3)
+ rb-inotify (>= 0.9)
+ mercenary (0.3.3)
+ nokogiri (1.5.11)
+ parslet (1.5.0)
+ blankslate (~> 2.0)
+ posix-spawn (0.3.8)
+ pygments.rb (0.6.0)
+ posix-spawn (~> 0.3.6)
+ yajl-ruby (~> 1.1.0)
+ rb-fsevent (0.9.4)
+ rb-inotify (0.9.5)
+ ffi (>= 0.5.0)
+ redcarpet (3.1.2)
+ ref (1.0.5)
+ robotex (1.0.0)
+ safe_yaml (1.0.3)
+ sass (3.3.9)
+ therubyracer (0.12.1)
+ libv8 (~> 3.16.14.0)
+ ref
+ timers (1.1.0)
+ toml (0.1.1)
+ parslet (~> 1.5.0)
+ trollop (2.0)
+ yajl-ruby (1.1.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ jekyll
+ link-checker
+ therubyracer