paper_house 0.4.1 → 0.5.0

data/features/{c_extension_task.feature → ruby_extension_task.feature}

@@ -1,90 +1,72 @@
-Feature: PaperHouse::CExtensionTask
+Feature: PaperHouse::RubyExtensionTask
 
-  PaperHouse provides a rake task called `PaperHouse::CExtensionTask`
+  PaperHouse provides a rake task called `PaperHouse::RubyExtensionTask`
   to build a C extention library from *.c and *.h files. These source
   files can be located in multiple subdirectories.
 
   @linux
-  Scenario: Build a C extension from one *.c and *.h file
-    Given the current project directory is "examples/c_extension"
-    When I successfully run `rake hello`
+  Scenario: Build a Ruby extension from one *.c and *.h file
+    Given the current project directory is "examples/ruby_extension"
+    When I run rake "hello"
     Then the output should match /^gcc/
     And the output should not match /^llvm-gcc/
     And a file named "hello.so" should exist
     And I successfully run `ruby -I. -rhello -e "p HelloPaperHouse"`
-    And the output should contain:
-    """
-    HelloPaperHouse
-    """
+    And the output should contain "HelloPaperHouse"
 
   @mac
-  Scenario: Build a C extension from one *.c and *.h file
-    Given the current project directory is "examples/c_extension"
-    When I successfully run `rake hello`
+  Scenario: Build a Ruby extension from one *.c and *.h file
+    Given the current project directory is "examples/ruby_extension"
+    When I run rake "hello"
     Then the output should match /^gcc/
     And the output should not match /^llvm-gcc/
     And a file named "hello.bundle" should exist
     And I successfully run `ruby -I. -rhello -e "p HelloPaperHouse"`
-    And the output should contain:
-    """
-    HelloPaperHouse
-    """
+    And the output should contain "HelloPaperHouse"
 
   @linux
-  Scenario: Build a C extension from one *.c and *.h file using llvm-gcc by specifying 'CC=' option
-    Given the current project directory is "examples/c_extension"
-    When I successfully run `rake hello CC=llvm-gcc`
+  Scenario: Build a Ruby extension from one *.c and *.h file using llvm-gcc by specifying 'CC=' option
+    Given the current project directory is "examples/ruby_extension"
+    When I run rake "hello CC=llvm-gcc"
     Then the output should match /^llvm-gcc/
     And the output should not match /^gcc/
     And a file named "hello.so" should exist
     And I successfully run `ruby -I. -rhello -e "p HelloPaperHouse"`
-    And the output should contain:
-    """
-    HelloPaperHouse
-    """
+    And the output should contain "HelloPaperHouse"
 
   @mac
-  Scenario: Build a C extension from one *.c and *.h file using llvm-gcc by specifying 'CC=' option
-    Given the current project directory is "examples/c_extension"
-    When I successfully run `rake hello CC=llvm-gcc`
+  Scenario: Build a Ruby extension from one *.c and *.h file using llvm-gcc by specifying 'CC=' option
+    Given the current project directory is "examples/ruby_extension"
+    When I run rake "hello CC=llvm-gcc"
     Then the output should match /^llvm-gcc/
     And the output should not match /^gcc/
     And a file named "hello.bundle" should exist
     And I successfully run `ruby -I. -rhello -e "p HelloPaperHouse"`
-    And the output should contain:
-    """
-    HelloPaperHouse
-    """
+    And the output should contain "HelloPaperHouse"
 
   @linux
-  Scenario: Build a C extension from one *.c and *.h file using llvm-gcc
-    Given the current project directory is "examples/c_extension"
-    When I successfully run `rake -f Rakefile.llvm hello`
+  Scenario: Build a Ruby extension from one *.c and *.h file using llvm-gcc
+    Given the current project directory is "examples/ruby_extension"
+    When I run rake "-f Rakefile.llvm hello"
     Then the output should match /^llvm-gcc/
     And the output should not match /^gcc/
     And a file named "hello.so" should exist
     And I successfully run `ruby -I. -rhello -e "p HelloPaperHouse"`
-    And the output should contain:
-    """
-    HelloPaperHouse
-    """
+    And the output should contain "HelloPaperHouse"
 
   @mac
-  Scenario: Build a C extension from one *.c and *.h file using llvm-gcc
-    Given the current project directory is "examples/c_extension"
-    When I successfully run `rake -f Rakefile.llvm hello`
+  Scenario: Build a Ruby extension from one *.c and *.h file using llvm-gcc
+    Given the current project directory is "examples/ruby_extension"
+    When I run rake "-f Rakefile.llvm hello"
     Then the output should match /^llvm-gcc/
     And the output should not match /^gcc/
     And a file named "hello.bundle" should exist
     And I successfully run `ruby -I. -rhello -e "p HelloPaperHouse"`
-    And the output should contain:
-    """
-    HelloPaperHouse
-    """
+    And the output should contain "HelloPaperHouse"
 
   @linux
   Scenario: Clean
-    Given the current project directory is "examples/c_extension"
+    Given the current project directory is "examples/ruby_extension"
     And I successfully run `rake hello`
     When I successfully run `rake clean`
     Then a file named "hello.o" should not exist
@@ -93,7 +75,7 @@ Feature: PaperHouse::CExtensionTask
 
   @mac
   Scenario: Clean
-    Given the current project directory is "examples/c_extension"
+    Given the current project directory is "examples/ruby_extension"
     And I successfully run `rake hello`
     When I successfully run `rake clean`
     Then a file named "hello.o" should not exist
@@ -102,7 +84,7 @@ Feature: PaperHouse::CExtensionTask
 
   @linux
   Scenario: Clobber
-    Given the current project directory is "examples/c_extension"
+    Given the current project directory is "examples/ruby_extension"
     And I successfully run `rake hello`
     When I successfully run `rake clobber`
     Then a file named "hello.o" should not exist
@@ -111,7 +93,7 @@ Feature: PaperHouse::CExtensionTask
 
   @mac
   Scenario: Clobber
-    Given the current project directory is "examples/c_extension"
+    Given the current project directory is "examples/ruby_extension"
     And I successfully run `rake hello`
     When I successfully run `rake clobber`
     Then a file named "hello.o" should not exist

data/features/shared_library_task.feature

@@ -8,172 +8,148 @@ Feature: PaperHouse::SharedLibraryTask
   @linux
   Scenario: Build a shared library from one *.c and *.h file
     Given the current project directory is "examples/shared_library"
-    When I successfully run `rake hello`
-    Then the output should contain:
+    When I run rake "hello"
+    Then the stderr should contain:
     """
     gcc -H -fPIC -I. -c hello.c -o ./hello.o
-    gcc -H -fPIC -I. -c main.c -o ./main.o
     gcc -shared -Wl,-soname,libhello.so.0 -o ./libhello.so.0.1.0 ./hello.o -lm
     ln -s libhello.so.0.1.0 libhello.so
     ln -s libhello.so.0.1.0 libhello.so.0
+    gcc -H -fPIC -I. -c main.c -o ./main.o
     gcc -o ./hello ./main.o -L. -lhello
     """
     And a file named "libhello.so.0.1.0" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   @mac
   Scenario: Build a shared library from one *.c and *.h file
     Given the current project directory is "examples/shared_library"
-    When I successfully run `rake hello`
-    Then the output should contain:
+    When I run rake "hello"
+    Then the stderr should contain:
     """
     gcc -H -fPIC -I. -c hello.c -o ./hello.o
-    gcc -H -fPIC -I. -c main.c -o ./main.o
     gcc -shared -Wl,-install_name,libhello.so.0 -o ./libhello.so.0.1.0 ./hello.o -lm
     ln -s libhello.so.0.1.0 libhello.so
     ln -s libhello.so.0.1.0 libhello.so.0
+    gcc -H -fPIC -I. -c main.c -o ./main.o
     gcc -o ./hello ./main.o -L. -lhello
     """
     And a file named "libhello.so.0.1.0" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   @linux
   Scenario: Build a shared library from one *.c and *.h file using llvm-gcc by specifying `CC=` option
     Given the current project directory is "examples/shared_library"
-    When I successfully run `rake hello CC=llvm-gcc`
-    Then the output should contain:
+    When I run rake "hello CC=llvm-gcc"
+    Then the stderr should contain:
     """
     llvm-gcc -H -fPIC -I. -c hello.c -o ./hello.o
-    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     llvm-gcc -shared -Wl,-soname,libhello.so.0 -o ./libhello.so.0.1.0 ./hello.o -lm
     ln -s libhello.so.0.1.0 libhello.so
     ln -s libhello.so.0.1.0 libhello.so.0
+    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     llvm-gcc -o ./hello ./main.o -L. -lhello
     """
     And a file named "libhello.so.0.1.0" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   @mac
   Scenario: Build a shared library from one *.c and *.h file using llvm-gcc by specifying `CC=` option
     Given the current project directory is "examples/shared_library"
-    When I successfully run `rake hello CC=llvm-gcc`
-    Then the output should contain:
+    When I run rake "hello CC=llvm-gcc"
+    Then the stderr should contain:
     """
     llvm-gcc -H -fPIC -I. -c hello.c -o ./hello.o
-    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     llvm-gcc -shared -Wl,-install_name,libhello.so.0 -o ./libhello.so.0.1.0 ./hello.o -lm
     ln -s libhello.so.0.1.0 libhello.so
     ln -s libhello.so.0.1.0 libhello.so.0
+    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     llvm-gcc -o ./hello ./main.o -L. -lhello
     """
     And a file named "libhello.so.0.1.0" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   @linux
   Scenario: Build a shared library from one *.c and *.h file using llvm-gcc
     Given the current project directory is "examples/shared_library"
-    When I successfully run `rake -f Rakefile.llvm hello`
-    Then the output should contain:
+    When I run rake "-f Rakefile.llvm hello"
+    Then the stderr should contain:
     """
     llvm-gcc -H -fPIC -I. -c hello.c -o ./hello.o
-    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     llvm-gcc -shared -Wl,-soname,libhello.so.0 -o ./libhello.so.0.1.0 ./hello.o -lm
     ln -s libhello.so.0.1.0 libhello.so
     ln -s libhello.so.0.1.0 libhello.so.0
+    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     llvm-gcc -o ./hello ./main.o -L. -lhello
     """
     And a file named "libhello.so.0.1.0" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   @mac
   Scenario: Build a shared library from one *.c and *.h file using llvm-gcc
     Given the current project directory is "examples/shared_library"
-    When I successfully run `rake -f Rakefile.llvm hello`
-    Then the output should contain:
+    When I run rake "-f Rakefile.llvm hello"
+    Then the stderr should contain:
     """
     llvm-gcc -H -fPIC -I. -c hello.c -o ./hello.o
-    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     llvm-gcc -shared -Wl,-install_name,libhello.so.0 -o ./libhello.so.0.1.0 ./hello.o -lm
     ln -s libhello.so.0.1.0 libhello.so
     ln -s libhello.so.0.1.0 libhello.so.0
+    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     llvm-gcc -o ./hello ./main.o -L. -lhello
     """
     And a file named "libhello.so.0.1.0" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   @linux
   Scenario: Build a shared library from multiple *.c and *.h files in subcirectories
     Given the current project directory is "examples/shared_library_subdirs"
-    When I successfully run `rake hello`
+    When I run rake "hello"
     Then the output should contain:
     """
-    gcc -H -Werror -Wall -Wextra -fPIC -Iincludes -Isources -c sources/hello.c -o objects/hello.o
-    gcc -H -fPIC -Iincludes -Isources -c sources/main.c -o ./main.o
     mkdir -p objects
+    gcc -H -Werror -Wall -Wextra -fPIC -Iincludes -Isources -c sources/hello.c -o objects/hello.o
     gcc -shared -Wl,-soname,libhello.so.0 -o objects/libhello.so.0.1.0 objects/hello.o
     ln -s objects/libhello.so.0.1.0 libhello.so
     ln -s objects/libhello.so.0.1.0 libhello.so.0
+    gcc -H -fPIC -Iincludes -Isources -c sources/main.c -o ./main.o
     gcc -o ./hello ./main.o -L. -lhello
     """
     And a file named "objects/libhello.so.0.1.0" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   @mac
   Scenario: Build a shared library from multiple *.c and *.h files in subcirectories
     Given the current project directory is "examples/shared_library_subdirs"
-    When I successfully run `rake hello`
+    When I run rake "hello"
     Then the output should contain:
     """
-    gcc -H -Werror -Wall -Wextra -fPIC -Iincludes -Isources -c sources/hello.c -o objects/hello.o
-    gcc -H -fPIC -Iincludes -Isources -c sources/main.c -o ./main.o
     mkdir -p objects
+    gcc -H -Werror -Wall -Wextra -fPIC -Iincludes -Isources -c sources/hello.c -o objects/hello.o
     gcc -shared -Wl,-install_name,libhello.so.0 -o objects/libhello.so.0.1.0 objects/hello.o
     ln -s objects/libhello.so.0.1.0 libhello.so
     ln -s objects/libhello.so.0.1.0 libhello.so.0
+    gcc -H -fPIC -Iincludes -Isources -c sources/main.c -o ./main.o
     gcc -o ./hello ./main.o -L. -lhello
     """
     And a file named "objects/libhello.so.0.1.0" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   Scenario: Automatically rebuild an executable when dependent library is updated
     Given the current project directory is "examples/shared_library"
@@ -181,10 +157,7 @@ Feature: PaperHouse::SharedLibraryTask
     And I successfully run `sleep 1`
     And I successfully run `touch libhello.so.0`
     When I successfully run `rake hello`
