nkryptic-sandbox 0.2.1 → 0.2.2

data/TODO

@@ -1,4 +1,7 @@
-
+TODO: fix dependencies in rake files
+TODO: add 'gem: --no-ri --no-rdoc' to .gemrc in new sandbox
+TODO: do 'gem sources -a http://gems.github.com'
+TODO: 0 gems initially to be installed
 TODO: put in timeout when installing gems
 TODO: check for network connection
 TODO: perhaps look in installed rubygems cache first

data/lib/sandbox/templates/activate_sandbox.erb

@@ -2,19 +2,8 @@
 # This file must be used with "source bin/activate" *from bash*
 # you cannot run it directly
 
-deactivate_sandbox () {
-    if [ -n "$_OLD_SANDBOX_PATH" ] ; then
-        PATH="$_OLD_SANDBOX_PATH"
-        export PATH
-        unset _OLD_SANDBOX_PATH
-    fi
+forget_cached_commands () {
     
-    if [ -n "$_OLD_SANDBOX_HOME" ] ; then
-        HOME="$_OLD_SANDBOX_HOME"
-        export HOME
-        unset _OLD_SANDBOX_HOME
-    fi
-
     # This should detect bash and zsh, which have a hash command that must
     # be called to get it to forget past commands.  Without forgetting
     # past commands the $PATH changes we made may not be respected
@@ -22,76 +11,94 @@ deactivate_sandbox () {
         hash -r
     fi
     
+}
+
+deactivate_sandbox () {
+    
     if [ -n "$_OLD_SANDBOX_GEM_HOME" ] ; then
         GEM_HOME="$_OLD_SANDBOX_GEM_HOME"
         export GEM_HOME
-        unset _OLD_SANDBOX_GEM_HOME
+    else
+        unset GEM_HOME
     fi
     
     if [ -n "$_OLD_SANDBOX_GEM_PATH" ] ; then
         GEM_PATH="$_OLD_SANDBOX_GEM_PATH"
         export GEM_PATH
-        unset _OLD_SANDBOX_GEM_PATH
+    else
+        unset GEM_PATH
+    fi
+    
+    if [ -n "$_OLD_SANDBOX_PATH" ] ; then
+        PATH="$_OLD_SANDBOX_PATH"
+        export PATH
+    fi
+    
+    if [ -n "$_OLD_SANDBOX_HOME" ] ; then
+        HOME="$_OLD_SANDBOX_HOME"
+        export HOME
     fi
     
     if [ -n "$_OLD_SANDBOX_PS1" ] ; then
         PS1="$_OLD_SANDBOX_PS1"
         export PS1
-        unset _OLD_SANDBOX_PS1
     fi
     
-    # unset again, in case they were missed because they were blank
+    unset _OLD_SANDBOX_PATH
+    unset _OLD_SANDBOX_HOME
     unset _OLD_SANDBOX_GEM_HOME
     unset _OLD_SANDBOX_GEM_PATH
-    
+    unset _OLD_SANDBOX_PS1
     unset SANDBOX_ENV
+    
+    forget_cached_commands
+    
     if [ ! "$1" = "nondestructive" ] ; then
         # Self destruct!
         unset deactivate_sandbox
+        unset forget_cached_commands
     fi
 }
 
-# unset irrelavent variables
-deactivate_sandbox nondestructive
-
-SANDBOX_ENV="<%= target %>"
-export SANDBOX_ENV
-
-_OLD_SANDBOX_PATH="$PATH"
-PATH="$SANDBOX_ENV/bin:$PATH"
-export PATH
-
-_OLD_SANDBOX_HOME="$HOME"
-HOME="$SANDBOX_ENV"
-export HOME
 
-_OLD_SANDBOX_GEM_HOME="$GEM_HOME"
-GEM_HOME="$SANDBOX_ENV/rubygems"
-export GEM_HOME
+activate_sandbox () {
+    
+    # unset irrelavent variables
+    deactivate_sandbox nondestructive
 
-_OLD_SANDBOX_GEM_PATH="$GEM_PATH"
-GEM_PATH="$GEM_HOME"
-export GEM_PATH
+    # preserve current variables
+    _OLD_SANDBOX_GEM_HOME="$GEM_HOME"
+    _OLD_SANDBOX_GEM_PATH="$GEM_PATH"
+    _OLD_SANDBOX_PATH="$PATH"
+    _OLD_SANDBOX_HOME="$HOME"
+    _OLD_SANDBOX_PS1="$PS1"
+    
+    # set the sandbox-aware states
+    SANDBOX_ENV="<%= target %>"
+    PATH="$SANDBOX_ENV/bin:$PATH"
+    HOME="$SANDBOX_ENV"
+    GEM_HOME="$SANDBOX_ENV/rubygems"
+    GEM_PATH="$GEM_HOME"
+    if [ "`basename \"$SANDBOX_ENV\"`" = "__" ] ; then
+        # special case for Aspen magic directories
+        # see http://www.zetadev.com/software/aspen/
+        PS1="[sandbox:`basename \`dirname \"$SANDBOX_ENV\"\``] $PS1"
+    else
+        PS1="(sandbox:`basename \"$SANDBOX_ENV\"`)$PS1"
+    fi
+    
+    export SANDBOX_ENV PATH HOME GEM_HOME GEM_PATH PS1
+    
+    forget_cached_commands
+    
+    unset activate_sandbox
+    
+}
 
-_OLD_SANDBOX_PS1="$PS1"
-if [ "`basename \"$SANDBOX_ENV\"`" = "__" ] ; then
-    # special case for Aspen magic directories
-    # see http://www.zetadev.com/software/aspen/
-    PS1="[sandbox:`basename \`dirname \"$SANDBOX_ENV\"\``] $PS1"
-else
-    PS1="(sandbox:`basename \"$SANDBOX_ENV\"`)$PS1"
-fi
-export PS1
 
-# This should detect bash and zsh, which have a hash command that must
-# be called to get it to forget past commands.  Without forgetting
-# past commands the $PATH changes we made may not be respected
-if [ -n "$BASH" -o -n "$ZSH_VERSION" ] ; then
-    hash -r
-fi
+activate_sandbox
 
 
-# 
 # 
 # Thanks to the virtualenv developers ( http://pypi.python.org/pypi/virtualenv )
 # 

data/lib/sandbox/version.rb

@@ -5,7 +5,7 @@ module Sandbox
     
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     STRING = [ MAJOR, MINOR, TINY ].join( '.' )
     

data/sandbox.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sandbox}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacob Radford"]
-  s.date = %q{2008-12-05}
+  s.date = %q{2008-12-06}
   s.default_executable = %q{sandbox}
   s.description = %q{Create virtual ruby/rubygems sandboxes.}
   s.email = %q{nkryptic@gmail.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nkryptic-sandbox
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jacob Radford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-05 00:00:00 -08:00
+date: 2008-12-06 00:00:00 -08:00
 default_executable: sandbox
 dependencies: []