pdd 0.17.3 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9737f2ffe3116e23bfcc57021b402e0ef01dd580
-  data.tar.gz: 71d0b9a2044217d12c978473c19843ede5759988
+  metadata.gz: 8e3a86ea459f81e85300aca8db83ac75fa4900ef
+  data.tar.gz: 0e0b0382904a578a64e43066bb06ae8b8be78b56
 SHA512:
-  metadata.gz: df79e23a678a56d0623496d7fde7cf5ba3782ae868ddf854919bfa5d93952e1e03a77c84bdb46f395352a082eccf24af666e6b425e08b70b5bfbf98f00eea9a8
-  data.tar.gz: bb5703913a301601dee492be977948950e19e6515398cbc4ecd4958a227c0da9edd713cb71df709c92cca1ceaa7b1726f888e6901618a5f1a5755d94c292e458
+  metadata.gz: fb8ed0d9236f69ad90bfb6f81ae7d8439c9982e004351ea18a10ee4236eadd3d7272d532c1cb0976a28edd10f238ee3121a37ac8e00ab7560be7b9c8bee2e601
+  data.tar.gz: c0aad26728527b0f345932dbcdb0c022e6693e91c076e8f81280b7db5243285dfead016ebfdcf191d8f7ea1201ddb19af8d5a315c7c9d88a4e1b24c578e9eabf

data/.simplecov

@@ -38,6 +38,6 @@ else
   SimpleCov.start do
     add_filter "/test/"
     add_filter "/features/"
-    minimum_coverage 100
+    minimum_coverage 90
   end
 end

data/Rakefile

@@ -61,11 +61,10 @@ RuboCop::RakeTask.new(:rubocop) do |task|
 end
 
 require 'cucumber/rake/task'
-Cucumber::Rake::Task.new(:features) do |t|
+Cucumber::Rake::Task.new(:features) do
   Rake::Cleaner.cleanup_files(['coverage'])
-  t.profile = 'travis'
 end
-Cucumber::Rake::Task.new(:"features:html") do |t|
+Cucumber::Rake::Task.new(:'features:html') do |t|
   t.profile = 'html_report'
 end
 

data/bin/pdd

@@ -23,53 +23,26 @@
 
 STDOUT.sync = true
 
-require 'pdd'
 require 'slop'
-require 'pdd/version'
 require 'nokogiri'
+require_relative '../lib/pdd'
+require_relative '../lib/pdd/version'
 
 args = []
 args += File.read('.pdd').split(/\s+/).map(&:strip) if File.exist?('.pdd')
 args += ARGV
 
-opts = Slop.parse(args, strict: true, help: true) do
-  banner "Usage (#{PDD::VERSION}): pdd [options]"
-  on 'v', 'verbose', 'Enable verbose mode'
-  on 'q', 'quiet', 'Enable quiet mode'
-  on 'version', 'Show current version'
-  on(
-    's',
-    'source',
-    'Source directory to parse',
-    argument: :required
-  )
-  on(
-    'f',
-    'file',
-    'File to save XML into',
-    argument: :required
-  )
-  on(
-    'e',
-    'exclude',
-    'Glob pattern to exclude',
-    as: Array,
-    argument: :required
-  )
-  on(
-    't',
-    'format',
-    'Format to use (xml|html)',
-    argument: :required
-  )
-  on(
-    'r',
-    'rule',
-    'Format to use (xml|html)',
-    argument: :required,
-    as: Array,
-    limit: 1
-  )
+opts = Slop.parse(args, strict: true, help: true) do |o|
+  o.banner = "Usage (#{PDD::VERSION}): pdd [options]"
+  o.bool '-h', '--help', 'Show these instructions'
+  o.bool '-v', '--verbose', 'Enable verbose mode'
+  o.bool '-q', '--quiet', 'Enable quiet mode'
+  o.bool '--version', 'Show current version'
+  o.string '-s', '--source', 'Source directory to parse'
+  o.string '-f', '--file', 'File to save XML into'
+  o.array '-e', '--exclude', 'Glob pattern to exclude'
+  o.string '-t', '--format', 'Format to use (xml|html)'
+  o.array '-r', '--rule', 'Rule to apply'
 end
 
 raise '-f is mandatory when using -v' if opts.verbose? && !opts.file?

data/features/step_definitions/steps.rb

@@ -20,20 +20,20 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'pdd'
 require 'nokogiri'
 require 'tmpdir'
 require 'slop'
 require 'English'
+require_relative '../../lib/pdd'
 
 Before do
   @cwd = Dir.pwd
   @dir = Dir.mktmpdir('test')
   FileUtils.mkdir_p(@dir) unless File.exist?(@dir)
   Dir.chdir(@dir)
-  @opts = Slop.parse ['-v', '-s', @dir] do
-    on 'v', 'verbose'
-    on 's', 'source', argument: :required
+  @opts = Slop.parse ['-v', '-s', @dir] do |o|
+    o.bool '-v', '--verbose'
+    o.string '-s', '--source'
   end
 end
 

data/features/support/env.rb

@@ -21,4 +21,4 @@
 # SOFTWARE.
 
 require 'simplecov'
-require 'pdd'
+require_relative '../../lib/pdd'

data/features/unicode.feature

@@ -22,6 +22,6 @@ Feature: Unicode
     # @todo #44 \xFF hey
     \xFF test again
     """
-    When I run bin/pdd with "--exclude=test.txt --v -f=/dev/null"
+    When I run bin/pdd with "--exclude=test.txt -v -f=/dev/null"
     Then Stdout contains "excluding test.txt"
     Then Exit code is zero

data/lib/pdd.rb

@@ -20,15 +20,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'pdd/sources'
-require 'pdd/version'
-require 'pdd/rule/estimates'
-require 'pdd/rule/text'
-require 'pdd/rule/duplicates'
-require 'pdd/rule/roles'
 require 'nokogiri'
 require 'logger'
 require 'time'
+require_relative 'pdd/sources'
+require_relative 'pdd/version'
+require_relative 'pdd/rule/estimates'
+require_relative 'pdd/rule/text'
+require_relative 'pdd/rule/duplicates'
+require_relative 'pdd/rule/roles'
 
 # PDD main module.
 # Author:: Yegor Bugayenko (yegor@teamed.io)

data/lib/pdd/source.rb

@@ -21,7 +21,9 @@
 # SOFTWARE.
 
 require 'digest/md5'
-require 'pdd/puzzle'
+require 'shellwords'
+require_relative '../pdd'
+require_relative '../pdd/puzzle'
 
 module PDD
   # Source.
@@ -105,10 +107,9 @@ module PDD
 
     # Git information at the line
     def git(pos)
-      cmd = [
-        "cd #{File.dirname(@file)}",
-        "git blame -L #{pos},#{pos} --porcelain #{File.basename(@file)}"
-      ].join(' && ')
+      cmd = "cd #{Shellwords.escape(File.dirname(@file))} && \
+git blame -L #{pos},#{pos} --porcelain \
+#{Shellwords.escape(File.basename(@file))}"
       Hash[
         `#{cmd}`.split("\n").map do |line|
           if line =~ /^author /

data/lib/pdd/sources.rb

@@ -20,10 +20,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'pdd'
-require 'pdd/source'
 require 'shellwords'
 require 'English'
+require_relative '../pdd'
+require_relative 'source'
 
 module PDD
   # Code base abstraction

data/lib/pdd/version.rb

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

data/pdd.gemspec

@@ -22,7 +22,7 @@
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pdd/version'
+require_relative 'lib/pdd/version'
 
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
@@ -45,7 +45,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 'slop', '~>3.6'
+  s.add_runtime_dependency 'slop', '~>4.4.1'
   s.add_development_dependency 'rake', '10.5.0'
   s.add_development_dependency 'coveralls', '0.7.2'
   s.add_development_dependency 'rdoc', '4.2.0'

data/test/test__helper.rb

@@ -23,5 +23,5 @@
 STDOUT.sync = true
 
 require 'simplecov'
-require 'pdd'
 require 'minitest/autorun'
+require_relative '../lib/pdd'

data/test/test_duplicates.rb

@@ -22,7 +22,7 @@
 
 require 'minitest/autorun'
 require 'nokogiri'
-require 'pdd/rule/duplicates'
+require_relative '../lib/pdd/rule/duplicates'
 
 # PDD::Rule::MaxDuplicates class test.
 # Author:: Yegor Bugayenko (yegor@teamed.io)

data/test/test_estimates.rb

@@ -22,7 +22,7 @@
 
 require 'minitest/autorun'
 require 'nokogiri'
-require 'pdd/rule/estimates'
+require_relative '../lib/pdd/rule/estimates'
 
 # PDD::Rule::Estimate module tests.
 # Author:: Yegor Bugayenko (yegor@teamed.io)

data/test/test_pdd.rb

@@ -22,9 +22,9 @@
 
 require 'minitest/autorun'
 require 'nokogiri'
-require 'pdd'
 require 'tmpdir'
 require 'slop'
+require_relative '../lib/pdd'
 
 # PDD main module test.
 # Author:: Yegor Bugayenko (yegor@teamed.io)
@@ -68,8 +68,13 @@ class TestPDD < Minitest::Test
         git init .
         git config user.email test@teamed.io
         git config user.name 'Mr. Tester'
-        echo '@todo #1 this is the puzzle' > .x.txt
-        git add .x.txt
+        mkdir 'a long dir name'
+        cd 'a long dir name'
+        mkdir 'a kid'
+        cd 'a kid'
+        echo '@todo #1 this is the puzzle' > '.это файл.txt'
+        cd ../..
+        git add -f .
         git commit -am 'first version'
       ")
       matches(
@@ -77,7 +82,7 @@ class TestPDD < Minitest::Test
         [
           '/puzzles[count(puzzle)=1]',
           '/puzzles/puzzle[id]',
-          '/puzzles/puzzle[file=".x.txt"]',
+          '/puzzles/puzzle[file="a long dir name/a kid/.это файл.txt"]',
           '/puzzles/puzzle[author="Mr. Tester"]',
           '/puzzles/puzzle[email="test@teamed.io"]',
           '/puzzles/puzzle[time]'
@@ -89,11 +94,11 @@ class TestPDD < Minitest::Test
   private
 
   def opts(args)
-    Slop.parse args do
-      on 'v', 'verbose'
-      on 's', 'source', argument: :required
-      on 'e', 'exclude', as: Array, argument: :required
-      on 'r', 'rule', as: Array, argument: :required
+    Slop.parse args do |o|
+      o.bool '-v', '--verbose'
+      o.string '-s', '--source'
+      o.array '-e', '--exclude'
+      o.array '-r', '--rule'
     end
   end
 

data/test/test_roles.rb

@@ -22,7 +22,7 @@
 
 require 'minitest/autorun'
 require 'nokogiri'
-require 'pdd/rule/roles'
+require_relative '../lib/pdd/rule/roles'
 
 # PDD::Rule::Role module tests.
 # Author:: Yegor Bugayenko (yegor@teamed.io)

data/test/test_source.rb

@@ -21,8 +21,8 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require 'pdd/sources'
 require 'tmpdir'
+require_relative '../lib/pdd/sources'
 
 # Source test.
 # Author:: Yegor Bugayenko (yegor@teamed.io)

data/test/test_sources.rb

@@ -23,9 +23,8 @@
 require 'minitest/autorun'
 require 'fileutils'
 require 'tmpdir'
-require 'pdd/sources'
-
 require_relative '../test/test__helper'
+require_relative '../lib/pdd/sources'
 
 # Sources test.
 # Author:: Yegor Bugayenko (yegor@teamed.io)

data/test/test_text.rb

@@ -22,7 +22,7 @@
 
 require 'minitest/autorun'
 require 'nokogiri'
-require 'pdd/rule/text'
+require_relative '../lib/pdd/rule/text'
 
 # PDD::Rule::Text module tests.
 # Author:: Yegor Bugayenko (yegor@teamed.io)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdd
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.17.4
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 4.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 4.4.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement