aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject svn commit: r1719616 - in /aurora/site: Gemfile.lock README.md Vagrantfile provision.sh
Date Sat, 12 Dec 2015 01:30:33 GMT
Author: wfarner
Date: Sat Dec 12 01:30:33 2015
New Revision: 1719616

URL: http://svn.apache.org/viewvc?rev=1719616&view=rev
Log:
Site: add a vagrant-based build environment.

Added:
    aurora/site/Vagrantfile
    aurora/site/provision.sh
Modified:
    aurora/site/Gemfile.lock
    aurora/site/README.md

Modified: aurora/site/Gemfile.lock
URL: http://svn.apache.org/viewvc/aurora/site/Gemfile.lock?rev=1719616&r1=1719615&r2=1719616&view=diff
==============================================================================
--- aurora/site/Gemfile.lock (original)
+++ aurora/site/Gemfile.lock Sat Dec 12 01:30:33 2015
@@ -1,21 +1,24 @@
-GIT
-  remote: git://github.com/vmg/redcarpet.git
-  revision: 896f7287f463840a3ca991739f6b9aebc9144d7f
-  specs:
-    redcarpet (3.2.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.2.5)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     addressable (2.3.8)
-    chunky_png (1.3.4)
-    coffee-script (2.2.0)
+    capybara (2.4.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    chunky_png (1.3.5)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.10.0)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -31,82 +34,98 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.0.7)
-    execjs (1.4.1)
-      multi_json (~> 1.0)
-    ffi (1.9.8)
-    haml (4.0.6)
+    erubis (2.7.0)
+    eventmachine (1.0.8)
+    execjs (2.6.0)
+    ffi (1.9.10)
+    haml (4.0.7)
       tilt
     hike (1.2.3)
-    htmlentities (4.3.3)
+    hooks (0.4.1)
+      uber (~> 0.0.14)
+    htmlentities (4.3.4)
     http_parser.rb (0.6.0)
-    i18n (0.6.11)
-    kramdown (1.7.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    kramdown (1.9.0)
     libv8 (3.16.14.7)
-    listen (1.3.1)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    middleman (3.2.0)
-      coffee-script (~> 2.2.0)
-      compass (>= 0.12.2)
-      execjs (~> 1.4.0)
-      haml (>= 3.1.6)
+    middleman (3.4.1)
+      coffee-script (~> 2.2)
+      compass (>= 1.0.0, < 2.0.0)
+      compass-import-once (= 1.0.5)
+      execjs (~> 2.0)
+      haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.2.0)
+      middleman-core (= 3.4.1)
       middleman-sprockets (>= 3.1.2)
-      sass (>= 3.1.20)
-      uglifier (~> 2.1.0)
-    middleman-blog (3.5.1)
+      sass (>= 3.4.0, < 4.0)
+      uglifier (~> 2.5)
+    middleman-blog (3.5.3)
       addressable (~> 2.3.5)
       middleman-core (~> 3.2)
       tzinfo (>= 0.3.0)
-    middleman-core (3.2.0)
-      activesupport (~> 3.2.6)
+    middleman-core (3.4.1)
+      activesupport (~> 4.1)
       bundler (~> 1.1)
-      i18n (~> 0.6.1)
-      listen (~> 1.1)
-      rack (>= 1.4.5)
-      rack-test (~> 0.6.1)
+      capybara (~> 2.4.4)
+      erubis
+      hooks (~> 0.3)
+      i18n (~> 0.7.0)
+      listen (~> 3.0.3)
+      padrino-helpers (~> 0.12.3)
+      rack (>= 1.4.5, < 2.0)
       thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.3.6)
-    middleman-livereload (3.1.0)
-      em-websocket (>= 0.2.0)
-      middleman-core (>= 3.0.2)
-      multi_json (~> 1.0)
-      rack-livereload
-    middleman-sprockets (3.3.3)
-      middleman-core (>= 3.2)
-      sprockets (~> 2.2)
+      tilt (~> 1.4.1, < 2.0)
+    middleman-livereload (3.4.4)
+      em-websocket (~> 0.5.1)
+      middleman-core (>= 3.3)
+      rack-livereload (~> 0.3.15)
+    middleman-sprockets (3.4.2)
+      middleman-core (>= 3.3)
+      sprockets (~> 2.12.1)
       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.11.0)