-    Then the output should contain:
-    """
-    gcc -o ./hello ./main.o -L. -lhello
-    """
+    Then the output should contain "gcc -o ./hello ./main.o -L. -lhello"
 
   Scenario: Clean
     Given the current project directory is "examples/shared_library"

data/features/static_library_task.feature

@@ -7,80 +7,68 @@ Feature: PaperHouse::StaticLibraryTask
 
   Scenario: Build a static library from one *.c and *.h file
     Given the current project directory is "examples/static_library"
-    When I successfully run `rake hello`
-    Then the output should contain:
+    When I run rake "hello"
+    Then the stderr should contain:
     """
     gcc -H -fPIC -I. -c hello.c -o ./hello.o
-    gcc -H -fPIC -I. -c main.c -o ./main.o
     ar -cq ./libhello.a ./hello.o
     ranlib ./libhello.a
+    gcc -H -fPIC -I. -c main.c -o ./main.o
     gcc -o ./hello ./main.o -L. -lhello
     """
     And a file named "libhello.a" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   Scenario: Build a static library from one *.c and *.h file using llvm-gcc by specifying `CC=` option
     Given the current project directory is "examples/static_library"
-    When I successfully run `rake hello CC=llvm-gcc`
-    Then the output should contain:
+    When I run rake "hello CC=llvm-gcc"
+    Then the stderr should contain:
     """
     llvm-gcc -H -fPIC -I. -c hello.c -o ./hello.o
-    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     ar -cq ./libhello.a ./hello.o
     ranlib ./libhello.a
+    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     llvm-gcc -o ./hello ./main.o -L. -lhello
     """
     And a file named "libhello.a" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   Scenario: Build a static library from one *.c and *.h file using llvm-gcc
     Given the current project directory is "examples/static_library"
-    When I successfully run `rake -f Rakefile.llvm hello`
-    Then the output should contain:
+    When I run rake "-f Rakefile.llvm hello"
+    Then the stderr should contain:
     """
     llvm-gcc -H -fPIC -I. -c hello.c -o ./hello.o
-    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     ar -cq ./libhello.a ./hello.o
     ranlib ./libhello.a
+    llvm-gcc -H -fPIC -I. -c main.c -o ./main.o
     llvm-gcc -o ./hello ./main.o -L. -lhello
     """
     And a file named "libhello.a" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   Scenario: Build a static library from multiple *.c and *.h files in subcirectories
     Given the current project directory is "examples/static_library_subdirs"
-    When I successfully run `rake hello`
-    Then the output should contain:
+    When I run rake "hello"
+    Then the stderr should contain:
     """
-    gcc -H -Werror -Wall -Wextra -fPIC -Iincludes -Isources -c sources/hello.c -o objects/hello.o
-    gcc -H -fPIC -Iincludes -Isources -c sources/main.c -o ./main.o
     mkdir -p objects
+    gcc -H -Werror -Wall -Wextra -fPIC -Iincludes -Isources -c sources/hello.c -o objects/hello.o
     ar -cq objects/libhello.a objects/hello.o
     ranlib objects/libhello.a
+    gcc -H -fPIC -Iincludes -Isources -c sources/main.c -o ./main.o
     gcc -o ./hello ./main.o -Lobjects -lhello
     """
     And a file named "objects/libhello.a" should exist
     And a file named "hello" should exist
     And I successfully run `./hello`
-    And the output should contain:
-    """
-    Hello, PaperHouse!
-    """
+    And the output should contain "Hello, PaperHouse!"
 
   Scenario: Automatically rebuild an executable when dependent library is updated
     Given the current project directory is "examples/static_library"
@@ -88,10 +76,7 @@ Feature: PaperHouse::StaticLibraryTask
     And I successfully run `sleep 1`
     And I successfully run `touch libhello.a`
     When I successfully run `rake hello`
-    Then the output should contain:
-    """
-    gcc -o ./hello ./main.o -L. -lhello
-    """
+    Then the output should contain "gcc -o ./hello ./main.o -L. -lhello"
 
   Scenario: Clean
     Given the current project directory is "examples/static_library"

data/features/step_definitions/paper_house_steps.rb

@@ -1,8 +1,17 @@
+# -*- coding: utf-8 -*-
+
 Given(/^the current project directory is "(.*?)"$/) do | dir |
+  example_name = File.basename(dir)
   in_current_dir do
