clintegracon 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7ea45e09d41cdf32e54a9f202b3ef12249cb234
-  data.tar.gz: 572433ceeea7dbdac41d2408c501f59ecfdda7cd
+  metadata.gz: 8783eed598a5361fc795faf244dbd22fe60a35f1
+  data.tar.gz: a030a86de14cb5a5a4a9e686b5943a6a1c8fb864
 SHA512:
-  metadata.gz: 5800a93a5b745f89a39a65e5c4d2d7dab91ea49f77636d13f69b82976933d24966108305cbf7d19f12a8da4d39ce19b00c26dda6e818412b2d64ee2d16bc9e93
-  data.tar.gz: 3afc19fc729fea9dfa3327a0941cec7b98c8be85cb1dc521f8f7966f4f09d31f8692af2bdef73398545f76a690ceafac3de67777709ab30c1ba07f152901d46f
+  metadata.gz: 6fca68914e6029a04788fb6c99e37abaa8c392fc541f86219a213c6594ae86c848d05e193199179071b66ac90f79a88de8716993510b3592bf6cb27ed3c1b139
+  data.tar.gz: 3db0cd2ef3d3dcc8ab501db629bf0121d8587fcb44a765a6c8be18b6cb0488862c543dee168d02750ed8241baf564b52b3beaf8ca41620817ef8865520b4de14

data/.travis.yml

@@ -1,7 +1,10 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 2.1.1
+  # OS X 10.9.5-10.10.0 (2.0.0-p481)
+  - 2.0.0-p481
+  # OS X 10.9.3-10.9.4
+  - 2.0.0-p451
+
 
 #addons:
 # code_climate:

data/Gemfile.lock

@@ -1,45 +1,52 @@
 PATH
   remote: .
   specs:
-    clintegracon (0.6.1)
+    clintegracon (0.7.0)
       colored (~> 1.2)
       diffy
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.20)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     bacon (1.2.0)
-    claide (0.7.0)
+    claide (0.8.1)
     coderay (1.1.0)
     colored (1.2)
-    diffy (3.0.6)
-    i18n (0.6.11)
-    inch (0.5.0)
+    diffy (3.0.7)
+    i18n (0.7.0)
+    inch (0.6.1)
       pry
       sparkr (>= 0.2.0)
       term-ansicolor
-      yard (~> 0.8.7)
+      yard (~> 0.8.7.5)
+    json (1.8.2)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mocha (1.0.0)
+    minitest (5.6.1)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
-    multi_json (1.10.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.1.1)
+    rake (10.4.2)
     slop (3.6.0)
     sparkr (0.4.1)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
-    tins (1.3.3)
-    yard (0.8.7.4)
+    thread_safe (0.3.5)
+    tins (1.5.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
@@ -48,9 +55,8 @@ DEPENDENCIES
   activesupport (>= 3.1)
   bacon
   bundler (~> 1.3)
-  claide
+  claide (~> 0.8)
   clintegracon!
   inch
-  mocha (~> 1.0.0)
   mocha-on-bacon
-  rake (~> 10.1.0)
+  rake

data/Rakefile

@@ -39,6 +39,11 @@ begin
       ].join " | "
     end
 
+    desc 'Approve the bacon integration execution output as acceptable'
+    task :rebuild_bacon_integration do
+      `bundle exec rake spec:bacon_integration_runner > spec/bacon/execution_output.txt`
+    end
+
     desc 'Run all integration specs'
     task :integration => [
       'spec:bacon_integration'

data/clintegracon.gemspec

@@ -23,11 +23,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", '~> 10.1.0'   # Ruby 1.8.7
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "bacon"
-  spec.add_development_dependency "mocha", "~> 1.0.0"   # Ruby 1.8.7
   spec.add_development_dependency "mocha-on-bacon"
-  spec.add_development_dependency "claide"              # Example CLI
+  spec.add_development_dependency "claide", "~> 0.8"    # Example CLI
   spec.add_development_dependency "inch"
   spec.add_development_dependency 'activesupport', '>= 3.1'
 

data/lib/CLIntegracon/adapter/bacon.rb

@@ -48,11 +48,11 @@ module CLIntegracon::Adapter::Bacon
 
     # Works like `behaves_like`, but takes arguments for the shared example
     #
-    # @param [String] name
-    #        name of the shared context.
+    # @param  [String] name
+    #         name of the shared context.
     #
-    # @param [...] args
-    #        params to pass to the shared context
+    # @param  [...] args
+    #         params to pass to the shared context
     #
     def behaves_like_a(name, *args)
       instance_exec(*args, &Bacon::Shared[name])
@@ -69,17 +69,26 @@ module CLIntegracon::Adapter::Bacon
     # @param   [String] spec_dir
     #          the concrete directory of the spec, see {file_spec}.
     #
-    # @param   [String] args
-    #          the additional arguments to pass on launch to {CLIntegracon::Subject}.
+    # @param   [String] head_args
+    #          the arguments to pass before the +default_args+ on launch to {CLIntegracon::Subject}.
+    #
+    # @param   [String] tail_args
+    #          the arguments to pass after the +default_args+ on launch to {CLIntegracon::Subject}.
+    #
+    # @param   [String] based_on
+    #          Allows to specify an optional base spec, whose after directory will be used
+    #          as before directory. You have to ensure that the specs are defined in order,
+    #          so that the base spec was executed before.
     #
     # @return  [String]
     #          name of the set of shared expectations
     #
-    def cli_spec(spec_dir, *args)
-      file_spec spec_dir do
-        output = subject.launch(*args)
+    def cli_spec(spec_dir, head_args=nil, tail_args=nil, based_on: nil)
+      file_spec(spec_dir, based_on: based_on) do
+        output = subject.launch(head_args, tail_args)
         status = $?
 
+        args = [head_args, tail_args].compact
         it "$ #{subject.name} #{args.join(' ')}" do
           status.should.satisfy("Binary failed\n\n#{output}") do
             status.success?
@@ -102,6 +111,10 @@ module CLIntegracon::Adapter::Bacon
     #          the concrete directory of the spec to be passed to
     #          {FileTreeSpecContext.spec}
     #
+    # @param   [String] based_on
+    #          Allows to specify an optional base spec, whose after directory will be used
+    #          as before directory.
+    #
     # @param   [Block<() -> ()>] block
     #          the block which will be executed after the before state is laid out in the
     #          temporary directory, which normally will make modifications to file system,
@@ -110,13 +123,13 @@ module CLIntegracon::Adapter::Bacon
     # @return  [String]
     #          name of the set of shared expectations
     #
-    def file_spec(spec_dir, &block)
+    def file_spec(spec_dir, based_on: nil, &block)
       raise ArgumentError.new("Spec directory is missing!") if spec_dir.nil?
 
       shared_name = spec_dir
 
       shared shared_name do
-        file_tree_spec_context.spec(spec_dir).run do |spec|
+        file_tree_spec_context.spec(spec_dir, based_on: based_on).run do |spec|
           instance_eval &block
 
           formatter = spec.formatter.lazy

data/lib/CLIntegracon/diff.rb

@@ -20,45 +20,45 @@ module CLIntegracon
 
     # @return [Proc<(Pathname)->(to_s)>]
     #         the proc, which transforms the files in a better comparable form
-    attr_accessor :preparator
+    attr_accessor :preprocessor
 
     # Init a new diff
     #
-    # @param [Pathname] expected
-    #        the expected file
+    # @param  [Pathname] expected
+    #         the expected file
     #
-    # @param [Pathname] produced
-    #        the produced file
+    # @param  [Pathname] produced
+    #         the produced file
     #
-    # @param [Pathname] relative_path
-    #        the relative path to the expected file
+    # @param  [Pathname] relative_path
+    #         the relative path to the expected file
     #
-    # @param [Block<(Pathname)->(to_s)>] preparator
-    #        the block, which transforms the files in a better comparable form
+    # @param  [Block<(Pathname)->(to_s)>] preprocessor
+    #         the block, which preprocess the files in a better comparable form
     #
-    def initialize(expected, produced, relative_path=nil, &preparator)
+    def initialize(expected, produced, relative_path=nil, &preprocessor)
       @expected = expected
       @produced = produced
       @relative_path = relative_path
-      preparator ||= Proc.new { |x| x } #id
-      self.preparator = preparator
+      preprocessor ||= Proc.new { |x| x } #id
+      self.preprocessor = preprocessor
     end
 
-    def prepared_expected
-      @prepared_expected ||= preparator.call(expected)
+    def preprocessed_expected
+      @preprocessed_expected ||= preprocessor.call(expected)
     end
 
-    def prepared_produced
-      @prepared_produced ||= preparator.call(produced)
+    def preprocessed_produced
+      @preprocessed_produced ||= preprocessor.call(produced)
     end
 
-    # Check if the prepared inputs are files or need to be dumped first to
+    # Check if the preprocessed inputs are files or need to be dumped first to
     # temporary files to be compared.
     #
     # @return [Bool]
     #
     def compares_files?
-      prepared_expected.is_a? Pathname
+      preprocessed_expected.is_a? Pathname
     end
 
     # Check if the produced output equals the expected
@@ -68,9 +68,9 @@ module CLIntegracon
     #
     def is_equal?
       @is_equal ||= if compares_files?
-        FileUtils.compare_file(prepared_expected, prepared_produced)
+        FileUtils.compare_file(preprocessed_expected, preprocessed_produced)
       else
-        prepared_expected == prepared_produced
+        preprocessed_expected == preprocessed_produced
       end
     end
 
@@ -86,7 +86,7 @@ module CLIntegracon
         :source  => compares_files? ? 'files' : 'strings',
         :context => 3
       }.merge options
