artii 1.0.3 → 2.0.0

data/Gemfile

@@ -1,8 +1,11 @@
 source "http://rubygems.org"
 
+# Specify your gem's dependencies in gopher.gemspec
+gemspec
+
 group :development do
   gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "~> 1.1.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -1,3 +1,8 @@
+PATH
+  remote: .
+  specs:
+    artii (1.0.3)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -22,7 +27,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  artii!
+  bundler (~> 1.1.0)
   jeweler (~> 1.6.4)
   rcov
   rspec (~> 2.3.0)

data/README.rdoc

@@ -11,7 +11,7 @@ ASCII Arty is a little ASCII art generator that uses the Figlet library. Just fe
 - Figlet font library
 
 == Examples
-  # Basic usage
+  # Basic usage (cli)
   $ artii 'Art!'
   # =>                 _   _ 
   # =>      /\        | | | |
@@ -30,9 +30,20 @@ ASCII Arty is a little ASCII art generator that uses the Figlet library. Just fe
   # =>  /_/  |_/_/   \__(_)   
   # =>                        
 
+  # Integrated usage
+  a = Artii::Base.new :font => 'slant'
+  a.asciify('Art!')
+  # =>      ___         __  __
+  # =>     /   |  _____/ /_/ /
+  # =>    / /| | / ___/ __/ / 
+  # =>   / ___ |/ /  / /_/_/  
+  # =>  /_/  |_/_/   \__(_)   
+  # =>                        
+
+
 == Requirements
 
-None (yet)
+None
 
 == Install
 
@@ -40,6 +51,7 @@ None (yet)
 
 == TODO
 
+- Allow integrated objects to accept a print out a pre-defined text value
 - Ability to load non *.flf files (fonts are available, .flc file-types seem to be an issue right now)
 - Ability to set custom configurations, so you don't have to constantly set the options (like font) unless you want to
 - Some nice built-in utilities (to make for easier demoing)
