samantha 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6392430cb7ccc85c8ae39a4078df65cb688a720f
-  data.tar.gz: 9d48e0aef594e8ebfacbf8389c5bdf1fc9033515
+  metadata.gz: a65b336028562cc70baeee5a52a897a27d2f37be
+  data.tar.gz: 64a85243c31799824b2a9758ae4a120759d45246
 SHA512:
-  metadata.gz: c32a4972cc24fa6149afb46072d177daf389507fb411a44015f7a5642829ebc8fc51d5746007f0e8068b8613a38276bdcdda65b0a1591b40272318db53c16ab3
-  data.tar.gz: f2b8f7e32285fef5ead1e0c9c5863443e5956687b13408a88698cea2db7343d6cb1070b371dbe8cab64e68b138d4db1469956954f998104351e06a6b5e1bd608
+  metadata.gz: 481f635439fd2b4d4c54748be6a4d4c63205c133e29d9095171a1aa02ab82dd0dcd7e718c9f4c49ed9c074dadeb100bca729222994e413b73fde822d7caf1c34
+  data.tar.gz: a9d60942595c2b428eefc1e9606a82547c3f0cb3139dac6a4101e861fe39624dd3846ed91ac8d6703d1f7b059e677ac991e120a89e988943a650e55ad4ba47c1

data/bin/samantha

@@ -4,4 +4,4 @@ require 'samantha'
 
 samantha = Samantha::Palette.new
 
-samantha.print_colors(*ARGV)
+samantha.print(*ARGV)

data/lib/samantha/version.rb

@@ -1,3 +1,3 @@
 module Samantha
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/samantha.rb

@@ -10,48 +10,56 @@ module Samantha
       @colors = []
     end
 
-    def find_colors(dir)
-      Dir["#{dir}/*"].each do |f|
-        File.open(f) do |f|
-          f.each_line do |l|
-            l.scan(/\B#[0-9a-fA-f]{3,6}\b/).each do |hex|
-              hex = hex.downcase
-              add_color(Color.new(hex, 1))
-            end
-          end
+    def find_colors_in_directory(directory)
+      Dir["#{directory}/*"].each do |file| find_colors_in_file(file) end
+    end
+
+    def find_colors_in_file(file)
+      File.open(file) do |file_contents|
+        file_contents.each_line do |line|
+          find_colors_in_line(line)
         end
       end
     end
 
-    def add_color(color)
-      a = @colors.detect { |c| c.hex == color.hex }
-      if a == nil
-        @colors.push(color)
-      else
-        a.count += 1
-      end
+    def find_colors_in_line(line)
+      line.scan(/\B#[0-9a-fA-f]{3,6}\b/).each do |hex| add_colors_from_line(hex) end
     end
 
-    def print_colors(dir)
-      find_colors(dir)
+    def add_colors_from_line(hex)
+      add_color(Color.new(hex.downcase))
+    end
+
+    def add_color(color)
+      existing_color = @colors.detect { |c| c.hex == color.hex }
+      existing_color ? existing_color.tally : @colors.push(color)
+    end
 
-      @colors.sort_by! { |c| c.count }
-      @colors.reverse!
+    def sort_colors
+      @colors.sort_by! { |c| c.count }.reverse!
+    end
 
-      puts Paint['', nil, nil]
-      @colors.each do |c|
-        puts "#{Paint['●', c.hex, nil]} ##{c.hex.ljust(6)} #{c.count.to_s.ljust(6)}"
-      end
-      puts
+    def print(directory)
+      find_colors_in_directory(directory)
+      sort_colors()
+      @colors.each do |color| puts color end
     end
   end
 
   class Color
     attr_accessor :hex, :count
 
-    def initialize(hex, count)
+    def initialize(hex)
       @hex = hex
-      @count = count
+      @count = 1
+    end
+
+    def tally
+      @count += 1
+    end
+
+    def to_s
+      "#{Paint['●', @hex, nil]} ##{@hex.ljust(6)} #{@count.to_s}"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samantha
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Flip Stewart