hieroglyph 0.1.3 → 0.1.4

data/Gemfile

@@ -3,6 +3,7 @@ source :rubygems
 gemspec
 gem 'savage'
 gem 'nokogiri'
+gem 'escape'
 
 group :test do
   gem 'rake'

data/README.md

@@ -1,4 +1,4 @@
-# Hieroglyph 0.1.3
+# Hieroglyph 0.1.4
 
 Icon fonts are a great way to add sharp, flexible icons to your website using @font-face. [Chris Coyier thinks they're a good idea](http://css-tricks.com/using-fonts-for-icons/), and you should too.
 
@@ -78,7 +78,7 @@ If you want to help out, great! As an inexperienced dev, I'd appreciate any help
 
     bundle install
     rake install
-    rake test
+    bundle exec rake
 
 ## Thanks
 
@@ -87,3 +87,20 @@ If you want to help out, great! As an inexperienced dev, I'd appreciate any help
 - [Jeremy Holland](http://www.jeremypholland.com/), for the [Savage SVG parsing gem.](https://github.com/awebneck/savage)
 - [Inkscape contributors](https://launchpad.net/inkscape/+topcontributors), who provided the original SVG font tool I used a lot on this project.
 - [P.J. Onori](http://somerandomdude.com/work/iconic/) for creating the open source Iconic icons, which I use as example icons.
+
+## Version notes
+
+**0.1.4**<br>
+Output is less verbose, more colorful
+
+**0.1.3**<br>
+Fix applied for older versions of ruby
+
+**0.1.2**<br>
+Better logging, more characters supported
+
+**0.1.1**<br>
+Officially a ruby gem, character sheet added
+
+**0.1**<br>
+Just a .rb script for converting simple SVGs to a font

data/lib/hieroglyph/character_sheet.rb

@@ -26,7 +26,6 @@ module Hieroglyph
     end
 
     def save
-      Hieroglyph.header 'Character sheet generated'
       cmd = ['montage']
       @@montage_args['title'] = @options[:name]
       @@montage_args.each do |arg, value|
@@ -39,7 +38,7 @@ module Hieroglyph
       cmd.push @output_path
       cmd = Escape.shell_command(cmd)
       system(cmd)
-      Hieroglyph.log "Saved to #{File.expand_path(@options[:output_folder])}/#{@options[:name]}_characters.svg"
+      Hieroglyph.success "Character sheet saved: #{File.expand_path(@options[:output_folder])}/#{@options[:name]}_characters.svg"
     end
   end
 

data/lib/hieroglyph/command_line.rb

@@ -21,16 +21,13 @@ Options:
       parse_options
       if @execute
         font = Hieroglyph.make @options
-        Hieroglyph.header "#{@options[:name]} generated"
-        Hieroglyph.log "Saved to #{File.expand_path(@options[:output_folder])}/#{@options[:name]}.svg"
-        Hieroglyph.log "To create a full set of webfonts, upload to:"
-        Hieroglyph.log "http://www.fontsquirrel.com/fontface/generator"
-        Hieroglyph.log
-        Hieroglyph.log "If you're having trouble uploading SVGs, try converting to a TTF first using http://www.freefontconverter.com"
-        Hieroglyph.log
+        Hieroglyph.success "#{@options[:name]} generated saved to #{File.expand_path(@options[:output_folder])}/#{@options[:name]}.svg"
         Hieroglyph.log "Single characters: #{font.characters.join(',')}"
         Hieroglyph.log "Unicode characters: #{font.unicode_values.join(',')}"
         Hieroglyph.log
+        Hieroglyph.log "To create a full set of webfonts, upload to http://www.fontsquirrel.com/fontface/generator"
+        Hieroglyph.log "If you're having trouble uploading SVGs, try converting to a TTF first using http://www.freefontconverter.com"
+        Hieroglyph.log
       end
     end
 

data/lib/hieroglyph/font.rb

@@ -21,7 +21,7 @@ module Hieroglyph
     end
 
     def setup
-      Hieroglyph.header "Generating #{@options[:name]}"
+      Hieroglyph.header 'Setup:'
       Hieroglyph.delete @output_path
       @character_sheet = Hieroglyph.imagemagick_installed? ? CharacterSheet.new(@options) : NoopSheet.new
       include 'header'
@@ -38,6 +38,7 @@ module Hieroglyph
         file.puts @contents
         file.close
       end
+      Hieroglyph.header 'Done!'
       @character_sheet.save
     end
 
@@ -46,7 +47,7 @@ module Hieroglyph
     end
 
     def add_glyphs
-      Hieroglyph.log
+      Hieroglyph.header 'Reading glyphs:'
       Dir.glob(File.join(@options[:glyph_folder], '*.svg')).each do |file|
         glyph = Glyph.new(file, @options[:glyph_folder], self)
         @character_sheet.add file

data/lib/hieroglyph/glyph.rb

@@ -27,7 +27,7 @@ module Hieroglyph
       @font = font
       set_name(file, source)
       @contents = Nokogiri::XML(File.new(file))
-      Hieroglyph.log "#{@name} -> reading...", 4
+      Hieroglyph.log "Parsing #{@name}", 2
       @path = parse_shapes
     end
 
@@ -72,19 +72,18 @@ module Hieroglyph
     end
 
     def convert_path(type, content)
-      Hieroglyph.log 'path found', 9
       path = Savage::Parser.parse(content['d'])
       flip(path)
     end
 
     def report_invalid(type, content)
-      Hieroglyph.log "#{type} found - this shape is invalid!", 9
-      Hieroglyph.log "'make compound path' in your vector tool to fix", 9
+      Hieroglyph.error "#{type} found - this shape is invalid!", 4
+      Hieroglyph.error "'make compound path' in your vector tool to fix", 4
     end
 
     def report_too_many
       unless @too_many
-        Hieroglyph.log 'too many shapes! your icon might look weird as a result', 9
+        Hieroglyph.error 'too many shapes! your icon might look weird as a result', 4
         @too_many = true
       end
     end

data/lib/hieroglyph/noop_sheet.rb

@@ -2,7 +2,7 @@ module Hieroglyph
 
   class NoopSheet
     def initialize(*)
-      Hieroglyph.log "ImageMagick not detected - skipping character sheet"
+      Hieroglyph.error "ImageMagick not detected - skipping character sheet"
     end
     def add(file)
     end

data/lib/hieroglyph/version.rb

@@ -1,3 +1,3 @@
 module Hieroglyph
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/hieroglyph.rb

@@ -6,10 +6,25 @@ module Hieroglyph
     puts str.rjust(str.length + pad)
   end
 
+  def self.colorize(str, color_code, pad)
+    Hieroglyph.log("\e[#{color_code}m#{str}\e[0m", pad)
+  end
+
   def self.header(str)
-    puts ""
-    puts "=== #{str} ==="
-    puts ""
+    Hieroglyph.log
+    Hieroglyph.log("\033[1m#{str}\e[22m", 0)
+  end
+
+  def self.status(str, pad=2)
+    colorize(str, 33, pad)
+  end
+
+  def self.error(str, pad=2)
+    colorize(str, 31, pad)
+  end
+
+  def self.success(str, pad=2)
+    colorize(str, 32, pad)
   end
 
   def self.make(options)
@@ -23,7 +38,7 @@ module Hieroglyph
   def self.delete(file)
     if File.exist? file
       trimmed_file = file.gsub(/\.\//, '')
-      Hieroglyph.log "#{trimmed_file} exists, deleting"
+      Hieroglyph.status "#{trimmed_file} exists, deleting"
       File.delete file
     end
   end

data/spec/lib/hieroglyph/character_sheet_spec.rb

@@ -7,8 +7,6 @@ describe Hieroglyph::CharacterSheet do
       module Hieroglyph
         def self.log(*)
         end
-        def self.header(*)
-        end
       end
       File.delete('/tmp/sheet_characters.png') if File.exists?('/tmp/sheet_characters.png')
       @character_sheet = Hieroglyph::CharacterSheet.new({:output_folder => '/tmp', :name => 'sheet'})

data/spec/lib/hieroglyph/font_spec.rb

@@ -8,8 +8,6 @@ describe Hieroglyph::Font do
       module Hieroglyph
         def self.log(*)
         end
-        def self.header(*)
-        end
       end
 
       system('rm -rf /tmp/glyphs/')

data/spec/lib/hieroglyph/glyph_spec.rb

@@ -7,8 +7,6 @@ describe Hieroglyph::Glyph do
       module Hieroglyph
         def self.log(*)
         end
-        def self.header(*)
-        end
       end
       system('rm -rf /tmp/glyphs/')
       system('mkdir /tmp/glyphs/')

data/spec/lib/hieroglyph/noop_sheet_spec.rb

@@ -7,8 +7,6 @@ describe Hieroglyph::NoopSheet do
       module Hieroglyph
         def log(*)
         end
-        def self.header(*)
-        end
       end
       @character_sheet = Hieroglyph::NoopSheet.new({:output_folder => '/tmp', :name => 'sheet'})
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hieroglyph
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70339388858920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70339388858920
 - !ruby/object:Gem::Dependency
   name: savage
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70339388858400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70339388858400
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70339388857840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,12 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70339388857840
 description: Generate a web-ready SVG font from a directory of SVG icons
 email:
 - dougunderscorenelson@gmail.com
@@ -120,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Icon font creator