fontcustom 1.3.0.beta4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83ae4b0585895308ea825062bedefd5f52e1601f
-  data.tar.gz: 94f1938fe393cd56761d7facc448c73f01131a9f
+  metadata.gz: c3398b6e31a2d23df76685528575c74d5f0d7739
+  data.tar.gz: 8ff178040adf1fc60c82edf1cf69cc0e427b00cf
 SHA512:
-  metadata.gz: a57e93b5b0b0fed46f13d4d246747de4e6a241d684f4736bb5ac25598e2cf1b8108d0ffc32e08731fa74e3e903567da4c9658dc4979f6507b23fd1d6967d4571
-  data.tar.gz: 94c7d261fabc35340808134ca63a422d986befff99fdc816a6067f1bca6f563606a6a969dbfde5ded65866d8c217960b18d6fcc03db5da8e2f723d8002672819
+  metadata.gz: 2d4d505b543b0c4c6be525f7151b4a5601547ba4decc860e1e985dceaa41da9a143a8bfc350ce608d83dbf3f9ddee3c6a6650ce4cd286ed5fdf857815f032beb
+  data.tar.gz: 58d1fc4dd1f3e4ee499adfb2a53252cd08330fb59c9661c2da523d9eac3999bb9e8a913bc9754497261080334224f66bb4dfd788d17474c2d1ee616db839f115

data/CHANGELOG.md

@@ -1,18 +1,20 @@
-## 1.3.0.beta (11/25/2013)
+## 1.3.0 (12/24/2013)
 
-**Delete your old `.fontcustom-manifest.json` and output directories before using this version.**
+**If upgrading from 1.2.0, delete your old `.fontcustom-manifest.json` and output directories first.**
 
-The big news: fixed glyph code points. Automatically assigned for now, but changing them by hand is just a matter of modifying the generated `.fontcustom-manifest.json`. A few breaking changes (`css_prefix`, custom template syntax, possibly others). Error messages and docs are currently sparse — my apologies in advance.
+The big news: fixed glyph code points. Automatically assigned for now, but changing them by hand is just a matter of modifying the generated `.fontcustom-manifest.json`. A few breaking changes (`css_prefix`, custom template syntax, possibly others).
 
-* Fixed glyph code points ([#56](https://github.com/FontCustom/fontcustom/issues/56))
+* Adds fixed glyph code points ([#56](https://github.com/FontCustom/fontcustom/issues/56))
+* Drops bootstrap templates (maintenance overhead, unsure if anyone was using them)
+* Stores relative paths for collaborative editing ([#149](https://github.com/FontCustom/fontcustom/pull/149))
 * Changes `css_prefix` to `css_selector` to allow greater flexibility ([#126](https://github.com/FontCustom/fontcustom/pull/126))
 * Skips compilation if inputs have not changed (and `force` option to bypass checks)
 * Adds CSS template helpers for convenience and DRYness
-* Drops bootstrap templates (maintenance overhead, unsure if anyone was using them)
-
-Next up:
-
-* Storing relative paths for collaborative editing ([#149](https://github.com/FontCustom/fontcustom/pull/149))
+* Improves rendering on Chrome Windows ([#143](https://github.com/FontCustom/fontcustom/pull/143))
+* Improves Windows hinting ([#160](https://github.com/FontCustom/fontcustom/pull/160))
+* Fixes Python 2.6 optsparse syntax ([#159](https://github.com/FontCustom/fontcustom/issues/159))
+* Fixes bug where changes in custom templates were not detected by `watch`
+* Improves error and debuggging messages
 
 ## 1.2.0 (11/2/2013)
 

data/TODO.md

@@ -2,10 +2,6 @@
 
 ### 1.3.0
 
-* update manifest content in spec_helper
-* fix failing travis-ci specs
-* reactivate watcher
-* more helpful messages when running without INPUT
 * redirect fontcustom.com to github repo (use wiki for documentation)
 
 ### Future

data/lib/fontcustom/base.rb

@@ -15,13 +15,15 @@ module Fontcustom
     def compile
       current = checksum
       previous = @manifest.get(:checksum)[:previous]
+
+      say_message :status, "Forcing compile." if @options[:force]
       if @options[:force] || current != previous
         @manifest.set :checksum, {:previous => previous, :current => current}
         start_generators
         @manifest.reload
         @manifest.set :checksum, {:previous => current, :current => current}
       else
-        say_message :status, "No changes detected. Skipping compilation."
+        say_message :status, "No changes detected. Skipping compile."
       end
     end
 

data/lib/fontcustom/cli.rb

@@ -68,13 +68,12 @@ module Fontcustom
     def watch(input = nil)
       say "Font Custom is watching your icons. Press Ctrl + C to stop.", :yellow unless options[:quiet]
       opts = options.merge :input => input, :skip_first => !! options[:skip_first]
-      opts = Options.new(opts)
       Watcher.new(opts).watch
     rescue Fontcustom::Error => e
       say_status :error, e.message, :red
     end
 
-    desc "config [DIR]", "Generates an annotated configuration file (fontcustom.yml) in DIR. Default: `pwd`"
+    desc "config [DIR]", "Generates a starter configuration file (fontcustom.yml) in DIR. Default: `pwd`"
     def config(dir = Dir.pwd)
       template "fontcustom.yml", File.join(dir, "fontcustom.yml")
     end

data/lib/fontcustom/generator/font.rb

@@ -6,7 +6,7 @@ module Fontcustom
     class Font
       include Utility
 
-      attr_reader :manifest, :options
+      attr_reader :manifest
 
       def initialize(manifest)
         @manifest = Fontcustom::Manifest.new manifest

data/lib/fontcustom/generator/template.rb

@@ -6,7 +6,7 @@ module Fontcustom
     class Template
       include Utility
 
-      attr_reader :manifest, :options
+      attr_reader :manifest
 
       def initialize(manifest)
         @manifest = Fontcustom::Manifest.new manifest
@@ -128,6 +128,13 @@ module Fontcustom
        #{url}("#{path}.svg##{font_name}") format("svg");
   font-weight: normal;
   font-style: normal;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  @font-face {
+    font-family: "#{font_name}";
+    src: url("#{path}.svg##{font_name}") format("svg");
+  }
 }|
       end
 

data/lib/fontcustom/options.rb

@@ -1,11 +1,10 @@
 require "yaml"
+require "pp"
 
 module Fontcustom
   class Options
     include Utility
 
-    attr_accessor :options
-
     def initialize(cli_options = {})
       @manifest = cli_options[:manifest]
       @cli_options = symbolize_hash(cli_options)
@@ -24,6 +23,7 @@ module Fontcustom
       set_input_paths
       set_output_paths
       check_template_paths
+      print_debug if @options[:debug]
     end
 
     # We give Thor fake defaults to generate more useful help messages.
@@ -60,11 +60,11 @@ module Fontcustom
     def load_config
       @config_options = {}
       if @cli_options[:config]
-        say_message :debug, "Using settings from `#{@cli_options[:config]}`." if @cli_options[:debug]
         begin
           config = YAML.load File.open(@cli_options[:config])
           if config # empty YAML returns false
             @config_options = symbolize_hash(config)
+            say_message :debug, "Using settings from `#{@cli_options[:config]}`." if @cli_options[:debug] || @config_options[:debug]
           else
             say_message :warn, "`#{@cli_options[:config]}` was empty. Using defaults."
           end
@@ -109,7 +109,12 @@ module Fontcustom
           @options[:input][:templates] = @options[:input][:vectors]
         end
       else
-        input = @options[:input] ? @options[:input] : "."
+        if @options[:input]
+          input = @options[:input]
+        else
+          input = "."
+          say_message :warn, "No input directory given. Using present working directory."
+        end
         check_input input
         @options[:input] = { :vectors => input, :templates => input }
       end
@@ -163,7 +168,7 @@ module Fontcustom
         path = File.expand_path File.join(@options[:input][:templates], template) unless template[0] == "/"
         unless File.exists? path
           raise Fontcustom::Error,
-            "Custom template `#{template}` doesn't exist. Check your options."
+            "Custom template `#{template}` wasn't found in `#{@options[:input][:templates]}/`. Check your options."
         end
       end
     end
@@ -177,5 +182,11 @@ module Fontcustom
           "Input `#{dir}` isn't a directory. Check your options."
       end
     end
+
+    def print_debug
+      message = line_break(16) 
+      message << @options.pretty_inspect.split("\n ").join(line_break(16))
+      say_message :debug, "Using options:#{message}"
+    end
   end
 end

data/lib/fontcustom/scripts/generate.py

@@ -17,7 +17,6 @@ try:
 except ImportError:
     import optparse
     parser = optparse.OptionParser()
-    parser.add_option('manifest', help='Path to .fontcustom-manifest.json')
     (nothing, args) = parser.parse_args()
 
 manifestfile = open(args.manifest, 'r+')
@@ -94,7 +93,7 @@ try:
     manifest['fonts'].append(fontfile + '.svg')
 
     # Hint the TTF file
-    subprocess.call('ttfautohint -s -f -n ' + fontfile + '.ttf ' + fontfile + '-hinted.ttf > /dev/null 2>&1 && mv ' + fontfile + '-hinted.ttf ' + fontfile + '.ttf', shell=True)
+    subprocess.call('ttfautohint -s -f -n -W ' + fontfile + '.ttf ' + fontfile + '-hinted.ttf > /dev/null 2>&1 && mv ' + fontfile + '-hinted.ttf ' + fontfile + '.ttf', shell=True)
 
     # Fix SVG header for webkit
     # from: https://github.com/fontello/font-builder/blob/master/bin/fontconvert.py

data/lib/fontcustom/templates/fontcustom.yml

@@ -4,42 +4,34 @@
 #   `fontcustom help` or visiting <http://fontcustom.com>.
 # --------------------------------------------------------------------------- #
 
-#font_name: fontcustom
-#css_selector: .icon-{{glyph}}
-#preprocessor_path: ""
-#autowidth: false
-#no_hash: false
-#force: false
-#debug: false
-#quiet: false
+font_name: fontcustom
+css_selector: .icon-{{glyph}}
+preprocessor_path: ""
+autowidth: false
+no_hash: false
+force: false
+debug: false
+quiet: false
 
 
 # --------------------------------------------------------------------------- #
 # Input Paths
 # --------------------------------------------------------------------------- #
 
-#input: assets/fonts/fontcustom/source                  # as a string
-
-# OR
-
-#input:                                                 # as a hash
-#  vectors: app/assets/fonts/fontcustom/vectors         # required
-#  templates: app/assets/fonts/fontcustom/templates
+input:
+  vectors: app/assets/fonts/fontcustom/vectors         # required
+  templates: app/assets/fonts/fontcustom/templates
 
 
 # --------------------------------------------------------------------------- #
 # Output Paths
 # --------------------------------------------------------------------------- #
 
-#output: assets/fonts/fontcustom                        # as a string
-
-# OR
-
-#output:                                                # as a hash
-#  fonts: app/assets/fonts                              # required
-#  css: app/assets/stylesheets
-#  preview: app/views/styleguide
-#  my-custom-template.yml: config
+output:
+  fonts: app/assets/fonts                              # required
+  css: app/assets/stylesheets
+  preview: app/views/styleguide
+  #my-custom-template.yml: path/to/template/output
 
 
 # --------------------------------------------------------------------------- #
@@ -49,7 +41,7 @@
 #   referenced by their baserame.
 # --------------------------------------------------------------------------- #
 
-#templates:
-# - scss
-# - preview
-# - my-custom-template.yml
+templates:
+ - scss
+ - preview
+ #- my-custom-template.yml

data/lib/fontcustom/utility.rb

@@ -91,25 +91,27 @@ module Fontcustom
     #
 
     def say_message(status, message, color = nil)
-      return if options[:quiet] && status != :error
+      return if options[:quiet] && status != :error && status != :debug
       color = :red if [:error, :debug, :warn].include?(status)
       say_status status, message, color
     end
 
     def say_changed(status, changed)
-      return if options[:quiet]
+      return if options[:quiet] || ! options[:debug] && status == :delete
       say_status status, changed.join(line_break)
     end
 
    # magic number for Thor say_status line breaks
-    def line_break
-      "\n#{" " * 14}"
+    def line_break(n = 14)
+      "\n#{" " * n}"
     end
 
-    private
-
     def options
-      @options || @cli_options
+      if @data
+        @data[:options]
+      else
+        @options || @cli_options || @config_options || {}
+      end
     end
   end
 end

data/lib/fontcustom/version.rb

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

data/lib/fontcustom/watcher.rb

@@ -5,31 +5,29 @@ module Fontcustom
   class Watcher
     include Utility
 
-    def initialize(opts)
-      @opts = opts
-      @vector_listener = Listen.to(@opts.input[:vectors]).relative_paths(true).filter(/\.(eps|svg)$/).change(&callback)
+    def initialize(options, is_test = false)
+      @base = Fontcustom::Base.new options
+      @options = @base.options
+      @is_test = is_test
 
-      templates = @opts.templates.dup
-      templates.delete_if do |template|
-        template.match Fontcustom.gem_lib
-      end
-      unless templates.empty?
-        templates = templates.map do |template|
-          File.basename template
-        end
-        @template_listener = Listen.to(@opts.input[:templates]).relative_paths(true).filter(/(#{templates.join("|")})/).change(&callback)
-      end
+      templates = @options[:templates].dup.map { |template| File.basename(template) }
+      packaged = %w|preview css scss scss-rails|
+      templates.delete_if { |template| packaged.include?(template) }
 
-      # Modified to allow testing
-      @is_test = @opts.instance_variable_get :@is_test
-      if @is_test
-        @vector_listener = @vector_listener.polling_fallback_message(false)
-        @template_listener = @template_listener.polling_fallback_message(false) if @template_listener
+      if templates.empty?
+        @listener = Listen.to(@options[:input][:vectors])
+      else
+        @listener = Listen.to(@options[:input][:vectors], @options[:input][:templates])
       end
+
+      @listener = @listener.relative_paths(true)
+      @listener = @listener.filter(/(#{templates.join("|")}|.+\.svg)$/)
+      @listener = @listener.change(&callback)
+      @listener = @listener.polling_fallback_message(false) if @is_test
     end
 
     def watch
-      compile unless @opts.skip_first
+      compile unless @options[:skip_first]
       start
     rescue SignalException # Catches Ctrl + C
       stop
@@ -39,18 +37,15 @@ module Fontcustom
 
     def start
       if @is_test # Non-blocking listener
-        @vector_listener.start
-        @template_listener.start if @template_listener
+        @listener.start
       else
-        @vector_listener.start!
-        @template_listener.start! if @template_listener
+        @listener.start!
       end
     end
 
     def stop
-      @vector_listener.stop
-      @template_listener.stop if @template_listener
-      say "\nFont Custom is signing off. Good night and good luck.", :yellow
+      @listener.stop
+      shell.say "\nFont Custom is signing off. Good night and good luck.", :yellow
     end
 
     def callback
@@ -68,17 +63,7 @@ module Fontcustom
     end
 
     def compile
-      Generator::Font.start [@opts]
-      Generator::Template.start [@opts]
-    end
-
-    def say(*args)
-      return if @opts.quiet
-      @opts.instance_variable_get(:@shell).say *args
-    end
-
-    def say_message(*args)
-      @opts.say_message *args
+      @base.compile
     end
   end
 end

data/spec/fontcustom/options_spec.rb

@@ -26,26 +26,20 @@ describe Fontcustom::Options do
   context ".set_config_path" do
     context "when :config is set" do
       it "should use options[:config] if it's a file" do
-        FileUtils.cd fixture do
-          o = options :config => "options/any-file-name.yml"
-          o.send :set_config_path
-          o.instance_variable_get(:@cli_options)[:config].should == "options/any-file-name.yml"
-        end
+        o = options :config => "options/any-file-name.yml"
+        o.send :set_config_path
+        o.instance_variable_get(:@cli_options)[:config].should == "options/any-file-name.yml"
       end
 
       it "should search for fontcustom.yml if options[:config] is a dir" do
-        FileUtils.cd fixture do
-          o = options :config => "options/config-is-in-dir"
-          o.send :set_config_path
-          o.instance_variable_get(:@cli_options)[:config].should == "options/config-is-in-dir/fontcustom.yml"
-        end
+        o = options :config => "options/config-is-in-dir"
+        o.send :set_config_path
+        o.instance_variable_get(:@cli_options)[:config].should == "options/config-is-in-dir/fontcustom.yml"
       end
 
       it "should raise error if :config doesn't exist" do
-        FileUtils.cd fixture do
-          o = options :config => "does-not-exist"
-          expect { o.send :set_config_path }.to raise_error Fontcustom::Error, /configuration file/
-        end
+        o = options :config => "does-not-exist"
+        expect { o.send :set_config_path }.to raise_error Fontcustom::Error, /configuration file/
       end
     end
 
@@ -67,11 +61,9 @@ describe Fontcustom::Options do
       end
 
       it "should be false if nothing is found" do
-        FileUtils.cd fixture do
-          o = options :manifest => "options/no-config-here/.fontcustom-manifest.json"
-          o.send :set_config_path
-          o.instance_variable_get(:@cli_options)[:config].should == false
-        end
+        o = options :manifest => "options/no-config-here/.fontcustom-manifest.json"
+        o.send :set_config_path
+        o.instance_variable_get(:@cli_options)[:config].should == false
       end
     end
   end
@@ -131,7 +123,7 @@ describe Fontcustom::Options do
   context ".clean_font_name" do
     it "should normalize the font name" do
       o = options
-      o.options = { :font_name => " A_stR4nG3  nAm3 Ø&  " }
+      o.instance_variable_set :@options, { :font_name => " A_stR4nG3  nAm3 Ø&  " }
       o.send :clean_font_name
       o.options[:font_name].should == "A_stR4nG3--nAm3---"
     end
@@ -141,7 +133,7 @@ describe Fontcustom::Options do
     it "should raise error if input[:vectors] doesn't contain SVGs" do
       FileUtils.cd fixture("shared") do
         o = options
-        o.options = { :input => "vectors-empty" }
+        o.instance_variable_set :@options, { :input => "vectors-empty" }
         expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /doesn't contain any SVGs/
       end
     end
@@ -150,7 +142,7 @@ describe Fontcustom::Options do
       it "should set :templates as :vectors if :templates isn't set" do
         FileUtils.cd fixture("shared") do
           o = options
-          o.options = { :input => { :vectors => "vectors" } }
+          o.instance_variable_set :@options, { :input => { :vectors => "vectors" } }
           o.send :set_input_paths
           o.options[:input][:templates].should == "vectors"
         end
@@ -159,7 +151,7 @@ describe Fontcustom::Options do
       it "should preserve :templates if it's set" do
         FileUtils.cd fixture("shared") do
           o = options
-          o.options = { :input => { :vectors => "vectors", :templates => "templates" } }
+          o.instance_variable_set :@options, { :input => { :vectors => "vectors", :templates => "templates" } }
           o.send :set_input_paths
           o.options[:input][:templates].should == "templates"
         end
@@ -168,7 +160,7 @@ describe Fontcustom::Options do
       it "should raise an error if :vectors isn't set" do
         FileUtils.cd fixture("shared") do
           o = options
-          o.options = { :input => { :templates => "templates" } }
+          o.instance_variable_set :@options, { :input => { :templates => "templates" } }
           expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /have a :vectors key/
         end
       end
@@ -176,7 +168,7 @@ describe Fontcustom::Options do
       it "should raise an error if :vectors doesn't point to an existing directory" do
         FileUtils.cd fixture("shared") do
           o = options
-          o.options = {
+          o.instance_variable_set :@options, {
             :config => "fontcustom.yml",
             :input => { :vectors => "not-a-dir" }
           }
@@ -189,7 +181,7 @@ describe Fontcustom::Options do
       it "should return a hash of locations" do
         FileUtils.cd fixture("shared") do
           o = options
-          o.options = { :input => "vectors" }
+          o.instance_variable_set :@options, { :input => "vectors" }
           o.send :set_input_paths
           o.options[:input].should have_key(:vectors)
           o.options[:input].should have_key(:templates)
@@ -199,7 +191,7 @@ describe Fontcustom::Options do
       it "should set :templates to match :vectors" do
         FileUtils.cd fixture("shared") do
           o = options
-          o.options = { :input => "vectors" }
+          o.instance_variable_set :@options, { :input => "vectors" }
           o.send :set_input_paths
           o.options[:input][:templates].should == "vectors"
         end
@@ -208,7 +200,7 @@ describe Fontcustom::Options do
       it "should raise an error if :vectors doesn't point to a directory" do
         FileUtils.cd fixture("shared") do
           o = options
-          o.options = {
+          o.instance_variable_set :@options, {
             :config => "fontcustom.yml",
             :input => "not-a-dir"
           }
@@ -223,7 +215,7 @@ describe Fontcustom::Options do
       context "when :debug is true" do
         it "should print a warning" do
           o = options
-          o.options = {
+          o.instance_variable_set :@options, {
             :debug => true,
             :font_name => "Test-Font"
           }
@@ -236,7 +228,7 @@ describe Fontcustom::Options do
     context "when :output is a hash" do
       it "should set :css and :preview to match :fonts if either aren't set" do
         o = options
-        o.options = { :output => { :fonts => "output/fonts" } }
+        o.instance_variable_set :@options, { :output => { :fonts => "output/fonts" } }
         o.send :set_output_paths
         o.options[:output][:css].should == "output/fonts"
         o.options[:output][:preview].should == "output/fonts"
@@ -244,7 +236,7 @@ describe Fontcustom::Options do
 
       it "should preserve :css and :preview if they do exist" do
         o = options
-        o.options = {
+        o.instance_variable_set :@options, {
           :output => {
             :fonts => "output/fonts",
             :css => "output/styles",
@@ -258,7 +250,7 @@ describe Fontcustom::Options do
 
       it "should create additional paths if they are given" do
         o = options
-        o.options = {
+        o.instance_variable_set :@options, {
           :output => {
             :fonts => "output/fonts",
             "special.js" => "assets/javascripts"
@@ -270,7 +262,7 @@ describe Fontcustom::Options do
 
       it "should raise an error if :fonts isn't set" do
         o = options
-        o.options = {
+        o.instance_variable_set :@options, {
           :config => "fontcustom.yml",
           :output => { :css => "output/styles" }
         }
@@ -281,7 +273,7 @@ describe Fontcustom::Options do
     context "when :output is a string" do
       it "should return a hash of output locations" do
         o = options
-        o.options = { :output => "output/fonts" }
+        o.instance_variable_set :@options, { :output => "output/fonts" }
         o.send :set_output_paths
         o.options[:output].should be_a(Hash)
         o.options[:output].should have_key(:fonts)
@@ -291,7 +283,7 @@ describe Fontcustom::Options do
 
       it "should set :css and :preview to match :fonts" do
         o = options
-        o.options = { :output => "output/fonts" }
+        o.instance_variable_set :@options, { :output => "output/fonts" }
         o.send :set_output_paths
         o.options[:output][:css].should == "output/fonts"
         o.options[:output][:preview].should == "output/fonts"
@@ -300,7 +292,7 @@ describe Fontcustom::Options do
       it "should raise an error if :fonts exists but isn't a directory" do
         FileUtils.cd fixture("shared") do
           o = options
-          o.options = {
+          o.instance_variable_set :@options, {
             :config => "fontcustom.yml",
             :output => "not-a-dir"
           }
@@ -313,11 +305,11 @@ describe Fontcustom::Options do
   context ".check_template_paths" do
     it "should raise an error if a template does not exist" do
       o = options
-      o.options = {
+      o.instance_variable_set :@options, {
         :input => { :templates => fixture("shared/templates") },
         :templates => %w|fake-template.txt|
       }
-      expect { o.send :check_template_paths }.to raise_error Fontcustom::Error, /doesn't exist/
+      expect { o.send :check_template_paths }.to raise_error Fontcustom::Error, /wasn't found/
     end
   end
 end

data/spec/fontcustom/{watcher_spec.rb.off → watcher_spec.rb}

@@ -4,27 +4,27 @@ require "fontcustom/watcher"
 
 describe Fontcustom::Watcher do
   # Silence messages without passing :quiet => true to everything
-  before(:each) do
-    Fontcustom::Options.any_instance.stub :say_message
-  end
+  #before(:each) do
+    #Fontcustom::Options.any_instance.stub :say_message
+  #end
 
   def watcher(options)
-    Fontcustom::Generator::Font.stub :start
-    Fontcustom::Generator::Template.stub :start
-    opts = Fontcustom::Options.new(options)
-    opts.instance_variable_set :@is_test, true # undocumented — non-blocking use of watcher for testing
-    Fontcustom::Watcher.new opts
+    Fontcustom::Manifest.any_instance.stub :write_file
+    Fontcustom::Base.any_instance.stub :compile
+
+    # undocumented — non-blocking use of watcher for testing
+    Fontcustom::Watcher.new options, true
   end
 
   context "#watch" do
-    it "should call generators on init" do
-      Fontcustom::Generator::Font.should_receive(:start).once
-      Fontcustom::Generator::Template.should_receive(:start).once
+    it "should compile on init" do
+      Fontcustom::Base.any_instance.should_receive(:compile).once
+
       w = watcher(
-        :project_root => fixture,
         :input => "shared/vectors",
         :output => "output"
       )
+
       # silence output
       capture(:stdout) do
         w.watch
@@ -33,14 +33,14 @@ describe Fontcustom::Watcher do
     end
 
     it "should not call generators on init if options[:skip_first] is passed" do
-      Fontcustom::Generator::Font.should_not_receive(:start)
-      Fontcustom::Generator::Template.should_not_receive(:start)
+      Fontcustom::Base.any_instance.should_not_receive(:compile)
+
       w = watcher(
-        :project_root => fixture,
         :input => "shared/vectors",
         :output => "output",
         :skip_first => true
       )
+
       capture(:stdout) do
         w.watch
         w.send :stop
@@ -48,14 +48,14 @@ describe Fontcustom::Watcher do
     end
 
     it "should call generators when vectors change" do
-      Fontcustom::Generator::Font.should_receive(:start).once
-      Fontcustom::Generator::Template.should_receive(:start).once
+      Fontcustom::Base.any_instance.should_receive(:compile).once
+
       w = watcher(
-        :project_root => fixture,
         :input => "shared/vectors",
         :output => "output",
         :skip_first => true
       )
+
       capture(:stdout) do
         begin
           w.watch
@@ -69,16 +69,16 @@ describe Fontcustom::Watcher do
       end
     end
 
-    it "should call generators when watched templates change" do
-      Fontcustom::Generator::Font.should_receive(:start).once
-      Fontcustom::Generator::Template.should_receive(:start).once
+    it "should call generators when custom templates change" do
+      Fontcustom::Base.any_instance.should_receive(:compile).once
+
       w = watcher(
-        :project_root => fixture,
         :input => {:vectors => "shared/vectors", :templates => "shared/templates"},
         :templates => %w|css preview custom.css|,
         :output => "output",
         :skip_first => true
       )
+
       capture(:stdout) do
         begin
           template = fixture "shared/templates/custom.css"
@@ -97,14 +97,14 @@ describe Fontcustom::Watcher do
     end
 
     it "should do nothing when non-vectors change" do
-      Fontcustom::Generator::Font.should_not_receive(:start)
-      Fontcustom::Generator::Template.should_not_receive(:start)
+      Fontcustom::Base.any_instance.should_not_receive(:compile)
+
       w = watcher(
-        :project_root => fixture,
         :input => "shared/vectors",
         :output => "output",
         :skip_first => true
       )
+
       capture(:stdout) do
         begin
           w.watch

data/spec/spec_helper.rb

@@ -4,34 +4,39 @@ require "fileutils"
 require File.expand_path("../../lib/fontcustom.rb", __FILE__)
 
 RSpec.configure do |c|
+  c.before(:all) do
+    FileUtils.cd fixture
+    puts "Running `cd #{Dir.pwd}`"
+  end
+
   def fixture(path = "")
     File.join(File.expand_path("../fixtures", __FILE__), path)
   end
 
-  def manifest_contents(root = Dir.pwd)
+  def manifest_contents
     {
       :checksum => {
         :current => "82a59e769bc60192484f2620570bbb59e225db97c1aac3f242a2e49d6060a19c", 
         :previous => "82a59e769bc60192484f2620570bbb59e225db97c1aac3f242a2e49d6060a19c"
       },
       :fonts => [
-        "#{root}/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.ttf",
-        "#{root}/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.svg",
-        "#{root}/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.woff",
-        "#{root}/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.eot"
+        "fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.ttf",
+        "fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.svg",
+        "fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.woff",
+        "fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.eot"
       ],
       :glyphs => {
         :"a_r3ally-exotic-f1le-name" => {
           :codepoint => 61696,
-          :source => "#{root}/vectors/a_R3ally-eXotic f1Le Name.svg"
+          :source => "vectors/a_R3ally-eXotic f1Le Name.svg"
         },
         :c => {
           :codepoint => 61697,
-          :source => "#{root}/vectors/C.svg"
+          :source => "vectors/C.svg"
         },  
         :d => {
           :codepoint => 61698,
-          :source => "#{root}/vectors/D.svg"}
+          :source => "vectors/D.svg"}
         },
       :options => {
         :autowidth => false,
@@ -39,23 +44,23 @@ RSpec.configure do |c|
         :css_selector => ".icon-{{glyph}}",
         :debug => false,
         :font_name => "fontcustom",
+        :force => true,
         :input => {
-          :templates => "#{root}/vectors",
-          :vectors => "#{root}/vectors"
+          :templates => "vectors",
+          :vectors => "vectors"
         },
-        :manifest => "#{root}/.fontcustom-manifest.json",
         :no_hash => false,
         :output => {
-          :css => "#{root}/fontcustom",
-          :fonts => "#{root}/fontcustom",
-          :preview => "#{root}/fontcustom"
+          :css => "fontcustom",
+          :fonts => "fontcustom",
+          :preview => "fontcustom"
         },
         :preprocessor_path => nil,
-        :project_root => "#{root}",
         :quiet => true,
         :templates => [
-          "#{Fontcustom.gem_lib}/templates/fontcustom.css",
-          "#{Fontcustom.gem_lib}/templates/fontcustom-preview.html"
+          "css",
+          "scss",
+          "preview"
         ]
       },
       :templates => []
@@ -80,7 +85,7 @@ RSpec.configure do |c|
 
   def live_test
     testdir = fixture File.join("sandbox", "test")
-    FileUtils.rm_r testdir
+    FileUtils.rm_r testdir if File.directory?(testdir)
     FileUtils.mkdir testdir
     FileUtils.cp_r fixture("shared/vectors"), testdir
     FileUtils.cd testdir do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta4
+  version: 1.3.0
 platform: ruby
 authors:
 - Kai Zau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -169,7 +169,7 @@ files:
 - spec/fontcustom/manifest_spec.rb
 - spec/fontcustom/options_spec.rb
 - spec/fontcustom/utility_spec.rb
-- spec/fontcustom/watcher_spec.rb.off
+- spec/fontcustom/watcher_spec.rb
 - spec/spec_helper.rb
 homepage: http://fontcustom.com
 licenses: []
@@ -186,9 +186,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.9
@@ -230,5 +230,5 @@ test_files:
 - spec/fontcustom/manifest_spec.rb
 - spec/fontcustom/options_spec.rb
 - spec/fontcustom/utility_spec.rb
-- spec/fontcustom/watcher_spec.rb.off
+- spec/fontcustom/watcher_spec.rb
 - spec/spec_helper.rb