fontcustom 1.2.0 → 1.3.0.beta

data/lib/fontcustom/templates/fontcustom.yml

@@ -5,10 +5,11 @@
 # --------------------------------------------------------------------------- #
 
 #font_name: fontcustom
-#css_prefix: icon-
+#css_selector: .icon-{{glyph}}
 #preprocessor_path: ""
 #autowidth: false
 #no_hash: false
+#force: false
 #debug: false
 #quiet: false
 
@@ -37,8 +38,7 @@
 # --------------------------------------------------------------------------- #
 # Templates
 #   Included in Font Custom:
-#     preview, css, scss, scss-rails, bootstrap, bootstrap-scss, bootstrap-ie7,
-#     bootstrap-ie7-scss
+#     preview, css, scss, scss-rails
 #   Custom templates should be saved in the INPUT[:templates] directory and
 #   referenced by their base file name.
 # --------------------------------------------------------------------------- #

data/lib/fontcustom/utility.rb

@@ -0,0 +1,145 @@
+require "json"
+require "thor/actions"
+require "thor/shell"
+require "thor/shell/basic"
+require "thor/shell/color"
+
+# Requires access to @options or @cli_options
+module Fontcustom
+  module Utility
+    include Thor::Actions
+
+    #
+    # Hacks that allow Thor::Actions and Thor::Shell to be used in Fontcustom classes.
+    #
+    
+    def self.shell
+      @shell || Thor::Shell::Color.new
+    end
+
+    def behavior
+      :invoke
+    end
+
+    def shell
+      Fontcustom::Utility.shell
+    end
+
+    def say_status(*args)
+      shell.say_status *args
+    end
+
+    def destination_root
+      @destination_stack ||= [_options[:project_root]]
+      @destination_stack.last
+    end
+
+    def source_paths
+      @source_paths ||= [File.join(Fontcustom.gem_lib, "templates")]
+    end
+
+    #
+    # Options
+    #
+
+    module HashWithMethodAccess
+      def method_missing(method, arg = nil)
+        if method[-1, 1] == "="
+          self[method[0...-1].to_sym] = arg
+        else
+          self[method.to_sym]
+        end
+      end
+    end
+
+    def symbolize_hash(hash)
+      hash.inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo }
+    end
+
+    def methodize_hash(hash)
+      hash.extend HashWithMethodAccess
+    end
+
+    #
+    # Paths
+    #
+
+    def expand_path(path)
+      return path if path[0] == "/" # ignore absolute paths
+      File.expand_path File.join(_options[:project_root], path)
+    end
+
+    # TODO Is this robust enough?
+    def relative_to_root(path)
+      path = path.sub(_options[:project_root], "")
+      path = path[1..-1] if path[0] == "/"
+      path = "." if path.empty?
+      path
+    end
+
+    #
+    # Manifest / Files
+    #
+
+    def write_file(file, content = "", message = nil, message_body = nil)
+      File.open(file, "w") { |f| f.write(content) }
+      if message
+        body = message_body || relative_to_root(file)
+        say_message message, body
+      end
+    end
+
+    def get_manifest(file = _options[:manifest])
+      begin
+        json = File.read file
+        JSON.parse(json, :symbolize_names => true)
+      rescue JSON::ParserError
+        raise Fontcustom::Error, 
+          "Couldn't parse `#{relative_to_root file}`. Fix the invalid "\
+          "JSON or delete the file to start from scratch."
+      end
+    end
+
+    def save_manifest
+      json = JSON.pretty_generate @manifest
+      write_file _options[:manifest], json
+    end
+
+    def delete_from_manifest(key)
+      files = @manifest[key]
+      return if files.empty?
+      begin
+        deleted = []
+        @manifest[key].each do |file|
+          remove_file file, :verbose => false
+          deleted << file
+        end
+      ensure
+        @manifest[key] = @manifest[key] - deleted
+        save_manifest
+        say_changed :delete, deleted
+      end
+    end
+
+    #
+    # Messages
+    #
+
+    def say_message(status, message, color = :yellow)
+      return if _options[:quiet] && status != :error
+      say_status status, message, color
+    end
+
+    def say_changed(status, changed)
+      return if _options[:quiet]
+      message = changed.map { |file| relative_to_root(file) }
+      say_status status, message.join("\n#{" " * 14}"), :green # magic number
+    end
+
+    private
+
+    def _options
+      @options || @cli_options
+    end
+  end
+end

