autoproj 1.10.2 → 1.11.0.b1

data/lib/autoproj/system.rb

@@ -202,33 +202,16 @@ module Autoproj
         end
     end
 
-    # Load a definition file given at +path+. +source+ is the package set from
-    # which the file is taken.
-    #
-    # If any error is detected, the backtrace will be filtered so that it is
-    # easier to understand by the user. Moreover, if +source+ is non-nil, the
-    # package set name will be mentionned.
+    # @deprecated use Ops.loader.load or add a proper Loader object to your
+    #   class
     def self.load(package_set, *path)
-        path = File.join(*path)
-        in_package_set(package_set, File.expand_path(path).gsub(/^#{Regexp.quote(Autoproj.root_dir)}\//, '')) do
-            begin
-                Kernel.load path
-            rescue Interrupt
-                raise
-            rescue ConfigError => e
-                raise
-            rescue Exception => e
-                filter_load_exception(e, package_set, path)
-            end
-        end
+        Ops.loader.load(package_set, *path)
     end
 
-    # Same as #load, but runs only if the file exists.
+    # @deprecated use Ops.loader.load_if_present or add a proper Loader object
+    #   to your class
     def self.load_if_present(package_set, *path)
-        path = File.join(*path)
-        if File.file?(path)
-            self.load(package_set, *path)
-        end
+        Ops.loader.load_if_present(package_set, *path)
     end
 
     # Look into +dir+, searching for shared libraries. For each library, display

data/lib/autoproj/variable_expansion.rb

@@ -10,7 +10,6 @@ module Autoproj
         options.each_key do |k|
             options[k] = options[k].to_s
         end
-        options = options.merge(option_overrides)
 
         loop do
             new_value = Autoproj.single_expansion(value, options)

data/lib/autoproj/vcs_definition.rb

@@ -30,6 +30,21 @@ module Autoproj
             Hash[:type => type, :url => url].merge(options)
         end
 
+        # Update this VCS definition with new information / options and return
+        # the updated definition
+        #
+        # @return [VCSDefinition]
+        def update(spec, new_raw_entry)
+            new = self.class.vcs_definition_to_hash(spec)
+            if new.has_key?(:type) && (type != new[:type])
+                # The type changed. We replace the old definition by the new one
+                # completely
+                self.class.from_raw(new, new_raw_entry)
+            else
+                self.class.from_raw(to_hash.merge(new), raw + new_raw_entry)
+            end
+        end
+
         # Updates the VCS specification +old+ by the information contained in
         # +new+
         #
@@ -133,6 +148,14 @@ module Autoproj
             end
         end
 
+        def hash
+            to_hash.hash
+        end
+
+        def eql?(other_vcs)
+            to_hash == other_vcs.to_hash
+        end
+
         def self.to_absolute_url(url, root_dir = nil)
             # NOTE: we MUST use nil as default argument of root_dir as we don't
             # want to call Autoproj.root_dir unless completely necessary

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.10.2"
+    VERSION = "1.11.0.b1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.0.b1
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -101,6 +101,7 @@ executables:
 - autoproj-query
 - autoproj-show
 - autoproj-snapshot
+- autoproj-switch-config
 - autoproj-test
 - autoproj_bootstrap
 - autoproj_bootstrap.in
@@ -133,6 +134,7 @@ files:
 - bin/autoproj-query
 - bin/autoproj-show
 - bin/autoproj-snapshot
+- bin/autoproj-switch-config
 - bin/autoproj-test
 - bin/autoproj_bootstrap
 - bin/autoproj_bootstrap.in
@@ -140,13 +142,21 @@ files:
 - lib/autoproj.rb
 - lib/autoproj/autobuild.rb
 - lib/autoproj/base.rb
+- lib/autoproj/build_option.rb
 - lib/autoproj/cmdline.rb
+- lib/autoproj/configuration.rb
 - lib/autoproj/default.osdeps
 - lib/autoproj/environment.rb
 - lib/autoproj/gitorious.rb
 - lib/autoproj/installation_manifest.rb
 - lib/autoproj/manifest.rb
 - lib/autoproj/metapackage.rb
+- lib/autoproj/ops/build.rb
+- lib/autoproj/ops/cache.rb
+- lib/autoproj/ops/configuration.rb
+- lib/autoproj/ops/loader.rb
+- lib/autoproj/ops/main_config_switcher.rb
+- lib/autoproj/ops/tools.rb
 - lib/autoproj/options.rb
 - lib/autoproj/osdeps.rb
 - lib/autoproj/package_definition.rb
@@ -205,9 +215,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -215,9 +225,9 @@ signing_key:
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files:
+- test/test_os_dependencies.rb
+- test/test_manifest.rb
+- test/package_managers/test_apt_dpkg_manager.rb
 - test/package_managers/test_gem.rb
 - test/package_managers/test_pip.rb
-- test/package_managers/test_apt_dpkg_manager.rb
 - test/test_package_manifest.rb
-- test/test_manifest.rb
-- test/test_os_dependencies.rb