starting_blocks 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d85fae44dd3a48a67ae0473e9592bcb1f2eadbad
-  data.tar.gz: 57cb4165b3abe6fba038282d204b67bea315a857
+  metadata.gz: 1462b26d4b584409f66efc4d657de2a05ecf0e0d
+  data.tar.gz: cd075e1c73f7c8d7ce013624679675b6b2a670d0
 SHA512:
-  metadata.gz: 13f8621ce3f73435918309fbe420d9ca1016ad0c3564e43f71efc2967afecbc156b7bab49e19c8deeaf946673dde2984cae88c6a6ccf471d05ec525466d619cd
-  data.tar.gz: 70fd0e80b63095ca0e4f88a6e4dc0af7fce1c5363d2997b62f0d1bdaf9f49a49f98868d2ca88b69556219c677f53460f0a588212ac77d2d1b0f1168b84778754
+  metadata.gz: 76503a6ffbd9583c06bedfdc11a9f0ea02f70ec14130c773041864e5e7e1694909f5033232e313f9482085d8855ab801d4178f0e7b97fc3e2eced3b815ecc36d
+  data.tar.gz: 26fef9f5f5a0dda1c8861ff7fe20bf443465bfa28ce77780ed6dbc29989a07049078370fe217d0b30835be7b5e49b3827a2c27814fa36f8ef5b30265fe538d8f

data/lib/starting_blocks/version.rb

@@ -1,3 +1,3 @@
 module StartingBlocks
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/lib/starting_blocks/watcher.rb

@@ -5,6 +5,23 @@ module StartingBlocks
 
     @last_failed_run = nil
 
+    def self.filter_files_according_to_the_contract files, contract
+      extensions = contract.extensions.map { |x| x.gsub('.', '').downcase }
+      files.select do |file|
+        splits = file.split('/')[-1].split('.')
+        (splits.count == 1 && extensions.include?('')) ||
+        (extensions.include?(splits[-1].downcase))
+      end
+    end
+
+    def self.filter_files_by_file_clues files, clues
+      files.select do |file|
+        file_without_path = file.split('/')[-1]
+        matches = clues.select { |clue| file_without_path.include? clue }
+        matches.count > 0
+      end
+    end
+
     class << self
       def start_watching(dir, options)
         StartingBlocks.display("Start watching #{dir.getwd} with #{options.inspect}")
@@ -21,6 +38,9 @@ module StartingBlocks
                      StartingBlocks::Watcher.add_it(added[0])      if added.count > 0
                      StartingBlocks::Watcher.delete_it(removed[0]) if removed.count > 0
                      next if @running
+
+                     modified = StartingBlocks::Watcher.filter_files_according_to_the_contract modified, @contract
+
                      StartingBlocks::Watcher.run_it(modified[0])   if modified.count > 0
                    end
 

data/lib/starting_blocks.rb

@@ -82,16 +82,10 @@ module StartingBlocks
     def run_all_specs
       ->() do
            contract = StartingBlocks::Contract.for StartingBlocks.options
-           file_specs = contract.file_clues.map do |clue|
-                          contract.extensions.map do |extension|
-                            "**/*#{clue}*.#{extension.gsub('.', '')}"
-                          end
-                        end.flatten
-           files = file_specs.map do |d|
-             Dir[d].
-               select { |f| File.file?(f) }.
-               map    { |x| File.expand_path(x) }
-           end.flatten
+           files = Dir['**/*'].select { |f| File.file? f }
+                              .map    { |x| File.expand_path x }.flatten
+           files = StartingBlocks::Watcher.filter_files_by_file_clues files, contract.file_clues
+           files = StartingBlocks::Watcher.filter_files_according_to_the_contract files, contract
            StartingBlocks::Runner.new(StartingBlocks.options).run_files files
          end
     end

data/spec/starting_blocks/watcher_spec.rb

@@ -0,0 +1,62 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe StartingBlocks::Watcher do
+
+  describe "filter files according to the contract" do
+
+    [
+      [['.rb'],         ['apple.rb', 'orange.py'],              ['apple.rb']],
+      [['.rb'],         ['apple.py', 'orange.rb'],              ['orange.rb']],
+      [['.txt'],        ['/test/something.txt', 'another.txt'], ['/test/something.txt', 'another.txt']],
+      [['.txt'],        ['/test/something.TXT', 'another.Txt'], ['/test/something.TXT', 'another.Txt']],
+      [['.txt', '.rb'], ['a.txt', 'b.rb', 'c.cs'],              ['a.txt', 'b.rb']],
+      [['txt', 'rb'],   ['a.txt', 'b.rb', 'c.cs'],              ['a.txt', 'b.rb']],
+      [[''],            ['a.txt', 'Gemfile'],                   ['Gemfile']],
+    ].map { |a| Struct.new(:extensions, :files, :expected_results).new(*a) }.each do |example|
+
+      describe "multiple examples" do
+
+        it "should filter the files" do
+
+          contract = Struct.new(:extensions).new example.extensions
+          results = StartingBlocks::Watcher.filter_files_according_to_the_contract example.files, contract
+
+          results.must_equal example.expected_results
+
+        end
+
+      end
+
+    end
+
+  end
+
+  describe "filtering files according to file clues" do
+
+    [
+      [
+        ['one_test.txt'], ['_test'], ['one_test.txt']
+      ],
+      [
+        ['one_spec.txt'], ['_test'], [],
+      ],
+      [
+        ['two_spec.txt', 'three_test.txt'], ['_spec', '_test'], ['two_spec.txt', 'three_test.txt'],
+      ],
+      [
+        ['another', 'two_spec.txt', 'three_test.txt'], ['_spec', '_test'], ['two_spec.txt', 'three_test.txt'],
+      ],
+    ].map { |x| Struct.new(:files, :clues, :expected).new(*x) }.each do |example|
+
+      describe "multiple examples" do
+        it "should return the expected results" do
+          results = StartingBlocks::Watcher.filter_files_by_file_clues example.files, example.clues
+          results.must_equal example.expected
+        end
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: starting_blocks
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Darren Cauthon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,6 +123,7 @@ files:
 - spec/starting_blocks/result_parser_spec.rb
 - spec/starting_blocks/result_text_parser_spec.rb
 - spec/starting_blocks/runner_spec.rb
+- spec/starting_blocks/watcher_spec.rb
 - starting_blocks.gemspec
 homepage: http://www.github.com/darrencauthon/starting_blocks
 licenses:
@@ -154,3 +155,4 @@ test_files:
 - spec/starting_blocks/result_parser_spec.rb
 - spec/starting_blocks/result_text_parser_spec.rb
 - spec/starting_blocks/runner_spec.rb
+- spec/starting_blocks/watcher_spec.rb