RubyGems - autoproj - Versions diffs - 1.9.7.rc10 → 1.9.7.rc11 - Mend

autoproj 1.9.7.rc10 → 1.9.7.rc11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/bin/autoproj_bootstrap CHANGED

@@ -1013,6 +1013,68 @@ fi
             @operating_system = values
         end
+        def self.guess_operating_system
+            if File.exists?('/etc/debian_version')
+                versions = [File.read('/etc/debian_version').strip]
+                if versions.first =~ /sid/
+                    versions = ["unstable", "sid"]
+                end
+                [['debian'], versions]
+            elsif File.exists?('/etc/redhat-release')
+                release_string = File.read('/etc/redhat-release').strip
+                release_string =~ /(.*) release ([\d.]+)/
+                name = $1.downcase
+                version = $2
+                if name =~ /Red Hat Entreprise/
+                    name = 'rhel'
+                end
+                [[name], [version]]
+            elsif File.exists?('/etc/gentoo-release')
+                release_string = File.read('/etc/gentoo-release').strip
+                release_string =~ /^.*([^\s]+)$/
+                version = $1
+                [['gentoo'], [version]]
+            elsif File.exists?('/etc/arch-release')
+                [['arch'], []]
+            elsif Autobuild.macos?
+                version=`sw_vers | head -2 | tail -1`.split(":")[1]
+                [['darwin'], [version.strip]]
+            elsif Autobuild.windows?
+                [['windows'], []]
+            elsif File.exists?('/etc/SuSE-release')
+                version = File.read('/etc/SuSE-release').strip
+                version =~/.*VERSION\s+=\s+([^\s]+)/
+                version = $1
+                [['opensuse'], [version.strip]]
+            end
+        end
+        def self.ensure_derivatives_refer_to_their_parents(names)
+            names = names.dup
+            version_files = Hash[
+                '/etc/debian_version' => 'debian',
+                '/etc/redhat-release' => 'fedora',
+                '/etc/gentoo-release' => 'gentoo',
+                '/etc/arch-release' => 'arch',
+                '/etc/SuSE-release' => 'opensuse']
+            version_files.each do |file, name|
+                if File.exists?(file) && !names.include?(name)
+                    names << name
+                end
+            end
+            names
+        end
+        def self.normalize_os_representation(names, versions)
+            # Normalize the names to lowercase
+            names    = names.map(&:downcase)
+            versions = versions.map(&:downcase)
+            if !versions.include?('default')
+                versions += ['default']
+            end
+            return names, versions
+        end
         # Autodetects the operating system name and version
         #
         # +osname+ is the operating system name, all in lowercase (e.g. ubuntu,
@@ -1036,102 +1098,41 @@ fi
             if options[:force]
                 @operating_system = nil
-            else
-                if !@operating_system.nil?
-                    return @operating_system
-                elsif Autoproj.has_config_key?('operating_system') && !(user_os = ENV['AUTOPROJ_OS'])
-                    os = Autoproj.user_config('operating_system')
-                    if os.respond_to?(:to_ary)
-                        if os[0].respond_to?(:to_ary) && os[0].all? { |s| s.respond_to?(:to_str) } &&
-                           os[1].respond_to?(:to_ary) && os[1].all? { |s| s.respond_to?(:to_str) }
-                           @operating_system = os
-                           return os
-                        end
+            elsif !@operating_system.nil? # @operating_system can be set to false to simulate an unknown OS
+                return @operating_system
+            elsif user_os = ENV['AUTOPROJ_OS']
+                @operating_system =
+                    if user_os.empty? then false
+                    else
+                        names, versions = user_os.split(':')
+                        normalize_os_representation(names.split(','), versions.split(','))
                     end
