autoproj 1.6.2 → 1.7.0.b1

data/lib/autoproj/options.rb

@@ -14,7 +14,7 @@ module Autoproj
             @name, @type, @options = name.to_str, type.to_str, options.to_hash
             @validator = validator.to_proc if validator
             if !BuildOption.respond_to?("validate_#{type}")
-                raise ConfigError, "invalid option type #{type}"
+                raise ConfigError.new, "invalid option type #{type}"
             end
         end
 
@@ -154,7 +154,7 @@ module Autoproj
             @user_config[option_name] = [value, true]
             value
         else
-            raise ConfigError, "undeclared option '#{option_name}'"
+            raise ConfigError.new, "undeclared option '#{option_name}'"
         end
     end
 

data/lib/autoproj/osdeps.rb

@@ -7,7 +7,7 @@ module Autoproj
                 data = YAML.load(File.read(file)) || Hash.new
                 verify_definitions(data)
             rescue ArgumentError => e
-                raise ConfigError, "error in #{file}: #{e.message}"
+                raise ConfigError.new, "error in #{file}: #{e.message}"
             end
 
             OSDependencies.new(data, file)
@@ -144,8 +144,9 @@ module Autoproj
                 return @operating_system
             elsif Autoproj.has_config_key?('operating_system')
                 os = Autoproj.user_config('operating_system')
-                if !os.respond_to?(:to_ary) # upgrade from previous format
-                    @operating_system = nil
+                if os.respond_to?(:to_ary) # upgrade from previous format
+                    @operating_system = os
+                    return os
                 end
             end
 
@@ -335,7 +336,7 @@ fi
             elsif data.respond_to?(:to_str)
                 return [PACKAGES, [data.to_str]]
             else
-                raise ConfigError, "invalid package specificiation #{data} in #{source_of(name)}"
+                raise ConfigError.new, "invalid package specificiation #{data} in #{source_of(name)}"
             end
         end
 
@@ -350,11 +351,11 @@ fi
             dependencies.each do |name|
                 result = resolve_package(name)
                 if result == NO_PACKAGE
-                    raise ConfigError, "there is no osdeps definition for #{name}"
+                    raise ConfigError.new, "there is no osdeps definition for #{name}"
                 elsif result == WRONG_OS
-                    raise ConfigError, "there is an osdeps definition for #{name}, but not for this operating system"
+                    raise ConfigError.new, "there is an osdeps definition for #{name}, but not for this operating system"
                 elsif result == WRONG_OS_VERSION
-                    raise ConfigError, "there is an osdeps definition for #{name}, but not for this particular operating system version"
+                    raise ConfigError.new, "there is an osdeps definition for #{name}, but not for this particular operating system version"
                 elsif result == IGNORE
                     next
                 elsif result[0] == PACKAGES
@@ -363,7 +364,7 @@ fi
             end
 
             if !os_names.any? { |os_name| OS_AUTO_PACKAGE_INSTALL.has_key?(os_name) }
-                raise ConfigError, "I don't know how to install packages on #{os_names.first}"
+                raise ConfigError.new, "I don't know how to install packages on #{os_names.first}"
             end
 
             return os_packages
@@ -446,7 +447,7 @@ fi
                         # This is *not* handled later, as is the absence of a
                         # package definition. The reason is that it is a bad
                         # configuration file, and should be fixed by the user
-                        raise ConfigError, "unknown OS-independent package management type #{pkg_def} for #{name}"
+                        raise ConfigError.new, "unknown OS-independent package management type #{pkg_def} for #{name}"
                     end
                 else
                     pkg_def.delete_if do |distrib_name, defs|
@@ -510,7 +511,7 @@ fi
                     installed_version = installed.map(&:version).max
                     available_version = available.map { |(name, v), source| v }.max
                     if !available_version
-                        raise ConfigError, "cannot find any gem with the name '#{name}'"
+                        raise ConfigError.new, "cannot find any gem with the name '#{name}'"
                     end
                     needs_update = (available_version > installed_version)
                     !needs_update

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.2"
+    VERSION = "1.7.0.b1"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 6629751
+  prerelease: true
   segments: 
   - 1
-  - 6
-  - 2
-  version: 1.6.2
+  - 7
+  - 0
+  - b1
+  version: 1.7.0.b1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +01:00
+date: 2010-11-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 45
+        hash: 51
         segments: 
         - 1
         - 5
-        - 23
-        version: 1.5.23
+        - 24
+        version: 1.5.24
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -157,9 +158,9 @@ dependencies:
         hash: 19
         segments: 
         - 2
-        - 6
-        - 2
-        version: 2.6.2
+        - 7
+        - 0
+        version: 2.7.0
   type: :development
   version_requirements: *id009
 description: |-
@@ -276,12 +277,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: autobuild