cleanup_vendor 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd69188501d192b24e691c1e39f4f234ddaafe83d438563c866fb23c0cc9d14
-  data.tar.gz: 3adda87794ca9d802fb13d30cb084eba8d8320fb6653b75f21e85c3350f8178f
+  metadata.gz: 24cac3d82b1d43e2442215768b8537b1f09f6a5fbaf5ddcd2d7ff9956ed363c1
+  data.tar.gz: 229cec236efa8bc3a7b8bf1bbe2fc5e1c974168aceec2420b386656f731de1b2
 SHA512:
-  metadata.gz: ebbf384b886c6c981f46493a7e34a4b99aeb9d1d56a1c0b28ee40ea93778365d30a9b49fbf562745c9f96629f22f54434c7eb5726fd77480b3aa754e113f4e76
-  data.tar.gz: 287c969e76e59265d4edba74c5ddeaf46016832e444eeab66248aa27dfe637cc4e7132390deeb6e536e8a1a876b4c291c7bbda77f946b7662b1103247eeb63a8
+  metadata.gz: ed7a4eefbed3e5b8682fcf0181a47778d6292d40827ad5441820080a6c9a64c16a32798adcad3b71b316fa7cf3bc7f29d56ddd5a972ae35cca446209dbb41765
+  data.tar.gz: 7ac1613c439b7dcf2d44a5b782612fbceb55e77702077dc30e79372094c9194e703c60fc6cc430e87083b8d6d62a384f68dbbd627b23845d7ac151d1c3f2be35

data/.travis.yml

@@ -17,4 +17,4 @@ script:
   - bundle exec rspec
   - bundle exec rubocop
 after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+  - ./cc-test-reporter after-build --debug --exit-code $TRAVIS_TEST_RESULT

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cleanup_vendor (0.3.0)
+    cleanup_vendor (0.4.0)
 
 GEM
   remote: https://rubygems.org/
@@ -13,6 +13,7 @@ GEM
     docile (1.3.2)
     gem-release (2.1.1)
     jaro_winkler (1.5.4)
+    json (2.3.0)
     method_source (0.9.2)
     parallel (1.19.1)
     parser (2.7.0.4)
@@ -50,10 +51,11 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    simplecov (0.18.5)
+    simplecov (0.17.1)
       docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     unicode-display_width (1.6.1)
     yard (0.9.24)
 
@@ -68,7 +70,7 @@ DEPENDENCIES
   pry-doc (~> 1.0)
   rspec (~> 3.0)
   rubocop (~> 0.80.1)
-  simplecov (~> 0.18.5)
+  simplecov (~> 0.17.1)
 
 BUNDLED WITH
    1.17.3

data/cleanup_vendor.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-doc', '~> 1.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.80.1'
-  spec.add_development_dependency 'simplecov', '~> 0.18.5'
+  spec.add_development_dependency 'simplecov', '~> 0.17.1'
 end

data/exe/cleanup_vendor

@@ -29,19 +29,14 @@ opt_parser = OptionParser.new do |opts|
     options[:summary] = s
   end
 
-  opts.on('-d', '--directory DIR', 'Match on this directory') do |dir|
+  opts.on('-d', '--directory PATTERN', 'Match on directory') do |pattern|
     options[:directories] ||= []
-    options[:directories] << dir
+    options[:directories] << pattern
   end
 
-  opts.on('-x', '--extension EXT', 'Match on extension') do |ext|
-    options[:extensions] ||= []
-    options[:extensions] << ext
-  end
-
-  opts.on('-f', '--file FILE', 'Match on these filenames') do |file|
-    options[:filenames] ||= []
-    options[:filenames] << file
+  opts.on('-f', '--extension PATTERN', 'Match on file') do |pattern|
+    options[:files] ||= []
+    options[:files] << pattern
   end
 
   opts.on_tail('-h', '--help', 'Show this message') do

data/lib/cleanup_vendor.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'pathname'
 require 'yaml'
 
 require 'cleanup_vendor/version'
+require 'cleanup_vendor/path'
 
 module CleanupVendor
   class Error < StandardError; end
@@ -16,7 +16,7 @@ module CleanupVendor
       summary = []
 
       filter(dir, DEFAULTS.merge(opts)) do |p|
-        summary << collect_summary(p) if opts[:summary]
+        summary << p.summary if opts[:summary]
 
         print_verbose(p) if opts[:verbose]
         print_path(p) if opts[:print0]
@@ -27,72 +27,35 @@ module CleanupVendor
       print_summary(summary) if opts[:summary]
     end
 
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def filter(dir, opts = {})
       raise Error, 'Not a directory' unless File.directory?(dir.to_s)
       return to_enum(:filter, dir, opts) unless block_given?
 
-      file_opts, dir_opts = get_options(opts)
-      filtered = Set.new
+      files, directories, filtered = get_options(opts)
 
-      dir_entries(dir) do |path|
-        next if skip_path?(path, filtered)
-        next unless match_file?(path, file_opts) || match_directory?(path, dir_opts)
+      Path.new(dir).recursive_entries do |path|
+        next if path.include?(filtered)
+        next unless path.file? && path.match?(files) || path.directory? && path.match?(directories)
 
         filtered << path
         yield(path)
       end
     end
-
-    def skip_path?(path, filtered)
-      path.basename.to_s == '.' || path.descend.any? { |p| filtered.include?(p) }
-    end
-    private :skip_path?
-
-    def match_file?(path, filenames: [], extensions: [])
-      return unless path.file?
-
-      filenames.include?(path.basename.to_s) || extensions.include?(path.extname.delete('.'))
-    end
-    private :match_file?
-
-    def match_directory?(path, directories: [], top_level_directories: [])
-      return unless path.directory?
-
-      basename = path.basename.to_s
-      directories.include?(basename) || top_level_directories.include?(basename) && path.parent.glob('*.gemspec').any?
-    end
-    private :match_directory?
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     def get_options(options)
-      file_opts = transform_options(options, :filenames, :extensions)
-      dir_opts = transform_options(options, :directories, :top_level_directories)
-      [file_opts, dir_opts]
-    end
-    private :get_options
-
-    def transform_options(options, *keys)
-      options.slice(*keys).transform_values do |v|
+      options.values_at(:files, :directories, :filtered).map do |v|
         (v || []).to_set
       end
     end
-    private :transform_options
-
-    def dir_entries(dir, &block)
-      Pathname.new(dir).glob('**/*', File::FNM_DOTMATCH, &block)
-    end
-    private :dir_entries
+    private :get_options
 
     def format_summary(prefix, number)
       "\t#{prefix}\t#{number.to_s.rjust(20)}"
     end
     private :format_summary
 
-    def collect_summary(path)
-      files = path.file? ? [path] : dir_entries(path).reject { |p| p.basename.to_s == '.' }
-      files.map(&:stat)
-    end
-    private :collect_summary
-
     def print_verbose(path)
       $stderr.puts "Removing #{path}..."
     end

data/lib/cleanup_vendor/path.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+module CleanupVendor
+  class Path < ::Pathname
+    def recursive_entries
+      return to_enum(:recursive_entries) unless block_given?
+
+      glob('**/*', File::FNM_DOTMATCH) do |path|
+        yield(Path.new(path)) unless path == self
+      end
+    end
+
+    def match?(patterns)
+      patterns.any? do |p|
+        p.start_with?('**') && fnmatch?(p, File::FNM_EXTGLOB) || basename.fnmatch?(p, File::FNM_EXTGLOB) && gem_level?
+      end
+    end
+
+    def gem_level?
+      @gem_level ||= parent.glob('*.gemspec').any?
+    end
+
+    def include?(enum)
+      descend.any? { |p| enum.include?(p) }
+    end
+
+    def summary
+      entries = [self] + recursive_entries.to_a
+      entries.map(&:stat)
+    end
+  end
+end

data/lib/cleanup_vendor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CleanupVendor
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/defaults.yml

@@ -1,54 +1,28 @@
-extensions:
-  - c
-  - cpp
-  - gcov
-  - gem
-  - h
-  - hpp
-  - java
-  - log
-  - markdown
-  - md
-  - mk
-  - o
-  - orig
-  - rdoc
-  - txt
-filenames:
-  - .DS_Store
-  - .appveyor.yml
-  - .byebug_history
-  - .codeclimate.yml
-  - .dockerignore
-  - .gitignore
-  - .gitkeep
-  - .gitmodules
-  - .hound.yml
-  - .keep
-  - .npmignore
-  - .rspec
-  - .rspec_status
-  - .rubocop.yml
-  - .ruby-gemset
-  - .ruby-version
-  - .rvmrc
-  - .travis.yml
-  - .yardopts
-  - CHANGELOG
-  - LICENSE
-  - MIT-LICENSE
-  - Makefile
-  - NEWS
-  - README
-  - TAGS
-  - TODO
-  - gem_make.out
-top_level_directories:
-  - spec
 directories:
-  - .circleci
-  - .config
-  - .git
-  - .github
-  - .idea
-  - .yardoc
+  - "spec"
+  - "coverage"
+  - "**/.circleci"
+  - "**/.config"
+  - "**/.{git,github}"
+  - "**/.idea"
+  - "**/.{npm,yarn}"
+  - "**/.yardoc"
+files:
+  - "**/.DS_Store"
+  - "**/*.{c,cpp,h,hpp,java,log,markdown,md,mk,o,orig,rdoc,txt}"
+  - "**/gem_make.out"
+  - "**/Makefile"
+  - "**/TAGS"
+  - "**/*.{gcov,gem}"
+  - "**/*.{log,markdown,md,rdoc,txt,yardopts}"
+  - "**/*.{bak,orig}"
+  - "**/{CHANGELOG,LICENSE,MIT-LICENSE,NEWS,README,TODO}"
+  - "**/.{gitkeep,gitignore,gitmodules}"
+  - "**/.keep"
+  - "**/{Dockerfile,.dockerignore}"
+  - "**/.{appveyor,codeclimate,hound,travis}.yml"
+  - "**/.{ruby-gemset,ruby-version,rvm}"
+  - "**/.{rspec,rspec_status}"
+  - "**/.npmignore"
+  - "**/.rubocop.yml"
+  - "**/.byebug_history"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cleanup_vendor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - KARASZI István
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.5
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.5
+        version: 0.17.1
 description: Removes unnecessary files which are not required in production environment.
 email:
 - github@spam.raszi.hu
@@ -129,6 +129,7 @@ files:
 - cleanup_vendor.gemspec
 - exe/cleanup_vendor
 - lib/cleanup_vendor.rb
+- lib/cleanup_vendor/path.rb
 - lib/cleanup_vendor/version.rb
 - lib/defaults.yml
 homepage: https://github.com/raszi/cleanup_vendor