data/lib/fontcustom/version.rb

@@ -1,3 +1,3 @@
 module Fontcustom
-  VERSION = "1.2.0"
+  VERSION = "1.3.0.beta"
 end

data/lib/fontcustom/watcher.rb

@@ -3,7 +3,7 @@ require "listen"
 
 module Fontcustom
   class Watcher
-    include Util
+    include Utility
 
     def initialize(opts)
       @opts = opts

data/spec/fixtures/generators/.fontcustom-manifest-corrupted.json

@@ -1,18 +1,25 @@
 'Totally invalid JSON.'
 {
-  'fonts": [
+  "checksum": {
+    "current": "82a59e769bc60192484f2620570bbb59e225db97c1aac3f242a2e49d6060a19c", 
+    "previous": "82a59e769bc60192484f2620570bbb59e225db97c1aac3f242a2e49d6060a19c"
+  },
+  "fonts": [
     "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff",
     "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf",
     "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot",
     "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg"
   ],
-  "templates": [
-    "fontcustom.css"
-  ],
-  "file_name": "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e",
   "glyphs": [
     "a_r3ally-exotic-f1le-name",
     "c",
     "d"
+  ],
+  "options": {
+    "foo": "bar",
+    "baz": "bum"
+  },
+  "templates": [
+    "fontcustom.css"
   ]
 }

data/spec/fixtures/generators/.fontcustom-manifest.json

@@ -1,17 +1,52 @@
 {
+  "checksum": {
+    "current": "82a59e769bc60192484f2620570bbb59e225db97c1aac3f242a2e49d6060a19c", 
+    "previous": "82a59e769bc60192484f2620570bbb59e225db97c1aac3f242a2e49d6060a19c"
+  },
   "fonts": [
-    "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff",
-    "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf",
-    "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot",
-    "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg"
-  ],
-  "templates": [
-    "fontcustom.css"
-  ],
-  "file_name": "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e",
-  "glyphs": [
-    "a_r3ally-exotic-f1le-name",
-    "c",
-    "d"
-  ]
+    "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.ttf", 
+    "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.svg", 
+    "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.woff", 
+    "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.eot"
+  ], 
+  "glyphs": {
+    "a_r3ally-exotic-f1le-name": {
+      "codepoint": 61696, 
+      "source": "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/vectors/a_R3ally-eXotic f1Le Name.svg"
+    }, 
+    "c": {
+      "codepoint": 61697, 
+      "source": "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/vectors/C.svg"
+    }, 
+    "d": {
+      "codepoint": 61698, 
+      "source": "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/vectors/D.svg"
+    }
+  }, 
+  "options": {
+    "autowidth": false, 
+    "config": false, 
+    "css_prefix": "test-", 
+    "debug": false, 
+    "font_name": "fontcustom", 
+    "input": {
+      "templates": "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/vectors", 
+      "vectors": "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/vectors"
+    }, 
+    "manifest": "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/.fontcustom-manifest-fonts.json", 
+    "no_hash": false, 
+    "output": {
+      "css": "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/fontcustom", 
+      "fonts": "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/fontcustom", 
+      "preview": "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test/fontcustom"
+    }, 
+    "preprocessor_path": null, 
+    "project_root": "/Users/kz/Projects/fontcustom/spec/fixtures/sandbox/test", 
+    "quiet": true, 
+    "templates": [
+      "/Users/kz/Projects/fontcustom/lib/fontcustom/templates/fontcustom.css", 
+      "/Users/kz/Projects/fontcustom/lib/fontcustom/templates/fontcustom-preview.html"
+    ]
+  }, 
+  "templates": []
 }

data/spec/fixtures/generators/mixed-output/fontcustom_82a59e769bc60192484f2620570bbb59.svg

@@ -0,0 +1,56 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-11-10: Created.
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+Created by FontForge 20120731 at Sun Nov 10 12:45:07 2013
+ By Kai Zau
+Created by Kai Zau with FontForge 2.0 (http://fontforge.sf.net)
+</metadata>
+<defs>
+<font id="fontcustom" horiz-adv-x="512" >
+  <font-face 
+    font-family="fontcustom"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="512"
+    panose-1="2 0 6 9 0 0 0 0 0 0"
+    ascent="448"
+    descent="-64"
+    bbox="0 -64 513.92 448"
+    underline-thickness="25.6"
+    underline-position="-51.2"
+    unicode-range="U+F100-F102"
+  />
+    <missing-glyph />
+    <glyph glyph-name="uniF100" unicode="&#xf100;" 
+d="M496.112 255.934c-3.53223 0 -6.81934 1.03906 -9.58398 2.81543l-50.8467 -43.3096l54.9375 -76.9023c0.15332 0.00976562 0.306641 0.0253906 0.460938 0.0253906c5.75977 0 10.4346 -4.66895 10.4346 -10.4297c0 -5.75977 -4.66992 -10.4287 -10.4297 -10.4287
+s-10.4189 4.66895 -10.4189 10.4287c0 1.35156 0.276367 2.63672 0.74707 3.81445l-57.2363 80.1543l-68.2598 40.1816c-2.20703 -2.04785 -2.62695 -3.61523 -7.74707 -4.49609v-90.5977c15.3604 -2.64746 23.8643 -14.6533 23.8643 -29.0664
+c0 -5.73438 -1.74512 -11.0752 -4.57227 -15.6162l34.873 -32.374c2.6875 2.02246 6.02051 3.23145 9.64062 3.23145c8.87793 0 16.0713 -7.19922 16.0713 -16.0723c0 -8.88281 -7.19336 -16.0762 -16.0713 -16.0762s-16.0771 7.19824 -16.0771 16.0762
+c0 1.04492 0.108398 2.06836 0.302734 3.05664l-36.4551 33.8486c-4.89453 -3.56836 -10.9053 -5.7041 -17.4229 -5.7041c-11.2949 0 -21.1045 6.32324 -26.1064 15.6162l-81.4902 -25.2061c-2.59082 -10.2344 -11.8379 -17.8271 -22.8916 -17.8271
+c-13.0664 0 -23.6387 10.5928 -23.6387 23.6387c0 2.97461 0.69043 5.77051 1.70996 8.40234l-35.8047 25.5537c-6.41992 -6.375 -15.2627 -10.3223 -25.001 -10.3223c-5.29883 0 -10.3066 1.19824 -14.8174 3.28223l-3.63477 -4.49023l-27.4639 -40.4688
+c1.22852 -2.05273 1.94531 -4.44922 1.94531 -7.01465c0 -7.57227 -6.13867 -13.7109 -13.7109 -13.7109s-13.7109 6.13867 -13.7109 13.7109c0 7.57812 6.13867 13.7119 13.7109 13.7119c0.839844 0 1.65332 -0.0869141 2.44727 -0.225586l30.582 45.0664
+c-0.0205078 0.0205078 -0.0410156 0.0458984 -0.0615234 0.0712891l0.0869141 0.0673828c-6.66602 6.44531 -10.8291 15.4668 -10.8291 25.4717c0 1.84863 0.276367 3.62012 0.553711 5.40137l-0.287109 0.0976562
+c0.0302734 0.0615234 0.0507812 0.123047 0.0771484 0.189453l-60.0225 27.2842c-3.36914 -3.69629 -8.20703 -6.02637 -13.6035 -6.02637c-10.1836 0 -18.4375 8.25391 -18.4375 18.4375s8.25391 18.4365 18.4375 18.4365s18.4375 -8.25293 18.4375 -18.4365
+c0 -0.707031 -0.046875 -1.4082 -0.128906 -2.09473l58.7676 -26.7051c0.00488281 0.0605469 0.0205078 0.117188 0.0253906 0.178711l0.492188 -0.164062c5.97461 11.1768 17.6123 18.8623 31.1396 18.8623c7.66504 0 14.6787 -2.47266 20.4951 -6.625l42.1533 42.1729
+c-2.05371 3.50781 -3.55371 7.36328 -3.55371 11.7256c0 4.25977 1.1416 8.24316 3.1084 11.6934l-75.1719 33.6689c-4.04492 -4.98145 -10.21 -8.1709 -17.1318 -8.1709c-12.1855 0 -22.0615 9.87598 -22.0615 22.0615s9.88086 22.0625 22.0615 22.0625
+c12.1855 0 22.0625 -9.87695 22.0625 -22.0625c0 -1.20312 -0.123047 -2.375 -0.307617 -3.52734l79.043 -35.4043c3.52734 2.08887 7.63379 3.3125 12.0371 3.3125c1.40234 0 2.76465 -0.148438 4.0957 -0.378906l29.875 63.9385
+c-2.29883 2.58496 -3.70703 5.98535 -3.70703 9.71777c0 8.08984 6.55859 14.6484 14.6484 14.6484s14.6484 -6.55371 14.6484 -14.6484c0 -1.20898 -0.164062 -2.37598 -0.44043 -3.50195l59.5098 -47.2529c3.30762 2.47266 7.39844 3.95312 11.8477 3.95312
+c10.9668 0 19.8555 -8.88867 19.8555 -19.8555c0 -1.63867 -0.219727 -3.22559 -0.59375 -4.74609l65.8633 -38.7432l51.9834 44.2822c-0.706055 1.91992 -1.11035 3.9834 -1.11035 6.14453c0 9.83008 7.97168 17.8076 17.8066 17.8076
+c9.83594 0 17.8076 -7.97754 17.8076 -17.8076c0 -9.83594 -7.97168 -17.8125 -17.8076 -17.8125zM312.679 128.133c0 7.43457 2.75977 14.208 7.27539 19.415l-88.1768 76.3604c-4.18848 -6.60547 -11.5459 -10.9932 -19.9531 -10.9932
+c-4.36719 0 -8.2168 1.5 -11.7295 3.55371l-42.1533 -42.1738c4.11133 -5.77539 6.60547 -12.8359 6.60547 -20.4746c0 -5.56543 -1.38281 -10.7363 -3.6709 -15.4473l36.0342 -25.7129c4.09082 3.38965 9.16504 5.69922 14.9141 5.69922
+c10.9678 0 20.1523 -7.47559 22.8252 -17.5879l78.208 24.1875c-0.112305 1.04395 -0.178711 2.09863 -0.178711 3.17383zM337.92 157.199v90.583c-10.2402 2.44238 -14.8223 10.0254 -14.8223 19.0205c0 2.3916 -0.194336 4.6748 0.578125 6.7998l-59.499 47.2529
+c-2.18164 -1.29102 -4.70508 -2.04297 -7.41895 -2.04297c-0.235352 0 -0.450195 0.0253906 -0.686523 0.0351562l-29.6904 -63.6309c5.57031 -4.32129 9.24707 -11.0645 9.24707 -18.668c0 -0.265625 0.12793 -0.521484 0.117188 -0.788086l94.0029 -81.1318
+c2.36035 1.17285 3.05176 2.05859 8.17188 2.57031z" />
+    <glyph glyph-name="uniF101" unicode="&#xf101;" 
+d="M256 448c141.399 0 256 -114.601 256 -255.97v-256.03h-512v256.03c0 141.369 114.632 255.97 256 255.97zM494.935 -46.9346v238.965c0 131.733 -107.202 238.899 -238.935 238.899s-238.935 -107.166 -238.935 -238.899v-238.965h477.869zM256 396.8
+c113.101 0 204.8 -91.6992 204.8 -204.77v-204.83l-153.6 153.6v51.2002c0 28.2676 -22.9326 51.2002 -51.2002 51.2002s-51.2002 -22.9326 -51.2002 -51.2002v-51.2002l-153.6 -153.6v204.83c0 113.07 91.7344 204.77 204.8 204.77z" />
+    <glyph glyph-name="uniF102" unicode="&#xf102;" 
+d="M448 64c35.374 0 64 -28.6924 64 -64s-28.626 -64 -64 -64s-64 28.6924 -64 64c0 8.05859 1.87402 15.626 4.62891 22.748l-96.9375 69.1914c-17.3818 -17.249 -41.3184 -27.9395 -67.6914 -27.9395c-53.002 0 -96 42.998 -96 96c0 5.00195 0.74707 9.80957 1.5 14.6279
+l-76.626 25.5645c-5.62109 -4.94141 -12.8154 -8.19238 -20.874 -8.19238c-17.6895 0 -32 14.3105 -32 32s14.3105 32 32 32c15.3086 0 27.5 -10.9414 30.623 -25.3135l77.0654 -25.748c16.1846 30.2539 47.6885 51.0615 84.3115 51.0615
+c20.751 0 39.752 -6.69141 55.501 -17.9404l114.125 114.191c-5.56543 9.49707 -9.62598 19.9375 -9.62598 31.749c0 35.374 28.626 64 64 64s64 -28.626 64 -64s-28.626 -64 -64 -64c-11.8115 0 -22.252 4.06055 -31.7539 9.62598l-114.125 -114.187
+c11.126 -15.6318 17.874 -34.75 17.874 -55.4395c0 -15.0576 -3.74805 -29.0615 -9.93848 -41.8096l97.5674 -69.6328c11.0645 9.19043 24.8164 15.4424 40.376 15.4424z" />
+  </font>
+</defs></svg>

data/spec/fontcustom/base_spec.rb

@@ -0,0 +1,58 @@
+require "spec_helper"
+
+describe Fontcustom::Base do
+  context "#compile" do
+    context "when [:checksum][:current] equals [:checksum][:previous]" do
+      it "should show 'no change' message" do
+        Fontcustom::Base.any_instance.stub :init_manifest
+        Fontcustom::Base.any_instance.stub :check_fontforge
+        base = Fontcustom::Base.new({})
+        base.stub(:checksum).and_return("abc")
+        base.instance_variable_set :@manifest, {:checksum => {:previous => "abc", :current => ""}}
+        base.instance_variable_set :@options, {:quiet => false}
+
+        output = capture(:stdout) { base.compile }
+        output.should match(/No changes/)
+      end
+    end
+  end
+
+  context ".check_fontforge" do
+    it "should raise error if fontforge isn't installed" do
+      Fontcustom::Base.any_instance.stub :init_manifest
+      Fontcustom::Base.any_instance.stub(:"`").and_return("")
+      expect { Fontcustom::Base.new(:option => "foo") }.to raise_error Fontcustom::Error, /fontforge/
+    end
+  end
+
+  context ".init_manifest" do
+    before(:each) do
+      Fontcustom::Base.any_instance.stub :check_fontforge
+      manifest = double("manifest")
+      manifest.should_receive(:manifest).and_return(manifest_contents)
+      Fontcustom::Manifest.stub(:new).and_return manifest
+    end
+
+    it "should pass CLI options to FC::Options" do
+      opts = double "options"
+      opts.should_receive :options
+      Fontcustom::Options.should_receive(:new).with({:foo => "bar"}).and_return opts
+      Fontcustom::Base.new :foo => "bar"
+    end
+  end
+
+  context ".checksum" do
+    it "should return hash of all vectors and templates" do
+      pending "SHA2 is different on CI servers. Why?"
+      Fontcustom::Base.any_instance.stub :check_fontforge
+      Fontcustom::Base.any_instance.stub :init_manifest
+      base = Fontcustom::Base.new({})
+      base.instance_variable_set :@options, {
+        :input => {:vectors => fixture("shared/vectors")},
+        :templates => Dir.glob(File.join(fixture("shared/templates"), "*"))
+      }
+      hash = base.send :checksum
+      hash.should == "81ffd2f72877be02aad673fdf59c6f9dbfee4cc37ad0b121b9486bc2923b4b36"
+    end
+  end
+end

data/spec/fontcustom/cli_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+require "fontcustom/cli"
+
+describe Fontcustom::CLI do
+  context "#compile" do
+    it "should generate fonts and templates (integration)", :integration => true do
+      live_test do |testdir|
+        Fontcustom::CLI.start ["compile", "vectors", "--quiet"]
+        manifest = File.join testdir, ".fontcustom-manifest.json"
+        Dir.glob(File.join(testdir, "fontcustom", "fontcustom_*\.{ttf,svg,woff,eot}")).length.should == 4
+        File.read(manifest).should match(/"fonts":.+sandbox\/test\/fontcustom\/fontcustom_.+\.ttf"/m)
+      end
+    end
+  end
+end

data/spec/fontcustom/generator/font_spec.rb

@@ -1,244 +1,74 @@
 require "spec_helper"
 
 describe Fontcustom::Generator::Font do
-  # Silence messages without passing :quiet => true to everything
-  before(:each) do
-    Fontcustom::Options.any_instance.stub :say_message
-  end
-  
-  def generator(options)
-    opts = Fontcustom::Options.new(options)
-    Fontcustom::Generator::Font.new([opts])
+  def generator
+    Fontcustom::Generator::Font.any_instance.stub(:get_manifest).and_return :options => {}
+    Fontcustom::Generator::Font.new("")
   end
 
-  context "#prepare_output_dirs" do
-    it "should create output dir if it doesn't exist" do
-      options = {
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => "create-me"
-      }
-      gen = generator options
-      gen.stub(:empty_directory)
-      gen.should_receive(:empty_directory).with(fixture("create-me"), anything)
-      gen.prepare_output_dirs
+  context "#generate" do
+    it "should set manifest[:glyphs] (integration)", :integration => true do
+      live_test do |testdir|
+        manifest = test_manifest
+        gen = Fontcustom::Generator::Font.new manifest
+        gen.stub :create_fonts
+        gen.generate
+        File.read(manifest).should match(/"glyphs":.+"c":/m)
+      end
     end
 
-    it "should create dirs for multiple output dirs" do
-      options = {
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => {
-          :fonts => "assets/fonts",
-          :css => "assets/stylesheets"
-        }
-      }
-      gen = generator options
-      gen.stub(:empty_directory)
-      gen.should_receive(:empty_directory).twice
-      gen.prepare_output_dirs
+    it "should generate fonts (integration)", :integration => true do
+      live_test do |testdir|
+        manifest = test_manifest
+        Fontcustom::Generator::Font.new(manifest).generate
+        Dir.glob(File.join(testdir, "fontcustom", "fontcustom_*\.{ttf,svg,woff,eot}")).length.should == 4
+        File.read(manifest).should match(/"fonts":.+sandbox\/test\/fontcustom\/fontcustom_.+\.ttf"/m)
+      end
     end
   end
 
-  context "#get_manifest" do
-    it "should assign empty data model if data file is empty or missing" do
-      options = {
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :quiet => true
-      }
-      gen = generator options
-      gen.get_manifest
-      data = gen.instance_variable_get("@data")
-      data.should == Fontcustom::DATA_MODEL
-    end
-
-    it "should assign @data from data file" do
-      options = {
-        :project_root => fixture,
-        :config => "generators",
-        :input => "shared/vectors",
-        :output => "mixed-output",
-        :quiet => true
-      }
-      gen = generator options
-      gen.get_manifest
-      data = gen.instance_variable_get("@data")
-      data.should_not == Fontcustom::DATA_MODEL
-    end
-
-    it "should throw an error if the data file is corrupted." do
+  context ".create_output_dirs" do
+    it "should create empty dirs if they don't exist" do
+      gen = generator
       options = {
-        :project_root => fixture,
-        :config => "generators",
-        :manifest => "generators/.fontcustom-manifest-corrupted.json",
-        :input => "shared/vectors",
-        :output => "mixed-output",
+        :output => {:fonts => "path/fonts", :vectors => "path/vectors"},
         :quiet => true
       }
-      gen = generator options
-      expect { gen.get_manifest }.to raise_error Fontcustom::Error, /corrupted/
+      gen.instance_variable_set :@options, options
+      gen.should_receive(:empty_directory).with("path/fonts", :verbose => false)
+      gen.should_receive(:empty_directory).with("path/vectors", :verbose => false)
+      gen.send :create_output_dirs
     end
   end
 
-  context "#reset_output" do
-    subject do
-      options = {
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => "mixed-output",
-        :quiet => true
-      }
-      gen = generator options
-      gen.stub :remove_file
-      gen.stub :overwrite_file
-      gen.instance_variable_set(:@data, data_file_contents)
-      gen
-    end
-
-    it "should delete fonts from @data[:fonts]" do
-      subject.should_receive(:remove_file).exactly(4).times.with(/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e/, anything)
-      subject.reset_output
-    end
+  context ".set_glyph_info" do
+    it "should set :glyphs in manifest" do
+      gen = generator
+      gen.instance_variable_set :@options, :input => {:vectors => fixture("shared/vectors")}
+      gen.instance_variable_set :@manifest, :glyphs => {}
 
-    it "should not delete non-font files" do
-      subject.should_not_receive(:remove_file).with("dont-delete-me.bro")
-      subject.should_not_receive(:remove_file).with("another-font.ttf")
-      subject.should_not_receive(:remove_file).with("fontcustom.css")
-      subject.reset_output
+      gen.should_receive(:save_manifest)
+      gen.send :set_glyph_info
+      manifest = gen.instance_variable_get(:@manifest)
+      manifest[:glyphs][:"a_r3ally-exotic-f1le-name"].should include(:codepoint => 61696)
+      manifest[:glyphs][:c].should include(:codepoint => 61697)
+      manifest[:glyphs][:d].should include(:codepoint => 61698)
     end
 
-    it "should empty @data[:fonts]" do
-      subject.reset_output
-      subject.instance_variable_get(:@data)[:fonts].should be_empty
-    end
+    it "should not change codepoints of existing glyphs" do
+      gen = generator
+      gen.instance_variable_set :@options, :input => {:vectors => fixture("shared/vectors")}
+      gen.instance_variable_set :@manifest, :glyphs => {:c => {:source => "foo", :codepoint => 61699}}
 
-    it "should update the data file" do
-      file = fixture(".fontcustom-manifest.json")
-      subject.should_receive(:overwrite_file).once.with(file, /"fonts":/)
-      subject.reset_output
-    end
-
-    it "should be silent" do
-      stdout = capture(:stdout) { subject.reset_output }
-      stdout.should == ""
+      gen.should_receive(:save_manifest)
+      gen.send :set_glyph_info
+      manifest = gen.instance_variable_get(:@manifest)
+      manifest[:glyphs][:"a_r3ally-exotic-f1le-name"].should include(:codepoint => 61700)
+      manifest[:glyphs][:c].should include(:codepoint => 61699)
+      manifest[:glyphs][:d].should include(:codepoint => 61701)
     end
   end
 
-  context "#generate" do
-    subject do
-      gen = generator(
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => "mixed-output",
-        :quiet => true
-      )
-      gen.stub(:execute_and_clean).and_return [fontforge_stdout.split("\n"), fontforge_stderr, double(:status, :success? => true)]
-      gen
-    end
-
-    it "should call fontforge" do
-      subject.should_receive(:execute_and_clean).with(/fontforge -script/)
-      subject.generate
-    end
-
-    it "should pass options to fontforge" do
-      subject.should_receive(:execute_and_clean).with(/#{fixture("shared/vectors")}.+#{fixture("mixed-output")}/)
-      subject.generate
-    end
-
-    it "should assign @json" do
-      subject.generate
-      json = subject.instance_variable_get(:@json)
-      json.should == data_file_contents.to_json
-    end
-
-    it "should raise error if fontforge fails" do
-      gen = generator(
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => "fake-dir-should-cause-failure",
-        :debug => true
-      )
-      expect { capture(:stdout) { gen.generate } }.to raise_error Fontcustom::Error, /failed/
-    end
-  end
-
-  context "#collect_data" do
-    it "should assign @data from @json" do
-      gen = generator(
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => "output"
-      )
-      gen.instance_variable_set(:@data, Fontcustom::DATA_MODEL)
-      gen.instance_variable_set(:@json, data_file_contents.to_json)
-      gen.collect_data
-      data = gen.instance_variable_get(:@data)
-      data[:glyphs].should =~ ["c", "d", "a_r3ally-exotic-f1le-name"]
-      data[:fonts].should =~ [
-        fixture("output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot"),
-        fixture("output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg"),
-        fixture("output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf"),
-        fixture("output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff")
-      ]
-    end
-  end
-
-  context "#announce_files" do
-    it "should print generated files to console" do
-      gen = generator(
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => "output"
-      )
-      gen.instance_variable_set :@data, data_file_contents
-      stdout = capture(:stdout) { gen.announce_files }
-      stdout.should =~ /create.+\.(woff|ttf|eot|svg)/
-    end
-
-    it "should print nothing if :quiet is set" do
-      gen = generator(
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => "output",
-        :quiet => true
-      )
-      gen.instance_variable_set :@data, data_file_contents
-      stdout = capture(:stdout) { gen.announce_files }
-      stdout.should == ""
-    end
-  end
-
-  context "#save_data" do
-    it "should update data file" do
-      gen = generator(
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => "output"
-      )
-      gen.stub :overwrite_file
-      gen.instance_variable_set(:@data, data_file_contents)
-      file = File.join fixture(".fontcustom-manifest.json")
-      gen.should_receive(:overwrite_file).once.with do |path, content|
-        path.should == file
-        content.should match(/"fonts":/)
-        content.should match(/"glyphs":/)
-      end
-      gen.save_data
-    end
-
-    it "should be silent if :quiet is set" do
-      gen = generator(
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :output => "output",
-        :quiet => true
-      )
-      gen.stub :overwrite_file
-      gen.instance_variable_set(:@data, data_file_contents)
-      stdout = capture(:stdout) { gen.save_data }
-      stdout.should == ""
-    end
-  end
+  #context ".run_fontforge" do
+  #end
 end