autoproj 1.7.12 → 1.7.13

data/History.txt

@@ -1,3 +1,6 @@
+= Version 1.7.13
+ * bugfix release: fix HTTP fallback mechanism for gitorious servers
+
 = Version 1.7.12
  * improved some error messages
  * fixed error if config.yml is empty

data/bin/autoproj_bootstrap

@@ -255,7 +255,15 @@ module Autoproj
         #
         # Examples: ['debian', ['sid', 'unstable']] or ['ubuntu', ['lucid lynx', '10.04']]
         def self.operating_system(options = Hash.new)
-            options = Kernel.validate_options options, :force => false
+            # Validate the options. We check on the availability of
+            # validate_options as to not break autoproj_bootstrap (in which
+            # validate_options is not available)
+            options =
+                if Kernel.respond_to?(:validate_options)
+                    Kernel.validate_options options, :force => false
+                else
+                    options.dup
+                end
 
             if !options[:force]
                 if !@operating_system.nil?

data/lib/autoproj/autobuild.rb

@@ -300,7 +300,7 @@ module Autoproj
         elsif File.file?(File.join(full_path, "CMakeLists.txt"))
             "cmake_package"
         elsif File.directory?(File.join(full_path, "lib")) &&
-            !Dir.enum_for(:glob, File.join(full_path, "*.rb")).to_a.empty?
+            Find.enum_for(:find, File.join(full_path, "lib")).any? { |path| path =~ /\.rb$/ }
             "ruby_package"
         end
     end

data/lib/autoproj/gitorious.rb

@@ -53,6 +53,7 @@ module Autoproj
         if Autobuild::Importer.respond_to?(:fallback) && options[:fallback_to_http]
             Autobuild::Importer.fallback do |package, importer|
                 root_rx = /^(?:http:\/\/git\.|git:\/\/|git@)#{Regexp.quote(base_url)}:?/
+
                 if importer.kind_of?(Autobuild::Git) && importer.repository =~ root_rx && importer.repository !~ /^http/
                     Autoproj.warn "import from #{importer.repository} failed, falling back to using http for all packages on #{base_url}"
 
@@ -87,9 +88,9 @@ module Autoproj
             if url !~ /^\//
                 url = "/#{url}"
             end
-            base_url = Autoproj.user_config("#{name}_ROOT")
-            base_push_url = Autoproj.user_config("#{name}_PUSH_ROOT")
-            return Hash[:type => 'git', :url => "#{base_url}#{url}", :push_to => "#{base_push_url}#{url}"].merge(options)
+            pull_base_url = Autoproj.user_config("#{name}_ROOT")
+            push_base_url = Autoproj.user_config("#{name}_PUSH_ROOT")
+            Hash[:type => 'git', :url => "#{pull_base_url}#{url}", :push_to => "#{push_base_url}#{url}"].merge(options)
         end
     end
 end

data/lib/autoproj/osdeps.rb

@@ -156,7 +156,15 @@ module Autoproj
         #
         # Examples: ['debian', ['sid', 'unstable']] or ['ubuntu', ['lucid lynx', '10.04']]
         def self.operating_system(options = Hash.new)
-            options = Kernel.validate_options options, :force => false
+            # Validate the options. We check on the availability of
+            # validate_options as to not break autoproj_bootstrap (in which
+            # validate_options is not available)
+            options =
+                if Kernel.respond_to?(:validate_options)
+                    Kernel.validate_options options, :force => false
+                else
+                    options.dup
+                end
 
             if !options[:force]
                 if !@operating_system.nil?

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.12"
+    VERSION = "1.7.13"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 7
-  - 12
-  version: 1.7.12
+  - 13
+  version: 1.7.13
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 Z
+date: 2011-08-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild