pdd 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 785afdc87a9645ad5b28e986751ef260572d8b79
-  data.tar.gz: b11c03bee8bd38b9c8047a01e8ef0023e5efb03f
+  metadata.gz: 9737f2ffe3116e23bfcc57021b402e0ef01dd580
+  data.tar.gz: 71d0b9a2044217d12c978473c19843ede5759988
 SHA512:
-  metadata.gz: f47c3728b82e73489fc7574533c343882528f5bf1364e37c8b6f2fa033bc1f077c6d51286b8c5be999e53b8edcf0af016096f6be6305dd4a1d8a056a86b5406a
-  data.tar.gz: 3f8a6fd4904254a6bebb1a73f8791fd03d2d7fe4b3e7e896eb55acd2b2e88152b7264c279380f58eb6cd7974e07f631af6bfbf4821ecb1c020ddffd4d95b468a
+  metadata.gz: df79e23a678a56d0623496d7fde7cf5ba3782ae868ddf854919bfa5d93952e1e03a77c84bdb46f395352a082eccf24af666e6b425e08b70b5bfbf98f00eea9a8
+  data.tar.gz: bb5703913a301601dee492be977948950e19e6515398cbc4ecd4958a227c0da9edd713cb71df709c92cca1ceaa7b1726f888e6901618a5f1a5755d94c292e458

data/lib/pdd/sources.rb

@@ -20,8 +20,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'ptools'
+require 'pdd'
 require 'pdd/source'
+require 'shellwords'
+require 'English'
 
 module PDD
   # Code base abstraction
@@ -35,14 +37,18 @@ module PDD
 
     # Fetch all sources.
     def fetch
-      files = Dir.glob(File.join(@dir, '**/*'), File::FNM_DOTMATCH)
+      files = Dir.glob(
+        File.join(@dir, '**/*'), File::FNM_DOTMATCH
+      ).reject { |f| File.directory?(f) }
+      excluded = 0
       @exclude.each do |ptn|
         Dir.glob(File.join(@dir, ptn), File::FNM_DOTMATCH) do |f|
           files.delete_if { |i| i == f }
+          excluded += 1
         end
       end
-      PDD.log.info "#{files.size} file(s) found"
-      files.select { |f| !File.directory?(f) && !File.binary?(f) }.map do |file|
+      PDD.log.info "#{files.size} file(s) found, #{excluded} excluded"
+      files.reject { |f| binary?(f) }.map do |file|
         VerboseSource.new(
           file,
           Source.new(file, file[@dir.length + 1, file.length])
@@ -53,5 +59,17 @@ module PDD
     def exclude(ptn)
       Sources.new(@dir, @exclude.push(ptn))
     end
+
+    private
+
+    def binary?(f)
+      `grep -qI '.' #{Shellwords.escape(f)}`
+      if $CHILD_STATUS.success?
+        false
+      else
+        PDD.log.info "#{f} is a binary file (#{File.size(f)} bytes)"
+        true
+      end
+    end
   end
 end

data/lib/pdd/version.rb

@@ -25,5 +25,5 @@
 # Copyright:: Copyright (c) 2014-2017 Yegor Bugayenko
 # License:: MIT
 module PDD
-  VERSION = '0.17.2'.freeze
+  VERSION = '0.17.3'.freeze
 end

data/pdd.gemspec

@@ -45,7 +45,6 @@ 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 '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__helper.rb

@@ -20,6 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+STDOUT.sync = true
+
 require 'simplecov'
 require 'pdd'
 require 'minitest/autorun'

data/test/test_sources.rb

@@ -21,9 +21,11 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require 'pdd/sources'
 require 'fileutils'
 require 'tmpdir'
+require 'pdd/sources'
+
+require_relative '../test/test__helper'
 
 # Sources test.
 # Author:: Yegor Bugayenko (yegor@teamed.io)
@@ -38,9 +40,16 @@ class TestSources < Minitest::Test
   end
 
   def test_ignores_binary_files
-    skip
-    in_temp(['c']) do |dir|
-      FileUtils.cp(File.join(Dir.pwd, '.git/index'), dir)
+    in_temp([]) do |dir|
+      [
+        'README.md',
+        '.git/index',
+        'test_assets/elegant-objects.png',
+        'test_assets/aladdin.jpg',
+        'test_assets/article.pdf',
+        'test_assets/cambria.woff',
+        'test_assets/favicon.ico'
+      ].each { |f| FileUtils.cp(File.join(Dir.pwd, f), dir) }
       list = PDD::Sources.new(dir).fetch
       assert_equal 1, list.size
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdd
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: ptools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +207,11 @@ files:
 - test/test_source.rb
 - test/test_sources.rb
 - test/test_text.rb
+- test_assets/aladdin.jpg
+- test_assets/article.pdf
+- test_assets/cambria.woff
+- test_assets/elegant-objects.png
+- test_assets/favicon.ico
 homepage: http://github.com/yegor256/pdd
 licenses:
 - MIT