Merge branch 'master' into dist/2.5/trusty

Author: sorah

debian/changelog

@@ -1,3 +1,9 @@
+ruby-defaults (1:2.5.2+0nkmi1~dist) unstable; urgency=medium
+
+  * Port from debian upstream
+
+ -- Sorah Fukumori <[email protected]>  Wed, 21 Nov 2018 21:59:38 +0000
+
 ruby-defaults (1:2.5.0+0nkmi1~trusty) trusty; urgency=medium
 
   * Make Ruby 2.5 the default

debian/control

@@ -1,8 +1,8 @@
 Source: ruby-defaults
 Section: ruby
 Priority: optional
-Maintainer: Antonio Terceiro <terceiro@debian.org>,
-            Sorah Fukumori <[email protected]>,
+Maintainer: Debian Ruby Team <[email protected].debian.org>,
+            Sorah Fukumori <[email protected]>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.8
 Homepage: http://www.ruby-lang.org/

debian/rules

@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+
 # XXX remember to regenerate debian/ruby.postinst when you change either of
 # these variables.
 #
@@ -18,6 +20,10 @@ export DEBIAN_RUBY_PROGRAMS = \
 %:
 	dh $@
 
+override_dh_auto_configure:
+	debian/version-check "$(DEB_VERSION)" "$(DEBIAN_DEFAULT_RUBY_VERSION)"
+	dh_auto_configure
+
 debian/ruby.postinst: debian/ruby.postinst.in
 	sed -e 's/@@DEBIAN_DEFAULT_RUBY_VERSION@@/$(DEBIAN_DEFAULT_RUBY_VERSION)/g; s/@@DEBIAN_RUBY_PROGRAMS@@/$(DEBIAN_RUBY_PROGRAMS)/g' $< > $@ || ($(RM) $@; false)
 

debian/tests/ruby-all-dev

@@ -9,6 +9,22 @@ describe RubyDebianDev do
     it "installs #{data[:binary]}" do
       File.executable?(data[:binary]).must_equal true
     end
+
+    it "has an associated minimum version of #{ruby}" do
+      v = RubyDebianDev.min_ruby_dependency_for("lib#{ruby}")
+      v.must_match %r{^ruby \(>= .+\)$}
+    end
+  end
+
+  it 'provides a Ruby upper bound' do
+    ruby_upper_bound = RubyDebianDev.ruby_upper_bound
+    ruby_upper_bound.must_match %r{^ruby \(<< .+\)}
   end
+
+  it 'provides list of supported interpreters with default first' do
+    default = File.basename(File.readlink('/usr/bin/ruby'))
+    default.must_equal RubyDebianDev::SUPPORTED_RUBY_VERSIONS.keys.first
+  end
+
 end
 

debian/version-check

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -eu
+
+package_version="$1"
+default_ruby_version="$2"
+
+case "$package_version" in
+  [0-9]:$default_ruby_version*)
+    : ok
+    ;;
+  *)
+    echo "E: Inconsistent package version number: $package_version"
+    echo "E: Default Ruby version: $default_ruby_version"
+    exit 1;
+    ;;
+esac

ruby_debian_dev.rb

@@ -6,25 +6,36 @@ def self.has_support_for(ruby)
     RUBY_INTERPRETERS[ruby] = yield
   end
 
-  has_support_for 'ruby2.4' do
+  has_support_for 'ruby2.5' do
     {
       version:             '2.5',
       binary:              '/usr/bin/ruby2.5',
       api_version:         '2.5.0',
       shared_library:      'libruby2.5',
-      min_ruby_dependency: 'ruby (>= 1:2.5~0)',
+      min_ruby_version:    '1:2.5~0',
+      ruby_upper_bound:    '1:2.6~',
     }
   end
 
   def self.min_ruby_dependency_for(shared_library)
     RUBY_INTERPRETERS.each do |int,data|
       if data[:shared_library] == shared_library
-        return data[:min_ruby_dependency]
+        return "ruby (>= %s)" % data[:min_ruby_version]
       end
     end
     return nil
   end
 
+  def self.ruby_upper_bound
+    sort = IO.popen('sort -V', 'w+')
+    RUBY_INTERPRETERS.values.map do |data|
+      sort.puts(data[:ruby_upper_bound])
+    end
+    sort.close_write()
+    version = sort.read.split.last
+    "ruby (<< #{version})"
+  end
+
   #################################################################
   # These constants below are kept here for backwards compatibility
   #################################################################