Merge branch 'domcleal-tickets/master/18494-ruby-2.0'

* domcleal-tickets/master/18494-ruby-2.0:
  (#18494) Rearrange loop to remove Ruby 2.0 warning
  (#18494) Enable Travis building on Ruby 2.0.0
  (#18494) Make ActiveRecord-based inventory service unsupported under Ruby 2
  (#18494) Force literal strings in test to ASCII-8BIT encoding
  (#18494) Remove TypeError handling code used for tests
  (#18494) Fix error message test for Ruby 2.0
  (#18494) Fix Ruby version number format for Ruby 2.0.0-p-1
  (#18494) Change version comparisons to support Ruby 2.0

closes #1470

Author: Jeff McCune

.travis.yml

@@ -4,6 +4,7 @@ script: "bundle exec rake spec SPEC_OPTS='--color --format documentation'"
 notifications:
   email: false
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.8.7
   - ruby-head

lib/puppet/file_serving/fileset.rb

@@ -136,7 +136,7 @@ def perform_recursion
     result = []
     return result unless recurse?(depth)
 
-    while dir_path = current_dirs.shift or ((depth += 1) and recurse?(depth) and current_dirs = next_dirs and next_dirs = [] and dir_path = current_dirs.shift)
+    while dir_path = current_dirs.shift
       next unless stat = stat(dir_path)
       next unless stat.directory?
 
@@ -153,6 +153,14 @@ def perform_recursion
         # And to our list of files/directories to iterate over.
         next_dirs << File.join(dir_path, file_path)
       end
+
+      # Move to the next recusion level
+      if current_dirs.empty?
+        depth += 1
+        break unless recurse?(depth)
+        current_dirs = next_dirs
+        next_dirs = []
+      end
     end
 
     result

lib/puppet/indirector/facts/inventory_active_record.rb

@@ -11,6 +11,7 @@ class Puppet::Node::Facts::InventoryActiveRecord < Puppet::Indirector::ActiveRec
     and inventory are deprecated. See http://links.puppetlabs.com/activerecord-deprecation"
 
   def initialize
+    raise Puppet::Error, "ActiveRecords-based inventory is unsupported with Ruby 2 and Rails 3.0" if RUBY_VERSION[0] == '2'
     Puppet.deprecation_warning "ActiveRecord-based storeconfigs and inventory are deprecated. See http://links.puppetlabs.com/activerecord-deprecation"
     super
   end

lib/puppet/transaction/event.rb

@@ -29,15 +29,8 @@ def property=(prop)
   end
 
   def resource=(res)
-    begin
-      # In Ruby 1.8 looking up a symbol on a string gives nil; in 1.9 it will
-      # raise a TypeError, which we then catch.  This should work on both
-      # versions, for all that it is a bit naff. --daniel 2012-03-11
-      if res.respond_to?(:[]) and level = res[:loglevel]
-        @default_log_level = level
-      end
-    rescue TypeError => e
-      raise unless e.to_s == "can't convert Symbol into Integer"
+    if res.respond_to?(:[]) and level = res[:loglevel]
+      @default_log_level = level
     end
     @resource = res.to_s
   end

lib/puppet/util/classgen.rb

@@ -148,10 +148,10 @@ class << self
   # @api private
   #
   def is_constant_defined?(const)
-    if ::RUBY_VERSION =~ /1.9/
-      const_defined?(const, false)
-    else
+    if ::RUBY_VERSION =~ /^1.8/
       const_defined?(const)
+    else
+      const_defined?(const, false)
     end
   end
 

lib/puppet/util/rdoc/parser.rb

@@ -8,18 +8,18 @@
 require "puppet/util/rdoc/code_objects"
 require "rdoc/tokenstream"
 
-if ::RUBY_VERSION =~ /1.9/
-	require "rdoc/markup/preprocess"
-	require "rdoc/parser"
-else
+if ::RUBY_VERSION =~ /^1.8/
 	require "rdoc/markup/simple_markup/preprocess"
 	require "rdoc/parsers/parserfactory"
+else
+	require "rdoc/markup/preprocess"
+	require "rdoc/parser"
 end
 
 module RDoc
 
 class Parser
-  extend ParserFactory unless ::RUBY_VERSION =~ /1.9/
+  extend ParserFactory if ::RUBY_VERSION =~ /^1.8/
 
   SITE = "__site__"
 

spec/unit/forge/repository_spec.rb

@@ -92,7 +92,7 @@
         http.expects(:request).with() do |request|
           puppet_version = /Puppet\/\d+\..*/
           os_info = /\(.*\)/
-          ruby_version = /Ruby\/\d+\.\d+\.\d+(-p\d+)? \(\d{4}-\d{2}-\d{2}; .*\)/
+          ruby_version = /Ruby\/\d+\.\d+\.\d+(-p-?\d+)? \(\d{4}-\d{2}-\d{2}; .*\)/
 
           request["User-Agent"] =~ /^#{consumer_version} #{puppet_version} #{os_info} #{ruby_version}/
         end