autoproj 1.12.5 → 1.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de1b737b5a26bac3eafe2394e7a9d57032321935
-  data.tar.gz: c09ff63617a7bc670e9608c4d06a245cdd112ba6
+  metadata.gz: 30982dc07e20775dc8e9e2a2dd5a3210445f02d1
+  data.tar.gz: f3d8d1886e6c8ecd8140ba60c92e154de2c022a5
 SHA512:
-  metadata.gz: e4e68ed38d8a6b2588053fdb5bf38955600ebfeb825e3ab67d8834b37e1c21fb8723a503267c6c9400eb5f4a5a0f85838dfe6dd4f0656b4ccd3a84acad669b1e
-  data.tar.gz: 49c225e45df8256da2d3e90d1da139d4766be1e1d2454637a19b5e67991dff729968b83cd594fc99cd70f55cea93003937000986d22c61c9465baed342d64cf4
+  metadata.gz: 23a44919a79b9428768958e6a5d60940f12f22f81b0227957a3effe09784a7b39c4a08ed5a02b48c2430c6cea7b91d7f6f7afb6ddd2ffbf49d02b4847e344f1a
+  data.tar.gz: ca149e32d50932a01db5a2ead6afc35aa367ed602eb20de2514fbb8ef9ba6f2e406b1a4d31aaf4ff86976f04a31966211e87036eac76e32013f787cdb6afce24

data/bin/autoproj_bootstrap

@@ -2423,7 +2423,7 @@ module Autobuild
 
         def find_in_path(file)
             path = ENV['PATH'].split(File::PATH_SEPARATOR).
-                find { |dir| File.exists?(File.join(dir, file)) }
+                find { |dir| File.exist?(File.join(dir, file)) }
             if path
                 return File.join(path, file)
             end

data/lib/autoproj/gitorious.rb

@@ -25,35 +25,51 @@ module Autoproj
             :http_url => "https://git.#{base_url}",
             :ssh_url  => "git@#{base_url}:",
             :fallback_to_http => true,
-            :default => 'git,ssh'
-
-        gitorious_long_doc = [
-            "How should I interact with #{base_url} (git, http or ssh)",
-            "If you give two values, comma-separated, the first one will be",
-            "used for pulling and the second one for pushing"]
+            :default => 'http,ssh',
+            :disabled_methods => []
+            
+        disabled_methods = Array(options[:disabled_methods])
 
         access_methods = Hash[
             'git' => 'git,ssh',
             'ssh' => 'ssh,ssh',
             'http' => 'http,http']
 
-        configuration_option name, 'string',
-            :default => options[:default],
-            :doc => gitorious_long_doc do |value|
-                if value =~ /,/
-                    value.split(',').each do |method|
-                        if !access_methods.has_key?(method)
-                            raise Autoproj::InputError, "#{method} is not a known access method"
-                        end
+        gitorious_long_doc = [
+            "How should I interact with #{base_url} (#{(access_methods.keys - disabled_methods).sort.join(", ")})",
+            "If you give two values, comma-separated, the first one will be",
+            "used for pulling and the second one for pushing"]
+
+        validator = lambda do |value|
+            if value =~ /,/
+                value.split(',').each do |method|
+                    if !access_methods.has_key?(method)
+                        raise Autoproj::InputError, "#{method} is not a known access method"
+                    elsif disabled_methods.include?(method)
+                        raise Autoproj::InputError, "#{method} is disabled on #{base_url}"
                     end
-                elsif !access_methods.has_key?(value)
-                    raise Autoproj::InputError, "#{value} is not a known access method"
                 end
-
-                value
+            elsif !access_methods.has_key?(value)
+                raise Autoproj::InputError, "#{value} is not a known access method"
+            elsif disabled_methods.include?(value)
+                raise Autoproj::InputError, "#{method} is disabled on #{base_url}"
             end
 
-        access_mode = Autoproj.user_config(name)
+            value
+        end
+
+        configuration_option name, 'string',
+            :default => options[:default],
+            :doc => gitorious_long_doc, &validator
+
+        access_mode = Autoproj.config.get(name)
+        begin
+            validator[access_mode]
+        rescue Autoproj::InputError => e
+            Autoproj.warn e.message
+            Autoproj.config.reset(name)
+            access_mode = Autoproj.config.get(name)
+        end
         access_mode = access_methods[access_mode] || access_mode
         pull, push = access_mode.split(',')
         [[pull, "_ROOT"], [push, "_PUSH_ROOT"]].each do |method, var_suffix|
@@ -78,6 +94,6 @@ module Autoproj
     end
 end
 
-Autoproj.gitorious_server_configuration('GITORIOUS', 'gitorious.org')
+Autoproj.gitorious_server_configuration('GITORIOUS', 'gitorious.org', :default => 'http,ssh', :disabled_methods => 'git')
 Autoproj.gitorious_server_configuration('GITHUB', 'github.com', :http_url => 'https://github.com', :default => 'http,ssh')
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.12.5"
+    VERSION = "1.12.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.12.5
+  version: 1.12.6
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -190,7 +190,6 @@ files:
 - test/data/test_manifest/autoproj/local_set/local.autobuild
 - test/data/test_manifest/autoproj/local_set/source.yml
 - test/data/test_manifest/autoproj/manifest
-- test/ops/test_configuration.rb
 - test/package_managers/apt-dpkg-status
 - test/package_managers/apt-dpkg-status.installed-last
 - test/package_managers/apt-dpkg-status.noninstalled-last
@@ -226,11 +225,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy installation and management of sets of software packages
-test_files:
-- test/package_managers/test_apt_dpkg_manager.rb
-- test/package_managers/test_gem.rb
-- test/package_managers/test_pip.rb
-- test/test_manifest.rb
-- test/test_package_manifest.rb
-- test/test_os_dependencies.rb
-- test/ops/test_configuration.rb
+test_files: []

data/test/ops/test_configuration.rb

@@ -1,20 +0,0 @@
-require 'autoproj/test'
-require 'autoproj/ops/configuration'
-
-describe Autoproj::Ops::Configuration do
-    describe "#sort_package_sets_by_import_order" do
-        attr_reader :ops
-
-        before do
-            @ops = Autoproj::Ops::Configuration.new(nil, nil)
-        end
-
-        it "should handle standalone package sets that are both explicit and dependencies of other package sets gracefully (issue#30)" do
-            pkg_set0 = flexmock('set0', imports: [], explicit?: true)
-            pkg_set1 = flexmock('set1', imports: [pkg_set0], explicit?: true)
-            root_pkg_set = flexmock('root', imports: [pkg_set0, pkg_set1], explicit?: true)
-            assert_equal [pkg_set0, pkg_set1, root_pkg_set],
-                ops.sort_package_sets_by_import_order([pkg_set1, pkg_set0], root_pkg_set)
-        end
-    end
-end