-    project_files = Dir.glob( File.join( "..", "..", dir, "*" ) )
-    FileUtils.cp_r project_files, "."
-    system "rake clobber"
-    FileUtils.rm_r "objects" if FileTest.exists?( "objects" )
+    FileUtils.cp_r File.join('..', '..', dir), '.'
+    Dir.chdir example_name do
+      system 'rake clobber'
+      FileUtils.rm_r 'objects' if FileTest.exists?('objects')
+    end
   end
+  step %{I cd to "#{example_name}"}
+end
+
+When(/^I run rake "(.*?)"$/) do |args|
+  step "I successfully run `rake #{args} -I../../.. -rrake_simplecov_hook`"
 end

data/features/support/env.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2013 NEC Corporation
 #
@@ -15,25 +16,21 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+require 'rubygems'
 
-require "rubygems"
-
-require "simplecov"
+require 'simplecov'
 SimpleCov.start
 
-require "aruba/cucumber"
-require "rake"
-
+require 'aruba/cucumber'
+require 'rake'
 
-ENV[ "LD_LIBRARY_PATH" ] = "."
+ENV['LD_LIBRARY_PATH'] = '.'
 
-
-if ENV[ "TRAVIS" ]
-  require "coveralls"
+if ENV['TRAVIS']
+  require 'coveralls'
   Coveralls.wear_merged!
 end
 
-
 ### Local variables:
 ### mode: Ruby
 ### coding: utf-8-unix

data/features/support/hooks.rb

@@ -1,12 +1,17 @@
+# -*- coding: utf-8 -*-
+
+AfterConfiguration do |config|
+  FileUtils.rm_f Dir.glob('tmp/.*_id')
+end
+
 Before do
-  ENV[ "CC" ] = nil
-  ENV[ "dragonegg_disable_version_check" ] = "1"
+  ENV['CC'] = nil
+  ENV['dragonegg_disable_version_check'] = '1'
   @aruba_timeout_seconds = 5
 end
 
-
 After do
-  ENV[ "CC" ] = nil
-  ENV[ "dragonegg_disable_version_check" ] = nil
+  ENV['CC'] = nil
+  ENV['dragonegg_disable_version_check'] = nil
   Rake::Task.clear
 end

data/lib/paper_house/auto_depends.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2013 NEC Corporation
 #
@@ -15,9 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-
-require "paper_house/safe_popen"
-
+require 'paper_house/safe_popen'
 
 module PaperHouse
   #
@@ -26,68 +25,64 @@ module PaperHouse
   class AutoDepends
     attr_reader :data
 
-
-    def initialize c_file, o_file, cc, cc_options
+    def initialize(c_file, o_file, cc, cc_options)
       @cc = cc
-      @command = "#{ @cc } -H #{ cc_options } -c #{ c_file } -o #{ o_file }"
+      @command = "#{@cc} -H #{cc_options} -c #{c_file} -o #{o_file}"
       @data = []
+      @out = STDERR
     end
 
-
     #
     # Runs dependency detection.
     #
     def run
-      puts @command
+      @out.puts @command
       exit_status = popen_command
-      raise "#{ @cc } failed" if exit_status != 0
+      fail "#{@cc} failed" if exit_status != 0
     end
 
-
-    ############################################################################
     private
-    ############################################################################
-
 
     def popen_command
-      SafePopen.popen( @command ) do | stdout, stderr, stdin, |
+      SafePopen.popen(@command) do |stdout, stderr, stdin, |
         stdin.close
         parse_cc_h_stderr stderr
       end.exitstatus
     end
 
-
-    def parse_cc_h_stderr stderr
-      stderr.each do | each |
-        parse_cc_h_stderr_line( each, stderr )
+    def parse_cc_h_stderr(stderr)
+      stderr.each do |each|
+        parse_cc_h_stderr_line(each, stderr)
       end
     end
 
-
-    def parse_cc_h_stderr_line line, stderr
+    def parse_cc_h_stderr_line(line, stderr)
       case line
       when /^\./
-        @data << line.sub( /^\.+\s+/, "" ).strip
+        extract_header_path_from line
       when /Multiple include guards/
         filter_out_include_guards_warnings stderr
       else
-        puts line
+        @out.puts line
       end
     end
 
+    def extract_header_path_from(line)
+      @data << line.sub(/^\.+\s+/, '').strip
+    end
+
+    private
 
-    def filter_out_include_guards_warnings stderr
-      stderr.each do | each |
-        if /:$/=~ each
-          puts each
-          return
-        end
+    def filter_out_include_guards_warnings(stderr)
+      stderr.each_line do |each|
+        next unless each =~ /:$/
+        @out.puts each
+        return
       end
     end
   end
 end
 
-
 ### Local variables:
 ### mode: Ruby
 ### coding: utf-8-unix