rprogram 0.2.3 → 0.3.0

data/lib/rprogram/version.rb

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

data/rprogram.gemspec

@@ -9,7 +9,7 @@ rescue NameError
     require 'ore/specification'
     retry
   rescue LoadError
-    STDERR.puts "The 'rprogram.gemspec' file requires Ore."
+    STDERR.puts "The '#{__FILE__}' file requires Ore."
     STDERR.puts "Run `gem install ore-core` to install Ore."
   end
 end

data/spec/classes/aliased_program.rb

@@ -1,8 +1,4 @@
-require 'rprogram/nameable'
-
-class AliasedProgram
-
-  include RProgram::Nameable
+class AliasedProgram < RProgram::Program
 
   name_program 'ls'
   alias_program 'dir'

data/spec/classes/named_program.rb

@@ -1,8 +1,4 @@
-require 'rprogram/nameable'
-
-class NamedProgram
-
-  include RProgram::Nameable
+class NamedProgram < RProgram::Program
 
   name_program 'ls'
 

data/spec/program_spec.rb

@@ -1,12 +1,95 @@
 require 'rprogram/program'
 
 require 'spec_helper'
+require 'classes/named_program'
+require 'classes/aliased_program'
 require 'classes/ls_program'
 
 describe Program do
   subject { Program.new('/usr/bin/cc') }
   after(:all) { LS.path = nil }
 
+  describe "named program" do
+    subject { NamedProgram }
+
+    it "should be able to give a class a program name" do
+      subject.program_name.should == 'ls'
+    end
+
+    it "should not have any program aliases" do
+      subject.program_aliases.should be_empty
+    end
+
+    it "should have one program name" do
+      subject.program_names.should == ['ls']
+    end
+
+    it "should provide an instance method for the program name" do
+      program = subject.find
+
+      program.program_name.should == 'ls'
+    end
+
+    it "should provide an instance method for the program names" do
+      program = subject.find
+
+      program.program_names.should == ['ls']
+    end
+  end
+
+  describe "aliased program" do
+    subject { AliasedProgram }
+
+    it "should have program aliases" do
+      subject.program_aliases.should == ['dir']
+    end
+
+    it "should have one program name" do
+      subject.program_names.should == ['ls', 'dir']
+    end
+
+    it "should provide an instance method for the program aliases" do
+      program = subject.find
+
+      program.program_aliases.should == ['dir']
+    end
+
+    it "should provide an instance method for the program names" do
+      program = subject.find
+
+      program.program_names.should == ['ls', 'dir']
+    end
+  end
+
+  describe "path" do
+    subject { NamedProgram }
+
+    it "should not have a path by default" do
+      subject.path.should be_nil
+    end
+
+    it "should allow setting the path" do
+      new_path = '/bin/ls'
+
+      subject.path = new_path
+      subject.path.should == new_path
+    end
+
+    it "should expand paths" do
+      subject.path = '/../bin/ls'
+
+      subject.path.should == '/bin/ls'
+    end
+
+    it "should allow setting the path to nil" do
+      subject.path = nil
+
+      subject.path.should be_nil
+    end
+
+    after(:all) { NamedProgram.path = nil }
+  end
+
   it "should create a Program from a path" do
     subject.should_not be_nil
   end
@@ -50,7 +133,7 @@ describe Program do
   end
 
   it "should allow using a default path" do
-    LS.path = '/usr/bin/dir'
+    LS.path = '/bin/ls'
 
     LS.find.path.should == LS.path
   end

data/spec/scripts/echo.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+puts STDIN.readline.chomp

data/spec/scripts/fail.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+exit -1

data/spec/scripts/print.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+puts ARGV[0]

data/spec/scripts/success.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+exit 0

data/spec/system_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+require 'tempfile'
+
+require 'rprogram/system'
+
+describe System do
+  subject { System }
+
+  it "should determine the native architecture" do
+    subject.arch.should_not be_empty
+  end
+
+  it "should determine the native platform" do
+    subject.platform.should_not be_empty
+  end
+
+  it "should have a list of directories that contain programs" do
+    subject.paths.should_not be_empty
+
+    subject.paths.any? { |dir| dir.directory? }.should == true
+  end
+
+  it "should be able to find programs" do
+    subject.find_program('ls').should be_executable
+  end
+
+  it "should be able to find programs by multiple names" do
+    subject.find_program_by_names('ls','dir').should be_executable
+  end
+
+  describe "run" do
+    let(:scripts_dir) { File.join(File.dirname(__FILE__),'scripts') }
+
+    let(:fail_script) { File.join(scripts_dir,'fail.rb') }
+    let(:success_script) { File.join(scripts_dir,'success.rb') }
+
+    let(:print_script) { File.join(scripts_dir,'print.rb') }
+    let(:echo_script) { File.join(scripts_dir,'echo.rb') }
+    let(:data) { 'hello' }
+
+    it "should return true when programs succeed" do
+      subject.run(success_script).should == true
+    end
+
+    it "should return false when programs fail" do
+      subject.run(fail_script).should == false
+    end
+
+    unless System.ruby_1_8?
+      it "should allow passing exec options as the last argument" do
+        output = Tempfile.new('rprogram_run_with_options')
+        subject.run(print_script, data, :out => [output.path, 'w'])
+
+        output.read.chomp.should == data
+      end
+    else
+      it "should raise an exception when passing exec options" do
+        lambda {
+          subject.run(print_script, data, :out => ['foo', 'w'])
+        }.should raise_error
+      end
+    end
+
+
+    unless (System.ruby_1_8? || (System.windows? && !System.jruby?))
+      it "should allow running programs with IO.popen" do
+        io = subject.run(echo_script, :popen => 'w+')
+
+        io.puts(data)
+        io.readline.chomp.should == data
+      end
+    else
+      it "should raise an exception when specifying :popen" do
+        lambda {
+          subject.run(echo_script, :popen => 'w+')
+        }.should raise_error
+      end
+    end
+  end
+end

data/spec/task_spec.rb

@@ -35,21 +35,6 @@ describe Task do
     end
   end
 
-  describe "sudo" do
-    it "should allow passing in the :sudo option" do
-      task = LSTask.new(:sudo => true)
-
-      task.should be_sudo
-    end
-
-    it "should allow enabling sudo after the task has been initialized" do
-      task = LSTask.new
-
-      task.sudo = true
-      task.should be_sudo
-    end
-  end
-
   before(:each) do
     @task = LSTask.new
   end

metadata

@@ -2,7 +2,7 @@
 name: rprogram
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Postmodern
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -04:00
-default_executable: 
+date: 2011-04-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: env
@@ -79,21 +78,16 @@ files:
 - Rakefile
 - gemspec.yml
 - lib/rprogram.rb
-- lib/rprogram/compat.rb
 - lib/rprogram/exceptions.rb
 - lib/rprogram/exceptions/program_not_found.rb
-- lib/rprogram/extensions.rb
-- lib/rprogram/nameable.rb
-- lib/rprogram/nameable/class_methods.rb
-- lib/rprogram/nameable/nameable.rb
 - lib/rprogram/non_option.rb
 - lib/rprogram/option.rb
 - lib/rprogram/option_list.rb
-- lib/rprogram/options.rb
-- lib/rprogram/options/class_methods.rb
-- lib/rprogram/options/options.rb
 - lib/rprogram/program.rb
 - lib/rprogram/rprogram.rb
+- lib/rprogram/sudo.rb
+- lib/rprogram/sudo_task.rb
+- lib/rprogram/system.rb
 - lib/rprogram/task.rb
 - lib/rprogram/version.rb
 - lib/rprogram/yard.rb
@@ -103,17 +97,19 @@ files:
 - spec/classes/ls_selinux_task.rb
 - spec/classes/ls_task.rb
 - spec/classes/named_program.rb
-- spec/compat_spec.rb
-- spec/nameable_spec.rb
 - spec/non_option_spec.rb
 - spec/option_examples.rb
 - spec/option_list_spec.rb
 - spec/option_spec.rb
 - spec/program_spec.rb
 - spec/rprogram_spec.rb
+- spec/scripts/echo.rb
+- spec/scripts/fail.rb
+- spec/scripts/print.rb
+- spec/scripts/success.rb
 - spec/spec_helper.rb
+- spec/system_spec.rb
 - spec/task_spec.rb
-has_rdoc: yard
 homepage: http://github.com/postmodern/rprogram
 licenses: 
 - MIT
@@ -137,16 +133,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rprogram
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A library for creating wrappers around command-line programs.
 test_files: 
+- 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/program_spec.rb
+- spec/system_spec.rb
+- spec/option_list_spec.rb
 - spec/option_spec.rb
+- spec/task_spec.rb

data/lib/rprogram/compat.rb

@@ -1,124 +0,0 @@
-require 'rprogram/exceptions/program_not_found'
-require 'rprogram/rprogram'
-
-require 'env/variables'
-
-module RProgram
-  module Compat
-    extend Env::Variables
-
-    #
-    # Determines the native platform.
-    #
-    # @return [String]
-    #   The native platform.
-    #
-    # @example
-    #   Compat.arch  #=> "linux"
-    #
-    # @deprecated Will be removed in 0.3.0.
-    #
-    def Compat.platform
-      RUBY_PLATFORM.split('-').last
-    end
-
-    #
-    # Finds the full-path of the program with the matching name.
-    #
-    # @param [String] name
-    #   The name of the program to find.
-    #
-    # @return [Pathname, nil]
-    #   The full-path of the desired program.
-    #
-    # @example
-    #   Compat.find_program('as')
-    #   #=> #<Pathname:/usr/bin/as>
-    #
-    def Compat.find_program(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 full_path.file?
-      end
-
-      return nil
-    end
-
-    #
-    # Finds the program matching one of the matching names.
-    #
-    # @param [Array] names
-    #   The names of the program to use while searching for the program.
-    #
-    # @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.each do |name|
-        if (path = find_program(name))
-          return path
-        end
-      end
-
-      return nil
-    end
-
-    #
-    # Runs a program.
-    #
-    # @param [String] path
-    #   The path to the program.
-    #
-    # @param [Array] args
-    #   Additional arguments to run the program with.
-    #
-    # @return [Boolean]
-    #   Specifies whether the program exited successfully.
-    #
-    def Compat.run(path,*args)
-      args = args.map { |arg| arg.to_s }
-
-      if RProgram.debug
-        STDERR.puts ">>> #{path} #{args.join(' ')}"
-      end
-
-      return Kernel.system(path,*args)
-    end
-
-    #
-    # Runs a program under sudo.
-    #
-    # @param [String] path
-    #   Path of the program to run.
-    #
-    # @param [Array] args
-    #   Additional arguments to run the program with.
-    #
-    # @return [Boolean]
-    #   Specifies whether the program exited successfully.
-    #
-    # @raise [ProgramNotFound]
-    #   Indicates that the `sudo` program could not be located.
-    #
-    # @since 0.1.8
-    #
-    def Compat.sudo(path,*args)
-      sudo_path = find_program('sudo')
-
-      unless sudo_path
-        raise(ProgramNotFound,'could not find the "sudo" program',caller)
-      end
-
-      return run(sudo_path,path,*args)
-    end
-  end
-end