-      Diffy::Diff.new(prepared_expected.to_s, prepared_produced.to_s, options).each &block
+      Diffy::Diff.new(preprocessed_expected.to_s, preprocessed_produced.to_s, options).each &block
     end
 
   end

data/lib/CLIntegracon/file_tree_spec.rb

@@ -3,6 +3,14 @@ require 'CLIntegracon/diff'
 require 'CLIntegracon/formatter'
 
 module CLIntegracon
+  # FileTreeSpec represents a single specification, which is mirrored
+  # on the file system in the spec directory by a direct children.
+  # It contains a before directory (#before_path) and an after
+  # directory (#after_path) or if it is initialized with a #base_spec,
+  # the before directory of this spec is used. The before directory
+  # contents in the #spec_path of the child spec, can contain further
+  # files, which overwrite, if given, the inherited contents.
+  #
   class FileTreeSpec
 
     # @return [FileTreeSpecContext]
@@ -37,26 +45,49 @@ module CLIntegracon
       context.temp_path + spec_folder
     end
 
+    # @return [String|NilClass]
+    #         The name of an optional #base_spec.
+    attr_reader :base_spec_name
+
+    # Return whether this spec is based on another spec.
+    #
+    # @return  [Bool]
+    #
+    def has_base?
+      !base_spec_name.nil?
+    end
+
+    # @return [FileTreeSpec|NilClass]
+    #         The spec on whose #after_path will be used as #before_path
+    #         for this spec.
+    def base_spec
+      has_base? ? context.spec(base_spec_name) : nil
+    end
+
     # Init a spec with a given context
     #
-    # @param [FileTreeSpecContext] context
-    #        The context, which configures path and file behaviors
+    # @param  [FileTreeSpecContext] context
+    #         The context, which configures path and file behaviors
     #
-    # @param [String] spec_folder
-    #        The concrete spec folder
+    # @param  [String] spec_folder
+    #         The concrete spec folder
     #
-    def initialize(context, spec_folder)
+    # @param  [String] based_on
+    #         @see #base_spec_name
+    #
+    def initialize(context, spec_folder, based_on: nil)
       @context = context
       @spec_folder = spec_folder
+      @base_spec_name = based_on
     end
 
     # Run this spec
     #
-    # @param [Block<(FileTreeSpec)->()>] block
-    #        The block, which will be executed after chdir into the created temporary
-    #        directory. In this block you will likely run your modifications to the
-    #        file system and use the received FileTreeSpec instance to make asserts
-    #        with the test framework of your choice.
+    # @param  [Block<(FileTreeSpec)->()>] block
+    #         The block, which will be executed after chdir into the created temporary
+    #         directory. In this block you will likely run your modifications to the
+    #         file system and use the received FileTreeSpec instance to make asserts
+    #         with the test framework of your choice.
     #
     def run(&block)
       prepare!
@@ -71,9 +102,9 @@ module CLIntegracon
     # Compares the expected and produced directory by using the rules
     # defined in the context
     #
-    # @param [Block<(Diff)->()>] diff_block
-    #        The block, where you will likely define a test for each file to compare.
-    #        It will receive a Diff of each of the expected and produced files.
+    # @param  [Block<(Diff)->()>] diff_block
+    #         The block, where you will likely define a test for each file to compare.
+    #         It will receive a Diff of each of the expected and produced files.
     #
     def compare(&diff_block)
       transform_paths!
@@ -82,12 +113,10 @@ module CLIntegracon
         expected = after_path + relative_path
 
         next unless expected.file?
+        next if context.ignores?(relative_path)
 
-        block = special_behavior_for_path relative_path
-        next if block == context.class.nop
-
-        diff = diff_files(expected, relative_path)
-        diff.preparator = block unless block.nil?
+        block = context.preprocessors_for(relative_path).first
+        diff = diff_files(expected, relative_path, &block)
 
         diff_block.call diff
       end
@@ -100,9 +129,9 @@ module CLIntegracon
     # test case for each file, which wasn't expected at all. So you can
     # keep your test cases consistent.
     #
-    # @param [Block<(Array)->()>] diff_block
-    #        The block, where you will likely define a test that no unexpected files exists.
-    #        It will receive an Array.
+    # @param  [Block<(Array)->()>] diff_block
+    #         The block, where you will likely define a test that no unexpected files exists.
+    #         It will receive an Array.
     #
     def check_unexpected_files(&block)
       expected_files = glob_all after_path
@@ -110,10 +139,10 @@ module CLIntegracon
       unexpected_files = produced_files - expected_files
 
       # Select only files
-      unexpected_files.reject! { |path| !path.file? }
+      unexpected_files.select! { |path| path.file? }
 
       # Filter ignored paths
-      unexpected_files.reject! { |path| special_behavior_for_path(path) == context.class.nop }
+      unexpected_files.reject! { |path| context.ignores?(path) }
 
       block.call unexpected_files
     end
@@ -141,18 +170,25 @@ module CLIntegracon
       # directory.
       #
       def copy_files!
-        source = before_path
         destination = temp_path
-        FileUtils.cp_r("#{source}/.", destination)
+
+        if has_base?
+          FileUtils.cp_r("#{base_spec.after_path}/.", destination)
+        end
+
+        begin
+          FileUtils.cp_r("#{before_path}/.", destination)
+        rescue Errno::ENOENT => e
+          raise e unless has_base?
+        end
       end
 
       # Applies the in the context configured transformations.
       #
       def transform_paths!
-        context.transform_paths.each do |path, block|
-          Dir.glob(path) do |produced_path|
-            produced = Pathname(produced_path)
-            block.call(produced)
+        glob_all.each do |path|
+          context.transformers_for(path).each do |transformer|
+            transformer.call(path)
           end
         end
       end
@@ -160,53 +196,37 @@ module CLIntegracon
       # Searches recursively for all files and take care for including hidden files
       # if this is configured in the context.
       #
-      # @param [String] path
-      #        The relative or absolute path to search in (optional)
+      # @param  [String] path
+      #         The relative or absolute path to search in (optional)
       #
       # @return [Array<Pathname>]
       #
       def glob_all(path=nil)
         Dir.chdir path || '.' do
-          Dir.glob("**/*", context.include_hidden_files? ? File::FNM_DOTMATCH : 0).sort.map { |path|
-            Pathname(path)
-          }
-        end
-      end
-
-      # Find the special behavior for a given path
-      #
-      # @return [Block<(Pathname) -> to_s>]
-      #         This block takes the Pathname and transforms the file in a better comparable
-      #         state. If it returns nil, the file is ignored.
-      #
-      def special_behavior_for_path(path)
-        context.special_paths.each do |key, block|
-          matched = if key.is_a?(Regexp)
-            path.to_s.match(key)
-          else
-            File.fnmatch(key, path)
+          Dir.glob("**/*", context.include_hidden_files? ? File::FNM_DOTMATCH : 0).sort.map do |p|
+            Pathname(p)
           end
-          next unless matched
-          return block
         end
-        return nil
       end
 
       # Compares two files to check if they are identical and produces a clear diff
       # to highlight the differences.
       #
-      # @param [Pathname] expected
-      #        The file in the after directory
+      # @param  [Pathname] expected
+      #         The file in the after directory
+      #
+      # @param  [Pathname] relative_path
+      #         The file in the temp directory
       #
-      # @param [Pathname] relative_path
-      #        The file in the temp directory
+      # @param  [Block<(Pathname)->(to_s)>] block
+      #         the block, which transforms the files in a better comparable form
       #
       # @return [Diff]
       #         An object holding a diff
       #
-      def diff_files(expected, relative_path)
+      def diff_files(expected, relative_path, &block)
         produced = temp_path + relative_path
-        Diff.new(expected, produced, relative_path)
+        Diff.new(expected, produced, relative_path, &block)
       end
 
   end

data/lib/CLIntegracon/file_tree_spec_context.rb

@@ -29,13 +29,17 @@ module CLIntegracon
     #
     attr_accessor :temp_path
 
-    # @return [Hash<String,Block>]
-    #         the special paths of files, which need to be transformed in a better comparable form
+    # @return [Hash<String|Regexp,Block>]
+    #         the paths of files, which need to be transformed in a better comparable form
     attr_accessor :transform_paths
 
-    # @return [Hash<String,Block>]
-    #         the special paths of files, where an individual file diff handling is needed
-    attr_accessor :special_paths
+    # @return [Hash<String|Regexp,Block>]
+    #         the paths of files, where an individual file diff handling is needed
+    attr_accessor :preprocess_paths
+
+    # @return [Array<String|Regexp>]
+    #         the paths of files to exclude from comparison
+    attr_accessor :ignore_paths
 
     # @return [Bool]
     #         whether to include hidden files, when searching directories (true by default)
@@ -49,12 +53,12 @@ module CLIntegracon
 
     # "Designated" initializer
     #
-    # @param [Hash<Symbol,String>] properties
-    #        The configuration parameter (optional):
-    #        :spec_path   => see self.spec_path
-    #        :before_dir  => see self.before_dir
-    #        :after_dir   => see self.after_dir
-    #        :temp_path   => see self.temp_path
+    # @param  [Hash<Symbol,String>] properties
+    #         The configuration parameter (optional):
+    #         :spec_path   => see self.spec_path
+    #         :before_dir  => see self.before_dir
+    #         :after_dir   => see self.after_dir
+    #         :temp_path   => see self.temp_path
     #
     def initialize(properties={})
       self.spec_path   = properties[:spec_path]   || '.'
@@ -62,24 +66,12 @@ module CLIntegracon
       self.before_dir  = properties[:before_dir]  || 'before'
       self.after_dir   = properties[:after_dir]   || 'after'
       self.transform_paths = {}
-      self.special_paths = {}
+      self.preprocess_paths = {}
+      self.ignore_paths = []
       self.include_hidden_files = true
     end
 
 
-    #-----------------------------------------------------------------------------#
-
-    # @!group Helper
-
-    # This value is used for ignored paths
-    #
-    # @return [Proc]
-    #         Does nothing
-    def self.nop
-      @nop ||= Proc.new {}
-    end
-
-
     #-----------------------------------------------------------------------------#
 
     # @!group Setter
@@ -109,11 +101,12 @@ module CLIntegracon
 
     # @!group DSL-like Setter
 
-    # Registers a block for special handling certain files, matched with globs.
+    # Registers a block to transform certain files, matched with globs or
+    # regular expressions.
     # Multiple transformers can match a single file.
     #
     # @param  [String...] file_paths
-    #         The file path(s) of the files, which were created/changed and need transformation
+    #         The path(s), which need to be transformed in a better comparable form
     #
     # @param  [Block<(Pathname) -> ()>] block
     #         The block, which takes each of the matched files, transforms it if needed
@@ -127,31 +120,70 @@ module CLIntegracon
       end
     end
 
-    # Registers a block for special handling certain files, matched with globs.
+    # Registers a block to preprocess certain files, matched with globs or
+    # regular expressions.
     # Registered file paths will be excluded from default comparison by `diff`.
-    # Multiple special handlers can match a single file.
+    # A file is preprocessed with the first matching preprocessor.
     #
     # @param  [String|Regexp...] file_paths
-    #         The file path(s) of the files, which were created/changed and need special comparison
+    #         The path(s)s, where an individual file diff handling is needed
     #
     # @param  [Block<(Pathname) -> (String)>] block
     #         The block, which takes each of the matched files, transforms it if needed
     #         in a better comparable form.
     #
-    def has_special_handling_for(*file_paths, &block)
+    def preprocess(*file_paths, &block)
       file_paths.each do |file_path|
-        self.special_paths[file_path] = block
+        self.preprocess_paths[file_path] = block
       end
     end
 
     # Copies the before subdirectory of the given tests folder in the temporary
     # directory.
     #
-    # @param  [String|RegExp...] file_path
-    #         the file path of the files, which were changed and need special comparison
+    # @param  [String|RegExp...] file_paths
+    #         the file path(s) of the files to exclude from comparison
+    #
+    def ignores(*file_paths)
+      self.ignore_paths += file_paths
+    end
+
+
+    #-----------------------------------------------------------------------------#
+
+    # @!group Path accessors
+
+    # Returns a list of transformers to apply for a given file path.
+    #
+    # @param  [Pathname] file_path
+    #         The file path to match
+    #
+    # @return [Array<Block<(Pathname) -> ()>>]
+    #
+    def transformers_for(file_path)
+      select_matching_file_patterns(transform_paths, file_path).values
+    end
+
+    # Returns a list of preprocessors to apply for a given file path.
+    #
+    # @param  [Pathname] file_path
+    #         The file path to match
+    #
+    # @return [Array<Block<(Pathname) -> (String)>>]
+    #
+    def preprocessors_for(file_path)
+      select_matching_file_patterns(preprocess_paths, file_path).values
+    end
+
+    # Checks whether a given file path is to ignore.
+    #
+    # @param  [Pathname] file_path
+    #         The file path to match
+    #
+    # @return [Bool]
     #
-    def ignores(*file_path)
-      has_special_handling_for *file_path, &self.class.nop
+    def ignores?(file_path)
+      !select_matching_file_patterns(ignore_paths, file_path).empty?
     end
 
 
@@ -168,13 +200,42 @@ module CLIntegracon
 
     # Get a specific spec with given folder to run it
     #
-    # @param [String] folder
-    #        The name of the folder of the tests
+    # @param  [String] folder
+    #         The name of the folder of the tests
+    #
+    # @param  [String] based_on
+    #         @see FileTreeSpec#base_spec_name
     #
     # @return [FileTreeSpec]
     #
-    def spec(spec_folder)
-      FileTreeSpec.new(self, spec_folder)
+    def spec(spec_folder, based_on: nil)
+      FileTreeSpec.new(self, spec_folder, based_on: based_on)
+    end
+
+    #-----------------------------------------------------------------------------#
+
+    private
+
+    # @!group Helpers
+
+    # Select elements in an enumerable which match the given path.
+    #
+    # @param  [Enumerable<String|RegExp>] patterns
+    #         The patterns to check
+    #
+    # @param  [Pathname] path
+    #         The file to match
+    #
+    # @return [Enumerable<String|RegExp>]
+    #
+    def select_matching_file_patterns(patterns, path)
+      patterns.select do |pattern|
+        if pattern.is_a?(Regexp)
+          path.to_s.match(pattern)
+        else
+          File.fnmatch(pattern, path)
+        end
+      end
     end
 
   end

data/lib/CLIntegracon/subject.rb

@@ -42,11 +42,11 @@ module CLIntegracon
 
     # "Designated" initializer
     #
-    # @param [String] name
-    #        The name of the binary
+    # @param  [String] name
+    #         The name of the binary
     #
-    # @param [String] executable
-    #        The executable subject statement (optional)
+    # @param  [String] executable
+    #         The executable subject statement (optional)
     #
     def initialize(name='subject', executable=nil)
       self.name = name
@@ -65,11 +65,11 @@ module CLIntegracon
     # Define a pattern, whose occurrences in the output should be replaced by a
     # given placeholder.
     #
-    # @param [Regexp|String] pattern
-    #        The pattern
+    # @param  [Regexp|String] pattern
+    #         The pattern
     #
-    # @param [String] replacement
-    #        The replacement
+    # @param  [String] replacement
+    #         The replacement
     #
     def replace_pattern(pattern, replacement)
       self.replace_patterns[replacement] = pattern
@@ -78,11 +78,11 @@ module CLIntegracon
     # Define a path, whose occurrences in the output should be replaced by
     # either its basename or a given placeholder.
     #
-    # @param [String] path
-    #        The path
+    # @param  [String] path
+    #         The path
     #
-    # @param [String] name
-    #        The name of the path, or the basename of the given path
+    # @param  [String] name
+    #         The name of the path, or the basename of the given path
     #
     def replace_path(path, name=nil)
       name ||= File.basename path
@@ -92,11 +92,11 @@ module CLIntegracon
     # Define a path in the user directory, whose occurrences in the output
     # should be replaced by either its basename or a given placeholder.
     #
-    # @param [String] path
-    #        The path
+    # @param  [String] path
+    #         The path
     #
-    # @param [String] name
-    #        The name of the path, or the given path
+    # @param  [String] name
+    #         The name of the path, or the given path
     #
     def replace_user_path(path, name=nil)
       name ||= "$HOME/#{path}"

data/lib/CLIntegracon/version.rb

@@ -1,3 +1,3 @@
 module CLIntegracon
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/spec/bacon/execution_output.txt

@@ -4,9 +4,12 @@ CLIntegracon::Adapter::Bacon
       without milk
         - $ coffee-maker --no-milk
         - BlackEye.brewed-coffee
+        - BlackEye.brewed-coffee.decanted
         - CaPheSuaDa.brewed-coffee [FAILED]
+        - CaPheSuaDa.brewed-coffee.decanted
         - Coffeemakerfile.yml
         - RedTux.brewed-coffee
+        - RedTux.brewed-coffee.decanted
         - execution_output.txt
         - should not produce unexpected files [FAILED]
       with honey as sweetner
@@ -16,6 +19,17 @@ CLIntegracon::Adapter::Bacon
         - Coffeemakerfile.yml
         - RedTux.brewed-coffee [FAILED]
         - execution_output.txt
+        - should not produce unexpected files [FAILED]
+      without milk and honey as sweetner
+        - $ coffee-maker --no-milk --sweetner=honey
+        - Affogato.brewed-coffee
+        - Affogato.brewed-coffee.decanted
+        - BlackEye.brewed-coffee
+        - BlackEye.brewed-coffee.decanted
+        - Coffeemakerfile.yml
+        - RedTux.brewed-coffee
+        - RedTux.brewed-coffee.decanted
+        - execution_output.txt
         - should not produce unexpected files
     Get help
       - $ coffee-maker --help
@@ -28,17 +42,18 @@ Bacon::Error: File comparison error `CaPheSuaDa.brewed-coffee` for coffeemaker_n
 -  @origin = "Việt Nam"
 --- END ------------------------------------------------------------------------
 
-	spec/bacon/spec_helper.rb:45
-	spec/bacon/spec_helper.rb:44
-	spec/bacon/spec_helper.rb:42
+	spec/bacon/spec_helper.rb:49
+	spec/bacon/spec_helper.rb:48
+	spec/bacon/spec_helper.rb:46
 	spec/bacon/spec_helper.rb:17
 	spec/bacon/spec_helper.rb:15
 
 Bacon::Error: Unexpected files for coffeemaker_no_milk:
   * Affogato.brewed-coffee
-	spec/bacon/spec_helper.rb:45
-	spec/bacon/spec_helper.rb:44
-	spec/bacon/spec_helper.rb:42
+  * Affogato.brewed-coffee.decanted
+	spec/bacon/spec_helper.rb:49
+	spec/bacon/spec_helper.rb:48
+	spec/bacon/spec_helper.rb:46
 	spec/bacon/spec_helper.rb:17
 	spec/bacon/spec_helper.rb:15
 
@@ -49,17 +64,17 @@ Bacon::Error: File comparison error `Affogato.brewed-coffee` for coffeemaker_swe
    @sweetner = honey
 --- END ------------------------------------------------------------------------
 
-	spec/bacon/spec_helper.rb:49
-	spec/bacon/spec_helper.rb:48
-	spec/bacon/spec_helper.rb:42
+	spec/bacon/spec_helper.rb:53
+	spec/bacon/spec_helper.rb:52
+	spec/bacon/spec_helper.rb:46
 	spec/bacon/spec_helper.rb:17
 	spec/bacon/spec_helper.rb:15
 
 Bacon::Error: Missing file for coffeemaker_sweetner_honey:
   * BlackEye.brewed-coffee
-	spec/bacon/spec_helper.rb:49
-	spec/bacon/spec_helper.rb:48
-	spec/bacon/spec_helper.rb:42
+	spec/bacon/spec_helper.rb:53
+	spec/bacon/spec_helper.rb:52
+	spec/bacon/spec_helper.rb:46
 	spec/bacon/spec_helper.rb:17
 	spec/bacon/spec_helper.rb:15
 
@@ -71,10 +86,19 @@ Bacon::Error: File comparison error `RedTux.brewed-coffee` for coffeemaker_sweet
 +  @sweetner = honey
 --- END ------------------------------------------------------------------------
 
-	spec/bacon/spec_helper.rb:49
-	spec/bacon/spec_helper.rb:48
-	spec/bacon/spec_helper.rb:42
+	spec/bacon/spec_helper.rb:53
+	spec/bacon/spec_helper.rb:52
+	spec/bacon/spec_helper.rb:46
+	spec/bacon/spec_helper.rb:17
+	spec/bacon/spec_helper.rb:15
+
+Bacon::Error: Unexpected files for coffeemaker_sweetner_honey:
+  * Affogato.brewed-coffee.decanted
+  * RedTux.brewed-coffee.decanted
+	spec/bacon/spec_helper.rb:53
+	spec/bacon/spec_helper.rb:52
+	spec/bacon/spec_helper.rb:46
 	spec/bacon/spec_helper.rb:17
 	spec/bacon/spec_helper.rb:15
 
-17 specifications (27 requirements), 5 failures, 0 errors
+30 specifications (51 requirements), 6 failures, 0 errors

data/spec/bacon/spec_helper.rb

@@ -34,7 +34,11 @@ describe CLIntegracon::Adapter::Bacon do
       c.ignores '.DS_Store'
       c.ignores '.gitkeep'
 
-      c.has_special_handling_for 'CaPheSuaDa.brewed-coffee' do |path|
+      c.transform_produced /\.brewed-coffee/ do |path|
+        FileUtils.touch("#{path}.decanted")
+      end
+
+      c.preprocess 'CaPheSuaDa.brewed-coffee' do |path|
         File.read(path)
       end
     end
@@ -49,6 +53,11 @@ describe CLIntegracon::Adapter::Bacon do
         behaves_like cli_spec('coffeemaker_sweetner_honey', '--sweetner=honey')
       end
 
+      describe 'without milk and honey as sweetner' do
+        behaves_like cli_spec('coffeemaker_no_milk_sweetner_honey', '--no-milk --sweetner=honey',
+                              based_on: 'coffeemaker_sweetner_honey')
+      end
+
     end
 
     describe 'Get help' do

data/spec/integration/coffeemaker_help/after/execution_output.txt

@@ -9,7 +9,6 @@ Options:
 
     --no-milk                  Don’t add milk
     --sweetner=[sugar|honey]   Use one of the available sweetners
-    --completion-script        Print the auto-completion script
     --version                  Show the version of the tool
     --verbose                  Show more debugging information
     --no-ansi                  Show output without ANSI codes

data/spec/integration/coffeemaker_no_milk_sweetner_honey/after/Affogato.brewed-coffee

@@ -0,0 +1,2 @@
+class Affogato < BrewedCoffee
+  @sweetner = honey

data/spec/integration/coffeemaker_no_milk_sweetner_honey/after/BlackEye.brewed-coffee

@@ -0,0 +1,2 @@
+class BlackEye < BrewedCoffee
+  @sweetner = honey

data/spec/integration/coffeemaker_no_milk_sweetner_honey/after/Coffeemakerfile.yml

@@ -0,0 +1,2 @@
+recipes:
+  - BlackEye

data/spec/integration/coffeemaker_no_milk_sweetner_honey/after/RedTux.brewed-coffee

@@ -0,0 +1,2 @@
+class RedTux < BrewedCoffee
+  @sweetner = sugar

data/spec/integration/coffeemaker_no_milk_sweetner_honey/after/execution_output.txt

@@ -0,0 +1,3 @@
+COFFEE_MAKER_FILE=Coffeemakerfile.yml PROJECT_DIR=ROOT bundle exec ruby ROOT/spec/fixtures/bin/coffeemaker.rb --no-milk --sweetner=honey --verbose --no-ansi 2>&1
+* Brewing BlackEye
+* Enjoy!

data/spec/integration/coffeemaker_no_milk_sweetner_honey/before/Coffeemakerfile.yml

@@ -0,0 +1,2 @@
+recipes:
+  - BlackEye

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clintegracon
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Marius Rackwitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: mocha-on-bacon
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +70,16 @@ dependencies:
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: inch
   requirement: !ruby/object:Gem::Requirement
@@ -182,11 +168,23 @@ files:
 - spec/integration/coffeemaker_help/after/execution_output.txt
 - spec/integration/coffeemaker_help/before/.gitkeep
 - spec/integration/coffeemaker_no_milk/after/BlackEye.brewed-coffee
+- spec/integration/coffeemaker_no_milk/after/BlackEye.brewed-coffee.decanted
 - spec/integration/coffeemaker_no_milk/after/CaPheSuaDa.brewed-coffee
+- spec/integration/coffeemaker_no_milk/after/CaPheSuaDa.brewed-coffee.decanted
 - spec/integration/coffeemaker_no_milk/after/Coffeemakerfile.yml
 - spec/integration/coffeemaker_no_milk/after/RedTux.brewed-coffee
+- spec/integration/coffeemaker_no_milk/after/RedTux.brewed-coffee.decanted
 - spec/integration/coffeemaker_no_milk/after/execution_output.txt
 - spec/integration/coffeemaker_no_milk/before/Coffeemakerfile.yml
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/Affogato.brewed-coffee
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/Affogato.brewed-coffee.decanted
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/BlackEye.brewed-coffee
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/BlackEye.brewed-coffee.decanted
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/Coffeemakerfile.yml
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/RedTux.brewed-coffee
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/RedTux.brewed-coffee.decanted
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/execution_output.txt
+- spec/integration/coffeemaker_no_milk_sweetner_honey/before/Coffeemakerfile.yml
 - spec/integration/coffeemaker_sweetner_honey/after/Affogato.brewed-coffee
 - spec/integration/coffeemaker_sweetner_honey/after/BlackEye.brewed-coffee
 - spec/integration/coffeemaker_sweetner_honey/after/Coffeemakerfile.yml
@@ -229,11 +227,23 @@ test_files:
 - spec/integration/coffeemaker_help/after/execution_output.txt
 - spec/integration/coffeemaker_help/before/.gitkeep
 - spec/integration/coffeemaker_no_milk/after/BlackEye.brewed-coffee
+- spec/integration/coffeemaker_no_milk/after/BlackEye.brewed-coffee.decanted
 - spec/integration/coffeemaker_no_milk/after/CaPheSuaDa.brewed-coffee
+- spec/integration/coffeemaker_no_milk/after/CaPheSuaDa.brewed-coffee.decanted
 - spec/integration/coffeemaker_no_milk/after/Coffeemakerfile.yml
 - spec/integration/coffeemaker_no_milk/after/RedTux.brewed-coffee
+- spec/integration/coffeemaker_no_milk/after/RedTux.brewed-coffee.decanted
 - spec/integration/coffeemaker_no_milk/after/execution_output.txt
 - spec/integration/coffeemaker_no_milk/before/Coffeemakerfile.yml
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/Affogato.brewed-coffee
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/Affogato.brewed-coffee.decanted
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/BlackEye.brewed-coffee
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/BlackEye.brewed-coffee.decanted
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/Coffeemakerfile.yml
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/RedTux.brewed-coffee
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/RedTux.brewed-coffee.decanted
+- spec/integration/coffeemaker_no_milk_sweetner_honey/after/execution_output.txt
+- spec/integration/coffeemaker_no_milk_sweetner_honey/before/Coffeemakerfile.yml
 - spec/integration/coffeemaker_sweetner_honey/after/Affogato.brewed-coffee
 - spec/integration/coffeemaker_sweetner_honey/after/BlackEye.brewed-coffee
 - spec/integration/coffeemaker_sweetner_honey/after/Coffeemakerfile.yml