servicon 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67eb6c2cdee267d29874d29e0c1af4f3d819bd8e
-  data.tar.gz: 115c289f95f9883d9e4a159c7791c77abd84ad7f
+  metadata.gz: 7aa1d1becdc1cc492eb928a3055b3d1d068619f0
+  data.tar.gz: a4830cae2338ed88d8281031dfac712501412ebc
 SHA512:
-  metadata.gz: cf60ad132646b99585e3a0cb4257cceb541314e5cd25af2e46ae2e65698c0228dc11f22cf96142896d781489e5e085895bd69c4145fe2ab40f4c35b8b595251f
-  data.tar.gz: e011d13d312ae4d0b110177bc708388535f4ed02240347094b001043807d857ba23b9b0446c57e4febd4567ef3d3bb70570751568875e7cd2ecb4d8850c6d97a
+  metadata.gz: 11a6f44e56fbedc2c0313d9d0645b38d48b7094f916ed2752dc91701969f34cec82ee526f325c913bc1c5a96ac115a970c527dfc5ff6c1835132b2bfc420e8ce
+  data.tar.gz: 5f39ef628d0af3a13c1c347e4b95e942c8a771fda55963c2af1f771f2aedcf99e12b32604743d3d8d490bfae76ca48a068f39833523b7c621155e2910263470a

data/bin/servicon

@@ -1,7 +1,4 @@
 #!/usr/bin/env ruby
-
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-
 require 'servicon'
+Servicon::CLI.start
 
-exit Servicon::Bin.new(ARGV).run

data/features/icon.feature

@@ -0,0 +1,12 @@
+Feature: Icon
+  In order to display or pluralize icon
+  As a CLI
+  I want to be as objective as possible
+
+  Scenario: Broccoli is gross
+    When I run `servicon uuid webserver`
+    Then the output should contain "4355734430"
+
+  Scenario: Tomato, or Tomato?
+    When I run `servicon pluralize --word Tomato`
+    Then the output should contain "Tomatoes"

data/features/support/setup.rb

@@ -0,0 +1 @@
+require 'aruba/cucumber'

data/lib/servicon.rb

@@ -1,79 +1,92 @@
+# -*- coding: utf-8 -*-
 require "servicon/version"
-require "servicon/bin"
+require "servicon/cli"
 require "paint"
 require "digest"
 
 module Servicon
 
-  class Servicon
-    attr_accessor :key, :fingerprint, :identifier
+  class Icon
+    attr_accessor :fingerprint
     
-    def initialize(fingerprint)
+    def initialize(fingerprint, color = options[:color])
+      color=="true" ? @color = true : @color = false
       @fingerprint = fingerprint
-      @identifier = self.identifier
+      @uuid = self.uuid
     end
 
-    def identifier
-      identifier = Digest::MD5.hexdigest(@fingerprint).unpack('H*')[0].to_i(16)
+    def uuid
+      uuid = Digest::SHA1.hexdigest(@fingerprint).unpack('H*')[0].to_i(16)
+      return uuid
     end
 
     def matrix
       line = Array.new
       identicon = Array.new
 
-      63.downto(0) do |i|
-        line << @identifier[i]
-        if (i % 8 == 0)
-          line << @identifier[i]
+      0.upto(63) do |i|
+        line << @uuid[i]
+        if line.count == 8
           identicon << line + line.reverse
           line = Array.new
         end
       end
+
       return identicon
     end
 
     def rgb
       color = Hash.new
-      color[:red] = (@identifier & 0xff)
-      color[:blue] = ((@identifier >> 8) & 0xff)
-      color[:green] = ((@identifier >> 16) & 0xff)
+      color[:red] = ((@uuid >> 4) & 0xff)
+      color[:blue] = ((@uuid >> 8) & 0xff)
+      color[:green] = ((@uuid >> 16) & 0xff)
+
       return color
     end
-    
-    def color(matrix_line)
-      rgb = self.rgb
 
-      red = rgb[:red]
-      green = rgb[:green]
-      blue = rgb[:blue]
+    def display
+      draw_matrix(matrix)
+    end
 
-      line = Array.new
-      matrix_line.each do |character|
-        if character == 0
-          line << Paint[' ', nil, [red, green, blue]]
-        elsif character == 1
-          line << Paint[' ', nil, [red / 2, green / 2, blue / 2]]
-        end
+    def draw_matrix(matrix)
+      my_row = Array.new
+      
+      matrix.each do |row|
+         my_row << draw_row(row)
       end
-      return line.join
+      
+      return my_row.join
     end
     
+    def draw_row(matrix_row)
+      line = Array.new
 
-    def create
-      matrix = self.matrix
-
-      icon = String.new
-      matrix.each do |line|
-        icon = icon + color(line) + "\n"
+      matrix_row.each do |character|
+        line << draw_char(character)
       end
-      return icon
+        
+      return line.join + "\n"
     end
-    
 
-class Servicon::NoCodeError < StandardError; end
+    def draw_char(character)
+      rgb = [self.rgb[:red], self.rgb[:green], self.rgb[:blue]]
+      rgb.collect! { |n| n / 2 } if character == 1
 
-  end
+      background = :default
+      foreground = :default
+
+      if @color
+        background = rgb
+      else
+        background = :inverse if character == 1
+      end
 
+      Paint[" ", foreground, background]
+
+    end
+
+  end
 
+  class Servicon::NoCodeError < StandardError; end    
 
 end

data/lib/servicon/cli.rb

@@ -0,0 +1,17 @@
+require 'thor'
+require 'servicon'
+
+module Servicon
+  class CLI < Thor
+    desc "uuid FINGERPRINT", "Displays the UUID generated for the FINGERPRINT"
+    def uuid(fingerprint)
+      puts Servicon::Icon.new(fingerprint, false).uuid
+    end
+
+    desc "display FINGERPRINT", "Displays the icon generated for the FINGERPRINT"
+    method_option :color, :default => "true", :aliases => "-c"
+    def display(fingerprint)
+      puts Servicon::Icon.new(fingerprint, options[:color]).display
+    end
+  end
+end

data/lib/servicon/version.rb

@@ -1,3 +1,3 @@
 module Servicon
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/servicon.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "paint"
+  spec.add_dependency "thor"
+  spec.add_development_dependency "cucumber"
+  spec.add_development_dependency "aruba"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/servicon_spec.rb

@@ -1,18 +1,32 @@
 require 'servicon'
 
+# Goal:
+#
+# icon = Servicon::Icon.new("webserver", color = 1, ascii = 1)
+#
+# puts icon.uuid
+# puts icon.matrix
+# puts icon.display
+# puts icon.html
+
+
 describe Servicon do
   before(:all) do
-    @servicon = Servicon::Servicon.new("webserver")
+    @servicon = Servicon::Icon.new("webserver")
   end
                    
-  it "gives a unique id" do
-      @servicon.identifier.should eql(
+  it "displays the unique id" do
+      @servicon.uuid.should eql(
         22704338318629462888122409979625206231270005454074289634515086541537965794865)
   end
+  
+  it "displays the matrix" do
+      @servicon.matrix.count.should eql(8)
+  end
 
-  it "create a string" do
-      puts @servicon.create
-      @servicon.create.class.should eql(String)
+  it "displays the servicon" do
+      @servicon.display.should eql(8)
   end
+
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servicon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kyle Sexton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -24,6 +24,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,8 +122,10 @@ files:
 - README.md
 - Rakefile
 - bin/servicon
+- features/icon.feature
+- features/support/setup.rb
 - lib/servicon.rb
-- lib/servicon/bin.rb
+- lib/servicon/cli.rb
 - lib/servicon/version.rb
 - servicon.gemspec
 - spec/servicon_spec.rb
@@ -110,4 +154,6 @@ signing_key:
 specification_version: 4
 summary: Generate ANSI or ASCII identicons
 test_files:
+- features/icon.feature
+- features/support/setup.rb
 - spec/servicon_spec.rb

data/lib/servicon/bin.rb

@@ -1,55 +0,0 @@
-require 'optparse'
-
-class Servicon::Bin
-
-  def initialize(args)
-    @args = args
-  end
-
-  def run
-    help = <<-EOHELP
-    Servicon
-
-    Basic Command Line Usage:
-      servicon [OPTIONS] [FINGERPRINT]
-
-            FINGERPRINT                  Unique ID to generate identicon
-
-    Options:
-    EOHELP
-
-    opts = OptionParser.new do |opts|
-      opts.banner = help
-
-      opts.on("--version", "Display current version.") do
-        puts "servicon " + Servicon::VERSION
-        return 0
-      end
-    end
-
-    begin
-      opts.parse!(@args)
-    rescue OptionParser::InvalidOption
-      puts "servicon: #{$!.message}"
-      puts "servicon: try 'servicon --help' for more information"
-      return 1
-    end
-
-    if @args[0].nil?
-      puts "servicon: no fingerprint specified"
-      puts "servicon: try 'servicon --help' for more information"
-      return 1
-    end
-
-    begin
-      return_val = 0
-      i = Servicon::Servicon.new(@args[0])
-      puts i.create
-      return return_val
-    rescue Servicon::Servicon::NoCodeError
-      puts "servicon: no file specified or specified file does not exist"
-      puts "servicon: try 'servicon --help' for more information"
-      return 1
-    end
-  end
-end