sfb_scripts 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb3ebf4ec08d6ef316ac9d4f462bd320ee622ba
-  data.tar.gz: da810b2ea163102795299dea7cdf810079923944
+  metadata.gz: aab86c1ecf4b9c1691a7a4e686c823c10f9b6c36
+  data.tar.gz: b8ad1717e0cc3bbe363db504efb78e655c870d43
 SHA512:
-  metadata.gz: 9269cf51001f79af60f8ab56f3de331e41f58b5d10bcd695e8c605633182d67ac6802376b251d091d8ce5e561c9d706fb73b2dfdb0cc4902a6ab19a152ec6f5e
-  data.tar.gz: 1ae10878537a2e86ee3f9c9b39d42826751a6e48159790d1e829e98a75223f7283d71779c24cb2c5b0855406640674154a718e97c32eb736c0fc2cb3393e79cd
+  metadata.gz: 1765662a968df5a669370bf54287973a8b7726e921e6f1cd809b750387edc3ef39c904f5f5fdc9b8f0bed37e13c95acf87de5e28fb71de23ef27784a81626012
+  data.tar.gz: 09179f2e6c970043af511743ec2a6ca46793850dc1fb7acb092bcdd251351bb4d3d52e02501d04bfe6f1e5b9dfb4d724765da1392d0ad9828bce06765d34a04f

data/lib/sfb_scripts/dependency_loader.rb

@@ -4,6 +4,7 @@ require 'work_queue'
 require_relative 'monkey_patches/string_extension'
 require_relative 'bundler/bundle_manager'
 require_relative 'hooks/pre_push_hook'
+require_relative 'hook_manager'
 require_relative 'migrations/migrator'
 require_relative 'repositories/repo'
 require_relative 'repositories/active_repo'
@@ -17,4 +18,5 @@ require_relative 'test_running/test_collection'
 require_relative 'test_running/status_test_runner'
 require_relative 'test_running/test_runner'
 require_relative 'test_running/test_finder'
+require_relative 'test_running/test_filter'
 require_relative 'folder_guard'

data/lib/sfb_scripts/needs_manager.rb

@@ -2,7 +2,7 @@ require_relative 'dependency_loader'
 
 class NeedsManager
 
-  BUNDLER_MAX_THREAD_COUNT = 2
+  BUNDLER_MAX_THREAD_COUNT = 4
   MIGRATOR_MAX_THREAD_COUNT = 8
 
   def self.configure(task, needs, options)

data/lib/sfb_scripts/repositories/repo.rb

@@ -66,4 +66,5 @@ class Repo
     shell.run "git rev-parse HEAD"
   end
 
+
 end

data/lib/sfb_scripts/test_running/status_checker.rb

@@ -37,11 +37,11 @@ class StatusChecker
   private
 
   def test_files
-    file_names.select {|f| f.match(/_test$/) }
+    TestFilter.select_tests(file_names)
   end
 
   def non_test_files
-    file_names.reject {|f| f.match(/_test$/) }
+    TestFilter.reject_tests(file_names)
   end
 
   def file_names

data/lib/sfb_scripts/test_running/status_test_runner.rb

@@ -4,35 +4,38 @@ class StatusTestRunner
     new(env, ignore_selenium).status
   end
 
-  attr_reader :repo, :shell, :test_runner, :tests, :ignore_selenium
+  attr_reader :repo, :shell, :test_runner, :status_tests, :ignore_selenium
   def initialize(env, ignore_selenium)
     @repo = env[:repo]
     @shell = env[:shell]
     @test_runner = env[:test_runner]
     @ignore_selenium = ignore_selenium
+    @status_tests = get_status_tests
   end
 
   def status
-    files = repo.status_files.map {|f| {:file => f} }
-    @tests = TestCollection.new(files)
-
-    if tests.include_selenium?
+    if status_tests.include_selenium?
       handle_selenium
     end
 
-    if tests.empty?
+    if status_tests.empty?
       shell.notify 'No tests to run'
       exit
     end
 
-    test_runner.run_files(tests)
+    test_runner.run_files(status_tests)
   end
 
   private
 
   def handle_selenium
     if ignore_selenium || shell.deny?("The status includes some selenium files.  Do you wish to run those?")
-      tests.remove_selenium!
+      status_tests.remove_selenium!
     end
   end
+
+  def get_status_tests
+    files = TestFilter.select_tests(repo.status_files)
+    TestCollection.new(files)
+  end
 end

data/lib/sfb_scripts/test_running/test_collection.rb

@@ -6,6 +6,7 @@ class TestCollection
 
   def initialize(tests_data=[])
     @tests = tests_data.map do |test_data|
+      test_data = {file: test_data} if test_data.is_a?(String)
       TestCase.new(
         full_path: test_data[:file],
         line: test_data[:line]

data/lib/sfb_scripts/test_running/test_filter.rb

@@ -0,0 +1,15 @@
+class TestFilter
+  def self.select_tests(files)
+    filter(action: :select, files: files)
+  end
+
+  def self.reject_tests(files)
+    filter(action: :reject, files: files)
+  end
+
+  private
+
+  def self.filter(action:, files:)
+    files.send(action) {|f| f.match(/_test(\.rb)?$/) }
+  end
+end

data/lib/sfb_scripts/test_running/test_finder.rb

@@ -54,9 +54,7 @@ class TestFinder
   def tests_found_by_file_name
     @tests_found_by_file_name ||=
       begin
-        files = []
-        files << repo.find_files(query).select {|f| f.match /_test\.rb\Z/ }.map {|f| {:file => f} }
-        files.flatten!
+        files = TestFilter.select_tests(repo.find_files(query))
         TestCollection.new(files)
       end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfb_scripts
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -78,6 +78,7 @@ files:
 - lib/sfb_scripts/test_running/status_test_runner.rb
 - lib/sfb_scripts/test_running/test_case.rb
 - lib/sfb_scripts/test_running/test_collection.rb
+- lib/sfb_scripts/test_running/test_filter.rb
 - lib/sfb_scripts/test_running/test_finder.rb
 - lib/sfb_scripts/test_running/test_runner.rb
 - lib/sfb_scripts/tester.rb