env 0.1.0 → 0.1.2

data/ChangeLog.md

@@ -1,3 +1,9 @@
+### 0.1.2 / 2011-01-23
+
+* Fixed {Env::Variables#home} to match the behavior of `Gem.find_home`.
+* Have {Env::Variables#lang} return an empty Array if the `LANG`
+  environment variable is not set.
+
 ### 0.1.0 / 2011-01-22
 
 * Initial release:

data/lib/env/variables.rb

@@ -35,13 +35,28 @@ module Env
     #
     # The home directory.
     #
-    # @return [Pathname, nil]
+    # @return [Pathname]
     #   The path of the home directory.
     #
     def home
-      if (home = (env_hash['HOME'] || env_hash['HOMEPATH']))
-        Pathname.new(home)
-      end
+      # logic adapted from Gem.find_home.
+      path = if (env_hash['HOME'] || env_hash['USERPROFILE'])
+               env_hash['HOME'] || env_hash['USERPROFILE']
+             elsif (env_hash['HOMEDRIVE'] && env_hash['HOMEPATH'])
+               "#{env_hash['HOMEDRIVE']}#{env_hash['HOMEPATH']}"
+             else
+               begin
+                 File.expand_path('~')
+               rescue
+                 if File::ALT_SEPARATOR
+                   'C:/'
+                 else
+                   '/'
+                 end
+               end
+             end
+
+      return Pathname.new(path)
     end
 
     #
@@ -51,7 +66,11 @@ module Env
     #   The language name and encoding.
     #
     def lang
-      env_hash['LANG'].split('.',2)
+      if (lang = env_hash['LANG'])
+        lang.split('.',2)
+      else
+        []
+      end
     end
 
     #

data/lib/env/version.rb

@@ -1,4 +1,4 @@
 module Env
   # env version
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/spec/variables_spec.rb

@@ -32,12 +32,29 @@ describe Variables do
     subject.home.should == Pathname.new(home)
   end
 
-  it "should check HOMEPATH if HOME is not set" do
-    subject.stub!(:env_hash).and_return('HOMEPATH' => home)
+  it "should use the USERPROFILE variable if HOME is not set" do
+    subject.stub!(:env_hash).and_return('USERPROFILE' => home)
 
     subject.home.should == Pathname.new(home)
   end
 
+  it "should use HOMEDRIVE and HOMEPATH if HOME is not set" do
+    drive = 'C:'
+
+    subject.stub!(:env_hash).and_return(
+      'HOMEDRIVE' => drive,
+      'HOMEPATH' => home
+    )
+
+    subject.home.should == Pathname.new(drive + home)
+  end
+
+  it "should attempt to expand '~' if none of the HOME variables are set" do
+    subject.stub!(:env_hash).and_return({})
+
+    subject.home.should be_directory
+  end
+
   it "should parse the LANG variable" do
     name, encoding = subject.lang
 
@@ -45,6 +62,12 @@ describe Variables do
     encoding.should == 'UTF8'
   end
 
+  it "should return an empty Array if LANG is not set" do
+    subject.stub!(:env_hash).and_return({})
+
+    subject.lang.should be_empty
+  end
+
   it "should parse the COLUMNS variable" do
     subject.columns.should == 80
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Postmodern
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 -08:00
+date: 2011-01-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency