octocounter 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b11e8449a533df79b3aed3ebca176d6cc9b27f4a
-  data.tar.gz: 33a52e733f7f3a8884438d90c7110ff8d6680563
+  metadata.gz: 097ec5048b1f4fd93c33da4ddd6ea1e13d741fd3
+  data.tar.gz: 8168e52706bc3ee7b5f053492249511cfa2955cd
 SHA512:
-  metadata.gz: 17da731f05194708b0e283c66b1dc0ce42ba95edd8d303936ed88c7b319f928f098c274745247814b4ccec25bf981f3d1d6333dbcd96be2acd581f3504cb4d10
-  data.tar.gz: cd71a58760533d70d7d0dfadcd1c1a4a52800b7c8fef3cf34b10ca2c3361bda985082002557bb528551b348408f043cc59ebd2d850084301b21bcf13eeda48dd
+  metadata.gz: 66ab3ea6dbcd3fa0e48f834387cdb291b795da04b11943bed983a458b73d74bc6af3fcf839cc42934739e3136748ad85fbf80fd9eb5687f011a59e6a02187903
+  data.tar.gz: f5504f40295efd7adc6f3dc39b66c9bb16496f3a9cec1fa65f7c7d0a2865097ffd8009960b062920eb6701fe0ed1197af3ed84bbeede9fdcbe1606339c2ab864

data/lib/octocounter.rb

@@ -1,41 +1,4 @@
 require "commander"
 require "fileutils"
 
-require "octocounter/version"
-require "octocounter/counter"
-
-PATH_ARG = "
-  Usage:
-    octocounter path/to/directory
-"
-
-DESCRIPTION = "List files in directories to get count with same content"
-
-module Octocounter
-  class CommandBuilder
-    include Commander::Methods
-
-    def run
-      program :name, "Octocounter"
-      program :version, Octocounter::VERSION
-      program :description, DESCRIPTION
-
-      default_command :run
-
-      command :run do |c|
-        c.syntax = "octocounter path/to/directory"
-        c.description = DESCRIPTION
-        c.option '--all', String, "Show all list"
-        c.action do |args, options|
-          path = args.shift || abort(PATH_ARG)
-
-          counter = Octocounter::Counter.new(path, options.all)
-
-          counter.print_to_screen
-        end
-      end
-
-      run!
-    end
-  end
-end
+require "octocounter/command_builder"

data/lib/octocounter/command_builder.rb

@@ -0,0 +1,37 @@
+require "octocounter/version"
+require "octocounter/counter"
+
+module Octocounter
+  class CommandBuilder
+    include Commander::Methods
+
+    PATH_ARG = "
+      Usage:
+        octocounter path/to/directory
+    "
+    DESCRIPTION = "List files in directories to get count with same content"
+
+    def run
+      program :name, "Octocounter"
+      program :version, Octocounter::VERSION
+      program :description, DESCRIPTION
+
+      default_command :run
+
+      command :run do |c|
+        c.syntax = "octocounter path/to/directory"
+        c.description = DESCRIPTION
+        c.option "--all", String, "Show all list"
+        c.action do |args, options|
+          path = args.shift || abort(PATH_ARG)
+
+          counter = Octocounter::Counter.new(path, options.all)
+
+          counter.print_to_screen
+        end
+      end
+
+      run!
+    end
+  end
+end

data/lib/octocounter/counter.rb

@@ -6,7 +6,7 @@ module Octocounter
 
     REGEX_PATH = %r{/\/$/}
 
-    attr_accessor :path, :list, :all
+    attr_reader :path, :list, :all
 
     def initialize(path, all)
       path = "#{path}/" unless path =~ REGEX_PATH
@@ -17,9 +17,8 @@ module Octocounter
 
     def calculate
       Dir.glob(path + "**/*").select { |f| File.file?(f) }.each do |file|
-        open_file = File.open(file)
-        file_path = open_file.path.sub(path, '')
-        open_file.close
+        file_path = File.path(file).sub(path, "")
+
         if matched = matched?(file)
           matched[:count] += 1
           matched[:files] = "#{matched[:files]}\n#{file_path}"
@@ -30,14 +29,25 @@ module Octocounter
       list
     end
 
+    def print_to_screen
+      rows =
+        if all
+          calculate.map do |item|
+            [item[:files], content(item), item[:count]]
+          end
+        else
+          item = calculate.inject { |memo, i| memo && (memo[:count] > i[:count]) ? memo : i }
+          [[item[:files], content(item), item[:count]]]
+        end
+
+      puts Terminal::Table.new headings: %w[Files Content Count], rows: rows, style: { all_separators: true }
+    end
+
+    private
+
     def matched?(file)
       list.find do |item|
-        file1, file2 = [File.open(file), File.open(item[:file])]
-        size1, size2 = [file1.size, file2.size]
-        file1.close
-        file2.close
-
-        size1 == size2 &&
+        File.size(file) == File.size(item[:file]) &&
           FileUtils.compare_file(item[:file], file)
       end
     end
@@ -50,21 +60,8 @@ module Octocounter
         index += 1
         break if index == 10
       end
-      content.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')[0..50]
-    end
-
-    def print_to_screen
-      rows =
-        if all
-          calculate.map do |item|
-            [item[:files], content(item), item[:count]]
-          end
-        else
-          item = calculate.inject { |memo, i| memo && (memo[:count] > i[:count]) ? memo : i }
-          [[item[:files], content(item), item[:count]]]
-        end
-
-      puts Terminal::Table.new headings: ["Files", "Content", "Count"], rows: rows, style: { all_separators: true }
+      # force encode into UTF-8
+      content.encode("UTF-8", "binary", invalid: :replace, undef: :replace, replace: "")[0..50]
     end
   end
 end

data/lib/octocounter/version.rb

@@ -1,3 +1,3 @@
 module Octocounter
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octocounter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dimas J. Taniawan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
@@ -113,6 +113,7 @@ files:
 - bin/octocounter
 - bin/setup
 - lib/octocounter.rb
+- lib/octocounter/command_builder.rb
 - lib/octocounter/counter.rb
 - lib/octocounter/version.rb
 - octocounter.gemspec