gemenv 0.0.1 → 0.0.3

data/README.md

@@ -9,16 +9,16 @@ Introduction
 gemenv is a tool to build rubygem environments, in the spirit of
 Python's virtualenv.  It creates a directory with a complete GEM\_HOME
 to contain all of your project's gems.  It also contains an activation
-script to enable this environment.
+script to enable this environment, and an executor to run subshells
+(or anything else) with the right environment variables set.
 
 Here's an example session:
 
     $ cd /tmp
     $ gemenv my-new-env
     $ ls my-new-env
-    bin/ gem\_home
+    bin/ gem_home
     $ source my-new-env/bin/activate
-    {gemenv:my-new-env}
     $ gem install rake
     Fetching: rake-10.0.3.gem (100%)
     Successfully installed rake-10.0.3
@@ -26,25 +26,34 @@ Here's an example session:
     Installing ri documentation for rake-10.0.3...
     Installing RDoc documentation for rake-10.0.3...
     {gemenv:my-new-env}
-    $ ls my-new-env/gem\_home/gems
+    $ ls my-new-env/gem_home/gems
     rake-10.0.3
-    {gemenv:my-new-env}
     $ which rake
     /tmp/my-new-env/gem_home/bin/rake
+	$ echo $VIRTUAL_ENV
+	/tmp/my-new-env
+
 
 You can see that sourcing the activate script does three things:
 
-1. It adds the environment name to the prompt
-2. It sets GEM\_HOME so that gem installations go into the environment,
+1. It sets GEM\_HOME so that gem installations go into the environment,
    not your home or system GEM\_HOME
-3. It adds the GEM\_HOME bin/ directory to your $PATH so that
+2. It adds the GEM\_HOME bin/ directory to your $PATH so that
    gem-installed binaries are available.
+3. It adds a VIRTUAL\_ENV environment variable that you can strap into
+   PS1 if you wish.
 
-This is (almost) all it does.  There is currently no way to deactivate a
-gemenv environment, although this could be added in the future.
+This is (almost) all it does.  There is currently no way to deactivate
+a gemenv environment activated by bin/activate.  If you want a
+deactivatable environment, use bin/exec:
+
+    $ my-new-env/bin/exec /bin/bash
 
 Anything which respects GEM\_HOME should work with gemenv, so you can,
 for instance, use bundler to install gems into a gemenv.
 
--- 
+The activation script currently overwrites GEM_PATH, so gemenv does
+not currently support "global" gems.
+
+--
 Alex Young <alex@bytemark.co.uk>

data/lib/gemenv.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'gemenv/activate_script'
+require 'gemenv/exec_script'
 require 'gemenv/env_dir'
 
 module Gemenv
@@ -12,7 +13,7 @@ module Gemenv
     def run
       raise "Need an env dir!" unless @env_dir
       full_env_dir = File.expand_path( @env_dir )
-      EnvDir.new( full_env_dir, ActivateScript ).make
+      EnvDir.new( full_env_dir, ActivateScript, ExecScript ).make
     end
   end
 end

data/lib/gemenv/activate.erb

@@ -1,18 +1,14 @@
-VIRTUAL_ENV="<%= @env_dir %>"
-export VIRTUAL_ENV
+# Pick this up in $PS1 if you want
+export VIRTUAL_ENV="<%= @env_path %>"
 
-PATH="$VIRTUAL_ENV/gem_home/bin:$PATH"
-export PATH
+export PATH="$VIRTUAL_ENV/gem_home/bin:$PATH"
 
 if [ -n "$GEM_HOME" ]; then
   unset GEM_HOME
 fi
 
-GEM_HOME=$VIRTUAL_ENV/gem_home
-export GEM_HOME
-GEM_PATH=$(gem env home)
-
-PS1="{gemenv:$(basename $VIRTUAL_ENV)} $PS1"
+export GEM_HOME=$VIRTUAL_ENV/gem_home
+export GEM_PATH=$(gem env home)
 
 if [ -n "$BASH" -o -n "$ZSH_VERSION" ] ; then
     hash -r 2> /dev/null

data/lib/gemenv/activate_script.rb

@@ -1,18 +1,7 @@
 # encoding: utf-8
-require 'erb'
+require 'gemenv/generated_script'
 
 module Gemenv
-  class ActivateScript
-    def initialize( env_dir )
-      @env_dir = env_dir
-    end
-
-    def to_bash
-      here = File.dirname( __FILE__ )
-      template_filename = File.join( here, "activate.erb" )
-      template = File.read( template_filename )
-      ERB.new( template ).result( binding )
-    end
-
+  class ActivateScript < GeneratedScript
   end
 end

data/lib/gemenv/env_dir.rb

@@ -44,23 +44,25 @@ module Gemenv
   class EnvDir
     attr_reader :path
 
-    def initialize( env_dir, script_class )
+    def initialize( env_dir, *script_classes )
       @path = Path.new( env_dir )
-      @script_class = script_class
+      @script_classes = script_classes
     end
 
     def make
+      scripts = make_scripts( @path, @script_classes )
+
       @path.mkdir_p
-      
-      make_activate()
+      scripts.each do |script| script.render end
+
       make_gem_home()
       self
     end
 
     private
-    def make_activate
-      activate_path.dirname.mkdir_p
-      activate_path.write( activate_contents )
+
+    def make_scripts( env_path, script_classes )
+      script_classes.map { |cls| cls.new( env_path ) }
     end
 
 
@@ -69,18 +71,10 @@ module Gemenv
     end
 
 
-    def activate_path
-      @path/"bin"/"activate"
-    end
-
     def gem_home_path
       @path/"gem_home"
     end
 
-    def activate_contents
-      @script_class.new( @path ).to_bash
-    end
-      
 
   end
 end

data/lib/gemenv/exec.erb

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+. "<%= @env_path/"bin"/"activate" %>"
+
+exec "$@"

data/lib/gemenv/exec_script.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+require 'gemenv/generated_script'
+
+module Gemenv
+  class ExecScript < GeneratedScript
+    def render
+      super
+      target_filename.chmod(0755)
+    end
+  end
+end # module Gemenv

data/lib/gemenv/generated_script.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+require 'erb'
+
+module Gemenv
+  class GeneratedScript
+    def self.template_basename
+      self.target_basename + ".erb"
+    end
+
+    def self.target_basename
+      self.name.split("::").last.
+        sub("Script", '').
+        gsub(/([a-z])([A-Z])/, '\1_\2').
+        downcase
+    end
+
+
+    def self.template
+      here = File.dirname( __FILE__ )
+      template_filename = File.join( here, template_basename )
+      template = File.read( template_filename )
+    end
+
+
+    attr_reader :env_path
+
+    def initialize( env_path )
+      @env_path = env_path
+    end
+
+    def to_bash
+      ERB.new( self.class.template ).result( binding )
+    end
+
+
+    def mkdir
+      target_filename.dirname.mkdir_p
+    end
+
+    def target_filename
+      env_path/"bin"/self.class.target_basename
+    end
+
+
+    def render
+      mkdir
+      target_filename.write( to_bash )
+    end
+
+  end
+end

data/lib/gemenv/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Gemenv
-  VERSION="0.0.1"
+  VERSION="0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemenv
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies: []
 description: Gemenv provides a container for your gems, and otherwise stays out of
   your way.
@@ -21,10 +21,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/gemenv
-- lib/gemenv/env_dir.rb
 - lib/gemenv/activate_script.rb
-- lib/gemenv/activate.erb
 - lib/gemenv/version.rb
+- lib/gemenv/generated_script.rb
+- lib/gemenv/activate.erb
+- lib/gemenv/env_dir.rb
+- lib/gemenv/exec.erb
+- lib/gemenv/exec_script.rb
 - lib/gemenv.rb
 - LICENSE.txt
 - README.md
@@ -48,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: gemenv
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: The best way to contain your dependencies