fontcustom 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a6e8bb4958c86331ee3892c42e9a10b10cd3df0d
-  data.tar.gz: de87bb5735a42ebd41672e739f44c00bdc5452f7
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTRkNmEyNmI5ZTFhNjhhMTVmZTdlOTlkYzRiZTRhYWY2OGFkOGNkZg==
+  data.tar.gz: !binary |-
+    MGUzYTA4ZGNiZjBjN2M1NGJlY2ZkZWQxZDgwZjY3YzNiZjIzZjM3NQ==
 SHA512:
-  metadata.gz: f7a94f1314cf98b613bf5bca317ba166c4e2a148f0ae511cc033db551d9691fb04003a7c3ac8aa1c12d5a8bc0049bd6891f050738e0fe2c5968e73127a8ab72c
-  data.tar.gz: 2fba689d4f3f007385d3419dff4652254ad0cddc9eaf97129baeba392188b3fcca58ab598efcdc7cd5215ec584b3b79583198cb7e3328de77393e81f2597ce15
+  metadata.gz: !binary |-
+    ZWVjYTY1N2Q4NWRkNzY0ZTFlMzY1ZGFmZTc1ZmNkZGJjZTM1YmYyMjA4NDc1
+    ZjI4MmY0NzJlODRjOWVhNTkxMTc2YTE4NTRmZWM4OWE0N2FiNWM5ZGM5N2E3
+    OWQ2NjlkYTBkMGRhODhmZjljYTMzYzUyZGE2MWVhOGIzOTk0MDg=
+  data.tar.gz: !binary |-
+    OWY3MTM5OWE1ZWMxMGVkMDFjNTExNGIzMTVjM2VmZjE3NDY3YTZjODhjMTI4
+    ZTQ4NGI0OWZiYWQzMGEwYzg0NTBmZjQ2N2RlYjgxNGIwMzFlY2ZhMzk5ZTNj
+    MTA0OGE2YzFiMWJiMGZlZmEwYzE4MTE1NDhhZjIyMjJiNzMxOGM=

data/.travis.yml

@@ -10,4 +10,11 @@ rvm:
   - 2.0.0
   - 1.9.3
   - 1.9.2
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile.listen_1
+matrix:
+  exclude:
+    - gemfile: Gemfile
+      rvm: 1.9.2
 script: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.3.4 (10/11/2014)
+
+* Updates rspec tests to be compatible with rspec v3.1.6
+* Add additional metrics to make it easier to have different size icon fonts ([#175](https://github.com/FontCustom/fontcustom/pull/175))
+* Add woff data uri to generated CSS + template helper ([#182](https://github.com/FontCustom/fontcustom/pull/182))
+* Support listen v1 and v2 ([#191](https://github.com/FontCustom/fontcustom/pull/191))
+* Add multiple classes to config file ([#174](https://github.com/FontCustom/fontcustom/issues/174))
+* Don't strip "%" symbol (and other potentially valid characters) from CSS selector ([#173](https://github.com/FontCustom/fontcustom/issues/173))
+* Fix bug where custom template path appears in output filenames ([#198](https://github.com/FontCustom/fontcustom/pull/198), [#172](https://github.com/FontCustom/fontcustom/issues/172))
+* SCSS content variables like Font Awesome ([#151](https://github.com/FontCustom/fontcustom/issues/151))
+* Running compile on a folder containing directories shouldn't throw an error
+
 ## 1.3.3 (2/20/2014)
 
 * Removes ttfautohint ([#160c](https://github.com/FontCustom/fontcustom/pull/160#issuecomment-34593191))

data/README.md

@@ -73,6 +73,10 @@ output:
 ```yml
 font_name: fontcustom                 # Also sets the default output directory and
                                       # the name of generated stock templates
+font_design_size: 16                  # The size of the original glyphs
+font_em: 512                          # Scale font up to this size
+font_ascent: 448                      # Location of font ascent
+font_descent: 64                      # Location of font descent
 no_hash: false                        # Don't add asset-busting hashes to font files
 autowidth: false                      # Automatically size glyphs based on the width of
                                       # their individual vectors

data/fontcustom.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "json", "~>1.4"
   gem.add_dependency "thor", "~>0.14"
-  gem.add_dependency "listen", "~>1.0"
+  gem.add_dependency "listen", ">=1.0","<3.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "bundler"

data/gemfiles/Gemfile.listen_1

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fontcustom.gemspec
+gemspec
+
+gem "listen", "~>1.0"

data/lib/fontcustom.rb

@@ -28,6 +28,10 @@ module Fontcustom
     :config => nil,
     :templates => %w|css preview|,
     :font_name => "fontcustom",
+    :font_design_size => 16,
+    :font_em => 512,
+    :font_ascent => 448,
+    :font_descent => 64,
     :css_selector => ".icon-{{glyph}}",
     :preprocessor_path => nil,
     :autowidth => false,

data/lib/fontcustom/base.rb

@@ -38,8 +38,8 @@ module Fontcustom
 
     # Calculates a hash of vectors, options, and templates (content and filenames)
     def checksum
-      files = Dir.glob File.join(@options[:input][:vectors], "*.svg")
-      files += Dir.glob File.join(@options[:input][:templates], "*")
+      files = Dir.glob(File.join(@options[:input][:vectors], "*.svg")).select { |fn| File.file?(fn) }
+      files += Dir.glob(File.join(@options[:input][:templates], "*")).select { |fn| File.file?(fn) }
       content = files.map { |file| File.read(file) }.join
       content << files.join
       content << @options.flatten(2).join

data/lib/fontcustom/cli.rb

@@ -25,6 +25,22 @@ module Fontcustom
     class_option :font_name, :aliases => "-f", :type => :string,
       :desc => "The font's name. Also determines the file names of generated templates.",
       :default => DEFAULT_OPTIONS[:font_name]
+    
+    class_option :font_design_size, :aliases => '-x', :type => :numeric,
+      :desc => "Size (in pica points) for which this font was designed.",
+      :default => DEFAULT_OPTIONS[:font_design_size]
+
+    class_option :font_em, :aliases => '-m', :type => :numeric,
+      :desc => "The em size of the font. Setting this will scale the entire font to the given size.",
+      :default => DEFAULT_OPTIONS[:font_em]
+
+    class_option :font_ascent, :aliases => '-a', :type => :numeric,
+      :desc => "The font's ascent.",
+      :default => DEFAULT_OPTIONS[:font_ascent]
+
+    class_option :font_descent, :aliases => '-z', :type => :numeric,
+      :desc => "The font's descent.",
+      :default => DEFAULT_OPTIONS[:font_descent]
 
     class_option :css_selector, :aliases => "-s", :type => :string,
       :desc => "Format of generated CSS selector. \"{{glyph}}\" is substituted for the glyph name.",

data/lib/fontcustom/generator/template.rb

@@ -1,5 +1,6 @@
 require "json"
 require "pathname"
+require "base64"
 
 module Fontcustom
   module Generator
@@ -36,7 +37,7 @@ module Fontcustom
         css_path = Pathname.new(@options[:output][:css]).realdirpath
         preview_path = Pathname.new(@options[:output][:preview]).realdirpath
         @font_path = File.join fonts_path.relative_path_from(css_path).to_s, name
-        @font_path_alt = if @options[:preprocessor_path].nil? 
+        @font_path_alt = if @options[:preprocessor_path].nil?
           @font_path
         elsif ! @options[:preprocessor_path] || @options[:preprocessor_path].empty?
           name
@@ -51,9 +52,9 @@ module Fontcustom
         existing = @manifest.get :templates
         created = []
         begin
-          @options[:templates].each do |source|
+          @options[:templates].each do |template_name|
             begin
-              source = get_source_path(source)
+              source = get_source_path(template_name)
               target = get_target_path(source)
               template source, target, :verbose => false, :force => true
             end
@@ -89,7 +90,7 @@ module Fontcustom
         packaged = %w|fontcustom-preview.html fontcustom.css _fontcustom.scss _fontcustom-rails.scss|
 
         target = if @options[:output].keys.include? base.to_sym
-          File.join @options[:output][base.to_sym], source
+          File.join @options[:output][base.to_sym], base
         elsif ext && css_exts.include?(ext)
           File.join @options[:output][:css], base
         elsif source.match(/fontcustom-preview\.html/)
@@ -129,6 +130,7 @@ module Fontcustom
   font-family: "#{font_name}";
   src: #{url}("#{path}.eot");
   src: #{url}("#{path}.eot?#iefix") format("embedded-opentype"),
+       #{url}(#{woff_data_uri}),
        #{url}("#{path}.woff") format("woff"),
        #{url}("#{path}.ttf") format("truetype"),
        #{url}("#{path}.svg##{font_name}") format("svg");
@@ -144,6 +146,15 @@ module Fontcustom
 }|
       end
 
+      def woff_data_uri
+        "data:application/x-font-woff;charset=utf-8;base64,#{woff_base64}"
+      end
+
+      def woff_base64
+        woff_path = File.join(@options[:output][:fonts], "#{@font_path_alt}.woff")
+        Base64.encode64(File.read(File.join(woff_path))).gsub("\n", "")
+      end
+
       def glyph_selectors
         output = @glyphs.map do |name, value|
           @options[:css_selector].sub("{{glyph}}", name.to_s) + ":before"

data/lib/fontcustom/options.rb

@@ -90,7 +90,7 @@ module Fontcustom
         raise Fontcustom::Error,
           "CSS selector `#{@options[:css_selector]}` should contain the \"{{glyph}}\" placeholder."
       end
-      @options[:css_selector] = @options[:css_selector].strip.gsub(/[^\.#\{\}\w]/, "-")
+      @options[:css_selector] = @options[:css_selector].strip.gsub(/[^&%=\[\]\.#\{\}""\d\w]/, "-")
     end
 
     def set_input_paths

data/lib/fontcustom/scripts/generate.py

@@ -28,20 +28,19 @@ options = manifest['options']
 # Font
 #
 
+design_px = options['font_em'] / options['font_design_size']
+
 font = fontforge.font()
 font.encoding = 'UnicodeFull'
-font.design_size = 16
-font.em = 512
-font.ascent = 448
-font.descent = 64
+font.design_size = options['font_design_size']
+font.em = options['font_em']
+font.ascent = options['font_ascent']
+font.descent = options['font_descent']
 font.fontname = options['font_name']
 font.familyname = options['font_name']
 font.fullname = options['font_name']
 if options['autowidth']:
-    font.autoWidth(0, 0, 512)
-
-# NOTE not referenced anywhere, safe to remove?
-KERNING = 15
+    font.autoWidth(0, 0, options['font_em'])
 
 #
 # Glyphs
@@ -73,7 +72,13 @@ def createGlyph( name, source, code ):
             glyph.left_side_bearing = glyph.right_side_bearing = 0
             glyph.round()
         else:
-            glyph.width = 512
+            glyph.width = options['font_em']
+            width = glyph.width - glyph.left_side_bearing - glyph.right_side_bearing
+            aligned_to_pixel_grid = (width % design_px == 0)
+            if (aligned_to_pixel_grid):
+                shift = glyph.left_side_bearing % design_px
+                glyph.left_side_bearing = glyph.left_side_bearing - shift
+                glyph.right_side_bearing = glyph.right_side_bearing + shift
 
 for glyph, data in manifest['glyphs'].iteritems():
     name = createGlyph(glyph, data['source'], data['codepoint'])

data/lib/fontcustom/templates/_fontcustom.scss

@@ -12,3 +12,5 @@
 }
 
 <%= glyphs %>
+<% @glyphs.each do |name, value| %>
+$font-<%= font_name.gsub(/[^\w\d_]/, '-') %>-<%= name.to_s %>: "\<%= value[:codepoint].to_s(16) %>";<% end %>

data/lib/fontcustom/templates/fontcustom-preview.html

@@ -154,7 +154,7 @@
         selector = @options[:css_selector].sub('{{glyph}}', name.to_s) %>
       <div class="glyph">
         <div class="preview-glyphs">
-          <% scale.each do |n| %><span class="step size-<%= n %>"><span class="letters">Pp</span><i id="<%= selector[1..-1] %>" class="<%= selector[1..-1] %>"></i></span><% end %>
+          <% scale.each do |n| %><span class="step size-<%= n %>"><span class="letters">Pp</span><i id="<%= selector[1..-1] %>" class="<%= selector[1..-1].gsub('.', ' ') %>"></i></span><% end %>
         </div>
         <div class="preview-scale">
           <% scale.each do |n| %><span class="step"><%= n %></span><% end %>

data/lib/fontcustom/templates/fontcustom.yml

@@ -5,6 +5,10 @@
 # --------------------------------------------------------------------------- #
 
 font_name: fontcustom
+font_design_size: 16
+font_em: 512
+font_ascent: 448
+font_descent: 64
 css_selector: .icon-{{glyph}}
 preprocessor_path: ""
 autowidth: false

data/lib/fontcustom/version.rb

@@ -1,3 +1,3 @@
 module Fontcustom
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

data/lib/fontcustom/watcher.rb

@@ -14,16 +14,7 @@ module Fontcustom
       packaged = %w|preview css scss scss-rails|
       templates.delete_if { |template| packaged.include?(template) }
 
-      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
+      create_listener(templates)
     end
 
     def watch
@@ -35,11 +26,32 @@ module Fontcustom
 
     private
 
+    def create_listener(templates)
+      listen_options = {}
+      listen_options[:polling_fallback_message] = false if @is_test
+
+      listen_dirs = [@options[:input][:vectors]]
+      listen_dirs << @options[:input][:templates] unless templates.empty?
+
+      if listen_eq2
+        listen_options[:only] = /(#{templates.join("|")}|.+\.svg)$/
+        @listener = Listen.to(listen_dirs, listen_options, &callback)
+      else
+        listen_options[:filter] = /(#{templates.join("|")}|.+\.svg)$/
+        listen_options[:relative_paths] = true
+        @listener = Listen::Listener.new(listen_dirs, listen_options, &callback)
+      end
+    end
+
     def start
       if @is_test # Non-blocking listener
         @listener.start
       else
-        @listener.start!
+        if listen_eq2
+          @listener.start.join
+        else
+          @listener.start!
+        end
       end
     end
 
@@ -65,5 +77,14 @@ module Fontcustom
     def compile
       @base.compile
     end
+
+    def listen_eq2
+      begin
+        require 'listen/version'
+        ::Listen::VERSION =~ /^2\./
+      rescue LoadError
+        false
+      end
+    end
   end
 end

data/spec/fixtures/shared/templates/custom.css

@@ -1,7 +1,4 @@
 /*
 <%= @glyphs.inspect %>
 */
-.foo { color: black; }
-
-.bar { color: red; }
-.bar { color: red; }
+.foo { color: black; }

data/spec/fontcustom/base_spec.rb

@@ -1,31 +1,31 @@
 require "spec_helper"
 
 describe Fontcustom::Base do
-  before(:each) { Fontcustom::Manifest.any_instance.stub(:write_file) }
+  before(:each) { allow(Fontcustom::Manifest).to receive(:write_file) }
 
   context "#compile" do
     context "when [:checksum][:current] equals [:checksum][:previous]" do
       it "should show 'no change' message" do
-        Fontcustom::Base.any_instance.stub :check_fontforge
+        allow(Fontcustom::Base).to receive(:check_fontforge)
         options = double("options")
-        options.stub(:options).and_return({})
-        Fontcustom::Options.stub(:new).and_return options
+        allow(options).to receive(:options).and_return({})
+        allow(Fontcustom::Options).to receive(:new).and_return options
 
         output = capture(:stdout) do
           base = Fontcustom::Base.new({})
           manifest = base.instance_variable_get :@manifest
-          manifest.stub(:get).and_return :previous => "abc"
-          base.stub(:checksum).and_return "abc"
+          expect(manifest).to receive(:get).and_return :previous => "abc"
+          expect(base).to receive(:checksum).and_return "abc"
           base.compile
         end
-        output.should match(/No changes/)
+        expect(output).to 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(:"`").and_return("")
+      allow_any_instance_of(Fontcustom::Base).to receive(:"`").and_return("")
       expect { Fontcustom::Base.new(:option => "foo") }.to raise_error Fontcustom::Error, /fontforge/
     end
   end
@@ -33,7 +33,7 @@ describe Fontcustom::Base do
   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
+      allow(Fontcustom::Base).to receive(:check_fontforge)
       base = Fontcustom::Base.new({})
       base.instance_variable_set :@options, {
         :input => {:vectors => fixture("shared/vectors")},

data/spec/fontcustom/cli_spec.rb

@@ -7,8 +7,8 @@ describe Fontcustom::CLI 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":.+fontcustom\/fontcustom_.+\.ttf"/m)
+        expect(Dir.glob(File.join(testdir, "fontcustom", "fontcustom_*\.{ttf,svg,woff,eot}")).length).to eq(4)
+        expect(File.read(manifest)).to match(/"fonts":.+fontcustom\/fontcustom_.+\.ttf"/m)
       end
     end
   end

data/spec/fontcustom/generator/font_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Fontcustom::Generator::Font do
   def generator
-    Fontcustom::Manifest.any_instance.stub :write_file
+    allow_any_instance_of(Fontcustom::Manifest).to receive(:write_file)
     Fontcustom::Generator::Font.new("")
   end
 
@@ -12,9 +12,9 @@ describe Fontcustom::Generator::Font do
         test_manifest
         manifest = File.join Dir.pwd, ".fontcustom-manifest.json"
         gen = Fontcustom::Generator::Font.new manifest
-        gen.stub :create_fonts
+        allow(gen).to receive(:create_fonts)
         gen.generate
-        File.read(manifest).should match(/"glyphs":.+"C":/m)
+        expect(File.read(manifest)).to match(/"glyphs":.+"C":/m)
       end
     end
 
@@ -23,8 +23,8 @@ describe Fontcustom::Generator::Font do
         test_manifest
         manifest = File.join Dir.pwd, ".fontcustom-manifest.json"
         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":.*fontcustom\/fontcustom_.+\.ttf"/m)
+        expect(Dir.glob(File.join(testdir, "fontcustom", "fontcustom_*\.{ttf,svg,woff,eot}")).length).to eq(4)
+        expect(File.read(manifest)).to match(/"fonts":.*fontcustom\/fontcustom_.+\.ttf"/m)
       end
     end
   end
@@ -37,8 +37,8 @@ describe Fontcustom::Generator::Font do
         :quiet => true
       }
       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)
+      expect(gen).to receive(:empty_directory).with("path/fonts", :verbose => false)
+      expect(gen).to receive(:empty_directory).with("path/vectors", :verbose => false)
       gen.send :create_output_dirs
     end
   end
@@ -51,9 +51,9 @@ describe Fontcustom::Generator::Font do
 
       gen.send :set_glyph_info
       data = manifest.instance_variable_get(:@data)
-      data[:glyphs][:C].should include(:codepoint => 61696)
-      data[:glyphs][:D].should include(:codepoint => 61697)
-      data[:glyphs][:"a_R3ally-eXotic-f1Le-Name"].should include(:codepoint => 61698)
+      expect(data[:glyphs][:C]).to include(:codepoint => 61696)
+      expect(data[:glyphs][:D]).to include(:codepoint => 61697)
+      expect(data[:glyphs][:"a_R3ally-eXotic-f1Le-Name"]).to include(:codepoint => 61698)
     end
 
     it "should not change codepoints of existing glyphs" do
@@ -64,9 +64,9 @@ describe Fontcustom::Generator::Font do
 
       gen.send :set_glyph_info
       data = manifest.instance_variable_get(:@data)
-      data[:glyphs][:C].should include(:codepoint => 61699)
-      data[:glyphs][:D].should include(:codepoint => 61700)
-      data[:glyphs][:"a_R3ally-eXotic-f1Le-Name"].should include(:codepoint => 61701)
+      expect(data[:glyphs][:C]).to include(:codepoint => 61699)
+      expect(data[:glyphs][:D]).to include(:codepoint => 61700)
+      expect(data[:glyphs][:"a_R3ally-eXotic-f1Le-Name"]).to include(:codepoint => 61701)
     end
   end
 end

data/spec/fontcustom/generator/template_spec.rb

@@ -15,7 +15,7 @@ describe Fontcustom::Generator::Template do
         Fontcustom::Generator::Template.new(manifest).generate
 
         content = File.read manifest
-        content.should match(/fontcustom\/fontcustom-preview.html/)
+        expect(content).to match(/fontcustom\/fontcustom-preview.html/)
       end
     end
   end
@@ -27,9 +27,9 @@ describe Fontcustom::Generator::Template do
       options[:output] = {:fonts => fixture("sandbox/test/fonts"), :css => fixture("sandbox/test/css"), :preview => fixture("sandbox/test")}
 
       gen.send :set_relative_paths
-      gen.instance_variable_get(:@font_path).should match("../fonts")
-      gen.instance_variable_get(:@font_path_alt).should match("../fonts")
-      gen.instance_variable_get(:@font_path_preview).should match(".")
+      expect(gen.instance_variable_get(:@font_path)).to match("../fonts")
+      expect(gen.instance_variable_get(:@font_path_alt)).to match("../fonts")
+      expect(gen.instance_variable_get(:@font_path_preview)).to match(".")
     end
 
     it "should assign @font_path_alt if :preprocessor_path is set" do
@@ -39,7 +39,7 @@ describe Fontcustom::Generator::Template do
       options[:output] = {:fonts => fixture("sandbox/test/fonts"), :css => fixture("sandbox/test/css"), :preview => fixture("sandbox/test")}
 
       gen.send :set_relative_paths
-      gen.instance_variable_get(:@font_path_alt).should match("fonts/fontcustom")
+      expect(gen.instance_variable_get(:@font_path_alt)).to match("fonts/fontcustom")
     end
 
     it "should assign @font_path_alt as bare font name if :preprocessor_path is false" do
@@ -49,7 +49,7 @@ describe Fontcustom::Generator::Template do
       options[:output] = {:fonts => fixture("sandbox/test/fonts"), :css => fixture("sandbox/test/css"), :preview => fixture("sandbox/test")}
 
       gen.send :set_relative_paths
-      gen.instance_variable_get(:@font_path_alt).should_not match("../fonts")
+      expect(gen.instance_variable_get(:@font_path_alt)).to_not match("../fonts")
     end
 
     it "should assign '.' when paths are the same" do
@@ -58,7 +58,31 @@ describe Fontcustom::Generator::Template do
       options[:output] = {:fonts => fixture("sandbox/test/fonts"), :css => fixture("sandbox/test/fonts"), :preview => fixture("sandbox/test/fonts")}
 
       gen.send :set_relative_paths
-      gen.instance_variable_get(:@font_path).should match("./")
+      expect(gen.instance_variable_get(:@font_path)).to match("./")
+    end
+  end
+
+  context ".create_files" do
+    it "should not include the template path in custom output file paths" do
+      gen = Fontcustom::Generator::Template.new fixture("generators/.fontcustom-manifest.json")
+
+      # Set options to specify a custom CSS template with a custom output location.
+      options = gen.instance_variable_get :@options
+      options[:input][:templates] = fixture("shared/templates")
+      options[:templates] = ['custom.css']
+      options[:output][:'custom.css'] = fixture("sandbox/test")
+
+      # Don't update the manifest based on these options.
+      manifest = gen.instance_variable_get :@manifest
+      expect(manifest).to receive(:set)
+
+      # Confirm that the output file doesn't include the template path.
+      expect(gen).to receive(:template).once do |source, target|
+        expect(source).to match("shared/templates")
+        expect(target).to_not match("shared/templates")
+      end
+
+      gen.send :create_files
     end
   end
 end

data/spec/fontcustom/manifest_spec.rb

@@ -10,7 +10,7 @@ describe Fontcustom::Manifest do
           Fontcustom::Manifest.new manifest, options
         end
         content = File.read File.join(testdir, ".fontcustom-manifest.json")
-        content.should match(/"options":.+"input":/m)
+        expect(content).to match(/"options":.+"input":/m)
       end
     end
   end

data/spec/fontcustom/options_spec.rb

@@ -8,8 +8,8 @@ describe Fontcustom::Options do
   end
 
   before(:each) do
-    Fontcustom::Options.any_instance.stub :say_message
-    Fontcustom::Options.any_instance.stub :parse_options
+    allow_any_instance_of(Fontcustom::Options).to receive(:say_message)
+    allow_any_instance_of(Fontcustom::Options).to receive(:parse_options)
   end
 
   context ".overwrite_examples" do
@@ -18,7 +18,7 @@ describe Fontcustom::Options do
       o.send :overwrite_examples
       cli = o.instance_variable_get(:@cli_options)
       Fontcustom::EXAMPLE_OPTIONS.keys.each do |key|
-        cli[key].should == Fontcustom::DEFAULT_OPTIONS[key]
+        expect(cli[key]).to eq(Fontcustom::DEFAULT_OPTIONS[key])
       end
     end
   end
@@ -28,13 +28,13 @@ describe Fontcustom::Options do
       it "should use options[:config] if it's a file" 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"
+        expect(o.instance_variable_get(:@cli_options)[:config]).to eq("options/any-file-name.yml")
       end
 
       it "should search for fontcustom.yml if options[:config] is a dir" 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"
+        expect(o.instance_variable_get(:@cli_options)[:config]).to eq("options/config-is-in-dir/fontcustom.yml")
       end
 
       it "should raise error if :config doesn't exist" do
@@ -48,7 +48,7 @@ describe Fontcustom::Options do
         FileUtils.cd fixture("options") do
           o = options
           o.send :set_config_path
-          o.instance_variable_get(:@cli_options)[:config].should == "fontcustom.yml"
+          expect(o.instance_variable_get(:@cli_options)[:config]).to eq("fontcustom.yml")
         end
       end
 
@@ -56,14 +56,14 @@ describe Fontcustom::Options do
         FileUtils.cd fixture("options/rails-like") do
           o = options
           o.send :set_config_path
-          o.instance_variable_get(:@cli_options)[:config].should == "config/fontcustom.yml"
+          expect(o.instance_variable_get(:@cli_options)[:config]).to eq("config/fontcustom.yml")
         end
       end
 
       it "should be false if nothing is found" 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
+        expect(o.instance_variable_get(:@cli_options)[:config]).to eq(false)
       end
     end
   end
@@ -72,7 +72,7 @@ describe Fontcustom::Options do
     it "should warn if fontcustom.yml is blank" do
       o = options
       o.instance_variable_set :@cli_options, {:config => fixture("options/fontcustom-empty.yml")}
-      o.should_receive(:say_message).with :warn, /was empty/
+      expect(o).to receive(:say_message).with :warn, /was empty/
       o.send :load_config
     end
 
@@ -86,7 +86,7 @@ describe Fontcustom::Options do
       o = options
       o.instance_variable_set :@cli_options, {:config => false}
       o.send :load_config
-      o.instance_variable_get(:@config_options).should == {}
+      expect(o.instance_variable_get(:@config_options)).to eq({})
     end
 
     context "when :debug is true" do
@@ -96,7 +96,7 @@ describe Fontcustom::Options do
           :config => fixture("options/any-file-name.yml"),
           :debug => true
         }
-        o.should_receive(:say_message).with :debug, /Using settings/
+        expect(o).to receive(:say_message).with :debug, /Using settings/
         o.send :load_config
       end
     end
@@ -107,7 +107,7 @@ describe Fontcustom::Options do
       o = options
       o.instance_variable_set :@config_options, { :input => "config" }
       o.send :merge_options
-      o.options[:input].should == "config"
+      expect(o.options[:input]).to eq("config")
     end
 
     it "should overwrite config file and defaults with CLI options" do
@@ -115,8 +115,8 @@ describe Fontcustom::Options do
       o.instance_variable_set :@config_options, { :input => "config", :output => "output" }
       o.instance_variable_set :@cli_options, { :input => "cli" }
       o.send :merge_options
-      o.options[:input].should == "cli"
-      o.options[:output].should == "output"
+      expect(o.options[:input]).to eq("cli")
+      expect(o.options[:output]).to eq("output")
     end
   end
 
@@ -125,7 +125,7 @@ describe Fontcustom::Options do
       o = options
       o.instance_variable_set :@options, { :font_name => " A_stR4nG3  nAm3 Ø&  " }
       o.send :clean_font_name
-      o.options[:font_name].should == "A_stR4nG3--nAm3---"
+      expect(o.options[:font_name]).to eq("A_stR4nG3--nAm3---")
     end
   end
 
@@ -144,7 +144,7 @@ describe Fontcustom::Options do
           o = options
           o.instance_variable_set :@options, { :input => { :vectors => "vectors" } }
           o.send :set_input_paths
-          o.options[:input][:templates].should == "vectors"
+          expect(o.options[:input][:templates]).to eq("vectors")
         end
       end
 
@@ -153,7 +153,7 @@ describe Fontcustom::Options do
           o = options
           o.instance_variable_set :@options, { :input => { :vectors => "vectors", :templates => "templates" } }
           o.send :set_input_paths
-          o.options[:input][:templates].should == "templates"
+          expect(o.options[:input][:templates]).to eq("templates")
         end
       end
 
@@ -183,8 +183,8 @@ describe Fontcustom::Options do
           o = options
           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)
+          expect(o.options[:input]).to have_key(:vectors)
+          expect(o.options[:input]).to have_key(:templates)
         end
       end
 
@@ -193,7 +193,7 @@ describe Fontcustom::Options do
           o = options
           o.instance_variable_set :@options, { :input => "vectors" }
           o.send :set_input_paths
-          o.options[:input][:templates].should == "vectors"
+          expect(o.options[:input][:templates]).to eq("vectors")
         end
       end
 
@@ -219,7 +219,7 @@ describe Fontcustom::Options do
             :debug => true,
             :font_name => "Test-Font"
           }
-          o.should_receive(:say_message).with :debug, /Test-Font/
+          expect(o).to receive(:say_message).with :debug, /Test-Font/
           o.send :set_output_paths
         end
       end
@@ -230,8 +230,8 @@ describe Fontcustom::Options do
         o = options
         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"
+        expect(o.options[:output][:css]).to eq("output/fonts")
+        expect(o.options[:output][:preview]).to eq("output/fonts")
       end
 
       it "should preserve :css and :preview if they do exist" do
@@ -244,8 +244,8 @@ describe Fontcustom::Options do
           }
         }
         o.send :set_output_paths
-        o.options[:output][:css].should == "output/styles"
-        o.options[:output][:preview].should == "output/preview"
+        expect(o.options[:output][:css]).to eq("output/styles")
+        expect(o.options[:output][:preview]).to eq("output/preview")
       end
 
       it "should create additional paths if they are given" do
@@ -257,7 +257,7 @@ describe Fontcustom::Options do
           }
         }
         o.send :set_output_paths
-        o.options[:output][:"special.js"].should == "assets/javascripts"
+        expect(o.options[:output][:"special.js"]).to eq("assets/javascripts")
       end
 
       it "should raise an error if :fonts isn't set" do
@@ -275,18 +275,18 @@ describe Fontcustom::Options do
         o = options
         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)
-        o.options[:output].should have_key(:css)
-        o.options[:output].should have_key(:preview)
+        expect(o.options[:output]).to be_a(Hash)
+        expect(o.options[:output]).to have_key(:fonts)
+        expect(o.options[:output]).to have_key(:css)
+        expect(o.options[:output]).to have_key(:preview)
       end
 
       it "should set :css and :preview to match :fonts" do
         o = options
         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"
+        expect(o.options[:output][:css]).to eq("output/fonts")
+        expect(o.options[:output][:preview]).to eq("output/fonts")
       end
 
       it "should raise an error if :fonts exists but isn't a directory" do

data/spec/fontcustom/utility_spec.rb

@@ -14,7 +14,7 @@ describe Fontcustom::Utility do
   it "should include Thor::Action methods" do
     gen = Generator.new
     %w|template add_file remove_file|.each do |method|
-      gen.should respond_to(method.to_sym)
+      expect(gen).to respond_to(method.to_sym)
     end
   end
 
@@ -22,7 +22,7 @@ describe Fontcustom::Utility do
     it "should turn string keys into symbols" do
       gen = Generator.new
       hash = gen.symbolize_hash "foo" => "bar"
-      hash.should == { :foo => "bar" }
+      expect(hash).to eq({ :foo => "bar" })
     end
   end
 
@@ -30,14 +30,14 @@ describe Fontcustom::Utility do
     it "should define getter method" do
       gen = Generator.new
       hash = gen.methodize_hash :foo => "bar"
-      hash.foo.should == "bar"
+      expect(hash.foo).to eq("bar")
     end
 
     it "should define setter method" do
       gen = Generator.new
       hash = gen.methodize_hash :foo => "bar"
       hash.foo = "baz"
-      hash.foo.should == "baz"
+      expect(hash.foo).to eq("baz")
     end
   end
 
@@ -45,8 +45,8 @@ describe Fontcustom::Utility do
     it "should replace the contents of a file" do
       gen = Generator.new
       file = double "file"
-      File.should_receive(:open).with(fixture("shared/test"), "w").and_yield file
-      file.should_receive(:write).with("testing")
+      expect(File).to receive(:open).with(fixture("shared/test"), "w").and_yield file
+      expect(file).to receive(:write).with("testing")
       gen.write_file fixture("shared/test"), "testing"
     end
   end

data/spec/fontcustom/watcher_spec.rb

@@ -9,8 +9,8 @@ describe Fontcustom::Watcher do
   #end
 
   def watcher(options)
-    Fontcustom::Manifest.any_instance.stub :write_file
-    Fontcustom::Base.any_instance.stub :compile
+    allow_any_instance_of(Fontcustom::Manifest).to receive(:write_file)
+    allow_any_instance_of(Fontcustom::Base).to receive(:compile)
 
     # undocumented — non-blocking use of watcher for testing
     Fontcustom::Watcher.new options, true
@@ -18,7 +18,7 @@ describe Fontcustom::Watcher do
 
   context "#watch" do
     it "should compile on init" do
-      Fontcustom::Base.any_instance.should_receive(:compile).once
+      expect_any_instance_of(Fontcustom::Base).to receive(:compile).once
 
       w = watcher(
         :input => "shared/vectors",
@@ -33,7 +33,7 @@ describe Fontcustom::Watcher do
     end
 
     it "should not call generators on init if options[:skip_first] is passed" do
-      Fontcustom::Base.any_instance.should_not_receive(:compile)
+      expect_any_instance_of(Fontcustom::Base).to_not receive(:compile).once
 
       w = watcher(
         :input => "shared/vectors",
@@ -48,7 +48,7 @@ describe Fontcustom::Watcher do
     end
 
     it "should call generators when vectors change" do
-      Fontcustom::Base.any_instance.should_receive(:compile).once
+      expect_any_instance_of(Fontcustom::Base).to receive(:compile).once
 
       w = watcher(
         :input => "shared/vectors",
@@ -70,13 +70,13 @@ describe Fontcustom::Watcher do
     end
 
     it "should call generators when custom templates change" do
-      Fontcustom::Base.any_instance.should_receive(:compile).once
+      expect_any_instance_of(Fontcustom::Base).to receive(:compile).once
 
       w = watcher(
         :input => {:vectors => "shared/vectors", :templates => "shared/templates"},
         :templates => %w|css preview custom.css|,
         :output => "output",
-        :skip_first => true
+        :skip_first => false
       )
 
       capture(:stdout) do
@@ -86,6 +86,7 @@ describe Fontcustom::Watcher do
           new = content + "\n.bar { color: red; }"
 
           w.watch
+          sleep 1
           File.open(template, "w") { |file| file.write(new) }
           sleep 1
         ensure
@@ -97,7 +98,7 @@ describe Fontcustom::Watcher do
     end
 
     it "should do nothing when non-vectors change" do
-      Fontcustom::Base.any_instance.should_not_receive(:compile)
+      expect_any_instance_of(Fontcustom::Base).to_not receive(:compile).once
 
       w = watcher(
         :input => "shared/vectors",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Kai Zau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -43,56 +43,62 @@ dependencies:
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Font Custom makes using vector icons easy. Generate icon fonts and supporting
@@ -116,6 +122,7 @@ files:
 - TODO.md
 - bin/fontcustom
 - fontcustom.gemspec
+- gemfiles/Gemfile.listen_1
 - lib/fontcustom.rb
 - lib/fontcustom/base.rb
 - lib/fontcustom/cli.rb
@@ -173,24 +180,25 @@ files:
 homepage: http://fontcustom.com
 licenses: []
 metadata: {}
-post_install_message: '>> Thanks for installing Font Custom! Please ensure that fontforge
-  is installed before compiling any icons. Visit <http://fontcustom.com> for instructions.'
+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
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generate icon fonts from the command line.