source_finder 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6ecbf7965c9e0af5116ffb6c7bd0b1bf012ffaf
-  data.tar.gz: 3359716864ec2918c0c6c72d09e64325f41210f9
+  metadata.gz: d3bd7e1099d630f8438986e471408ce11b86678a
+  data.tar.gz: 7cf482806ad50d8aa7d18553be6ecccd2b7a5134
 SHA512:
-  metadata.gz: b7bdda00f84530f105bf3dc078aa1fe5174ba75d68af5d56074ccd2156b8e734ac57b60e233195bbf6ddd007044afd4ec27d95591a89653ac7e344c542dc0f8b
-  data.tar.gz: d9fc5f1c2628692c462b3e70af1faa86b2ae66a4c49f0d80d3d4d92055a755c9237ea1930ab1f0bab25bcf92e1804b7877d7d5e710f7f7b9e58a1224a4d14605
+  metadata.gz: 2aec66197c7a0d2d5985ef92d4ad43c28542580718bd9c2428611bc484f5aea9800cd791cae09fd7c6b6b25c7413d658174f7efd0717bd8cb556aed342690e17
+  data.tar.gz: e42acce8c250f4e054ea82d3d8cd2862dec1fae92d813987a0fcd72a2d94632c1364d7cc2364e6350582e809bef93f55a7e1bc0ce8e1ac8f386e0ee1436769fc

data/lib/source_finder/langs/js.rb

@@ -13,7 +13,9 @@ module SourceFinder
     end
 
     def js_file_extensions_arr
-      @js_file_extensions_arr || %w(js)
+      make_extensions_arr(@js_file_extensions_glob,
+                          @js_file_extensions_arr,
+                          %w(js))
     end
 
     def js_file_extensions_glob

data/lib/source_finder/langs/python.rb

@@ -13,7 +13,9 @@ module SourceFinder
     end
 
     def python_file_extensions_arr
-      @python_file_extensions_arr || %w(py)
+      make_extensions_arr(@python_file_extensions_glob,
+                          @python_file_extensions_arr,
+                          %w(py))
     end
 
     def python_file_extensions_glob

data/lib/source_finder/langs/ruby.rb

@@ -2,6 +2,7 @@ module SourceFinder
   # Globber for Ruby
   module RubySourceFileGlobber
     attr_accessor :ruby_dirs_arr, :extra_ruby_files_arr,
+                  :ruby_file_extensions_glob,
                   :ruby_file_extensions_arr
 
     def ruby_dirs_arr
@@ -13,11 +14,13 @@ module SourceFinder
     end
 
     def ruby_file_extensions_arr
-      @ruby_file_extensions_arr || %w(gemspec rake rb)
+      make_extensions_arr(@ruby_file_extensions_glob,
+                          @ruby_file_extensions_arr,
+                          %w(gemspec rake rb))
     end
 
     def ruby_file_extensions_glob
-      @ruby_file_extensions_glob ||= ruby_file_extensions_arr.join(',')
+      @ruby_file_extensions_glob || ruby_file_extensions_arr.join(',')
     end
 
     def ruby_files_glob

data/lib/source_finder/source_file_globber.rb

@@ -36,9 +36,8 @@ module SourceFinder
     end
 
     def exclude_files_arr
-      if @exclude_files_arr
-        @exclude_files_arr
-      elsif @source_files_exclude_glob
+      return @exclude_files_arr if @exclude_files_arr
+      if @source_files_exclude_glob
         exclude_garbage(@globber.glob(@source_files_exclude_glob))
       else
         exclude_garbage(@globber.glob(default_source_files_exclude_glob))
@@ -106,14 +105,17 @@ module SourceFinder
       arr.size > 0 ? "#{arr.join(',')}," : ''
     end
 
-    def make_files_glob(extra_source_files_arr,
-                        dirs_arr,
-                        extensions_glob)
+    def make_files_glob(extra_source_files_arr, dirs_arr, extensions_glob)
       '{' + arr2glob(extra_source_files_arr) + "{*,.*}.{#{extensions_glob}}," +
         File.join("{#{dirs_arr.join(',')}}", '**',
                   "{*,.*}.{#{extensions_glob}}") + '}'
     end
 
+    def make_extensions_arr(glob_var, arr_var, default_arr)
+      fail 'glob already set' if glob_var
+      arr_var || default_arr
+    end
+
     def emacs_lockfile?(filename)
       File.basename(filename) =~ /^\.#/
     end

data/lib/source_finder/version.rb

@@ -1,4 +1,4 @@
 # SourceFinder finds source and documentation files within a project.
 module SourceFinder
-  VERSION = '2.3.2'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: source_finder
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Vince Broz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler