samantha 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a65b336028562cc70baeee5a52a897a27d2f37be
-  data.tar.gz: 64a85243c31799824b2a9758ae4a120759d45246
+  metadata.gz: 06ec55fd31ee86f1543cb2728771057cf428018a
+  data.tar.gz: 86c29217d23778a4d644f4a87b4942bdb8fd1ab2
 SHA512:
-  metadata.gz: 481f635439fd2b4d4c54748be6a4d4c63205c133e29d9095171a1aa02ab82dd0dcd7e718c9f4c49ed9c074dadeb100bca729222994e413b73fde822d7caf1c34
-  data.tar.gz: a9d60942595c2b428eefc1e9606a82547c3f0cb3139dac6a4101e861fe39624dd3846ed91ac8d6703d1f7b059e677ac991e120a89e988943a650e55ad4ba47c1
+  metadata.gz: 6307473d66bfba03a75e9181bf16be0d01cf9dbd4edf366b09bf744f68f97da6a11f93d5b8ef2a0c5bfc1b1039c69e649b62f7dd1d8e596a54e48c702fa268ad
+  data.tar.gz: 3006b69aec5c91715ca6e8838cc2956d791e4f65fb07ac1e0fcd5dd293761a28834c054a8e1a475309554249dce5b0308eb766137c6b6fbce7f7cf38775cb281

data/Gemfile.lock

@@ -0,0 +1,19 @@
+PATH
+  remote: .
+  specs:
+    samantha (0.0.7)
+      paint (= 0.8.6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    paint (0.8.6)
+    rake (10.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  rake
+  samantha!

data/bin/samantha

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'samantha'
+require "samantha"
 
-samantha = Samantha::Palette.new
+samantha = Samantha::Base.new
 
-samantha.print(*ARGV)
+samantha.print_colors_in_directory(*ARGV)

data/lib/colors.rb

@@ -0,0 +1,20 @@
+module Samantha
+
+  class Color
+    attr_accessor :hex, :count
+
+    def initialize(hex)
+      @hex = hex
+      @count = 1
+    end
+
+    def tally
+      @count += 1
+    end
+
+    def to_s
+      "#{Paint['●', @hex, nil]} ##{@hex.ljust(6)} #{@count.to_s}"
+    end
+  end
+
+end

data/lib/hex_aggregator.rb

@@ -0,0 +1,25 @@
+module Samantha
+
+  class Hex_Aggregator
+    attr_accessor :hexes
+
+    def initialize
+      @hexes = []
+    end
+
+    def find_colors_in_directory(directory)
+      Dir["#{directory}/*"].map { |file| find_colors_in_file(file) }
+    end
+
+    def find_colors_in_file(file)
+      File.open(file) do |file_contents|
+        file_contents.each_line { |line| find_colors_in_line(line) }
+      end
+    end
+
+    def find_colors_in_line(line)
+      line.scan(/\B#[0-9a-fA-f]{3,6}\b/).each {|hex| @hexes.push(hex)}
+    end
+  end
+
+end

data/lib/palette.rb

@@ -0,0 +1,20 @@
+module Samantha
+
+  class Palette
+    attr_accessor :colors
+
+    def initialize
+      @colors = []
+    end
+
+    def add_color(hex)
+      existing_color = @colors.detect { |c| c.hex == hex }
+      existing_color ? existing_color.tally : @colors.push(Color.new(hex.downcase))
+    end
+
+    def sort_colors
+      @colors.sort_by! { |c| c.count }.reverse!
+    end
+  end
+
+end

data/lib/samantha.rb

@@ -1,67 +1,24 @@
 require "samantha/version"
 require "paint"
 
-module Samantha
-
-  class Palette
-    attr_accessor :colors
-
-    def initialize()
-      @colors = []
-    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 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 add_colors_from_line(hex)
-      add_color(Color.new(hex.downcase))
-    end
+require_relative "colors"
+require_relative "hex_aggregator"
+require_relative "palette"
 
-    def add_color(color)
-      existing_color = @colors.detect { |c| c.hex == color.hex }
-      existing_color ? existing_color.tally : @colors.push(color)
-    end
-
-    def sort_colors
-      @colors.sort_by! { |c| c.count }.reverse!
-    end
-
-    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)
-      @hex = hex
-      @count = 1
-    end
+module Samantha
 
-    def tally
-      @count += 1
+  class Base
+    def initialize
+      @hex_aggregator = Hex_Aggregator.new
+      @palette = Palette.new
     end
 
-    def to_s
-      "#{Paint['●', @hex, nil]} ##{@hex.ljust(6)} #{@count.to_s}"
+    def print_colors_in_directory(directory)
+      @hex_aggregator.find_colors_in_directory(directory)
+      @hex_aggregator.hexes.each { |hex| @palette.add_color(hex) }
+      @palette.sort_colors
+      @palette.colors.each { |color| puts color }
     end
   end
 
-end
-
+end

data/lib/samantha/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samantha
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Flip Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,15 +60,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- lib/colors.rb
+- lib/hex_aggregator.rb
+- lib/palette.rb
+- lib/samantha.rb
+- lib/samantha/version.rb
+- bin/samantha
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/samantha
-- lib/samantha.rb
-- lib/samantha/version.rb
-- samantha.gemspec
 homepage: ''
 licenses:
 - MIT

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/samantha.gemspec

@@ -1,25 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'samantha/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "samantha"
-  spec.version       = Samantha::VERSION
-  spec.authors       = ["Flip Stewart"]
-  spec.email         = ["flipstewart@me.com"]
-  spec.description   = %q{Hex code counter}
-  spec.summary       = %q{Samantha finds all the hex color codes in a directory and displays them along with the number of times they occur}
-  spec.homepage      = ""
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = ["samantha"]
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-
-  spec.add_runtime_dependency('paint', '0.8.6')
-end