fontcustom 1.1.1 → 1.2.0

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq fontforge
+  - wget http://people.mozilla.com/~jkew/woff/woff-code-latest.zip
+  - unzip woff-code-latest.zip -d sfnt2woff && cd sfnt2woff && make && sudo mv sfnt2woff /usr/local/bin/
+  - bundle
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - 1.9.2
+script: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.2.0 (11/2/2013)
+
+* Preparation for fixed glyph code points.
+  * Tweaks command line options (more semantic aliases)
+  * Renames :data_cache to :manifest
+* Sets the stage for a more streamlined, predictable workflow
+  * Drops EPS support (was buggy and unused)
+  * Turns glyph width adjustment into an option (off by default) ([#137](https://github.com/FontCustom/fontcustom/pull/137))
+* Relaxes all dependency version requirements ([#127](https://github.com/FontCustom/fontcustom/issues/127))
+
 ## 1.1.1 (10/16/2013)
 
 * Preview characters are turned off by default in the preview template.

data/CONTRIBUTING.md

@@ -1,14 +1,27 @@
-# Contributor Guidelines
+## Help make Font Custom better!
 
-Thanks for helping make Font Custom better. This project was born out of an overheard conversation between two devs in a NYC coffee shop — it's come a long ways thanks to the support of folks like you.
+This project was born out of an overheard conversation between two devs in a
+NYC coffee shop — it's come a long ways thanks to your support.
 
-## Conventions
+### Wishlist / Roadmap
 
-We try to follow the [Github ruby styleguide](https://github.com/styleguide/ruby) as much as possible. 
+* Ruby on Rails integration
+* Compass integration
+* Base 64 encode fonts into CSS
+* Templates for LESS, stylus, etc.
+* Ligature support
+* Windows support
+* Make better use of Thor
 
-If you catch a typo or a particularly unsightly piece of code — please _do_ let us know. No such thing as too small of an improvement.
+### Conventions
 
-## Process
+We try to follow the [Github ruby styleguide](https://github.com/styleguide/ruby) 
+as much as possible. 
+
+If you catch a typo or a block of code that could be more elegant — please let
+us know. No such thing as too small of an improvement.
+
+### Process
 
 * Visit [issues](https://github.com/FontCustom/fontcustom/issues) for ideas.
 * Fork the repo.

data/README.md

@@ -1,53 +1,76 @@
-# FontCustom v1.1.0
+[![Gem Version](https://badge.fury.io/rb/fontcustom.png)](http://badge.fury.io/rb/fontcustom)
+[![Build Status](https://api.travis-ci.org/FontCustom/fontcustom.png)](https://travis-ci.org/FontCustom/fontcustom)
+[![Code Quality](https://codeclimate.com/github/FontCustom/fontcustom.png)](https://codeclimate.com/github/FontCustom/fontcustom)
 
-**Generate icon webfonts from the comfort of the command line.**
+## Font Custom
 
-[Full documentation](http://fontcustom.com)<br/>
+**Icon fonts from the command line.**
+
+Generate cross-browser compatible icon fonts and supporting files (e.g.
+@font-face CSS) from a collection of SVGs.
+
+[Documentation](http://fontcustom.com)<br/>
 [Changelog](https://github.com/FontCustom/fontcustom/blob/master/CHANGELOG.md)<br/>
-[Feedback and issues](https://github.com/FontCustom/fontcustom/issues)
+[Support](https://github.com/FontCustom/fontcustom/issues)<br/>
+[Contribute!](https://github.com/FontCustom/fontcustom/blob/master/CONTRIBUTING.md)
+
+### Installation
 
-## Installation
+Requires **Ruby 1.9.2+**, **FontForge** with Python scripting.
 
 ```sh
-# Requires FontForge
+# On Mac
 brew install fontforge eot-utils ttfautohint
 gem install fontcustom
+
+# On Linux
+sudo apt-get install fontforge ttfautohint
+wget http://people.mozilla.com/~jkew/woff/woff-code-latest.zip
+unzip woff-code-latest.zip -d sfnt2woff && cd sfnt2woff && make && sudo mv sfnt2woff /usr/local/bin/
+gem install fontcustom
 ```
 
-## Quick Start
+### Quick Start
 
 ```sh
 fontcustom compile path/to/vectors  # Compiles icons into `fontcustom/`
 fontcustom watch path/to/vectors    # Compiles when vectors are changed/added/removed
 
 fontcustom compile                  # Uses configuration options from `fontcustom.yml`
-fontcustom watch                    # or `config/fontcustom.yml`
+fontcustom watch
 
+fontcustom config                   # Generate a blank a configuration file
 fontcustom help                     # See all options
 ```
 
-## Configuration
+### Configuration
 
-To avoid finger-fatigue, create a configuration file with `fontcustom config`. Typically, this should live in the directory where you plan on running `fontcustom` commands.
+To preserve options between compiles, create a configuration file with
+`fontcustom config`. This should live in the directory where you plan on
+running `fontcustom` commands.
 
 ```yml
-# Available Options (defaults shown)
-font_name: fontcustom                 # Names the font (also sets name and directory of generated files)
-project_root: (working dir)           # Context for all relative paths
+# General Options (defaults shown)
+font_name: fontcustom                 # Names the font and sets the name and directory
+                                      # of generated files
+project_root: (pwd)                   # Context for all relative paths
 input: (project_root)                 # Where vectors and templates are located
 output: (project_root)/(font name)    # Where generated files will be saved
-no_hash: false                        # Remove asset-busting hashes from generated files
+config: (pwd)/fontcustom.yml          # Optional path to a configuration file
+templates: [ css, preview ]           # Templates to generate alongside fonts
+                                      # Possible values: preview, css, scss,
+                                      # scss-rails, bootstrap, bootstrap-scss,
+                                      # bootstrap-ie7, bootstrap-ie7-scss
 css_prefix: icon-                     # CSS class prefix
+no_hash: false                        # Don't add asset-busting hashes
 preprocessor_path: ""                 # Font path used in CSS proprocessor templates
-data_cache: (same as fontcustom.yml)  # Sets location of data file
+autowidth: false                      # Automatically size glyphs based on the width of
+                                      # their individual vectors
 debug: false                          # Output raw messages from fontforge
 quiet: false                          # Silence all output messages
-templates: [ css, preview ]           # Templates to generate alongside fonts
-                                      # Possible values: preview, css, scss, scss-rails, bootstrap, 
-                                      # bootstrap-scss, bootstrap-ie7, bootstrap-ie7-scss
 
-# Advanced input/output
-#   Set input or output as a hash for more control
+# For more control over file locations,
+# set input and output as Yaml hashes
 input:
   vectors: path/to/vectors            # required
   templates: path/to/templates
@@ -56,12 +79,24 @@ output:
   fonts: app/assets/fonts             # required
   css: app/assets/stylesheets
   preview: app/views/styleguide
-  custom-template.yml: custom/path    # set paths of custom templates by referencing their file name
+  custom-template.yml: custom/path
 ```
 
+### SVG Recommendations
+
+All vectors are imported as a single layer with colors and strokes ignored. If
+you run into trouble, try combining your paths and ensuring that you don't have
+any white fills (which show up as colored).
+
+By default, Font Custom scales each vector to fit a 512x512 canvas with a
+baseline at 448. In practice, that means as long as your SVG `viewBox` is
+square, icons will look exactly like your SVGs.
+
+If you set the `autowidth` option, Font Custom will trim the widths of each
+glyph to the vector width. Heights are unaffected.
+
 ---
 
-[Contributor Guidelines](https://github.com/FontCustom/fontcustom/blob/master/CONTRIBUTING.md)<br/>
 [Licenses](https://github.com/FontCustom/fontcustom/blob/master/LICENSES.txt)
 
 Brought to you by [@endtwist](https://github.com/endtwist) and [@ezYZ](https://github.com/ezYZ)

data/fontcustom.gemspec

@@ -8,19 +8,19 @@ Gem::Specification.new do |gem|
   gem.version       = Fontcustom::VERSION
   gem.authors       = ["Kai Zau", "Joshua Gross"]
   gem.email         = ["kai@kaizau.com", "joshua@gross.is"]
-  gem.summary       = "Generate icon webfonts from the comfort of the command line."
-  gem.description   = "Transforms EPS and SVG vectors into icon webfonts. Generates CSS or other template files for your projects."
+  gem.summary       = "Generate icon fonts from the command line."
+  gem.description   = "Font Custom makes using vector icons easy. Generate icon fonts and supporting templates (e.g. @font-face CSS) from a collection of SVGs."
   gem.homepage      = "http://fontcustom.com"
-  gem.post_install_message = "  >> Thanks for installing Font Custom! Please ensure that fontforge is installed before compiling any icons."
+  gem.post_install_message = ">> Thanks for installing Font Custom! Please ensure that fontforge is installed before compiling any icons. Visit <http://fontcustom.com> for instructions."
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "json", "~>1.7"
-  gem.add_dependency "thor", "~>0.18.1"
-  gem.add_dependency "listen", "~>1.3.1"
+  gem.add_dependency "json", "~>1.4"
+  gem.add_dependency "thor", "~>0.14"
+  gem.add_dependency "listen", "~>1.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "bundler"

data/lib/fontcustom.rb

@@ -29,7 +29,7 @@ module Fontcustom
     :output => "PROJECT_ROOT/FONT_NAME",
     :config => "PROJECT_ROOT/fontcustom.yml OR PROJECT_ROOT/config/fontcustom.yml",
     :templates => "css preview",
-    :data_cache => "CONFIG_DIR/.fontcustom-data OR at PROJECT_ROOT/.fontcustom-data"
+    :manifest => "CONFIG_DIR/.fontcustom-manifest.json OR PROJECT_ROOT/.fontcustom-manifest.json"
   }
 
   DEFAULT_OPTIONS = {
@@ -40,8 +40,9 @@ module Fontcustom
     :templates => %w|css preview|,
     :font_name => "fontcustom",
     :css_prefix => "icon-",
-    :data_cache => nil,
+    :manifest => nil,
     :preprocessor_path => nil,
+    :autowidth => false,
     :no_hash => false,
     :debug => false,
     :quiet => false

data/lib/fontcustom/cli.rb

@@ -34,17 +34,20 @@ module Fontcustom
       :desc => "Prefix for each glyph's CSS class.",
       :default => DEFAULT_OPTIONS[:css_prefix]
 
-    class_option :data_cache, :aliases => "-d", :type => :string,
+    class_option :manifest, :aliases => "-m", :type => :string,
       :desc => "Path to a manifest of generated files. Used for garbage collection.",
-      :default => EXAMPLE_OPTIONS[:data_cache]
+      :default => EXAMPLE_OPTIONS[:manifest]
 
-    class_option :preprocessor_path, :aliases => "-s", :type => :string,
+    class_option :preprocessor_path, :aliases => "-p", :type => :string,
       :desc => "Optional font path for CSS proprocessor templates."
 
-    class_option :no_hash, :aliases => "-h", :type => :boolean,
+    class_option :autowidth, :aliases => "-a", :type => :boolean,
+      :desc => "Auto-size glyphs to their individual vector widths."
+
+    class_option :no_hash, :aliases => "-n", :type => :boolean,
       :desc => "Generate fonts without asset-busting hashes."
 
-    class_option :debug, :aliases => "-g", :type => :boolean,
+    class_option :debug, :aliases => "-d", :type => :boolean,
       :desc => "Display debugging messages."
 
     class_option :quiet, :aliases => "-q", :type => :boolean,

data/lib/fontcustom/generator/font.rb

@@ -23,14 +23,14 @@ module Fontcustom
         end
       end
 
-      def get_data
-        if File.exists? opts.data_cache
+      def get_manifest
+        if File.exists? opts.manifest
           begin
-            data = File.read opts.data_cache
+            data = File.read opts.manifest
             data = JSON.parse(data, :symbolize_names => true) unless data.empty?
             @data = data.is_a?(Hash) ? symbolize_hash(data) : Fontcustom::DATA_MODEL.dup
           rescue
-            raise Fontcustom::Error, "Couldn't parse `#{relative_to_root(opts.data_cache)}`. Delete it to start from scratch. Any previously generated files will need to be deleted manually."
+            raise Fontcustom::Error, "Couldn't parse `#{relative_to_root(opts.manifest)}`. Delete it to start from scratch. Any previously generated files will need to be deleted manually."
           end
         else
           @data = Fontcustom::DATA_MODEL.dup
@@ -48,13 +48,14 @@ module Fontcustom
         ensure
           @data[:fonts] = @data[:fonts] - deleted
           json = JSON.pretty_generate @data
-          overwrite_file opts.data_cache, json
+          overwrite_file opts.manifest, json
           say_changed :delete, deleted
         end
       end
 
       def generate
-        cmd = "fontforge -script #{Fontcustom.gem_lib}/scripts/generate.py #{opts.input[:vectors]} #{opts.output[:fonts]} --name #{opts.font_name}" 
+        cmd = "fontforge -script #{Fontcustom.gem_lib}/scripts/generate.py #{opts.input[:vectors]} #{opts.output[:fonts]} --name #{opts.font_name}"
+        cmd += " --autowidth" if opts.autowidth
         cmd += " --nohash" if opts.no_hash
         cmd += " --debug" if opts.debug
         output, err, status = execute_and_clean(cmd)
@@ -76,12 +77,12 @@ module Fontcustom
 
       def save_data
         json = JSON.pretty_generate @data
-        overwrite_file opts.data_cache, json
+        overwrite_file opts.manifest, json
       end
 
       private
 
-      def execute_and_clean cmd
+      def execute_and_clean(cmd)
         stdout, stderr, status = Open3::capture3(cmd)
         stdout = stdout.split("\n")
         stdout = stdout[1..-1] if stdout[0] == "CreateAllPyModules()"

data/lib/fontcustom/generator/template.rb

@@ -19,14 +19,14 @@ module Fontcustom
         File.join Fontcustom.gem_lib, "templates"
       end
 
-      def get_data
-        if File.exists? opts.data_cache
-          @data = JSON.parse File.read(opts.data_cache), :symbolize_names => true
+      def get_manifest
+        if File.exists? opts.manifest
+          @data = JSON.parse File.read(opts.manifest), :symbolize_names => true
         else
-          raise Fontcustom::Error, "`#{relative_to_root(opts.data_cache)}` is missing. This file is required to generate templates."
+          raise Fontcustom::Error, "`#{relative_to_root(opts.manifest)}` is missing. This file is required to generate templates."
         end
       rescue
-        raise Fontcustom::Error, "Couldn't parse `#{relative_to_root(opts.data_cache)}`. Delete it to start from scratch. Any previously generated files will need to be deleted manually."
+        raise Fontcustom::Error, "Couldn't parse `#{relative_to_root(opts.manifest)}`. Delete it to start from scratch. Any previously generated files will need to be deleted manually."
       end
 
       def reset_output
@@ -40,7 +40,7 @@ module Fontcustom
         ensure
           @data[:templates] = @data[:templates] - deleted
           json = JSON.pretty_generate @data
-          overwrite_file opts.data_cache, json
+          overwrite_file opts.manifest, json
           say_changed :delete, deleted
         end
       end
@@ -88,7 +88,7 @@ module Fontcustom
           say_changed :create, created
           @data[:templates] = (@data[:templates] + created).uniq
           json = JSON.pretty_generate @data
-          overwrite_file opts.data_cache, json
+          overwrite_file opts.manifest, json
         end
       end
     end

data/lib/fontcustom/options.rb

@@ -8,7 +8,7 @@ module Fontcustom
   class Options
     include Util
 
-    attr_reader :project_root, :input, :output, :config, :templates, :font_name, :css_prefix, :data_cache, :preprocessor_path, :no_hash, :debug, :quiet, :skip_first 
+    attr_reader :project_root, :input, :output, :config, :templates, :font_name, :css_prefix, :manifest, :preprocessor_path, :autowidth, :no_hash, :debug, :quiet, :skip_first
 
     def initialize(options = {})
       check_fontforge
@@ -91,23 +91,23 @@ module Fontcustom
       options = DEFAULT_OPTIONS.dup
       options = options.merge @config_options
       options = options.merge symbolize_hash(@cli_options)
-      remove_instance_variable :@config_options
-      remove_instance_variable :@cli_options
+      send :remove_instance_variable, :@config_options
+      send :remove_instance_variable, :@cli_options
 
       # :config is excluded since it's already been set
-      keys = %w|project_root input output data_cache templates font_name css_prefix preprocessor_path skip_first no_hash debug quiet|
+      keys = %w|project_root input output manifest templates font_name css_prefix preprocessor_path skip_first autowidth no_hash debug quiet|
       keys.each { |key| instance_variable_set("@#{key}", options[key.to_sym]) }
 
       @font_name = @font_name.strip.gsub(/\W/, "-")
     end
 
     def set_data_path
-      @data_cache = if ! @data_cache.nil?
-        expand_path @data_cache
+      @manifest = if ! @manifest.nil?
+        expand_path @manifest
       elsif @config
-        File.join File.dirname(@config), ".fontcustom-data"
+        File.join File.dirname(@config), ".fontcustom-manifest.json"
       else
-        File.join @project_root, ".fontcustom-data"
+        File.join @project_root, ".fontcustom-manifest.json"
       end
     end
 
@@ -139,8 +139,8 @@ module Fontcustom
         @input = { :vectors => input, :templates => input }
       end
 
-      if Dir[File.join(@input[:vectors], "*.{svg,eps}")].empty?
-        raise Fontcustom::Error, "`#{relative_to_root(@input[:vectors])}` doesn't contain any vectors (*.svg or *.eps files)."
+      if Dir[File.join(@input[:vectors], "*.svg")].empty?
+        raise Fontcustom::Error, "`#{relative_to_root(@input[:vectors])}` doesn't contain any SVGs."
       end
     end
 

data/lib/fontcustom/scripts/generate.py

@@ -10,6 +10,7 @@ try:
 	parser = argparse.ArgumentParser(description='Convert a directory of svg and eps files into a unified font file.')
 	parser.add_argument('dir', metavar='directory', type=unicode, nargs=2, help='directory of vector files')
 	parser.add_argument('--name', metavar='fontname', type=unicode, nargs='?', help='reference name of the font (no spaces)')
+	parser.add_argument('--autowidth', '-a', action='store_true', help='automatically size generated glyphs to their vector width')
 	parser.add_argument('--nohash', '-n', action='store_true', help='disable hash fingerprinting of font files')
 	parser.add_argument('--debug', '-d', action='store_true', help='display debug messages')
 	args = parser.parse_args()
@@ -20,6 +21,7 @@ except ImportError:
 	import optparse
 	parser = optparse.OptionParser(description='Convert a directory of svg and eps files into a unified font file.')
 	parser.add_option('--name', metavar='fontname', type='string', nargs='?', help='reference name of the font (no spaces)')
+	parser.add_option('--autowidth', '-a', action='store_true', help='automatically size generated glyphs to their vector width')
 	parser.add_option('--nohash', '-n', action='store_true', help='disable hash fingerprinting of font files')
 	parser.add_argument('--debug', '-d', action='store_true', help='display debug messages')
 	(args, posargs) = parser.parse_args()
@@ -56,7 +58,7 @@ for dirname, dirnames, filenames in os.walk(indir):
 				# replace the <switch> </switch> tags with 'nothing'
 				svgtext = svgtext.replace('<switch>', '')
 				svgtext = svgtext.replace('</switch>', '')
-			
+
 				tmpsvgfile.file.write(svgtext)
 
 				svgfile.close()
@@ -64,7 +66,7 @@ for dirname, dirnames, filenames in os.walk(indir):
 
 				filePath = tmpsvgfile.name
 				# end hack
-				
+
 			m.update(filename + str(size) + ';')
 			glyph = f.createChar(cp)
 			glyph.importOutlines(filePath)
@@ -75,18 +77,25 @@ for dirname, dirnames, filenames in os.walk(indir):
 
 			# glyph.left_side_bearing = KERNING
 			# glyph.right_side_bearing = KERNING
-			#glyph.width = 512
 
 			# possible optimization?
 			# glyph.simplify()
 			# glyph.round()
-			glyph.left_side_bearing = glyph.right_side_bearing = 0
-			glyph.round()
+
+			# set glyph size explicitly or automatically depending on autowidth
+			if args.autowidth:
+				glyph.left_side_bearing = glyph.right_side_bearing = 0
+				glyph.round()
+			else:
+				# force a manual size when autowidth is disabled
+				glyph.width = 512
 
 			files.append(name)
 			cp += 1
 
-		f.autoWidth(0, 0, 512)
+		# resize glyphs if autowidth is enabled
+		if args.autowidth:
+			f.autoWidth(0, 0, 512)
 
 if args.nohash:
 	fontfile = outdir + '/' + args.name

data/lib/fontcustom/templates/fontcustom.yml

@@ -1,44 +1,46 @@
-# ---------------------------------------------------------------------------- #
+# --------------------------------------------------------------------------- #
 # Project Info
 #   Default values shown. Learn more about these options by running
-#   `fontcustom help` or visit <http://fontcustom.com>.
-# ---------------------------------------------------------------------------- #
+#   `fontcustom help` or visiting <http://fontcustom.com>.
+# --------------------------------------------------------------------------- #
 
 #font_name: fontcustom
 #css_prefix: icon-
 #preprocessor_path: ""
+#autowidth: false
 #no_hash: false
 #debug: false
 #quiet: false
 
 
-# ---------------------------------------------------------------------------- #
+# --------------------------------------------------------------------------- #
 # Project Paths
-#   Relative paths are expanded from PROJECT_ROOT (default: working directory).
-#   INPUT and OUTPUT can be assigned as hashes instead of a strings.
-#   The OUPUT hash can route custom templates according to their filename.
-# ---------------------------------------------------------------------------- #
+#   Relative paths are expanded from PROJECT_ROOT (defaults to the directory
+#   where the fontcustom command is run). INPUT and OUTPUT can be strings or
+#   hashes or file types / names.
+# --------------------------------------------------------------------------- #
 
 #project_root: some/other/place
-#data_cache: tmp/fontcustom
+#manifest: tmp/fontcustom
 
 #input:
-#  vectors: app/assets/fonts/fontcustom/vectors
+#  vectors: app/assets/fonts/fontcustom/vectors         # required
 #  templates: app/assets/fonts/fontcustom/templates
 
 #output:
-#  fonts: app/assets/fonts
+#  fonts: app/assets/fonts                              # required
 #  css: app/assets/stylesheets
 #  preview: app/views/styleguide
 #  my-custom-template.yml: config
 
 
-# ---------------------------------------------------------------------------- #
+# --------------------------------------------------------------------------- #
 # Templates
 #   Included in Font Custom:
 #     preview, css, scss, scss-rails, bootstrap, bootstrap-scss, bootstrap-ie7,
 #     bootstrap-ie7-scss
-#   Custom templates should be saved in the INPUT[:templates] directory.
-# ---------------------------------------------------------------------------- #
+#   Custom templates should be saved in the INPUT[:templates] directory and
+#   referenced by their base file name.
+# --------------------------------------------------------------------------- #
 
 #templates: [ scss, preview, my-custom-template.yml ]

data/lib/fontcustom/version.rb

@@ -1,3 +1,3 @@
 module Fontcustom
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/fontcustom/generator/font_spec.rb

@@ -40,7 +40,7 @@ describe Fontcustom::Generator::Font do
     end
   end
 
-  context "#get_data" do
+  context "#get_manifest" do
     it "should assign empty data model if data file is empty or missing" do
       options = {
         :project_root => fixture,
@@ -48,7 +48,7 @@ describe Fontcustom::Generator::Font do
         :quiet => true
       }
       gen = generator options
-      gen.get_data
+      gen.get_manifest
       data = gen.instance_variable_get("@data")
       data.should == Fontcustom::DATA_MODEL
     end
@@ -62,7 +62,7 @@ describe Fontcustom::Generator::Font do
         :quiet => true
       }
       gen = generator options
-      gen.get_data
+      gen.get_manifest
       data = gen.instance_variable_get("@data")
       data.should_not == Fontcustom::DATA_MODEL
     end
@@ -71,13 +71,13 @@ describe Fontcustom::Generator::Font do
       options = {
         :project_root => fixture,
         :config => "generators",
-        :data_cache => "generators/.fontcustom-data-corrupted",
+        :manifest => "generators/.fontcustom-manifest-corrupted.json",
         :input => "shared/vectors",
         :output => "mixed-output",
         :quiet => true
       }
       gen = generator options
-      expect { gen.get_data }.to raise_error Fontcustom::Error, /corrupted/
+      expect { gen.get_manifest }.to raise_error Fontcustom::Error, /corrupted/
     end
   end
 
@@ -114,7 +114,7 @@ describe Fontcustom::Generator::Font do
     end
 
     it "should update the data file" do
-      file = fixture(".fontcustom-data")
+      file = fixture(".fontcustom-manifest.json")
       subject.should_receive(:overwrite_file).once.with(file, /"fonts":/)
       subject.reset_output
     end
@@ -219,7 +219,7 @@ describe Fontcustom::Generator::Font do
       )
       gen.stub :overwrite_file
       gen.instance_variable_set(:@data, data_file_contents)
-      file = File.join fixture(".fontcustom-data")
+      file = File.join fixture(".fontcustom-manifest.json")
       gen.should_receive(:overwrite_file).once.with do |path, content|
         path.should == file
         content.should match(/"fonts":/)

data/spec/fontcustom/generator/template_spec.rb

@@ -11,14 +11,14 @@ describe Fontcustom::Generator::Template do
     Fontcustom::Generator::Template.new([opts])
   end
 
-  context "#get_data" do
+  context "#get_manifest" do
     it "should raise error if data file doesn't exist" do
       gen = generator(
         :project_root => fixture,
         :input => "shared/vectors",
         :quiet => true
       )
-      expect { gen.get_data }.to raise_error Fontcustom::Error, /\.fontcustom-data/
+      expect { gen.get_manifest }.to raise_error Fontcustom::Error, /\.fontcustom-manifest\.json/
     end
 
     it "should assign @data from data file" do
@@ -27,7 +27,7 @@ describe Fontcustom::Generator::Template do
         :input => "../shared/vectors",
         :quiet => true
       )
-      gen.get_data
+      gen.get_manifest
       gen.instance_variable_get(:@data)[:templates].should =~ data_file_contents[:templates]
     end
   end
@@ -64,7 +64,7 @@ describe Fontcustom::Generator::Template do
     end
 
     it "should update the data file" do
-      file = fixture("generators/.fontcustom-data")
+      file = fixture("generators/.fontcustom-manifest.json")
       subject.should_receive(:overwrite_file).once.with(file, /"templates":/)
       subject.reset_output
     end
@@ -136,7 +136,7 @@ describe Fontcustom::Generator::Template do
     end
 
     it "should update data file with generated templates" do
-      file = fixture("generators/.fontcustom-data")
+      file = fixture("generators/.fontcustom-manifest.json")
       subject.should_receive(:overwrite_file).once.with do |path, content|
         path.should == file
         content.should match(/fontcustom\.css/)

data/spec/fontcustom/options_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe Fontcustom::Options do
@@ -125,7 +126,8 @@ describe Fontcustom::Options do
       o = options
       o.instance_variable_set :@config_options, {}
       o.send :merge_options
-      o.instance_variables.length.should == Fontcustom::DEFAULT_OPTIONS.length + 2 # @shell, @mock_proxy (rspec)
+      o.send :remove_instance_variable, :@mock_proxy if o.instance_variable_get(:@mock_proxy)
+      o.instance_variables.length.should == Fontcustom::DEFAULT_OPTIONS.length + 1 # @shell
     end
 
     it "should overwrite defaults with config file" do
@@ -154,24 +156,24 @@ describe Fontcustom::Options do
   end
 
   context ".set_data_path" do
-    it "should set :data_cache in the config dir by default" do
+    it "should set :manifest in the config dir by default" do
       silent
       o = options
       o.instance_variable_set :@config, "path/to/config/fontcustom.yml"
-      o.instance_variable_set :@data_cache, nil
-      o.remove_instance_variable :@cli_options
+      o.instance_variable_set :@manifest, nil
+      o.send :remove_instance_variable, :@cli_options
       o.send :set_data_path
-      o.instance_variable_get(:@data_cache).should == "path/to/config/.fontcustom-data"
+      o.instance_variable_get(:@manifest).should == "path/to/config/.fontcustom-manifest.json"
     end
   end
 
   context "#send :set_input_paths" do
-    it "should raise error if input[:vectors] doesn't contain vectors" do
+    it "should raise error if input[:vectors] doesn't contain SVGs" do
       o = options
       o.instance_variable_set :@project_root, fixture
       o.instance_variable_set :@input, "shared/vectors-empty"
-      o.remove_instance_variable :@cli_options
-      expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /doesn't contain any vectors/
+      o.send :remove_instance_variable, :@cli_options
+      expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /doesn't contain any SVGs/
     end
 
     context "when @input is a hash" do
@@ -180,7 +182,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, hash
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         o.send :set_input_paths
         input = o.instance_variable_get :@input
         input[:templates].should == fixture("shared/vectors")
@@ -191,7 +193,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, hash
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         o.send :set_input_paths
         input = o.instance_variable_get :@input
         input[:templates].should == fixture("shared/templates")
@@ -202,7 +204,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, hash
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /contain a :vectors key/
       end
 
@@ -211,7 +213,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, hash
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /should be a directory/
       end
     end
@@ -221,7 +223,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, "shared/vectors"
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         o.send :set_input_paths
         input = o.instance_variable_get :@input
         input.should have_key(:vectors)
@@ -232,7 +234,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, "shared/vectors"
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         o.send :set_input_paths
         input = o.instance_variable_get :@input
         input[:templates].should == fixture("shared/vectors")
@@ -242,7 +244,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, "shared/not-a-dir"
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /should be a directory/
       end
     end
@@ -256,7 +258,7 @@ describe Fontcustom::Options do
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@font_name, "Test-Font"
         o.instance_variable_set :@output, nil
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
         output[:fonts].should == fixture("Test-Font")
@@ -267,7 +269,7 @@ describe Fontcustom::Options do
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@font_name, "Test-Font"
         o.instance_variable_set :@output, nil
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         stdout = capture(:stdout) { o.send :set_output_paths }
         stdout.should match("Test-Font")
       end
@@ -279,7 +281,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, hash
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
         output[:css].should == fixture("output/fonts")
@@ -295,7 +297,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, hash
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
         output[:css].should == fixture("output/styles")
@@ -310,7 +312,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, hash
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
         output[:"special.js"].should == fixture("assets/javascripts")
@@ -321,7 +323,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, hash
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         expect { o.send :set_output_paths }.to raise_error Fontcustom::Error, /contain a :fonts key/
       end
     end
@@ -331,7 +333,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, "output/fonts"
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
         output.should be_a(Hash)
@@ -344,7 +346,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, "output/fonts"
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
         output[:css].should == fixture("output/fonts")
@@ -355,7 +357,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, "shared/not-a-dir"
-        o.remove_instance_variable :@cli_options
+        o.send :remove_instance_variable, :@cli_options
         expect { o.send :set_output_paths }.to raise_error Fontcustom::Error, /directory, not a file/
       end
     end
@@ -367,7 +369,7 @@ describe Fontcustom::Options do
       o.instance_variable_set :@project_root, fixture
       o.instance_variable_set :@input, { :templates => "shared/templates" }
       o.instance_variable_set :@templates, %w|preview css scss bootstrap bootstrap-scss bootstrap-ie7 bootstrap-ie7-scss|
-      o.remove_instance_variable :@cli_options
+      o.send :remove_instance_variable, :@cli_options
       o.send :set_template_paths
       templates = o.instance_variable_get :@templates
       templates.should =~ [
@@ -386,7 +388,7 @@ describe Fontcustom::Options do
       o.instance_variable_set :@project_root, fixture
       o.instance_variable_set :@input, { :templates => fixture("shared/templates") }
       o.instance_variable_set :@templates, %w|custom.css|
-      o.remove_instance_variable :@cli_options
+      o.send :remove_instance_variable, :@cli_options
       o.send :set_template_paths
       templates = o.instance_variable_get :@templates
       templates.should =~ [fixture("shared/templates/custom.css")]
@@ -397,7 +399,7 @@ describe Fontcustom::Options do
       o.instance_variable_set :@project_root, fixture
       o.instance_variable_set :@input, { :templates => "shared/templates" }
       o.instance_variable_set :@templates, %w|fake-template.txt|
-      o.remove_instance_variable :@cli_options
+      o.send :remove_instance_variable, :@cli_options
       expect { o.send :set_template_paths }.to raise_error Fontcustom::Error, /does not exist/
     end
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Kai Zau
@@ -9,94 +10,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: bundler
   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: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Transforms EPS and SVG vectors into icon webfonts. Generates CSS or other
-  template files for your projects.
+description: Font Custom makes using vector icons easy. Generate icon fonts and supporting
+  templates (e.g. @font-face CSS) from a collection of SVGs.
 email:
 - kai@kaizau.com
 - joshua@gross.is
@@ -106,6 +119,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -135,8 +149,8 @@ files:
 - lib/fontcustom/util.rb
 - lib/fontcustom/version.rb
 - lib/fontcustom/watcher.rb
-- spec/fixtures/generators/.fontcustom-data
-- spec/fixtures/generators/.fontcustom-data-corrupted
+- spec/fixtures/generators/.fontcustom-manifest-corrupted.json
+- spec/fixtures/generators/.fontcustom-manifest.json
 - spec/fixtures/generators/fontcustom.yml
 - spec/fixtures/generators/mixed-output/another-font.ttf
 - spec/fixtures/generators/mixed-output/dont-delete-me.bro
@@ -167,31 +181,39 @@ files:
 - spec/spec_helper.rb
 homepage: http://fontcustom.com
 licenses: []
-metadata: {}
-post_install_message: '  >> Thanks for installing Font Custom! Please ensure that
-  fontforge is installed before compiling any icons.'
+post_install_message: ! '>> Thanks for installing Font Custom! Please ensure that
+  fontforge is installed before compiling any icons. Visit <http://fontcustom.com>
+  for instructions.'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1146963489862796142
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1146963489862796142
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: Generate icon webfonts from the comfort of the command line.
+specification_version: 3
+summary: Generate icon fonts from the command line.
 test_files:
-- spec/fixtures/generators/.fontcustom-data
-- spec/fixtures/generators/.fontcustom-data-corrupted
+- spec/fixtures/generators/.fontcustom-manifest-corrupted.json
+- spec/fixtures/generators/.fontcustom-manifest.json
 - spec/fixtures/generators/fontcustom.yml
 - spec/fixtures/generators/mixed-output/another-font.ttf
 - spec/fixtures/generators/mixed-output/dont-delete-me.bro

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4fc3add333473a23ddcb18a08c6b01eed71a029e
-  data.tar.gz: 2e0d757e1a0b038dc6bc8abdb22d900b24cbb268
-SHA512:
-  metadata.gz: 395f8eda59b936c25d52d832984dc514e594df0ba1a4742e652aa3115cfd388fbd8700e18eb72d6bc485af2b8dd784afedbe26e545117ebd3aea7b7970a5b377
-  data.tar.gz: d7fc088e213741da7d607273ebe9896fb836c6e7d66028bdbb4aeb950d3f45d4fcb3ea0168c7b98fa2fbef662d14841d133407a1adb9e01ccaebfd0124ab0933