s3-sync 1.2.6

data/lib/s3sync/S3_s3sync_mod.rb

@@ -0,0 +1,143 @@
+#  This software code is made available "AS IS" without warranties of any
+#  kind.  You may copy, display, modify and redistribute the software
+#  code either by itself or as incorporated into your code; provided that
+#  you do not remove any proprietary notices.  Your use of this software
+#  code is at your own risk and you waive any claim against Amazon
+#  Digital Services, Inc. or its affiliates with respect to your use of
+#  this software code. (c) 2006 Amazon Digital Services, Inc. or its
+#  affiliates.
+#  
+# This software code is made available "AS IS" without warranties of any        
+# kind.  You may copy, display, modify and redistribute the software            
+# code either by itself or as incorporated into your code; provided that        
+# you do not remove any proprietary notices.  Your use of this software         
+# code is at your own risk and you waive any claim against the author
+# with respect to your use of this software code. 
+# (c) 2007 s3sync.net
+#
+require 's3sync/S3'
+require 's3sync/HTTPStreaming'
+
+# The purpose of this file is to overlay the S3 library from AWS
+# to add some functionality
+# (without changing the file itself or requiring a specific version)
+# It still isn't perfectly robust, i.e. if radical changes are made
+# to the underlying lib this stuff will need updating.
+
+module S3
+	class AWSAuthConnection
+	
+      def make_http(bucket='', host='', proxy_host=nil, proxy_port=nil, proxy_user=nil, proxy_pass=nil)
+
+         # build the domain based on the calling format
+         server = ''
+         if host != ''
+           server = host           
+         elsif bucket.empty?
+           # for a bucketless request (i.e. list all buckets)
+           # revert to regular domain case since this operation
+           # does not make sense for vanity domains
+           server = @server
+         elsif @calling_format == CallingFormat::SUBDOMAIN
+           server = "#{bucket}.#{@server}" 
+         elsif @calling_format == CallingFormat::VANITY
+           server = bucket 
+         else
+           server = @server
+         end
+         # automatically does the right thing when no proxy
+         http = Net::HTTP::Proxy(proxy_host, proxy_port, proxy_user, proxy_pass).new(server, @port)
+         #http = Net::HTTP.new(server, @port)
+         http.use_ssl = @is_secure
+         http.verify_mode=@verify_mode
+         http.ca_file=@ca_file
+         http.ca_path=@ca_path
+         http.start
+         return http
+      end
+
+      # add support for streaming the response body to an IO stream
+      alias __make_request__ make_request
+      def make_request(method, bucket='', key='', path_args={}, headers={}, data='', metadata={}, streamOut=nil)
+         # build the path based on the calling format
+         path = ''
+         if (not bucket.empty?) and (@calling_format == CallingFormat::REGULAR)
+           path << "/#{bucket}"
+         end
+         # add the slash after the bucket regardless
+         # the key will be appended if it is non-empty
+         path << "/#{key}"
+
+         # build the path_argument string
+         # add the ? in all cases since 
+         # signature and credentials follow path args
+         path << '?'
+         path << S3.path_args_hash_to_string(path_args) 
+
+         req = method_to_request_class(method).new("#{path}")
+
+         set_headers(req, headers)
+         set_headers(req, metadata, METADATA_PREFIX)
+         set_headers(req, {'Connection' => 'keep-alive', 'Keep-Alive' => '300'})
+         
+         set_aws_auth_header(req, @aws_access_key_id, @aws_secret_access_key, bucket, key, path_args)
+         
+         http = $S3syncHttp
+            
+         if req.request_body_permitted?
+           return http.request(req, data, streamOut)
+         else
+           return http.request(req, nil, streamOut)
+         end
+      end
+
+		# a "get" operation that sends the body to an IO stream
+		def get_stream(bucket, key, headers={}, streamOut=nil)
+         return GetResponse.new(make_request('GET', bucket, CGI::escape(key), {}, headers, '', {}, streamOut))
+		end
+		
+		# a "get" operation that sends the body to an IO stream
+		def get_query_stream(bucket, key, path_args={}, headers={}, streamOut=nil)
+         return GetResponse.new(make_request('GET', bucket, CGI::escape(key), path_args, headers, '', {}, streamOut))
+		end
+      
+		def head(bucket, key=nil, headers={})
+         return GetResponse.new(make_request('HEAD', bucket, CGI::escape(key), {}, headers, '', {}))
+		end
+      undef create_bucket
+      def create_bucket(bucket, object)
+         object = S3Object.new(object) if not object.instance_of? S3Object
+         return Response.new(
+            make_request('PUT', bucket, '', {}, {}, object.data, object.metadata)
+         )
+      end
+      # no, because internally the library does not support the header,wait,body paradigm, so this is useless
+      #alias __put__ put
+      #def put(bucket, key, object, headers={})
+      #   headers['Expect'] = "100-continue"
+      #   __put__(bucket, key, object, headers)
+      #end
+
+               
+		# allow ssl validation
+      attr_accessor :verify_mode
+      attr_accessor :ca_path
+      attr_accessor :ca_file      
+
+	end
+   module CallingFormat
+      def CallingFormat.string_to_format(s)
+         case s
+         when 'REGULAR'
+           return CallingFormat::REGULAR
+         when 'SUBDOMAIN'
+           return CallingFormat::SUBDOMAIN
+         when 'VANITY'
+           return CallingFormat::VANITY
+         else
+           raise "Unsupported calling format #{s}"
+         end
+      end
+   end
+   
+end

data/lib/s3sync/S3encoder.rb

@@ -0,0 +1,50 @@
+# This software code is made available "AS IS" without warranties of any        
+# kind.  You may copy, display, modify and redistribute the software            
+# code either by itself or as incorporated into your code; provided that        
+# you do not remove any proprietary notices.  Your use of this software         
+# code is at your own risk and you waive any claim against the author
+# with respect to your use of this software code. 
+# (c) 2007 s3sync.net
+#
+
+# The purpose of this file is to overlay the cgi class
+# to add some functionality
+# (without changing the file itself or requiring a specific version)
+# It still isn't perfectly robust, i.e. if radical changes are made
+# to the underlying lib this stuff will need updating.
+
+require 'cgi'
+require 'iconv' # for UTF-8 conversion
+
+# thanks to http://www.redhillconsulting.com.au/blogs/simon/archives/000326.html
+module S3ExtendCGI
+	def self.included(base)
+		base.extend(ClassMethods)
+		base.class_eval do
+			class << self
+				alias_method :S3Extend_escape_orig, :escape unless method_defined?(:S3Extend_escape_orig)
+				alias_method :escape, :S3Extend_escape
+			end
+		end
+	end
+	module ClassMethods
+		@@exemptSlashesInEscape = false
+		attr_writer :exemptSlashesInEscape
+		@@usePercent20InEscape = false
+		attr_writer :usePercent20InEscape
+		@@nativeCharacterEncoding = "ISO-8859-1"
+		attr_writer :nativeCharacterEncoding
+		@@useUTF8InEscape = false
+		attr_writer :useUTF8InEscape
+		
+		def S3Extend_escape(string)
+			result = string
+			result = Iconv.iconv("UTF-8", @nativeCharacterEncoding, string).join if @useUTF8InEscape 
+			result = S3Extend_escape_orig(result)
+			result.gsub!(/%2f/i, "/") if @exemptSlashesInEscape
+			result.gsub!("+", "%20") if @usePercent20InEscape
+			result
+		end
+	end
+end
+CGI.send(:include, S3ExtendCGI)

data/lib/s3sync/s3config.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/ruby
+# This software code is made available "AS IS" without warranties of any        
+# kind.  You may copy, display, modify and redistribute the software            
+# code either by itself or as incorporated into your code; provided that        
+# you do not remove any proprietary notices.  Your use of this software         
+# code is at your own risk and you waive any claim against the author
+# with respect to your use of this software code. 
+# (c) 2007 alastair brunton
+#
+# modified to search out the yaml in several places, thanks wkharold.
+require 'yaml'
+
+module S3Config
+  
+  confpath = ["#{ENV['S3CONF']}", "#{ENV['HOME']}/.s3conf", "/etc/s3conf"]
+  
+  confpath.each do |path|
+    if File.exists?(path) and File.directory?(path) and File.exists?("#{path}/s3config.yml")
+      config = YAML.load_file("#{path}/s3config.yml")
+      config.each_pair do |key, value|
+        eval("$#{key.upcase} = '#{value}'")
+      end
+      break
+    end
+  end
+    
+end

data/lib/s3sync/s3try.rb

@@ -0,0 +1,178 @@
+#!/usr/bin/env ruby 
+# This software code is made available "AS IS" without warranties of any        
+# kind.  You may copy, display, modify and redistribute the software            
+# code either by itself or as incorporated into your code; provided that        
+# you do not remove any proprietary notices.  Your use of this software         
+# code is at your own risk and you waive any claim against the author
+# with respect to your use of this software code. 
+# (c) 2007 s3sync.net
+#
+module S3sync
+
+  $AWS_ACCESS_KEY_ID = ENV["AWS_ACCESS_KEY_ID"]
+  $AWS_SECRET_ACCESS_KEY = ENV["AWS_SECRET_ACCESS_KEY"]
+  $AWS_S3_HOST = (ENV["AWS_S3_HOST"] or "s3.amazonaws.com")
+  $HTTP_PROXY_HOST = ENV["HTTP_PROXY_HOST"]
+  $HTTP_PROXY_PORT = ENV["HTTP_PROXY_PORT"]
+  $HTTP_PROXY_USER = ENV["HTTP_PROXY_USER"]
+  $HTTP_PROXY_PASSWORD = ENV["HTTP_PROXY_PASSWORD"]
+  $SSL_CERT_DIR = ENV["SSL_CERT_DIR"]
+  $SSL_CERT_FILE = ENV["SSL_CERT_FILE"]
+  $S3SYNC_RETRIES = (ENV["S3SYNC_RETRIES"] or 100).to_i # number of errors to tolerate 
+  $S3SYNC_WAITONERROR = (ENV["S3SYNC_WAITONERROR"] or 5).to_i # seconds
+  $S3SYNC_NATIVE_CHARSET = (ENV["S3SYNC_NATIVE_CHARSET"] or "ISO-8859-1")
+  $AWS_CALLING_FORMAT = (ENV["AWS_CALLING_FORMAT"] or "SUBDOMAIN")
+
+  require 's3sync/S3'
+  require 's3sync/HTTPStreaming'
+  require 's3sync/S3encoder'
+
+  CGI::exemptSlashesInEscape = true
+  CGI::usePercent20InEscape = true
+  CGI::useUTF8InEscape = true
+  CGI::nativeCharacterEncoding = $S3SYNC_NATIVE_CHARSET
+  require 's3sync/S3_s3sync_mod'
+
+
+  $S3syncRetriesLeft = $S3SYNC_RETRIES.to_i
+
+
+  def S3sync.s3trySetup
+
+    # ---------- CONNECT ---------- #
+
+    $S3syncConnection = S3::AWSAuthConnection.new($AWS_ACCESS_KEY_ID, $AWS_SECRET_ACCESS_KEY, $S3syncOptions['--ssl'], $AWS_S3_HOST)
+    $S3syncConnection.calling_format = S3::CallingFormat::string_to_format($AWS_CALLING_FORMAT)
+    if $S3syncOptions['--ssl']
+      if $SSL_CERT_DIR
+        $S3syncConnection.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        $S3syncConnection.ca_path = $SSL_CERT_DIR
+      elsif $SSL_CERT_FILE
+        $S3syncConnection.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        $S3syncConnection.ca_file = $SSL_CERT_FILE
+      end
+    end
+  end
+
+  def S3sync.s3urlSetup
+    $S3syncGenerator = S3::QueryStringAuthGenerator.new($AWS_ACCESS_KEY_ID, $AWS_SECRET_ACCESS_KEY, $S3syncOptions['--ssl'], $AWS_S3_HOST)
+    $S3syncGenerator.calling_format = S3::CallingFormat::string_to_format($AWS_CALLING_FORMAT)
+    $S3syncGenerator.expires_in = $S3syncOptions['--expires-in']
+  end
+
+  def S3sync.S3tryConnect(bucket, host='')
+    $S3syncHttp = $S3syncConnection.make_http(bucket, host, $HTTP_PROXY_HOST, $HTTP_PROXY_PORT, $HTTP_PROXY_USER, $HTTP_PROXY_PASSWORD)
+  end
+
+  def S3sync.S3try(command, bucket, *args)
+    if(not $S3syncHttp or (bucket != $S3syncLastBucket))
+      $stderr.puts "Creating new connection" if $S3syncOptions['--debug']
+      $S3syncLastBucket = bucket
+      while $S3syncRetriesLeft > 0 do
+        begin
+          S3sync.S3tryConnect(bucket)
+          break
+        rescue Errno::ECONNRESET => e
+          $stderr.puts "Connection reset: #{e}"
+        rescue Errno::ECONNABORTED => e
+          $stderr.puts "Connection aborted: #{e}"
+        rescue Errno::ETIMEDOUT => e
+          $stderr.puts "Connection timed out: #{e}"
+        rescue Timeout::Error => e
+          $stderr.puts "Connection timed out: #{e}"
+        end
+        $S3syncRetriesLeft -= 1
+        $stderr.puts "#{$S3syncRetriesLeft} retries left, sleeping for #{$S3SYNC_WAITONERROR} seconds"
+        Kernel.sleep $S3SYNC_WAITONERROR.to_i
+      end
+    end
+
+    result = nil
+    delim = $,
+    $,=' '
+    while $S3syncRetriesLeft > 0 do
+      $stderr.puts "Trying command #{command} #{bucket} #{args} with #{$S3syncRetriesLeft} retries left" if $S3syncOptions['--debug']
+      forceRetry = false
+      now = false
+      hush = false
+      begin
+        result = $S3syncConnection.send(command, bucket, *args)
+      rescue Errno::EPIPE => e
+        forceRetry = true
+        $stderr.puts "Broken pipe: #{e}" 
+      rescue Errno::ECONNRESET => e
+        forceRetry = true
+        $stderr.puts "Connection reset: #{e}" 
+      rescue Errno::ECONNABORTED => e
+        forceRetry = true
+        $stderr.puts "Connection aborted: #{e}" 
+      rescue Errno::ETIMEDOUT => e
+        forceRetry = true
+        $stderr.puts "Connection timed out: #{e}"
+      rescue Timeout::Error => e
+        forceRetry = true
+        $stderr.puts "Connection timed out: #{e}" 
+      rescue EOFError => e
+        # i THINK this is happening like a connection reset
+        forceRetry = true
+        $stderr.puts "EOF error: #{e}"
+      rescue OpenSSL::SSL::SSLError => e
+        forceRetry = true
+        $stderr.puts "SSL Error: #{e}"
+      rescue NoMethodError => e
+        # we get this when using --progress, and the local item is something unreadable
+        $stderr.puts "Null stream error: #{e}"
+        break
+      end
+      if forceRetry
+        # kill and reset connection when we receive a non-50x yet retry-able error
+        S3sync.S3tryConnect(bucket)
+      end
+      begin
+        debug("Response code: #{result.http_response.code}")
+        break if ((200...300).include? result.http_response.code.to_i) and (not forceRetry)
+        if result.http_response.code.to_i == 301
+          $stderr.puts "Permanent redirect received. Try setting AWS_CALLING_FORMAT to SUBDOMAIN"
+        elsif result.http_response.code.to_i == 307
+          # move to the other host
+          host = %r{https?://([^/]+)}.match(result.http_response['Location'])[1]
+          $stderr.puts("Temporary Redirect to: " + host)
+          debug("Host: " + host)
+          S3sync.S3tryConnect(bucket, host)
+          $S3syncRetriesLeft = $S3syncRetriesLeft+1 # don't use one up below
+          forceRetry = true
+          now = true
+          hush = true
+        else
+          $stderr.puts "S3 command failed:\n#{command} #{args}"
+          $stderr.puts "With result #{result.http_response.code} #{result.http_response.message}\n"
+          debug(result.http_response.body)
+        end
+        # only retry 500's, per amazon
+        break unless ((500...600).include? result.http_response.code.to_i) or forceRetry
+      rescue NoMethodError
+        debug("No result available")
+      end
+      $S3syncRetriesLeft -= 1
+      $stderr.puts "#{$S3syncRetriesLeft} retries left, sleeping for #{$S3SYNC_WAITONERROR} seconds" unless hush
+      Kernel.sleep $S3SYNC_WAITONERROR.to_i unless now
+    end
+    if $S3syncRetriesLeft <= 0
+      $stderr.puts "Ran out of retries; operations did not complete!"
+    end
+    $, = delim
+    result
+  end
+
+  def S3sync.S3url(command, bucket, *args)
+    S3sync.s3urlSetup() unless $S3syncGenerator
+    result = nil
+    delim = $,
+    $,=' '
+    $stderr.puts "Calling command #{command} #{bucket} #{args}" if $S3syncOptions['--debug']
+    result = $S3syncGenerator.send(command, bucket, *args)
+    $, = delim
+    result
+  end
+end #module
+

data/lib/s3sync/thread_generator.rb

@@ -0,0 +1,383 @@
+#!/usr/bin/env ruby
+#--
+# $Idaemons: /home/cvs/rb/generator.rb,v 1.8 2001/10/03 08:54:32 knu Exp $
+# $RoughId: generator.rb,v 1.10 2003/10/14 19:36:58 knu Exp $
+# $Id: generator.rb,v 1.12 2005/12/31 02:56:46 ocean Exp $
+#++
+#
+# = generator.rb: convert an internal iterator to an external one
+#
+# Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
+#
+# All rights reserved.  You can redistribute and/or modify it under
+# the same terms as Ruby.
+#
+# == Overview
+#
+# This library provides the Generator class, which converts an
+# internal iterator (i.e. an Enumerable object) to an external
+# iterator.  In that form, you can roll many iterators independently.
+#
+# The SyncEnumerator class, which is implemented using Generator,
+# makes it easy to roll many Enumerable objects synchronously.
+#
+# See the respective classes for examples of usage.
+
+
+#
+# Generator converts an internal iterator (i.e. an Enumerable object)
+# to an external iterator.
+#
+# == Example
+#
+#   require 'generator'
+#
+#   # Generator from an Enumerable object
+#   g = Generator.new(['A', 'B', 'C', 'Z'])
+#
+#   while g.next?
+#     puts g.next
+#   end
+#
+#   # Generator from a block
+#   g = Generator.new { |g|
+#     for i in 'A'..'C'
+#       g.yield i
+#     end
+#
+#     g.yield 'Z'
+#   }
+#
+#   # The same result as above
+#   while g.next?
+#     puts g.next
+#   end
+#   
+class Generator
+  include Enumerable
+
+  # Creates a new generator either from an Enumerable object or from a
+  # block.
+  #
+  # In the former, block is ignored even if given.
+  #
+  # In the latter, the given block is called with the generator
+  # itself, and expected to call the +yield+ method for each element.
+  def initialize(enum = nil, &block)
+    if enum
+      @block = proc{|g| enum.each{|value| g.yield value}}
+    else
+      @block = block
+    end
+    @index = 0
+    @queue = []
+    @main_thread = nil
+    @loop_thread.kill if defined?(@loop_thread)
+    @loop_thread = Thread.new do
+      Thread.stop
+      begin
+        @block.call(self)
+      rescue
+        @main_thread.raise $!
+      ensure
+        @main_thread.wakeup
+      end
+    end
+    Thread.pass until @loop_thread.stop?
+    self
+  end
+
+  # Yields an element to the generator.
+  def yield(value)
+    if Thread.current != @loop_thread
+      raise "should be called in Generator.new{|g| ... }"
+    end
+    Thread.critical = true
+    begin
+      @queue << value
+      @main_thread.wakeup
+      Thread.stop
+    ensure
+      Thread.critical = false
+    end
+    self
+  end
+
+  # Returns true if the generator has reached the end.
+  def end?
+    if @queue.empty?
+      if @main_thread
+        raise "should not be called in Generator.new{|g| ... }"
+      end
+      Thread.critical = true
+      begin
+        @main_thread = Thread.current
+        @loop_thread.wakeup
+        Thread.stop
+      rescue ThreadError
+        # ignore
+      ensure
+        @main_thread = nil
+        Thread.critical = false
+      end
+    end
+    @queue.empty?
+  end
+
+  # Returns true if the generator has not reached the end yet.
+  def next?
+    !end?
+  end
+
+  # Returns the current index (position) counting from zero.
+  def index
+    @index
+  end
+
+  # Returns the current index (position) counting from zero.
+  def pos
+    @index
+  end
+
+  # Returns the element at the current position and moves forward.
+  def next
+    raise EOFError.new("no more elements available") if end?
+    @index += 1
+    @queue.shift
+  end
+
+  # Returns the element at the current position.
+  def current
+    raise EOFError.new("no more elements available") if end?
+    @queue.first
+  end
+
+  # Rewinds the generator.
+  def rewind
+    initialize(nil, &@block) if @index.nonzero?
+    self
+  end
+
+  # Rewinds the generator and enumerates the elements.
+  def each
+    rewind
+    until end?
+      yield self.next
+    end
+    self
+  end
+end
+
+#
+# SyncEnumerator creates an Enumerable object from multiple Enumerable
+# objects and enumerates them synchronously.
+#
+# == Example
+#
+#   require 'generator'
+#
+#   s = SyncEnumerator.new([1,2,3], ['a', 'b', 'c'])
+#
+#   # Yields [1, 'a'], [2, 'b'], and [3,'c']
+#   s.each { |row| puts row.join(', ') }
+#
+class SyncEnumerator
+  include Enumerable
+
+  # Creates a new SyncEnumerator which enumerates rows of given
+  # Enumerable objects.
+  def initialize(*enums)
+    @gens = enums.map { |e| Generator.new(e) }
+  end
+
+  # Returns the number of enumerated Enumerable objects, i.e. the size
+  # of each row.
+  def size
+    @gens.size
+  end
+
+  # Returns the number of enumerated Enumerable objects, i.e. the size
+  # of each row.
+  def length
+    @gens.length
+  end
+
+  # Returns true if the given nth Enumerable object has reached the
+  # end.  If no argument is given, returns true if any of the
+  # Enumerable objects has reached the end.
+  def end?(i = nil)
+    if i.nil?
+      @gens.detect { |g| g.end? } ? true : false
+    else
+      @gens[i].end?
+    end
+  end
+
+  # Enumerates rows of the Enumerable objects.
+  def each
+    @gens.each { |g| g.rewind }
+
+    loop do
+      count = 0
+
+      ret = @gens.map { |g|
+	if g.end?
+	  count += 1
+	  nil
+	else
+	  g.next
+	end
+      }
+
+      if count == @gens.size
+	break
+      end
+
+      yield ret
+    end
+
+    self
+  end
+end
+
+if $0 == __FILE__
+  eval DATA.read, nil, $0, __LINE__+4
+end
+
+__END__
+
+require 'test/unit'
+
+class TC_Generator < Test::Unit::TestCase
+  def test_block1
+    g = Generator.new { |g|
+      # no yield's
+    }
+
+    assert_equal(0, g.pos)
+    assert_raises(EOFError) { g.current }
+  end
+
+  def test_block2
+    g = Generator.new { |g|
+      for i in 'A'..'C'
+        g.yield i
+      end
+
+      g.yield 'Z'
+    }
+
+    assert_equal(0, g.pos)
+    assert_equal('A', g.current)
+
+    assert_equal(true, g.next?)
+    assert_equal(0, g.pos)
+    assert_equal('A', g.current)
+    assert_equal(0, g.pos)
+    assert_equal('A', g.next)
+
+    assert_equal(1, g.pos)
+    assert_equal(true, g.next?)
+    assert_equal(1, g.pos)
+    assert_equal('B', g.current)
+    assert_equal(1, g.pos)
+    assert_equal('B', g.next)
+
+    assert_equal(g, g.rewind)
+
+    assert_equal(0, g.pos)
+    assert_equal('A', g.current)
+
+    assert_equal(true, g.next?)
+    assert_equal(0, g.pos)
+    assert_equal('A', g.current)
+    assert_equal(0, g.pos)
+    assert_equal('A', g.next)
+
+    assert_equal(1, g.pos)
+    assert_equal(true, g.next?)
+    assert_equal(1, g.pos)
+    assert_equal('B', g.current)
+    assert_equal(1, g.pos)
+    assert_equal('B', g.next)
+
+    assert_equal(2, g.pos)
+    assert_equal(true, g.next?)
+    assert_equal(2, g.pos)
+    assert_equal('C', g.current)
+    assert_equal(2, g.pos)
+    assert_equal('C', g.next)
+
+    assert_equal(3, g.pos)
+    assert_equal(true, g.next?)
+    assert_equal(3, g.pos)
+    assert_equal('Z', g.current)
+    assert_equal(3, g.pos)
+    assert_equal('Z', g.next)
+
+    assert_equal(4, g.pos)
+    assert_equal(false, g.next?)
+    assert_raises(EOFError) { g.next }
+  end
+
+  def test_each
+    a = [5, 6, 7, 8, 9]
+
+    g = Generator.new(a)
+
+    i = 0
+
+    g.each { |x|
+      assert_equal(a[i], x)
+
+      i += 1
+
+      break if i == 3
+    }
+
+    assert_equal(3, i)
+
+    i = 0
+
+    g.each { |x|
+      assert_equal(a[i], x)
+
+      i += 1
+    }
+
+    assert_equal(5, i)
+  end
+end
+
+class TC_SyncEnumerator < Test::Unit::TestCase
+  def test_each
+    r = ['a'..'f', 1..10, 10..20]
+    ra = r.map { |x| x.to_a }
+
+    a = (0...(ra.map {|x| x.size}.max)).map { |i| ra.map { |x| x[i] } }
+
+    s = SyncEnumerator.new(*r)
+
+    i = 0
+
+    s.each { |x|
+      assert_equal(a[i], x)
+
+      i += 1
+
+      break if i == 3
+    }
+
+    assert_equal(3, i)
+
+    i = 0
+
+    s.each { |x|
+      assert_equal(a[i], x)
+
+      i += 1
+    }
+
+    assert_equal(a.size, i)
+  end
+end