samantha 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bba903f9f30cab948b6fb38f05479b1ffa553ec
-  data.tar.gz: 51ea88e965c81de1bb55dc0fa14c8486f76e0853
+  metadata.gz: 6392430cb7ccc85c8ae39a4078df65cb688a720f
+  data.tar.gz: 9d48e0aef594e8ebfacbf8389c5bdf1fc9033515
 SHA512:
-  metadata.gz: 9429041c9eb60258b85a61ccd7fc7fefcc6f63dcbf80809eab2cebe8d8de86cddeb20dad5c62aa38dc10f272cdb7049f9ea95cf717fb4327e4ced2b869b89843
-  data.tar.gz: 5d8ef26e6fb6312cf7ee6705a169554c845cdca5374f26cde45529b49cb4be5645ddf6a1e573e55a10d1b0113047a2341c1e502fe0fc081849e1e9a0d5576462
+  metadata.gz: c32a4972cc24fa6149afb46072d177daf389507fb411a44015f7a5642829ebc8fc51d5746007f0e8068b8613a38276bdcdda65b0a1591b40272318db53c16ab3
+  data.tar.gz: f2b8f7e32285fef5ead1e0c9c5863443e5956687b13408a88698cea2db7343d6cb1070b371dbe8cab64e68b138d4db1469956954f998104351e06a6b5e1bd608

data/bin/samantha

@@ -2,6 +2,6 @@
 
 require 'samantha'
 
-samantha = Samantha::Base.new
+samantha = Samantha::Palette.new
 
-samantha.find_colors(*ARGV)
+samantha.print_colors(*ARGV)

data/lib/samantha/version.rb

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

data/lib/samantha.rb

@@ -10,56 +10,50 @@ module Samantha
       @colors = []
     end
 
-    def add_color(color)
-      a = @colors.detect { |c| c.hex == color.hex }
-      if a == nil
-        @colors.push(color)
-      else
-        a.count += 1
-      end
-    end
-  end
-
-  class Color
-    attr_accessor :hex, :count
-
-    def initialize(hex, count)
-      @hex = hex
-      @count = count
-    end
-  end
-
-  class Base
-
-    def initialize()
-      @palette = Palette.new
-    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
-              @palette.add_color(Color.new(hex, 1))
+              add_color(Color.new(hex, 1))
             end
           end
         end
       end
+    end
 
-      color_block = "●"
+    def add_color(color)
+      a = @colors.detect { |c| c.hex == color.hex }
+      if a == nil
+        @colors.push(color)
+      else
+        a.count += 1
+      end
+    end
 
-      puts Paint['', nil, nil]
+    def print_colors(dir)
+      find_colors(dir)
 
-      @palette.colors.each do |c|
-        puts "#{Paint[color_block, c.hex, nil]} ##{c.hex.ljust(6)} #{c.count.to_s.ljust(6)}"
-      end
+      @colors.sort_by! { |c| c.count }
+      @colors.reverse!
 
+      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
+    end
+  end
 
+  class Color
+    attr_accessor :hex, :count
 
+    def initialize(hex, count)
+      @hex = hex
+      @count = count
     end
-
   end
 
 end
+

metadata

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