Merge pull request phpbridge#39 from dshafik/merge-railsbridge

Merge railsbridge HEAD

Author: michellesanver

Gemfile

@@ -19,7 +19,6 @@ group :development do
   gem "rake"
   gem "rack-test"
   gem "files", "~> 0.3.0"
-  gem "bourbon"  # do 'cd public/css; bourbon update' to get new bourbon
   gem 'rb-fsevent', :platform => :ruby
 end
 

Gemfile.lock

@@ -4,16 +4,13 @@ GEM
     activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    bourbon (3.1.8)
-      sass (>= 3.2.0)
-      thor
     celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
     coderay (1.1.0)
-    columnize (0.3.6)
+    columnize (0.8.9)
     daemons (1.1.9)
     debugger (1.6.6)
       columnize (>= 0.3.1)
@@ -35,37 +32,33 @@ GEM
     erector (0.9.0)
       treetop (>= 1.2.3)
     eventmachine (1.0.3)
-    eventmachine (1.0.3-x86-mingw32)
     ffi (1.9.3)
-    ffi (1.9.3-x86-mingw32)
     files (0.3.1)
     i18n (0.6.9)
     json (1.8.1)
-    listen (2.7.0)
+    listen (2.7.3)
       celluloid (>= 0.15.2)
       celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    mini_portile (0.5.2)
-    multi_json (1.9.0)
+    mini_portile (0.5.3)
+    multi_json (1.9.3)
     nio4r (1.0.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    nokogiri (1.6.1-x86-mingw32)
-      mini_portile (~> 0.5.0)
     polyglot (0.3.4)
     predicated (0.2.6)
     rack (1.5.2)
     rack-codehighlighter (0.5.0)
       nokogiri (>= 1.4.1)
       rack (>= 1.0.0)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.1.1)
+    rake (10.3.1)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.4)
       ffi (>= 0.5.0)
     redcarpet (2.3.0)
     rerun (0.9.0)
@@ -78,13 +71,13 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    ruby2ruby (2.0.7)
+    ruby2ruby (2.1.0)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.4.1)
+    ruby_parser (3.6.0)
       sexp_processor (~> 4.1)
-    sass (3.3.2)
-    sexp_processor (4.4.1)
+    sass (3.3.6)
+    sexp_processor (4.4.3)
     sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
@@ -93,10 +86,9 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    thor (0.18.1)
     tilt (1.4.1)
     timers (1.1.0)
-    treetop (1.5.1)
+    treetop (1.5.3)
       polyglot (~> 0.3)
     trollop (2.0)
     wrong (0.7.1)
@@ -108,11 +100,9 @@ GEM
 
 PLATFORMS
   ruby
-  x86-mingw32
 
 DEPENDENCIES
   activesupport (~> 3.2.0)
-  bourbon
   coderay
   debugger
   deckrb (~> 0.5.2)

LICENSE.md

@@ -0,0 +1,40 @@
+The documentation (including anything under the `sites` subdir as well as some hardcoded text elsewhere) is licensed under a Creative Commons license ([CC-BY,  specifically](http://creativecommons.org/licenses/by/3.0/)), which means you're welcome to share, remix, or use our content commercially. We just ask for attribution.
+
+    You are free to:
+    Share — copy and redistribute the material in any medium or format
+    Adapt — remix, transform, and build upon the material for any purpose, even commercially.
+    The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+    Under the following terms:
+    Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
+    No additional restrictions — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
+
+    Notices:
+    You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
+    No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
+
+
+Source code is under an [MIT License](http://opensource.org/licenses/MIT) (MIT):
+
+    Copyright (c) 2010-2014 by RailsBridge
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+
+

README.md

@@ -12,7 +12,7 @@ PHPBridge by standing on their shoulders and building up.
 
 This is a Sinatra app, deployed at <http://docs.railsbridge.org>. The PHPBridge documentation project is home to a few subprojects, including the PHPBridge installfest instructions, which leads students through the various complicated setup instructions for getting PHP, MySQL, Git, etc. installed on their computer (whatever combination of computer, OS, and version they happened to bring to the workshop!), as well as the PHPBridge workshop "Suggestotron" curriculum.
 
-Each subproject (a "site") comprises files stored under the "sites" directory; for instance, the installfest instructions are located at ROOT/sites/installfest, while the intro PHP curriculum can be found under ROOT/sites/intro-to-php.
+Each subproject (a "site") comprises files stored under the "sites" directory; for instance, the installfest instructions are located at ROOT/sites/en/installfest, while the intro PHP curriculum can be found under ROOT/sites/en/intro-to-php.
 
 These files can be in any of these formats:
 
@@ -31,9 +31,18 @@ These files can be in any of these formats:
 If the above fails (say, because `rerun` doesn't work on your system), try
 
     rackup
-    
+
 Then open <http://localhost:9292> in a web browser, and verify that you can navigate the installfest slides.
 
+## Locales
+
+To serve sites from "sites/en", use `rake run` or a vanilla deploy.
+
+To server sites from another locale (say, "es" or Spanish)...
+  * Locally, use the SITE_LOCALE environment variable: `SITE_LOCALE=es rake run`
+  * On a server, make the server respond to a locale subdomain: `http://es.railsbridge.org`
+  * Or to temporarily test, use a `locale` or `l` parameter: `http://docs.railsbridge.org/?l=es` (note that in this mode, links are not rewritten, so if they fail you will have to manually add the parameter again)
+
 ## Contributing
 
 Check out [CONTRIBUTING.md](CONTRIBUTING.md) to see how to join our [list of contributors](https://github.com/railsbridge/docs/contributors)!

Rakefile

@@ -1,17 +1,21 @@
-require 'rspec/core/rake_task'
-
-task :default => :spec
-
 def windows?
   Rake::Win32.windows?
 end
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = "spec/**/*_spec.rb"
-  t.rspec_opts =
-      "--format d --backtrace"
-  t.rspec_opts += " --color" if !windows?
-  # t.ruby_opts="-w"
+begin
+  require 'rspec/core/rake_task'
+
+  task :default => :spec
+
+  desc "Run all specs"
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = "spec/**/*_spec.rb"
+    t.rspec_opts =
+        "--format d"
+    t.rspec_opts += " --color" if !windows?
+    # t.ruby_opts="-w"
+  end
+rescue LoadError # swallow Heroku deploy error
 end
 
 def rerun cmd, rerun_opts = nil