ruby-llenv 0.0.7 → 0.0.8

data/Changelog.md

@@ -1,3 +1,8 @@
+## 0.0.8 (2012-12-29)
+
+* LLENV_ENV
+* need `llenv update`
+
 ## 0.0.7 (2012-12-28)
 
 * declare.run

data/README.md

@@ -40,6 +40,15 @@ Root directory installed all LLs. Default: "~/.llenv"
 
 Declare repository URL. Default: [https://github.com/riywo/llenv-declare.git](https://github.com/riywo/llenv-declare.git)
 
+### `LLENV_ENV`
+
+For passing user environment variables to inside of llenv.
+
+    $ LLENV_ENV=PORT=1234,LOGDIR=/var/log/log llenv exec env
+    PORT=1234
+    LOGDIR=/var/log/log
+    ...
+
 ## Contributing
 
 1. Fork it

data/lib/llenv/cli.rb

@@ -7,7 +7,8 @@ class LLenv::CLI < Thor
   def initialize(args = [], options = {}, config = {})
     @root_dir     = ENV["LLENV_ROOT"] || File.expand_path("~/.llenv")
     @declare_repo = ENV["LLENV_DECLARE_URL"] || "https://github.com/riywo/llenv-declare.git"
-    @declare      = LLenv::Declare.new(@root_dir)
+    @env          = ENV["LLENV_ENV"] || ""
+    @declare      = LLenv::Declare.new(@root_dir, @env)
     super
   end
 

data/lib/llenv/declare.rb

@@ -1,8 +1,14 @@
 require "llenv"
 
 class LLenv::Declare
-  def initialize(dir)
+
+  def initialize(dir, env)
     @root_dir = dir
+    @env = {}
+    env.split(',').each do |str|
+      k, v = str.split('=')
+      @env[k] = v
+    end
   end
 
   def run(llenv, command, argv = [])
@@ -26,17 +32,23 @@ private
     @declare_dir = File.join(@root_dir, llenv)
     raise "#{llenv} not declared in #{@root_dir}" unless File.directory?(@declare_dir)
 
-    ENV.clear
-    env = `. /etc/profile && env`
-    env.split("\n").map do |e|
-      k, v = e.split("=")
-      ENV[k] = v
-    end
+    env = {}
+    env["LLENV_ROOT"] = ENV["LLENV_ROOT"] if ENV.has_key? "LLENV_ROOT"
+    env["LLENV_DECLARE_URL"] = ENV["LLENV_DECLARE_URL"] if ENV.has_key? "LLENV_DECLARE_URL"
+    env.merge!(@env)
 
+    ENV.clear
+    path = `. /etc/profile && echo $PATH`.chomp
     home = File.join(@declare_dir, ".home")
-    Dir.mkdir(home) unless File.directory?(home)
+    Dir.mkdir(home) unless File.exists?(home)
+
+    ENV["PATH"] = path
     ENV["HOME"] = home
     ENV["SHELL"] = "/bin/bash"
+
+    env.each do |k,v|
+      ENV[k] = v
+    end
   end
 
 end

data/lib/llenv/version.rb

@@ -1,3 +1,3 @@
 module LLenv
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-llenv
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor