crf 0.0.8.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39439b8314df8014898523b78f41b0b1f7bc6887
-  data.tar.gz: 413044e24a72a934083899bea6011cd4ffddbbea
+  metadata.gz: fa3e9c8ebeb5a94afe67b3dcc014f9ee2adb08b8
+  data.tar.gz: 8879457f42c28b98229290f4edf37d53943daaf0
 SHA512:
-  metadata.gz: 1cebe9599e4735ffd9f56e4dba20a037b89416209e676c9849f56ac0a2f8188ca5eac3610fc779a2a062c159ff509042adb8b4fae601ff142746b5f1488ee576
-  data.tar.gz: c8e754cdadd719faf3bedcee8d02be743eb10a6a1e68cc4d1fbdc6ff98c526c700909653d16aff5be07d2451a274989c94171e742fee45259e18b8f18eb71472
+  metadata.gz: 38568aabac85aa5e3c41e7b8f556cf2b1c30c37464883dbaf380c224503d26c61fd815447d2161f3c7c91062417557f381f760a66de2c3316e518d80eceb04a1
+  data.tar.gz: c3f556267208c92a714106bf79b567b1641a32b6792041a4aec770dc93d32aad32f68d2599430549b943dd77d323c0dbd6a64fe036d23303c563067d13b046f6

data/.rubocop.yml

@@ -11,3 +11,6 @@ LineLength:
 
 FrozenStringLiteralComment:
   Enabled: false
+
+BlockLength:
+  Enabled: false

data/Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in crf.gemspec
 gemspec
 
-gem 'rake', '~> 11.1'
-gem 'rspec', '~> 3.4'
+gem 'rake', '~> 12.0'
 
 group :test do
-  gem 'codeclimate-test-reporter', require: false
+  gem 'rspec', '~> 3.5'
+  gem 'simplecov', '0.12.0', require: false
 end

data/LICENSE

@@ -0,0 +1,201 @@
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015-2017 Alejandro Bezdjian
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/crf.gemspec

@@ -2,6 +2,7 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'crf/version'
+require 'date'
 
 Gem::Specification.new do |spec|
   spec.name          = 'crf'
@@ -19,10 +20,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec)/})
 
-  spec.add_dependency 'colorize', '~> 0.7', '>= 0.7.5'
-  spec.add_dependency 'ruby-progressbar', '~> 1.7', '>= 1.7.0'
+  spec.add_dependency 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
+  spec.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
+  spec.add_dependency 'ruby-progressbar', '~> 1.8', '>= 1.8.1'
 
   spec.add_development_dependency 'bundler', '>= 1.3.0', '< 2.0'
   spec.add_development_dependency 'byebug', '~> 9.0', '>= 9.0.5' if RUBY_VERSION >= '2.0.0'
-  spec.add_development_dependency 'rubocop', '~> 0.38', '>= 0.37.2'
+  spec.add_development_dependency 'rubocop', '~> 0.47', '>= 0.47.1'
 end

data/lib/crf/finder.rb

@@ -1,6 +1,7 @@
 require 'crf/repetitions_list'
 require 'digest'
 require 'ruby-progressbar'
+require 'concurrent/executor/cached_thread_pool'
 
 module Crf
   class Finder
@@ -16,6 +17,7 @@ module Crf
     def initialize(paths, fast = false)
       @paths = paths
       @fast = fast
+      initialize_thread_pool
     end
 
     def search_repeated_files
@@ -60,16 +62,29 @@ module Crf
     #
     def second_run(repetitions)
       repetitions_list = Crf::RepetitionsList.new
+
       repetitions.values.each do |repeated_array|
         repeated_array.each do |file_path|
-          repetitions_list.add(file_hash(file_path).freeze, file_path)
+          @thread_pool.post { repetitions_list.add(file_hash(file_path), file_path) }
         end
       end
+      await_pool_termination
+
       repetitions_list.repetitions
     end
 
     def file_hash(path)
       Digest::SHA256.file(path).hexdigest
     end
+
+    def await_pool_termination
+      @thread_pool.shutdown
+      @thread_pool.wait_for_termination
+      initialize_thread_pool
+    end
+
+    def initialize_thread_pool
+      @thread_pool = Concurrent::CachedThreadPool.new
+    end
   end
 end

data/lib/crf/interactive_finder.rb

@@ -5,8 +5,7 @@ module Crf
   class InteractiveFinder < Crf::Finder
     def search_repeated_files
       all_paths = all_files
-      progressbar = ProgressBar.create(title: 'First run', total: all_paths.count,
-                                       format: '%t: %c/%C %a |%B| %%%P')
+      progressbar = initialize_progress_bar('First run', all_paths.count)
       rep_list = first_run(progressbar)
       return @repetitions = rep_list.repetitions if rep_list.repetitions.empty? || @fast
       second_run(rep_list)
@@ -23,17 +22,26 @@ module Crf
       repetitions_list
     end
 
+    # rubocop:disable Metrics/MethodLength
     def second_run(repetitions_list)
-      progressbar = ProgressBar.create(title: 'Second run', format: '%t: %c/%C %a |%B| %%%P',
-                                       total: repetitions_list.total_repetitions)
+      progressbar = initialize_progress_bar('Second run', repetitions_list.total_repetitions)
       confirmed_repetitions_list = Crf::RepetitionsList.new
+
       repetitions_list.repetitions.values.each do |repeated_array|
         repeated_array.each do |file_path|
-          confirmed_repetitions_list.add(file_hash(file_path), file_path)
-          progressbar.increment
+          @thread_pool.post do
+            confirmed_repetitions_list.add(file_hash(file_path), file_path)
+            progressbar.increment
+          end
         end
       end
+      await_pool_termination
+
       @repetitions = confirmed_repetitions_list.repetitions
     end
+
+    def initialize_progress_bar(title, total)
+      ProgressBar.create(title: title, format: '%t: %c/%C %a |%B| %%%P', total: total)
+    end
   end
 end

data/lib/crf/repetitions_list.rb

@@ -1,3 +1,5 @@
+require 'concurrent/atomic/semaphore'
+
 module Crf
   class RepetitionsList
     attr_reader :uniques, :repetitions, :total_repetitions
@@ -5,6 +7,7 @@ module Crf
     def initialize
       @uniques = {}
       @repetitions = {}
+      @semaphore = Concurrent::Semaphore.new(1)
       @total_repetitions = 0
     end
 
@@ -16,13 +19,16 @@ module Crf
     # @param value [String] path of the file
     #
     def add(key, value)
+      @semaphore.acquire
       if repetitions.key?(key)
         repetitions[key] << value
         @total_repetitions += 1
-        return
+      elsif uniques.key?(key)
+        repetition_found(key, value)
+      else
+        uniques[key] = value
       end
-      return repetition_found(key, value) if uniques.key?(key)
-      uniques[key] = value
+      @semaphore.release
     end
 
     private

data/lib/crf/version.rb

@@ -1,3 +1,3 @@
 module Crf
-  VERSION = '0.0.8.1'.freeze
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,55 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: crf
 version: !ruby/object:Gem::Version
-  version: 0.0.8.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Alejandro Bezdjian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,20 +116,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.47'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.47.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.47'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.47.1
 description: Library that looks for exact duplicated files in a directory.
 email: alebezdjian@gmail.com
 executables:
@@ -122,7 +142,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
-- LICENSE.md
+- LICENSE
 - README.md
 - Rakefile
 - bin/crf
@@ -156,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Look for exact duplicated files.

data/LICENSE.md

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Alejandro Bezdjian, aka alebian
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.