pdd 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f39abf45e74c8b628a184ebf3af5f381dd1a6fa
-  data.tar.gz: 7e5c582166939f646278e3026ddef64973aba9b4
+  metadata.gz: f70d3268af6c4b7f6fdf1e6401a1f73ed26f85f8
+  data.tar.gz: d2dab3ed08b56b2b3c1999feb2135f525b10711a
 SHA512:
-  metadata.gz: f63302dde98c839ea1d415750e7535640c0cf2e34c739e2bdf7f4f9c3e5b2bd6bbf3d5c758068a977d041fcc63cab0f07f1e80187c99dc7a6cd8b6b561460135
-  data.tar.gz: ee409a6da382ccace28f1e25a85440e5a93df7a06d16898991fb594e5b34be6860727709367b43f7615671244e7ce1b7efa48d113f71d6f456f62ebaef65f6ed
+  metadata.gz: 7a5fd5f873c59f78657c92b611965267ff712d4d7b50fd57ee349873f560f5359cc52410b2166d0080fd0b33812e812203706dab4e09813ddbf9df5664a168ae
+  data.tar.gz: 62ecc9002f192fee996038406473803e659c92b7efea421c612903ad3344ddb50a393d3ee758a8d6b51ed01d2bec42a17c56245cde842867ba9d7e173cf82f4c

data/lib/pdd/sources.rb

@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'filemagic'
+require 'ptools'
 require 'pdd/source'
 require 'rake/file_list'
 
@@ -33,7 +33,6 @@ module PDD
     def initialize(dir, ptns = [])
       @dir = dir
       @exclude = ptns
-      @magic = FileMagic.new(FileMagic::MAGIC_MIME)
     end
 
     # Fetch all sources.
@@ -46,15 +45,12 @@ module PDD
         end
       end.to_a
       PDD.log.info "#{files.size} file(s) found"
-      types = [%r{^text/}, %r{application/xml}]
-      files
-        .select { |f| types.index { |re| @magic.file(f) =~ re } }
-        .map do |file|
-          VerboseSource.new(
-            file,
-            Source.new(file, file[@dir.length + 1, file.length])
-          )
-        end
+      files.select { |f| !File.directory?(f) && !File.binary?(f) }.map do |file|
+        VerboseSource.new(
+          file,
+          Source.new(file, file[@dir.length + 1, file.length])
+        )
+      end
     end
 
     def exclude(ptn)

data/lib/pdd/version.rb

@@ -26,5 +26,5 @@
 # Copyright:: Copyright (c) 2014-2016 Yegor Bugayenko
 # License:: MIT
 module PDD
-  VERSION = '0.16.1'.freeze
+  VERSION = '0.16.2'.freeze
 end

data/pdd.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'nokogiri', '~>1.6'
-  s.add_runtime_dependency 'ruby-filemagic', '~>0.7'
+  s.add_runtime_dependency 'ptools', '~>1.3'
   s.add_runtime_dependency 'slop', '~>3.6'
   s.add_development_dependency 'rake', '10.5.0'
   s.add_development_dependency 'coveralls', '0.7.2'

data/test/test_sources.rb

@@ -23,6 +23,7 @@
 
 require 'minitest/autorun'
 require 'pdd/sources'
+require 'fileutils'
 require 'tmpdir'
 
 # Sources test.
@@ -38,8 +39,8 @@ class TestSources < Minitest::Test
   end
 
   def test_ignores_binary_files
-    in_temp(['c', 'd.png']) do |dir|
-      File.write(File.join(dir, 'd.png'), '')
+    in_temp(['c']) do |dir|
+      FileUtils.cp(File.join(Dir.pwd, '.git/index'), dir)
       list = PDD::Sources.new(dir).fetch
       assert_equal 1, list.size
     end
@@ -71,6 +72,8 @@ class TestSources < Minitest::Test
     end
   end
 
+  private
+
   def in_temp(files)
     Dir.mktmpdir 'x' do |dir|
       files.each do |path|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdd
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: ruby-filemagic
+  name: ptools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement