rprogram 0.2.2 → 0.2.3

data/ChangeLog.md

@@ -1,8 +1,16 @@
+### 0.2.3 / 2011-03-30
+
+* Require env ~> 0.1, >= 0.1.2.
+* Automatically search for programs with a `.exe` suffix, when running on
+  Windows.
+* {RProgram::Compat.find_program} and {RProgram::Compat.find_program_by_names}
+  now return a `Pathname` object.
+
 ### 0.2.2 / 2011-01-22
 
 * Deprecated {RProgram::Compat.platform}.
 * Use `File::PATH_SEPARATOR` to separate the `PATH` environment variable
-  in {RProgram::Compat.paths}.
+  in `RProgram::Compat.paths`.
 
 ### 0.2.1 / 2010-10-27
 
@@ -38,7 +46,7 @@
 
 * Use Hoe 2.2.0.
 * Removed requirement for 'open3'.
-* Renamed PRogram::Compat.PATHS to {RProgram::Compat.paths}.
+* Renamed PRogram::Compat.PATHS to `RProgram::Compat.paths`.
 * Refactored {RProgram::Option#arguments}.
 * Removed `RProgram::Option#format`.
 * Refactored {RProgram::NonOption#arguments}.

data/README.md

@@ -3,7 +3,7 @@
 * [Source](http://github.com/postmodern/rprogram)
 * [Issues](http://github.com/postmodern/rprogram/issues)
 * [Documentation](http://rubydoc.info/gems/rprogram)
-* Postmodern (postmodern.mod3 at gmail.com)
+* [Email](mailto:postmodern.mod3 at gmail.com)
 
 ## Description
   
@@ -92,11 +92,16 @@ Finally, run your program with options or a block:
     end
     # => true
 
+## Requirements
+
+* [env](http://github.com/postmodern/env) ~> 0.1, >= 0.1.2
+
 ## Install
 
     $ sudo gem install rprogram
 
 ## License
 
-See {file:LICENSE.txt} for license information.
+Copyright (c) 2007-2011 Hal Brodigan
 
+See {file:LICENSE.txt} for license information.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'ore-tasks', '~> 0.3.0'
+  gem 'ore-tasks', '~> 0.4'
   require 'ore/tasks'
 
   Ore::Tasks.new
@@ -12,7 +12,7 @@ rescue LoadError => e
 end
 
 begin
-  gem 'rspec', '~> 2.4.0'
+  gem 'rspec', '~> 2.4'
   require 'rspec/core/rake_task'
 
   RSpec::Core::RakeTask.new

data/gemspec.yml

@@ -13,7 +13,10 @@ email: postmodern.mod3@gmail.com
 homepage: http://github.com/postmodern/rprogram
 has_yard: true
 
+dependencies:
+  env: ~> 0.1, >= 0.1.2
+
 development_dependencies:
-  ore-tasks: ~> 0.3.0
-  rspec: ~> 2.4.0
+  ore-tasks: ~> 0.4
+  rspec: ~> 2.4
   yard: ~> 0.6.0

data/lib/rprogram/compat.rb

@@ -1,7 +1,12 @@
 require 'rprogram/exceptions/program_not_found'
+require 'rprogram/rprogram'
+
+require 'env/variables'
 
 module RProgram
   module Compat
+    extend Env::Variables
+
     #
     # Determines the native platform.
     #
@@ -17,40 +22,29 @@ module RProgram
       RUBY_PLATFORM.split('-').last
     end
 
-    #
-    # Determines the contents of the `PATH` environment variable.
-    #
-    # @return [Array]
-    #   The contents of the `PATH` environment variable.
-    #
-    # @example
-    #   Compat.paths #=> ["/bin", "/usr/bin"]
-    #
-    def Compat.paths
-      if ENV['PATH']
-        ENV['PATH'].split(File::PATH_SEPARATOR)
-      else
-        []
-      end
-    end
-
     #
     # Finds the full-path of the program with the matching name.
     #
     # @param [String] name
     #   The name of the program to find.
     #
-    # @return [String, nil]
+    # @return [Pathname, nil]
     #   The full-path of the desired program.
     #
     # @example
-    #   Compat.find_program('as')  #=> "/usr/bin/as"
+    #   Compat.find_program('as')
+    #   #=> #<Pathname:/usr/bin/as>
     #
     def Compat.find_program(name)
-      Compat.paths.each do |dir|
-        full_path = File.expand_path(File.join(dir,name))
+      # add the `.exe` suffix to the name, if running on Windows
+      if platform =~ /mswin/
+        name = "#{name}.exe"
+      end
+
+      paths.each do |dir|
+        full_path = dir.join(name).expand_path
 
-        return full_path if File.file?(full_path)
+        return full_path if full_path.file?
       end
 
       return nil
@@ -62,14 +56,20 @@ module RProgram
     # @param [Array] names
     #   The names of the program to use while searching for the program.
     #
-    # @return [String, nil]
+    # @return [Pathname, nil]
     #   The first full-path for the program.
     #
     # @example
     #   Compat.find_program_by_names("gas","as")  #=> "/usr/bin/as"
     #
     def Compat.find_program_by_names(*names)
-      names.map { |name| Compat.find_program(name) }.compact.first
+      names.each do |name|
+        if (path = find_program(name))
+          return path
+        end
+      end
+
+      return nil
     end
 
     #
@@ -112,13 +112,13 @@ module RProgram
     # @since 0.1.8
     #
     def Compat.sudo(path,*args)
-      sudo_path = Compat.find_program('sudo')
+      sudo_path = find_program('sudo')
 
       unless sudo_path
         raise(ProgramNotFound,'could not find the "sudo" program',caller)
       end
 
-      return Compat.run(sudo_path,path,*args)
+      return run(sudo_path,path,*args)
     end
   end
 end

data/lib/rprogram/option.rb

@@ -17,10 +17,9 @@ module RProgram
     attr_reader :sub_options
 
     #
-    # Creates a new Option object with. If a _block_
-    # is given it will be used for the custom formating of the option. If a
-    # _block_ is not given, the option will use the default_format when
-    # generating the arguments.
+    # Creates a new Option object with. If a block is given it will be
+    # used for the custom formatting of the option. If a block is not given,
+    # the option will use the default_format when generating the arguments.
     #
     # @param [Hash] options
     #   Additional options.

data/lib/rprogram/version.rb

@@ -1,4 +1,4 @@
 module RProgram
   # Version of RProgram
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require 'rubygems'
-gem 'rspec', '~> 2.4.0'
+gem 'rspec', '~> 2.4'
 require 'rspec'
 
 require 'rprogram/version'

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rprogram
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors: 
 - Postmodern
@@ -14,56 +10,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 -08:00
+date: 2011-03-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ore-tasks
+  name: env
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.2
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
-  type: :development
+        version: "0.1"
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: ore-tasks
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
+        version: "0.4"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
+        version: "2.4"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+  type: :development
+  version_requirements: *id004
 description: RProgram is a library for creating wrappers around command-line programs. RProgram provides a Rubyful interface to programs and all their options or non-options. RProgram can also search for programs installed on a system. files without having to use YAML or define classes named like the file.
-email: postmodern.mod3@gmail.com
+email: 
+- postmodern.mod3@gmail.com
 executables: []
 
 extensions: []
@@ -128,30 +127,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rprogram
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A library for creating wrappers around command-line programs.
 test_files: 
-- spec/nameable_spec.rb
-- spec/program_spec.rb
 - spec/rprogram_spec.rb
+- spec/nameable_spec.rb
+- spec/option_list_spec.rb
 - spec/non_option_spec.rb
+- spec/task_spec.rb
 - spec/compat_spec.rb
-- spec/option_list_spec.rb
+- spec/program_spec.rb
 - spec/option_spec.rb
-- spec/task_spec.rb