-                end
-            end
-            if user_os = ENV['AUTOPROJ_OS']
-                if user_os.empty?
-                    @operating_system = false
-                else
-                    names, versions = user_os.split(':')
-                    @operating_system = [names.split(','), versions.split(',')]
-                end
-            else
-                Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
-                names, versions = os_from_os_release
-                # Don't use the os-release information on Debian, since they
-                # refuse to put enough information to detect 'unstable'
-                # reliably. So, we use Debian's heuristic detection method below
-                if names && names[0] != 'debian'
-                    @operating_system = [names, versions]
-                else
-                    lsb_name, lsb_versions = os_from_lsb
-                    if lsb_name
-                        if lsb_name != 'debian' && File.exists?("/etc/debian_version")
-                            @operating_system = [[lsb_name, "debian"], lsb_versions]
-                        elsif lsb_name != 'arch' && File.exists?("/etc/arch-release")
-                            @operating_system = [[lsb_name, "arch"], lsb_versions]
-                        elsif lsb_name != 'opensuse' && File.exists?("/etc/SuSE-release")
-                            @operating_system = [[lsb_name, "opensuse"], lsb_versions]
-                        elsif lsb_name != 'debian'
-                            # Debian unstable cannot be detected with lsb_release,
-                            # so debian has its own detection logic
-                            @operating_system = [[lsb_name], lsb_versions]
-                        end
+                return @operating_system
+            elsif Autoproj.has_config_key?('operating_system')
+                os = Autoproj.user_config('operating_system')
+                if os.respond_to?(:to_ary)
+                    if os[0].respond_to?(:to_ary) && os[0].all? { |s| s.respond_to?(:to_str) } &&
+                       os[1].respond_to?(:to_ary) && os[1].all? { |s| s.respond_to?(:to_str) }
+                       @operating_system = os
+                       return os
                     end
                 end
+                @operating_system = nil # Invalid OS format in the configuration file
             end
-            if @operating_system.nil?
-                # Need to do some heuristics unfortunately
-                @operating_system =
-                    if File.exists?('/etc/debian_version')
-                        versions = [File.read('/etc/debian_version').strip]
-                        if versions.first =~ /sid/
-                            versions = ["unstable", "sid"]
-                        end
-                        if lsb_versions
-                            lsb_versions.each { |v| versions << v if !versions.include?(v) }
-                        end
-                        [['debian'], versions]
-                    elsif File.exists?('/etc/fedora-release')
-                        release_string = File.read('/etc/fedora-release').strip
-                        release_string =~ /Fedora release (\d+)/
-                        version = $1
-                        [['fedora'], [version]]
-                    elsif File.exists?('/etc/gentoo-release')
-                        release_string = File.read('/etc/gentoo-release').strip
-                        release_string =~ /^.*([^\s]+)$/
-                            version = $1
-                        [['gentoo'], [version]]
-                    elsif File.exists?('/etc/arch-release')
-                        [['arch'], []]
-                    elsif Autobuild.macos?
-                        version=`sw_vers | head -2 | tail -1`.split(":")[1]
-                        [['darwin'], [version.strip]]
-                    elsif Autobuild.windows?
-                        [['windows'], []]
-                    elsif File.exists?('/etc/SuSE-release')
-                        version = File.read('/etc/SuSE-release').strip
-                        version =~/.*VERSION\s+=\s+([^\s]+)/
-                        version = $1
-                        [['opensuse'], [version.strip]]
-                    end
-            end
+            Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
+            names, versions = os_from_os_release
-            if !@operating_system
-                return
+            # Don't use the os-release information on Debian, since they
+            # refuse to put enough information to detect 'unstable'
+            # reliably. So, we use the heuristic method for it
+            if !names || names[0] == 'debian'
+                names, versions = guess_operating_system
             end
+            return if !names
-            # Normalize the names to lowercase
-            names, versions = @operating_system[0], @operating_system[1]
-            names    = names.map(&:downcase)
-            versions = versions.map(&:downcase)
-            if !versions.include?('default')
-                versions += ['default']
-            end
+            names = ensure_derivatives_refer_to_their_parents(names)
+            names, versions = normalize_os_representation(names, versions)
             @operating_system = [names, versions]
             Autoproj.change_option('operating_system', @operating_system, true)
@@ -2286,26 +2287,6 @@ end
 DEFS = <<EODEFS
 ---
 none: ignore
-ruby18:
-  debian,ubuntu:
-  - ruby1.8-dev
-  - ruby1.8
-  - rubygems1.8
-  - ri1.8
-  - libopenssl-ruby1.8
-  - rake
-  gentoo:
-  - dev-lang/ruby:1.8
-  - rake
-  fedora:
-    '15,16':
-    - ruby
-    - rubygems
-  darwin:
-  - ruby
-  - rb-rake
-  default: nonexistent
-  arch: ignore
 ruby19:
   debian:
   - ruby1.9.1
@@ -2348,6 +2329,11 @@ ruby20:
   - ruby2.0-dev
   - rake
   - rubygems-integration
+  fedora:
+    '20':
+    - ruby
+    - ruby-devel
+    - rubygem-rake
   opensuse: ruby20-devel
   arch: ignore
   default: nonexistent
@@ -2358,12 +2344,16 @@ ruby21:
   - rake
   - rubygems-integration
   arch: ignore
+  fedora: ruby-devel
   default: nonexistent
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore
   arch: base-devel
-  fedora: ignore
+  fedora:
+  - gcc-c++
+  - make
+  - glibc-devel
   darwin: ignore
   opensuse:
   - ! '@devel_C_C++'
@@ -2420,13 +2410,6 @@ autotools:
   opensuse:
   - automake
   - autoconf
-lsb_release:
-  debian,ubuntu: lsb-release
-  gentoo: sys-apps/lsb-release
-  arch: lsb-release
-  fedora: redhat-lsb
-  darwin: ignore
-  opensuse: lsb-release
 archive:
   debian,ubuntu:
   - tar
@@ -2456,6 +2439,7 @@ pip:
   debian,ubuntu: python-pip
   arch: python2-pip
   opensuse: python-pip
+  fedora: python-pip
 EODEFS
@@ -2487,16 +2471,15 @@ rescue Autoproj::ConfigError => e
 end
 # Now try to find out the name of the gem binary
-PACKAGES      = %w{lsb_release}
-ENV['RUBYOPT']  = "-rubygems"
-require 'rubygems'
+PACKAGES      = []
 STDERR.puts "autoproj: installing autoproj and its dependencies (this can take a long time)"
 # First install the dependencies of autoproj, as we don't want them to be
 # affected by the prerelease flag
 begin
-    osdeps_management.install(PACKAGES)
+    if !PACKAGES.empty?
+        osdeps_management.install(PACKAGES)
+    end
 rescue Autoproj::ConfigError => e
     STDERR.puts "failed: #{e.message}"
     exit(1)

data/bin/autoproj_bootstrap.in CHANGED

@@ -167,16 +167,15 @@ rescue Autoproj::ConfigError => e
 end
 # Now try to find out the name of the gem binary
-PACKAGES      = %w{lsb_release}
-ENV['RUBYOPT']  = "-rubygems"
-require 'rubygems'
+PACKAGES      = []
 STDERR.puts "autoproj: installing autoproj and its dependencies (this can take a long time)"
 # First install the dependencies of autoproj, as we don't want them to be
 # affected by the prerelease flag
 begin
-    osdeps_management.install(PACKAGES)
+    if !PACKAGES.empty?
+        osdeps_management.install(PACKAGES)
+    end
 rescue Autoproj::ConfigError => e
     STDERR.puts "failed: #{e.message}"
     exit(1)

data/lib/autoproj/default.osdeps CHANGED

@@ -1,27 +1,6 @@
 # The following definitions are needed to bootstrap autoproj
 none: ignore
-ruby18:
-    debian,ubuntu:
-        - ruby1.8-dev
-        - ruby1.8
-        - rubygems1.8
-        - ri1.8
-        - libopenssl-ruby1.8
-        - rake
-    gentoo:
-        - dev-lang/ruby:1.8
-        - rake
-    fedora:
-      "15,16":
-        - ruby
-        - rubygems
-    darwin:
-        - ruby
-        - rb-rake
-    default: nonexistent
-    arch: ignore # on arch, if ruby is installed then so is the supporting stuff
 ruby19:
     debian:
         - ruby1.9.1
@@ -66,6 +45,11 @@ ruby20:
         - ruby2.0-dev
         - rake
         - rubygems-integration
+    fedora:
+      '20':
+      - ruby
+      - ruby-devel
+      - rubygem-rake
     opensuse: ruby20-devel
     arch: ignore # on arch, if ruby is installed then so is the supporting stuff
     default: nonexistent
@@ -77,13 +61,14 @@ ruby21:
         - rake
         - rubygems-integration
     arch: ignore # on arch, if ruby is installed then so is the supporting stuff
+    fedora: ruby-devel
     default: nonexistent
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore
   arch: base-devel
-  fedora: ignore
+  fedora: ["gcc-c++", make, glibc-devel]
   darwin: ignore
   opensuse: ["@devel_C_C++", "gcc-c++"]
@@ -146,14 +131,6 @@ autotools:
   - automake
   - autoconf
-lsb_release:
-  debian,ubuntu: lsb-release
-  gentoo: sys-apps/lsb-release
-  arch: lsb-release
-  fedora: redhat-lsb
-  darwin: ignore
-  opensuse: lsb-release
 archive:
   debian,ubuntu:
   - tar
@@ -185,6 +162,7 @@ pip:
   debian,ubuntu: python-pip
   arch: python2-pip
   opensuse: python-pip
+  fedora: python-pip
 # vim: expandtab

data/lib/autoproj/osdeps.rb CHANGED

@@ -889,6 +889,68 @@ fi
             @operating_system = values
         end
+        def self.guess_operating_system
+            if File.exists?('/etc/debian_version')
+                versions = [File.read('/etc/debian_version').strip]
+                if versions.first =~ /sid/
+                    versions = ["unstable", "sid"]
+                end
+                [['debian'], versions]
+            elsif File.exists?('/etc/redhat-release')
+                release_string = File.read('/etc/redhat-release').strip
+                release_string =~ /(.*) release ([\d.]+)/
+                name = $1.downcase
+                version = $2
+                if name =~ /Red Hat Entreprise/
+                    name = 'rhel'
+                end
+                [[name], [version]]
+            elsif File.exists?('/etc/gentoo-release')
+                release_string = File.read('/etc/gentoo-release').strip
+                release_string =~ /^.*([^\s]+)$/
+                version = $1
+                [['gentoo'], [version]]
+            elsif File.exists?('/etc/arch-release')
+                [['arch'], []]
+            elsif Autobuild.macos?
+                version=`sw_vers | head -2 | tail -1`.split(":")[1]
+                [['darwin'], [version.strip]]
+            elsif Autobuild.windows?
+                [['windows'], []]
+            elsif File.exists?('/etc/SuSE-release')
+                version = File.read('/etc/SuSE-release').strip
+                version =~/.*VERSION\s+=\s+([^\s]+)/
+                version = $1
+                [['opensuse'], [version.strip]]
+            end
+        end
+        def self.ensure_derivatives_refer_to_their_parents(names)
+            names = names.dup
+            version_files = Hash[
+                '/etc/debian_version' => 'debian',
+                '/etc/redhat-release' => 'fedora',
+                '/etc/gentoo-release' => 'gentoo',
+                '/etc/arch-release' => 'arch',
+                '/etc/SuSE-release' => 'opensuse']
+            version_files.each do |file, name|
+                if File.exists?(file) && !names.include?(name)
+                    names << name
+                end
+            end
+            names
+        end
+        def self.normalize_os_representation(names, versions)
+            # Normalize the names to lowercase
+            names    = names.map(&:downcase)
+            versions = versions.map(&:downcase)
+            if !versions.include?('default')
+                versions += ['default']
+            end
+            return names, versions
+        end
         # Autodetects the operating system name and version
         #
         # +osname+ is the operating system name, all in lowercase (e.g. ubuntu,
@@ -912,102 +974,41 @@ fi
             if options[:force]
                 @operating_system = nil
-            else
-                if !@operating_system.nil?
-                    return @operating_system
-                elsif Autoproj.has_config_key?('operating_system') && !(user_os = ENV['AUTOPROJ_OS'])
-                    os = Autoproj.user_config('operating_system')
-                    if os.respond_to?(:to_ary)
-                        if os[0].respond_to?(:to_ary) && os[0].all? { |s| s.respond_to?(:to_str) } &&
-                           os[1].respond_to?(:to_ary) && os[1].all? { |s| s.respond_to?(:to_str) }
-                           @operating_system = os
-                           return os
-                        end
+            elsif !@operating_system.nil? # @operating_system can be set to false to simulate an unknown OS
+                return @operating_system
+            elsif user_os = ENV['AUTOPROJ_OS']
+                @operating_system =
+                    if user_os.empty? then false
+                    else
+                        names, versions = user_os.split(':')
+                        normalize_os_representation(names.split(','), versions.split(','))
                     end
