env 0.2.0 → 0.3.0

data/.document

@@ -1,3 +1,3 @@
 - 
-ChangeLog.*
+ChangeLog.md
 LICENSE.txt

data/.gitignore

@@ -0,0 +1,2 @@
+doc/
+pkg/

data/ChangeLog.md

@@ -1,3 +1,13 @@
+### 0.3.0 / 2012-05-27
+
+* Added {Env::Variables#user}.
+* Added {Env::Variables#host_name}.
+* Fixed typos {Env.[]} and {Env.[]=} where the old `env_hash` method
+  was being called.
+* Fixed specs that were stubbing the old `env_hash` method.
+* Replaced ore-tasks with
+  [rubygems-tasks](https://github.com/postmodern/rubygems-tasks#readme).
+
 ### 0.2.0 / 2011-05-05
 
 * Added {Env::Variables#timezone}.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Hal Brodigan
+Copyright (c) 2011-2012 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,7 @@
 # Env
 
-* [Homepage](http://github.com/postmodern/env)
-* [Issues](http://github.com/postmodern/env/issues)
+* [Homepage](https://github.com/postmodern/env)
+* [Issues](https://github.com/postmodern/env/issues)
 * [Documentation](http://rubydoc.info/gems/env/frames)
 * [Email](mailto:postmodern.mod3 at gmail.com)
 
@@ -79,6 +79,6 @@ Only access the common variables from your Class:
 
 ## Copyright
 
-Copyright (c) 2011 Hal Brodigan
+Copyright (c) 2011-2012 Hal Brodigan
 
 See {file:LICENSE.txt} for details.

data/Rakefile

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'ore-tasks', '~> 0.4'
-  require 'ore/tasks'
+  gem 'rubygems-tasks', '~> 0.1'
+  require 'rubygems/tasks'
 
-  Ore::Tasks.new
+  Gem::Tasks.new
 rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
+  warn e.message
+  warn "Run `gem install rubygems-tasks` to install 'rubygems/tasks'."
 end
 
 begin
@@ -25,7 +25,7 @@ task :test => :spec
 task :default => :spec
 
 begin
-  gem 'yard', '~> 0.6.0'
+  gem 'yard', '~> 0.7'
   require 'yard'
 
   YARD::Rake::YardocTask.new  

data/env.gemspec

@@ -1,15 +1,105 @@
-# -*- encoding: utf-8 -*-
-
-begin
-  Ore::Specification.new do |gemspec|
-    # custom logic here
-  end
-rescue NameError
-  begin
-    require 'ore/specification'
-    retry
-  rescue LoadError
-    STDERR.puts "The 'env.gemspec' file requires Ore."
-    STDERR.puts "Run `gem install ore-core` to install Ore."
+# encoding: utf-8
+
+require 'yaml'
+
+Gem::Specification.new do |gemspec|
+  root    = File.dirname(__FILE__)
+  lib_dir = File.join(root,'lib')
+  files   = `git ls-files`.split($/)
+
+  filter_files = lambda { |paths|
+    files & case paths
+            when Array
+              paths
+            when String
+              Dir[paths]
+            end
+  }
+
+  version = {
+    :file     => 'env/version',
+    :constant => 'Env::VERSION'
+  }
+
+  defaults = {
+    'name'            => File.basename(root),
+    'files'           => files,
+    'require_paths'   => ['ext', 'lib'].select { |dir| File.directory?(dir) },
+    'executables'     => filter_files['bin/*'].map { |path| File.basename(path) },
+    'test_files'      => filter_files['{test/{**/}*_test.rb,spec/{**/}*_spec.rb}'],
+    'doc_files'       => filter_files['*.{txt,rdoc,md,markdown,tt,textile}'],
+    'extra_doc_files' => filter_files['*.{txt,rdoc,md,markdown,tt,textile}']
+  }
+
+  metadata = defaults.merge(YAML.load_file('gemspec.yml'))
+
+  gemspec.name    = metadata['name']
+  gemspec.version = if metadata['version']
+                      metadata['version']
+                    else
+                      $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
+
+                      require version[:file]
+                      eval(version[:constant])
+                    end
+
+  gemspec.summary     = metadata.fetch('summary',metadata['description'])
+  gemspec.description = metadata.fetch('description',metadata['summary'])
+
+  gemspec.licenses = Array(metadata['license'])
+  gemspec.authors  = Array(metadata['authors'])
+
+  gemspec.email    = metadata['email']
+  gemspec.homepage = metadata['homepage']
+
+  gemspec.require_paths = Array(metadata['require_paths'])
+  gemspec.files         = filter_files[metadata['files']]
+  gemspec.files        += Array(metadata['generated_files'])
+  gemspec.executables   = metadata['executables']
+  gemspec.extensions    = metadata['extensions']
+
+  if Gem::VERSION < '1.7.'
+    gemspec.default_executable = gemspec.executables.first
+  end
+
+  gemspec.test_files       = filter_files[metadata['test_files']]
+  gemspec.extra_rdoc_files = Array(metadata['extra_doc_files'])
+
+  gemspec.post_install_message = metadata['post_install_message']
+  gemspec.requirements         = metadata['requirements']
+
+  if gemspec.respond_to?(:required_ruby_version=)
+    gemspec.required_ruby_version = metadata['required_ruby_version']
+  end
+
+  if gemspec.respond_to?(:required_rubygems_version=)
+    gemspec.required_rubygems_version = metadata['required_ruby_version']
+  end
+
+  parse_versions = lambda { |versions|
+    case versions
+    when Array
+      versions.map { |v| v.to_s }
+    when String
+      versions.split(/,\s*/)
+    end
+  }
+
+  if metadata['dependencies']
+    metadata['dependencies'].each do |name,versions|
+      gemspec.add_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['runtime_dependencies']
+    metadata['runtime_dependencies'].each do |name,versions|
+      gemspec.add_runtime_dependency(name,parse_versions[versions])  
+    end
+  end
+
+  if metadata['development_dependencies']
+    metadata['development_dependencies'].each do |name,versions|
+      gemspec.add_development_dependency(name,parse_versions[versions])  
+    end
   end
 end

data/gemspec.yml

@@ -7,10 +7,10 @@ description:
 license: MIT
 authors: Postmodern
 email: postmodern.mod3@gmail.com
-homepage: http://github.com/postmodern/env
+homepage: https://github.com/postmodern/env#readme
 has_yard: true
 
 development_dependencies:
-  ore-tasks: ~> 0.4
+  rubygems-tasks: ~> 0.1
   rspec: ~> 2.4
-  yard: ~> 0.6.0
+  yard: ~> 0.7

data/lib/env/env.rb

@@ -17,7 +17,7 @@ module Env
   #   # => "/bin/bash"
   #
   def Env.[](name)
-    env_hash[name.to_s]
+    env[name.to_s]
   end
 
   #
@@ -33,7 +33,7 @@ module Env
   #   The String value of the environment variable.
   #
   def Env.[]=(name,value)
-    env_hash[name.to_s] = value.to_s
+    env[name.to_s] = value.to_s
   end
 
   protected

data/lib/env/variables.rb

@@ -8,7 +8,9 @@ module Env
     # @return [Hash{String => String}]
     #   The Hash of environment variable names and values.
     #
-    def env_hash
+    # @api semipublic
+    #
+    def env
       ENV
     end
 
@@ -19,7 +21,7 @@ module Env
     #   The paths of the directories.
     #
     def paths
-      parse_paths(env_hash['PATH'])
+      parse_paths(env['PATH'])
     end
 
     #
@@ -29,7 +31,33 @@ module Env
     #   The paths of the directories.
     #
     def ld_library_paths
-      parse_paths(env_hash['LD_LIBRARY_PATH'])
+      parse_paths(env['LD_LIBRARY_PATH'])
+    end
+
+    #
+    # The host-name of the system.
+    #
+    # @return [String]
+    #   The host-name.
+    #
+    # @since 0.3.0
+    #
+    def host_name
+      env['HOSTNAME']
+    end
+
+    #
+    # The name of the current user.
+    #
+    # @return [String]
+    #   The name of the user.
+    #
+    # @since 0.3.0
+    #
+    def user
+      # USER is used on GNU/Linux and Windows
+      # LOGNAME is the POSIX user-name ENV variable
+      env['USER'] || env['LOGNAME']
     end
 
     #
@@ -40,10 +68,10 @@ module Env
     #
     def home
       # 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']}"
+      path = if (env['HOME'] || env['USERPROFILE'])
+               env['HOME'] || env['USERPROFILE']
+             elsif (env['HOMEDRIVE'] && env['HOMEPATH'])
+               "#{env['HOMEDRIVE']}#{env['HOMEPATH']}"
              else
                begin
                  File.expand_path('~')
@@ -66,7 +94,7 @@ module Env
     #   The language name and encoding.
     #
     def lang
-      if (lang = env_hash['LANG'])
+      if (lang = env['LANG'])
         lang.split('.',2)
       else
         []
@@ -92,7 +120,7 @@ module Env
     #   The number of columns.
     #
     def columns
-      env_hash['COLUMNS'].to_i if env_hash['COLUMNS']
+      env['COLUMNS'].to_i if env['COLUMNS']
     end
 
     #
@@ -102,7 +130,7 @@ module Env
     #   The number of lines.
     #
     def lines
-      env_hash['LINES'].to_i if env_hash['LINES']
+      env['LINES'].to_i if env['LINES']
     end
 
     #
@@ -112,7 +140,7 @@ module Env
     #   The path to the default shell.
     #
     def shell
-      env_hash['SHELL']
+      env['SHELL']
     end
 
     #
@@ -132,7 +160,7 @@ module Env
     #   The name of the terminal program.
     #
     def terminal
-      env_hash['COLORTERM'] || env_hash['TERM']
+      env['COLORTERM'] || env['TERM']
     end
 
     #
@@ -142,7 +170,7 @@ module Env
     #   The name of the editor program.
     #
     def editor
-      env_hash['EDITOR']
+      env['EDITOR']
     end
 
     #
@@ -152,7 +180,7 @@ module Env
     #   The name of the browser program.
     #
     def browser
-      env_hash['BROWSER']
+      env['BROWSER']
     end
 
     #
@@ -164,7 +192,7 @@ module Env
     # @since 0.2.0
     #
     def debug?
-      true if env_hash['DEBUG']
+      true if env['DEBUG']
     end
 
     protected

data/lib/env/version.rb

@@ -1,4 +1,4 @@
 module Env
   # env version
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/variables_spec.rb

@@ -9,7 +9,7 @@ describe Variables do
   let(:shell) { '/bin/bash' }
 
   before(:each) do
-    subject.stub!(:env_hash).and_return(
+    subject.stub!(:env).and_return(
       'PATH' => '/usr/local/bin:/usr/bin:/bin',
       'HOME' => home,
       'TERM' => term,
@@ -34,7 +34,7 @@ describe Variables do
   end
 
   it "should use the USERPROFILE variable if HOME is not set" do
-    subject.stub!(:env_hash).and_return('USERPROFILE' => home)
+    subject.stub!(:env).and_return('USERPROFILE' => home)
 
     subject.home.should == Pathname.new(home)
   end
@@ -42,7 +42,7 @@ describe Variables do
   it "should use HOMEDRIVE and HOMEPATH if HOME is not set" do
     drive = 'C:'
 
-    subject.stub!(:env_hash).and_return(
+    subject.stub!(:env).and_return(
       'HOMEDRIVE' => drive,
       'HOMEPATH' => home
     )
@@ -51,7 +51,7 @@ describe Variables do
   end
 
   it "should attempt to expand '~' if none of the HOME variables are set" do
-    subject.stub!(:env_hash).and_return({})
+    subject.stub!(:env).and_return({})
 
     subject.home.should be_directory
   end
@@ -64,7 +64,7 @@ describe Variables do
   end
 
   it "should return an empty Array if LANG is not set" do
-    subject.stub!(:env_hash).and_return({})
+    subject.stub!(:env).and_return({})
 
     subject.lang.should be_empty
   end
@@ -90,7 +90,7 @@ describe Variables do
   end
 
   it "should check COLORTERM before the TERM variable" do
-    subject.stub!(:env_hash).and_return(
+    subject.stub!(:env).and_return(
       'COLORTERM' => 'gnome-terminal',
       'TERM' => term
     )

metadata

@@ -1,64 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: env
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Postmodern
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ore-tasks
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-05-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.4"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.0
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
-  version_requirements: *id003
-description: Provides a Ruby interface to common environment variables, used on Windows, Linux, BSD and OSX.
-email: 
-- postmodern.mod3@gmail.com
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+description: Provides a Ruby interface to common environment variables, used on Windows,
+  Linux, BSD and OSX.
+email: postmodern.mod3@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.md
+extra_rdoc_files:
 - ChangeLog.md
 - LICENSE.txt
-files: 
+- README.md
+files:
 - .document
 - .gemtest
+- .gitignore
 - .rspec
 - .yardopts
 - ChangeLog.md
@@ -74,33 +87,31 @@ files:
 - spec/env_spec.rb
 - spec/spec_helper.rb
 - spec/variables_spec.rb
-homepage: http://github.com/postmodern/env
-licenses: 
+homepage: https://github.com/postmodern/env#readme
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: env
-rubygems_version: 1.8.0
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Provides a Ruby interface to common environment variables
-test_files: 
-- spec/variables_spec.rb
+test_files:
 - spec/env_spec.rb
+- spec/variables_spec.rb