patir 0.7.0 → 0.7.2

data/History.txt

@@ -1,3 +1,7 @@
+==0.7.2 / 2011-11-29
+* you can now use require in configuration files
+* better handling of paths in configuration files. Relative paths in chained configuration files are now correct
+* more unit tests
 ==0.7.0 / 2011-08-11
 * Ruby 1.9 compatibility
 * updated systemu dependency

data/Rakefile

@@ -15,7 +15,7 @@ Hoe.spec('patir') do
   self.description = paragraphs_of('README.md', 1..4).join("\n\n")
   self.url = "http://patir.rubyforge.org"
   self.changes = paragraphs_of('History.txt', 0..1).join("\n\n")
-  extra_deps<<['systemu',"~>2.2.0"]
+  extra_deps<<['systemu',"~>2.3"]
 end
 
 # vim: syntax=Ruby

data/lib/patir/base.rb

@@ -6,7 +6,7 @@ module Patir
   module Version
     MAJOR=0
     MINOR=7
-    TINY=0
+    TINY=2
     STRING=[ MAJOR, MINOR, TINY ].join( "." )  	
   end
   #Error thrown usually in initialize methods when missing required parameters

data/lib/patir/configuration.rb

@@ -37,7 +37,7 @@ module Patir
   #To use it you would do
   # cfg=SimpleConfigurator.new("config.cfg").configuration
   class Configurator
-    attr_reader :logger,:config_file
+    attr_reader :logger,:config_file,:wd
     def initialize config_file,logger=nil
       @logger=logger
       @logger||=Patir.setup_logger
@@ -59,17 +59,19 @@ module Patir
     #You can 'include' the first.cfg file in the other configurations with
     # configuration.load_from_file("first.cfg")
     def load_from_file filename
-      load_configuration(filename)
+      fnm = File.exists?(filename) ? filename : File.join(@wd,filename)
+      load_configuration(fnm)
     end
     private
     def load_configuration filename
       begin 
-        #change into the directory of the configuration file to make requiring easy
-        prev_dir=Dir.pwd
-        Dir.chdir(File.dirname(filename))
-        cfg_txt=File.readlines(File.basename(filename))
+        cfg_txt=File.read(filename)
+        @wd=File.expand_path(File.dirname(filename))
         configuration=self
-        eval(cfg_txt.join(),binding())
+        #add the path to the require lookup path to allow require statements in the configuration files
+        $:.unshift File.join(@wd)
+        #evaluate in the working directory to enable relative paths in configuration
+        Dir.chdir(@wd){eval(cfg_txt,binding())}
         @logger.info("Configuration loaded from #{filename}") if @logger
       rescue ConfigurationException
         #pass it on, do not wrap again
@@ -85,9 +87,6 @@ module Patir
         @logger.debug($!)
         #Just wrap the exception so we can differentiate
         raise ConfigurationException.new,"#{$!.message}"
-      ensure
-        #ensure we go back to our previous dir
-        Dir.chdir(prev_dir)
       end
     end
   end

data/test/test_patir_configuration.rb

@@ -14,6 +14,15 @@ module Patir
     def test_configuration
       c=Patir::Configurator.new("samples/empty.cfg")
       assert_equal(c.configuration,c)
+      
+      c=Patir::Configurator.new("samples/chain.cfg")
+      assert_equal(c.configuration,c)
+    end
+    def test_raise_configuration
+      assert_raise(Patir::ConfigurationException) { Patir::Configurator.new("samples/failed.cfg")}
+      assert_raise(Patir::ConfigurationException) { Patir::Configurator.new("samples/failed_unknown.cfg")}
+      assert_raise(Patir::ConfigurationException) { Patir::Configurator.new("samples/syntax.cfg")}
+      assert_raise(Patir::ConfigurationException) { Patir::Configurator.new("samples/config_fail.cfg")}
     end
   end
 end

metadata

@@ -1,77 +1,64 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: patir
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.7.2
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 0
-  version: 0.7.0
 platform: ruby
-authors: 
+authors:
 - Vassilis Rizopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: systemu
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2161475600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2161475600
+- !ruby/object:Gem::Dependency
   name: hoe
+  requirement: &2161471140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2161471140
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &2161360540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id002
-description: |-
-  ##DESCRIPTION:
-    
-  patir provides code to enable project automation tasks:
-  
-   * A default logging format for ruby's built-in Logger
-   * A command abstraction with a platform independent implementation for running shell commands and ruby code
-   * Command sequences using the same command abstraction as single commands.
-   * Code that allows the use of configuration files written in ruby.
-  
-  ##INSTALL:
-  
-   gem install patir
+  prerelease: false
+  version_requirements: *2161360540
+description: ! "##DESCRIPTION:\n  \npatir provides code to enable project automation
+  tasks:\n\n * A default logging format for ruby's built-in Logger\n * A command abstraction
+  with a platform independent implementation for running shell commands and ruby code\n
+  * Command sequences using the same command abstraction as single commands.\n * Code
+  that allows the use of configuration files written in ruby.\n\n##INSTALL:\n\n gem
+  install patir"
 email: vassilisrizopoulos@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - COPYING.txt
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - COPYING.txt
 - History.txt
 - Manifest.txt
@@ -87,39 +74,35 @@ files:
 - .gemtest
 homepage: http://patir.rubyforge.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 813397894778583248
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: patir
-rubygems_version: 1.8.6
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
-summary: patir (Project Automation Tools in Ruby) provides libraries for use in project automation tools
-test_files: 
+summary: patir (Project Automation Tools in Ruby) provides libraries for use in project
+  automation tools
+test_files:
 - test/test_patir_base.rb
 - test/test_patir_command.rb
 - test/test_patir_configuration.rb