@@ -58,7 +70,7 @@ Figlet (http://www.figlet.org) implementation written by Tim Fletcher
 its removal.
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/VERSION

@@ -1 +1 @@
-1.0.3
+2.0.0

data/artii.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "artii"
-  s.version = "1.0.3"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Tierney"]
-  s.date = "2012-01-05"
+  s.date = "2012-05-04"
   s.description = "A Figlet-based ASCII art generator, useful for comand-line based ASCII Art Generation."
   s.email = "mike@panpainter.com"
   s.executables = ["artii"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "bin/artii",
     "lib/artii.rb",
     "lib/artii/base.rb",
+    "lib/artii/cli.rb",
     "lib/artii/figlet.rb",
     "lib/figlet/font.rb",
     "lib/figlet/fonts/3-d.flf",
@@ -697,6 +698,7 @@ Gem::Specification.new do |s|
     "lib/figlet/smusher.rb",
     "lib/figlet/typesetter.rb",
     "spec/artii/base_spec.rb",
+    "spec/artii/cli_spec.rb",
     "spec/artii_spec.rb",
     "spec/data/big.flf",
     "spec/data/big.txt",
@@ -709,26 +711,38 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/miketierney/artii"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "A little Figlet-based ASCII art generator."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<artii>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
+      s.add_dependency(%q<artii>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<artii>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end

data/bin/artii

@@ -3,7 +3,7 @@
 require 'artii'
 
 begin
-  a = Artii::Base.new *ARGV.dup
+  a = Artii::CLI.new *ARGV.dup
   puts a.output
 rescue StandardError => e
   puts "Something has gone horribly wrong!"

data/lib/artii.rb

@@ -12,6 +12,7 @@
 # Copyright:: Copyright (c) 2010 Michael Tierney
 # License::   Distributed under the MIT License
 
+require 'artii/cli'
 require 'artii/base'
 require 'artii/figlet'
 

data/lib/artii/base.rb

@@ -1,5 +1,4 @@
 require 'find'
-require 'optparse'
 require 'figlet/font'
 require 'figlet/smusher'
 require 'figlet/typesetter'
@@ -7,50 +6,36 @@ require 'figlet/typesetter'
 module Artii
   class Base
 
-    attr_accessor :output, :font, :font_name, :faces
+    attr_accessor :font, :faces
 
-    def initialize(*args)
-      @options = {}
-      @output = ''
-      @faces = all_fonts
-
-      OptionParser.new do |opts|
-        opts.banner = "Usage: artii 'your string here' [-f FONT_NAME or --font FONT_NAME] [-l or --list]"
-
-        opts.on('-f', '--font FONT_NAME', 'Specify the font to be used (defaults to "big")') do |font|
-          @font_name = @faces[font]
-        end
-
-        opts.on('-l', '--list', 'Prints the list of available fonts') do |list|
-          @options[:list] = list_all_fonts
-        end
-
-        opts.on_tail("-h", "--help", "Show this message") do
-          puts opts
-          exit
-        end
-
-        if args.empty?
-          puts opts
-          exit
-        end
-      end.parse!(args)
-
-      if @options[:list]
-        @output = list_all_fonts
+    def initialize(params={})
+      if params.is_a?(String)
+        params = {
+          :text => params
+        }
       end
 
-      @font_name = @font_name.nil? ? @faces['big'] : @font_name
+      @options = {
+        :font => "big"
+      }.merge(params)
 
-      @font = Artii::Figlet::Font.new("#{FONTPATH}/#{@font_name}")
+      @faces = all_fonts
+      @font = Artii::Figlet::Font.new font_file(@options[:font])
+    end
+
+    def font_name
+      @faces[@options[:font]]
+    end
 
-      asciify args.first unless args.empty?
+    def font_file(name)
+      "#{FONTPATH}/#{@faces[name]}"
     end
 
     def asciify(string)
       figlet = Artii::Figlet::Typesetter.new(@font)
-      @output = figlet[string]
+      figlet[string]
     end
+    alias :output :asciify
 
     def list_all_fonts
       font_list = "\n--------------------\nAll Available Fonts:\n--------------------\n\n"

data/lib/artii/cli.rb

@@ -0,0 +1,51 @@
+require 'optparse'
+
+module Artii
+  class CLI
+
+    attr_accessor :params, :action
+    def initialize(*args)
+      @params = {}
+      @action = :output
+
+      OptionParser.new do |opts|
+        opts.banner = "Usage: artii 'your string here' [-f FONT_NAME or --font FONT_NAME] [-l or --list]"
+
+        opts.on('-f', '--font FONT_NAME', 'Specify the font to be used (defaults to "big")') do |font|
+          @params[:font] = font
+        end
+
+        opts.on('-l', '--list', 'Prints the list of available fonts') do |list|
+          @action = :list_all_fonts
+        end
+
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+
+        if args.empty?
+          puts opts
+          exit
+        end
+      end.parse!(args)
+
+      @params[:text] = args.join " "
+
+      @a = Artii::Base.new(@params)
+    end
+
+    def font_name
+      @a.font_name
+    end
+
+    def output
+      if @action == :output
+        @a.send @action, @params[:text]
+      else
+        @a.send @action
+      end
+    end
+
+  end
+end

data/spec/artii/base_spec.rb

@@ -9,37 +9,37 @@ describe Artii::Base do
     end
   end
 
-    it "font_name should default to 'big.flf'" do
-      a = Artii::Base.new 'test'
-      a.font_name.should == 'big.flf'
-    end
+  it "font_name should default to 'big.flf'" do
+    a = Artii::Base.new 'test'
+    a.font_name.should == 'big.flf'
+  end
 
   describe "font switching" do
     context 'should set font if passed -f ' do
       it "should set @font_name" do
-        a = Artii::Base.new 'test', '-f', 'chunky'
-        a.instance_variable_get(:@font_name).should == 'chunky.flf'
+        a = Artii::Base.new(:text => 'test', :font => 'chunky')
+        a.font_name.should == 'chunky.flf'
       end
 
       xit "should accept non-flf file formats" do
-        a = Artii::Base.new 'test', '-f', 'frango'
+        a = Artii::Base.new(:text => 'test', :font => 'frango')
         a.font_name.should == 'frango.flc'
       end
 
       it "should accept fonts in nested directories" do
-        a = Artii::Base.new 'test', '-f', 'cour'
+        a = Artii::Base.new(:text => 'test', :font => 'cour')
         a.font_name.should == 'bdffonts/cour.flf'
       end
     end
 
     context 'should set font if passed --font' do
       it "set @font_name" do
-        a = Artii::Base.new 'test', '--font', 'chunky'
-        a.instance_variable_get(:@font_name).should == 'chunky.flf'
+        a = Artii::Base.new(:text => 'test', :font => 'chunky')
+        a.font_name.should == 'chunky.flf'
       end
 
       it "should accept fonts in nested directories" do
-        a = Artii::Base.new 'test', '--f', 'cour'
+        a = Artii::Base.new(:text => 'test', :font => 'cour')
         a.font_name.should == 'bdffonts/cour.flf'
       end
 
@@ -50,31 +50,10 @@ describe Artii::Base do
     end
   end
 
-  # TODO - this is a pretty weak set of tests, but works for now since the list is a simple string.
-  describe "available font list" do
-    it "should list all fonts if passed -l" do
-      a = Artii::Base.new '-l'
-      a.output.should_not be_empty
-      a.output.should include 'big'
-      a.output.should include 'chunky'
-      a.output.should include 'slant'
-      a.output.should include 'helv'
-    end
-
-    it "should list all fonts if passed --list" do
-      a = Artii::Base.new '--list'
-      a.output.should_not be_empty
-      a.output.should include 'big'
-      a.output.should include 'chunky'
-      a.output.should include 'slant'
-      a.output.should include 'helv'
-    end
-  end
-
   describe "#asciify" do
     it "should produce an output" do
-      a = Artii::Base.new 'hello world'
-      a.output.should_not be_empty
+      a = Artii::Base.new
+      a.asciify('hello world').should_not be_empty
     end
   end
-end
+end

data/spec/artii/cli_spec.rb

@@ -0,0 +1,80 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Artii::CLI do
+  describe '#new' do
+
+    it "should create a new instance" do
+      a = Artii::CLI.new ''
+      a.should be_an_instance_of Artii::CLI
+    end
+  end
+
+    it "font_name should default to 'big.flf'" do
+      a = Artii::CLI.new 'test'
+      a.font_name.should == 'big.flf'
+    end
+
+  describe "font switching" do
+    context 'should set font if passed -f ' do
+      it "should set @a.font_name" do
+        a = Artii::CLI.new 'test', '-f', 'chunky'
+        a.instance_variable_get(:@a).font_name.should == 'chunky.flf'
+      end
+
+      xit "should accept non-flf file formats" do
+        a = Artii::CLI.new 'test', '-f', 'frango'
+        a.font_name.should == 'frango.flc'
+      end
+
+      it "should accept fonts in nested directories" do
+        a = Artii::CLI.new 'test', '-f', 'cour'
+        a.font_name.should == 'bdffonts/cour.flf'
+      end
+    end
+
+    context 'should set font if passed --font' do
+      it "set @a.font_name" do
+        a = Artii::CLI.new 'test', '--font', 'chunky'
+        a.instance_variable_get(:@a).font_name.should == 'chunky.flf'
+      end
+
+      it "should accept fonts in nested directories" do
+        a = Artii::CLI.new 'test', '--f', 'cour'
+        a.font_name.should == 'bdffonts/cour.flf'
+      end
+
+      xit "should accept non-flf file formats" do
+        a = Artii::CLI.new 'test', '--font', 'frango'
+        a.font_name.should == 'frango.flc'
+      end
+    end
+  end
+
+  # TODO - this is a pretty weak set of tests, but works for now since the list is a simple string.
+  describe "available font list" do
+    it "should list all fonts if passed -l" do
+      a = Artii::CLI.new '-l'
+      a.output.should_not be_empty
+      a.output.should include 'big'
+      a.output.should include 'chunky'
+      a.output.should include 'slant'
+      a.output.should include 'helv'
+    end
+
+    it "should list all fonts if passed --list" do
+      a = Artii::CLI.new '--list'
+      a.output.should_not be_empty
+      a.output.should include 'big'
+      a.output.should include 'chunky'
+      a.output.should include 'slant'
+      a.output.should include 'helv'
+    end
+  end
+
+  describe "#asciify" do
+    it "should produce an output" do
+      a = Artii::CLI.new 'hello world'
+      a.output.should_not be_empty
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artii
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: artii
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70246026050280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +37,79 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70246026050280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70246026049800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70246026049800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70246026049320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +117,15 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70246026049320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70246026048800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70246026048800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Figlet-based ASCII art generator, useful for comand-line based ASCII
   Art Generation.
 email: mike@panpainter.com
@@ -76,6 +160,7 @@ files:
 - bin/artii
 - lib/artii.rb
 - lib/artii/base.rb
+- lib/artii/cli.rb
 - lib/artii/figlet.rb
 - lib/figlet/font.rb
 - lib/figlet/fonts/3-d.flf
@@ -744,6 +829,7 @@ files:
 - lib/figlet/smusher.rb
 - lib/figlet/typesetter.rb
 - spec/artii/base_spec.rb
+- spec/artii/cli_spec.rb
 - spec/artii_spec.rb
 - spec/data/big.flf
 - spec/data/big.txt
@@ -767,7 +853,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2121241110675444317
+      hash: -43648723671751029
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -776,7 +862,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A little Figlet-based ASCII art generator.