tee 0.0.2 → 0.0.3

data/lib/tee.rb

@@ -1,7 +1,7 @@
 # A class like tee(1)
 class Tee
   # @return [String]
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   class << self
     # @macro new
@@ -83,8 +83,7 @@ class Tee
   # @param obj [Object]
   # @return [self]
   def <<(obj)
-    each_ios_and_stdout { |io| io << obj }
-    self
+    each_ios_and_stdout(obj, &:<<)
   end
 
   # Closes all ios except stdout
@@ -107,7 +106,25 @@ class Tee
   # @return [self]
   def flush
     each_ios_and_stdout(&:flush)
-    self
+  end
+
+  # Delegates #print to ios
+  #
+  # @param obj [Object]
+  # @return [nil]
+  def print(*obj)
+    each_ios_and_stdout(*obj, &:print)
+    nil
+  end
+
+  # Delegates #printf to ios
+  #
+  # @param format [String]
+  # @param obj [Object]
+  # @return [nil]
+  def printf(format, *obj)
+    each_ios_and_stdout(format, *obj, &:printf)
+    nil
   end
 
   # Delegates #putc to ios
@@ -116,10 +133,27 @@ class Tee
   # @return [Fixnum]
   # @return [String]
   def putc(char)
-    each_ios_and_stdout { |io| io.putc(char) }
+    each_ios_and_stdout(char, &:putc)
     char
   end
 
+  # Delegates #puts to ios
+  #
+  # @param obj [Object]
+  # @return [nil]
+  def puts(*obj)
+    each_ios_and_stdout(*obj, &:puts)
+    nil
+  end
+
+  # Delegates #syswrite to ios
+  #
+  # @param string [String]
+  # @return [Array<Integer>]
+  def syswrite(string)
+    each_ios_and_stdout(string).map(&:syswrite)
+  end
+
   # Returns self
   #
   # @return [self]
@@ -135,71 +169,45 @@ class Tee
   end
   alias isatty tty?
 
-  # @method print(obj, ...)
-  # Delegates #print to ios
-  # @param obj [Object]
-  # @return [nil]
-
-  # @method printf(format[, obj, ...])
-  # Delegates #printf to ios
-  # @param format [String]
-  # @param obj [Object]
-  # @return [nil]
-
-  # @method puts(obj, ...)
-  # Delegates #puts to ios
-  # @param obj [Object]
-  # @return [nil]
-  %w( print printf puts ).each do |method|
-    class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-      def #{method}(*args)
-        each_ios_and_stdout { |io| io.#{method}(*args) }
-        nil
-      end
-    EOS
-  end
-
-  # @method syswrite(string)
-  # Delegates #syswrite to ios
-  # @param string [String]
-  # @return [Array<Integer>]
-
-  # @method write(string)
   # Delegates #write to ios
+  #
   # @param string [String]
   # @return [Array<Integer>]
+  def write(string)
+    each_ios_and_stdout(string).map(&:write)
+  end
 
-  # @method write_nonblock(string)
   # Delegates #write_nonblock to ios
+  #
   # @param string [String]
   # @return [Array<Integer>]
-  %w( syswrite write write_nonblock ).each do |method|
-    class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-      def #{method}(string)
-        each_ios_and_stdout.map { |io| io.#{method}(string) }
-      end
-    EOS
+  def write_nonblock(string)
+    each_ios_and_stdout(string).map(&:write_nonblock)
   end
 
   private
 
-  def each_ios(&block)
-    return to_enum(:each_ios) unless block_given?
+  # @return [self]
+  def each_ios(*args, &block)
+    return to_enum(:each_ios, *args) unless block_given?
     @ios.each do |io,|
-      yield io
+      yield io, *args
     end
     self
   end
 
-  def each_ios_and_stdout(&block)
-    return to_enum(:each_ios_and_stdout) unless block_given?
-    each_ios(&block)
-    yield @stdout if @stdout
-    self
+  # @return [self]
+  def each_ios_and_stdout(*args, &block)
+    return to_enum(:each_ios_and_stdout, *args) unless block_given?
+    yield @stdout, *args if @stdout
+    each_ios(*args, &block)
   end
 
+  # @return [nil]
   def close_ios_opened_by_self(ios = @ios)
-    ios.each { |io, opened| io.close if opened && !io.closed? }
+    ios.each do |io, opened|
+      io.close if opened && !io.closed?
+    end
     nil
   end
 end

data/spec/tee_spec.rb

@@ -267,6 +267,30 @@ describe Tee do
     end
   end
 
+  describe '#closed?' do
+    context 'when tee is opened without argument' do
+      it 'returns true' do
+        tee.closed?.should be_true
+      end
+    end
+
+    context 'when tee is opened with an ios' do
+      before { @tee = Tee.open(StringIO.new) }
+
+      it 'returns false' do
+        @tee.closed?.should be_false
+      end
+
+      context 'after closing' do
+        before { @tee.close }
+
+        it 'returns true' do
+          @tee.closed?.should be_true
+        end
+      end
+    end
+  end
+
   describe '#flush' do
     it 'returns self' do
       tee.flush.should be tee
@@ -322,6 +346,9 @@ describe Tee do
   end
 
   %w( syswrite write write_nonblock ).each do |method|
+    # for JRuby 1.6
+    next if method == 'write_nonblock' && !StringIO.method_defined?(method)
+
     describe "##{method}" do
       it 'returns Array of the number of bytes written' do
         string = 'foo'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tee
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70332175132780 !ruby/object:Gem::Requirement
+  requirement: &70107985808900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70332175132780
+  version_requirements: *70107985808900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70332175131820 !ruby/object:Gem::Requirement
+  requirement: &70107985774440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70332175131820
+  version_requirements: *70107985774440
 description: A class like tee(1).
 email: m.ishihara@gmail.com
 executables: []
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4540246555897654950
+      hash: 757023539280985321
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11