-    rack (1.6.1)
-    rack-livereload (0.3.15)
+      sprockets-sass (~> 1.3.0)
+    middleman-syntax (2.0.0)
+      middleman-core (~> 3.2)
+      rouge (~> 1.0)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2015.1120)
+    mini_portile2 (2.0.0)
+    minitest (5.8.3)
+    multi_json (1.11.2)
+    nokogiri (1.6.7)
+      mini_portile2 (~> 2.0.0.rc2)
+    padrino-helpers (0.12.5)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.5)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.5)
+      activesupport (>= 3.1)
+    rack (1.6.4)
+    rack-livereload (0.3.16)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.3.1)
-    rb-fsevent (0.9.4)
+    rake (10.4.2)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.4)
-      ffi (>= 0.5.0)
+    redcarpet (3.3.3)
     ref (1.0.5)
-    rouge (0.3.10)
-      thor
-    sass (3.4.13)
-    sprockets (2.12.3)
+    rouge (1.10.1)
+    sass (3.4.20)
+    sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.1.0)
+    sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
     therubyracer (0.12.2)
@@ -114,22 +133,28 @@ GEM
       ref
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.3.7)
+    tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.1.2)
+    uber (0.0.15)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  htmlentities
-  middleman (= 3.2.0)
-  middleman-blog (= 3.5.1)
-  middleman-livereload (= 3.1.0)
-  middleman-syntax (= 1.2.1)
-  rake (= 10.3.1)
-  redcarpet!
-  therubyracer
+  htmlentities (= 4.3.4)
+  middleman (= 3.4.1)
+  middleman-blog (= 3.5.3)
+  middleman-livereload (= 3.4.4)
+  middleman-syntax (= 2.0.0)
+  rake (= 10.4.2)
+  redcarpet (= 3.3.3)
+  therubyracer (= 0.12.2)
+
+BUNDLED WITH
+   1.10.6

Modified: aurora/site/README.md
URL: http://svn.apache.org/viewvc/aurora/site/README.md?rev=1719616&r1=1719615&r2=1719616&view=diff
==============================================================================
--- aurora/site/README.md (original)
+++ aurora/site/README.md Sat Dec 12 01:30:33 2015
@@ -1,69 +1,91 @@
 # Apache Aurora Website
-This codebase generates the Apache Aurora available at [http://aurora.apache.org](http://aurora.apache.org).
+This codebase generates the Apache Aurora available at
+[http://aurora.apache.org](http://aurora.apache.org).
 
-Community contributions and patches are welcomed to help keep the Aurora site up-to-date;
please see the section below on contributing website changes or feel free to ask questions
on the Aurora IRC channel, #aurora on Freenode.net.
+Community contributions and patches are welcomed to help keep the Aurora site up-to-date;
+please see the section below on contributing website changes or feel free to ask questions
+on the Aurora IRC channel, #aurora on Freenode.net.
 
 ## Website Basics
 ### Middleman CMS
-The Aurora website is powered by [Middleman](http://middlemanapp.com/), a static website
generator written in ruby. If you'd like to learn more about Middleman and how it works, their
official websites have helpful documentation.
+The Aurora website is powered by [Middleman](http://middlemanapp.com/), a static website
generator
+written in ruby. If you'd like to learn more about Middleman and how it works, their official
+websites have helpful documentation.
  
 ## Setup
-For most website-related changes, knowledge of Middleman or Ruby are unnecessary; Middleman
is used to convert markdown files to HTML and handle dynamic templates.
+For most website-related changes, knowledge of Middleman or Ruby are unnecessary; Middleman
is
+used to convert markdown files to HTML and handle dynamic templates.
 
 ### Directory Structure
 The website has three sub-directories:
 
- * `source/`, which includes site templates and markdown files. This is the directory you
will revise documents in 99% of the time.
- * `publish/`, where static-generated HTML files app live. Files in this directory are generated
when the `rake build` command is run, and these files are served via HTTP on the Aurora website.
- * `tmp/`, a directory used when cloning the remote project repository before processing
documentation and other files.
+ * `source/`, which includes site templates and markdown files. This is the directory you
will
+   revise documents in 99% of the time.
+ * `publish/`, where static-generated HTML files app live. Files in this directory are generated
+   when the `rake2.0 build` command is run, and these files are served via HTTP on the Aurora
+   website.
+ * `tmp/`, a directory used when cloning the remote project repository before processing
+   documentation and other files.
 
-The main directory includes a Rakefile, which will be used to run commands related to building
and testing the website during development. More info below.
+The main directory includes a Rakefile, which will be used to run commands related to building
and
+testing the website during development. More info below.
 
 ## Running and Developing the Website
 ### Setting up Local Dev Environment
-In order to build the Apache Aurora website locally, you must be running Ruby 2.0+.
+The build environment for the website is managed by Vagrant.  To initialize the environment
run:
 
-Once running a proper ruby version, install required Ruby gems by running the following:
+    vagrant up
 
-		gem install bundler
-		bundle install
+This will prepare the environment and generate the site.  Your local repository
+(the directory containing this README) will be mounted at `/vagrant` in the
+virtual machine.
+
+**Note:** all rake commands must be run from `/vagrant`.
 
 ### Generating the site
-To generate the site one only needs to run `rake` after performing the setup
+To generate the site one only needs to run `rake2.0` after performing the setup
 tasks mentioned above. This will download the latest Apache Aurora documentation
 contained in the `docs` folder, integrate them into the site, and generate all
 other files within the source folder.
 
-		rake
+    rake2.0
 
 ### Other available tasks
 
-		rake build				# Build the website from source
-		rake clean				# Remove any temporary products
-		rake clobber			# Remove any generated file
-		rake dev				# Run the site in development mode
-		rake update_docs  		# Update the latest docs from the Apache Aurora codebase
+    rake2.0 build        # Build the website from source
+    rake2.0 clean        # Remove any temporary products
+    rake2.0 clobber      # Remove any generated file
+    rake2.0 dev          # Run the site in development mode
+    rake2.0 update_docs  # Update the latest docs from the Apache Aurora codebase
 
 ### Development 
-To live edit the site run `rake dev` and then open a browser window to 
-http://localhost:4567/ . Any change you make to the sources dir will 
+To live edit the site run `rake2.0 dev` and then open a browser window to 
+`http://192.168.33.10:4567`. Any change you make to the sources dir will 
 be shown on the local dev site immediately. Errors will be shown in the 
-console you launched `rake dev` within.
+console you launched `rake2.0 dev` within.
 
 ## Contributing Website Changes
-Have you made local changes that you would like to contribute to the website? While we use
Apache [ReviewBoard](http://reviews.apache.org) for changes to the primary Aurora codebase,
website changes are currently reviewed by attaching diffs to Apache JIRA tickets.
+Have you made local changes that you would like to contribute to the website?
+While we use Apache [ReviewBoard](http://reviews.apache.org) for changes to the primary Aurora
+codebase, website changes are currently reviewed by attaching diffs to Apache JIRA tickets.
 
 ## Publishing Changes to the Website
-All project committers have access to commit to the Aurora website; we encourage those without
commit access to contribute changes by following the steps above.
+All project committers have access to commit to the Aurora website; we encourage those without
+commit access to contribute changes by following the steps above.
 
-The website uses svnpubsub to sync changes in this SVN repository with the live site. The
publish folder contains the websites content and when committed to the svn repository it will
be automatically deployed. Note: there is sometimes a slight delay between committing to SVN
and appearing online.
+The website uses svnpubsub to sync changes in this SVN repository with the live site. The
publish
+folder contains the websites content and when committed to the svn repository it will be
+automatically deployed. Note: there is sometimes a slight delay between committing to SVN
and
+appearing online.
 
-Before commiting, ensure that changes from source/ have been properly built in the publish/
directory. Changes will be published to the website by running:
+Before commiting, ensure that changes from source/ have been properly built in the `publish/`
+directory. Changes will be published to the website by running:
 
-		svn commit -m "Message describing the website changes you've made."
+    svn commit -m "Message describing the website changes you've made."
 
 ### Apache License
-Except as otherwise noted this software is licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)
+Except as otherwise noted this software is licensed under the
+[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -75,4 +97,4 @@ Unless required by applicable law or agr
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.

Added: aurora/site/Vagrantfile
URL: http://svn.apache.org/viewvc/aurora/site/Vagrantfile?rev=1719616&view=auto
==============================================================================
--- aurora/site/Vagrantfile (added)
+++ aurora/site/Vagrantfile Sat Dec 12 01:30:33 2015
@@ -0,0 +1,31 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.require_version ">= 1.5.0"
+
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/trusty64"
+
+  config.vm.network :private_network, ip: "192.168.33.10"
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--memory", "4096"]
+    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+  end
+  config.vm.provision "shell", path: "provision.sh"
+end

Added: aurora/site/provision.sh
URL: http://svn.apache.org/viewvc/aurora/site/provision.sh?rev=1719616&view=auto
==============================================================================
--- aurora/site/provision.sh (added)
+++ aurora/site/provision.sh Sat Dec 12 01:30:33 2015
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+apt-get update
+
+apt-get install -y \
+    build-essential \
+    git \
+    ruby2.0 \
+    ruby2.0-dev \
+    subversion \
+    zlib1g-dev
+
+gem2.0 install bundler
+cd /vagrant
+bundle install
+rake2.0



Mime
View raw message