-                end
-            end
-            if user_os = ENV['AUTOPROJ_OS']
-                if user_os.empty?
-                    @operating_system = false
-                else
-                    names, versions = user_os.split(':')
-                    @operating_system = [names.split(','), versions.split(',')]
-                end
-            else
-                Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
-                names, versions = os_from_os_release
-                # Don't use the os-release information on Debian, since they
-                # refuse to put enough information to detect 'unstable'
-                # reliably. So, we use Debian's heuristic detection method below
-                if names && names[0] != 'debian'
-                    @operating_system = [names, versions]
-                else
-                    lsb_name, lsb_versions = os_from_lsb
-                    if lsb_name
-                        if lsb_name != 'debian' && File.exists?("/etc/debian_version")
-                            @operating_system = [[lsb_name, "debian"], lsb_versions]
-                        elsif lsb_name != 'arch' && File.exists?("/etc/arch-release")
-                            @operating_system = [[lsb_name, "arch"], lsb_versions]
-                        elsif lsb_name != 'opensuse' && File.exists?("/etc/SuSE-release")
-                            @operating_system = [[lsb_name, "opensuse"], lsb_versions]
-                        elsif lsb_name != 'debian'
-                            # Debian unstable cannot be detected with lsb_release,
-                            # so debian has its own detection logic
-                            @operating_system = [[lsb_name], lsb_versions]
-                        end
+                return @operating_system
+            elsif Autoproj.has_config_key?('operating_system')
+                os = Autoproj.user_config('operating_system')
+                if os.respond_to?(:to_ary)
+                    if os[0].respond_to?(:to_ary) && os[0].all? { |s| s.respond_to?(:to_str) } &&
+                       os[1].respond_to?(:to_ary) && os[1].all? { |s| s.respond_to?(:to_str) }
+                       @operating_system = os
+                       return os
                     end
                 end
+                @operating_system = nil # Invalid OS format in the configuration file
             end
-            if @operating_system.nil?
-                # Need to do some heuristics unfortunately
-                @operating_system =
-                    if File.exists?('/etc/debian_version')
-                        versions = [File.read('/etc/debian_version').strip]
-                        if versions.first =~ /sid/
-                            versions = ["unstable", "sid"]
-                        end
-                        if lsb_versions
-                            lsb_versions.each { |v| versions << v if !versions.include?(v) }
-                        end
-                        [['debian'], versions]
-                    elsif File.exists?('/etc/fedora-release')
-                        release_string = File.read('/etc/fedora-release').strip
-                        release_string =~ /Fedora release (\d+)/
-                        version = $1
-                        [['fedora'], [version]]
-                    elsif File.exists?('/etc/gentoo-release')
-                        release_string = File.read('/etc/gentoo-release').strip
-                        release_string =~ /^.*([^\s]+)$/
-                            version = $1
-                        [['gentoo'], [version]]
-                    elsif File.exists?('/etc/arch-release')
-                        [['arch'], []]
-                    elsif Autobuild.macos?
-                        version=`sw_vers | head -2 | tail -1`.split(":")[1]
-                        [['darwin'], [version.strip]]
-                    elsif Autobuild.windows?
-                        [['windows'], []]
-                    elsif File.exists?('/etc/SuSE-release')
-                        version = File.read('/etc/SuSE-release').strip
-                        version =~/.*VERSION\s+=\s+([^\s]+)/
-                        version = $1
-                        [['opensuse'], [version.strip]]
-                    end
-            end
+            Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
+            names, versions = os_from_os_release
-            if !@operating_system
-                return
+            # Don't use the os-release information on Debian, since they
+            # refuse to put enough information to detect 'unstable'
+            # reliably. So, we use the heuristic method for it
+            if !names || names[0] == 'debian'
+                names, versions = guess_operating_system
             end
+            return if !names
-            # Normalize the names to lowercase
-            names, versions = @operating_system[0], @operating_system[1]
-            names    = names.map(&:downcase)
-            versions = versions.map(&:downcase)
-            if !versions.include?('default')
-                versions += ['default']
-            end
+            names = ensure_derivatives_refer_to_their_parents(names)
+            names, versions = normalize_os_representation(names, versions)
             @operating_system = [names, versions]
             Autoproj.change_option('operating_system', @operating_system, true)

data/lib/autoproj/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.7.rc10"
+    VERSION = "1.9.7.rc11"
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.7.rc10
+  version: 1.9.7.rc11
   prerelease: 6
 platform: ruby
 authors: