Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:wayneeseguin/bdsm-site

  • Loading branch information...
commit eb58aa5641958779460ee149917953414fbe0ffc 2 parents 07e1efa + 9957bff
@wayneeseguin wayneeseguin authored
Showing with 51 additions and 10 deletions.
  1. +10 −0 .gems
  2. +37 −3 .rvmrc
  3. +4 −7 content/extensions/basics.haml
View
10 .gems
@@ -0,0 +1,10 @@
+# .gems generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator
+chunky_png -v1.2.0
+compass -v0.11.5
+cri -v1.0.1
+fssm -v0.2.7
+haml -v3.1.2
+mime-types -v1.16
+nanoc3 -v3.1.9
+rack -v1.2.1
+sass -v3.1.4
View
40 .rvmrc
@@ -1,7 +1,41 @@
#!/usr/bin/env bash
-rvm --create 1.9.2@bdsm-site
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
-if [[ -s bdsm-site.gems ]] ; then
- rvm gemset import bdsm-site.gems
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="ruby-1.9.2-p290@bdsm-site"
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+ && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+ \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+
+ if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
+ then
+ . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
+ fi
+else
+ # If the environment file has not yet been created, use the RVM CLI to select.
+ if ! rvm --create "$environment_id"
+ then
+ echo "Failed to create RVM environment '${environment_id}'."
+ fi
fi
+
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+filename=".gems"
+if [[ -s "$filename" ]] ; then
+ rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+fi
+
View
11 content/extensions/basics.haml
@@ -66,15 +66,12 @@
root# bdsm udpate repository
%p
- Then we install the extension(s) that we require.
-%pre.code
- :preserve
- root# bdsm extend &lt;extension_name&gt; [&lt;extension_name&gt; [ ...]]
+ Internal extensions (found at https://github.com/wayneeseguin/bdsm-extensions)
+ are now installed by default when BDSM is installed.
%p
- Additionally, you may also manually copy an extension directory into the
- extensions directory ("$bdsm_path/extensions").
-
+ Additionally, you may also manually copy your own extension directory into the
+ external extensions directory ("$bdsm_path/extensions/external/").
%h2
Updating
Please sign in to comment.
Something went wrong with that request. Please try again.