fontcustom 1.3.8 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1de556a5e3246945f433c7553625791242421dd1
-  data.tar.gz: 31f207332430a7f094ddfe9ff8d5ee807efce082
+  metadata.gz: dc2597df3b94e7657fbaa82856e909f1b762baa7
+  data.tar.gz: 8f6437cb607c18c0c47228abc212058af9d58769
 SHA512:
-  metadata.gz: 5285a580ad2f2613dbc1eb131b4aa6bd818232c20472fda176b534a36a8f396b1389c2c365d2dd391b515821b9f9576decca61f3cb276996000430a0b6209697
-  data.tar.gz: a4545ac14e0b59216fe08ef6e477b6c99697c293036cca868ca5a2a4cebfd7c9e9d459f51b05def361fb85970a7749a341ff374c128e3725efbe35d69e09e49c
+  metadata.gz: 3faa26c666038c1e5b9ad4436ec849005fb5c32d2c8d255dc39065b08d4ea60a0e8faf10c1b4d606f63f7593b7a4019312e6f6823b830478ae7b124cb3fe4a08
+  data.tar.gz: afef84481d791bba0492fe284dffdb9331aeebae95ad03385ecc9e5a07fe53ea9c687e9b7a3baf8ec5b8ba74e9d98f43dd2f88d3e79514ed7e1b81e44028b95e

data/.travis.yml

@@ -1,20 +1,42 @@
+sudo: required
 language: ruby
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - fontforge-nox
+      - gcc-4.8
+      - g++-4.8
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq fontforge
   - wget http://people.mozilla.com/~jkew/woff/woff-code-latest.zip
-  - unzip woff-code-latest.zip -d sfnt2woff && cd sfnt2woff && make && sudo mv sfnt2woff /usr/local/bin/
+  - unzip woff-code-latest.zip -d sfnt2woff && cd sfnt2woff && make && mkdir -p bin && mv sfnt2woff bin && cd ..
+  - export PATH=$PATH:$PWD/sfnt2woff/bin/
+  - if [ $TRAVIS_OS_NAME == "linux" ]; then
+      export CC="gcc-4.8";
+      export CXX="g++-4.8";
+      export LINK="gcc-4.8";
+      export LINKXX="g++-4.8";
+    fi
+  - git clone --recursive https://github.com/google/woff2.git && cd woff2 && make clean all && sudo mv woff2_compress /usr/local/bin/ && sudo mv woff2_decompress /usr/local/bin/
   - bundle
 rvm:
+  - 2.2.2
   - 2.1.1
   - 2.0.0
   - 1.9.3
-  - 1.9.2
 gemfile:
   - Gemfile
   - gemfiles/Gemfile.listen_1
+  - gemfiles/Gemfile.listen_2
 matrix:
   exclude:
     - gemfile: Gemfile
-      rvm: 1.9.2
+      rvm: 1.9.3
+    - gemfile: Gemfile
+      rvm: 2.0.0
+    - gemfile: gemfiles/Gemfile.listen_2
+      rvm: 1.9.3
+    - gemfile: gemfiles/Gemfile.listen_2
+      rvm: 2.0.0
 script: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 2.0.0 (6/14/2017)
+
+* Adds support for Woff2 ([#313](https://github.com/FontCustom/fontcustom/pull/313))
+* Minimum ruby version bumped to 1.9.3
+* Support listen 3 ([#283](https://github.com/FontCustom/fontcustom/pull/283))
+* Support Python 3 ([#276](https://github.com/FontCustom/fontcustom/pull/276))
+* Compatible with Windows ([#289](https://github.com/FontCustom/fontcustom/pull/289))
+* Set glyph name when creating char in fontforge ([#286](https://github.com/FontCustom/fontcustom/pull/286))
+* Allow specification of copyright information ([#287](https://github.com/FontCustom/fontcustom/pull/287))
+* Enable CSS3 pseudo selectors '::' vs ':' ([#310](https://github.com/FontCustom/fontcustom/pull/310))
+* Update installation instructions with zlib for linux machines ([#224](https://github.com/FontCustom/fontcustom/pull/224))
+* Works with updated Travis CI configuration
+* Fix issue with relative paths in check_template_paths
+* Be more Unix-y and fail when there is an error ([#295](https://github.com/FontCustom/fontcustom/pull/295))
+
 ## 1.3.4 (10/11/2014)
 
 * Updates rspec tests to be compatible with rspec v3.1.6

data/CONTRIBUTING.md

@@ -30,7 +30,7 @@ us know. No such thing as too small of an improvement.
 You'll need:
 
 * Fontforge with Python scripting (easiest via [Homebrew](http://brew.sh/) on Mac)
-* Ruby 1.9.2+ (via [rbenv](https://github.com/sstephenson/rbenv), [RVM](https://rvm.io/), etc.)
+* Ruby 1.9.3+ (via [rbenv](https://github.com/sstephenson/rbenv), [RVM](https://rvm.io/), etc.)
 * Rubygems
   * Bundler
   * Rake

data/README.md

@@ -7,7 +7,7 @@
 **Icon fonts from the command line.**
 
 Generate cross-browser icon fonts and supporting files (@font-face CSS, etc.)
-from a collection of SVGs 
+from a collection of SVGs
 ([example](https://rawgit.com/FontCustom/fontcustom/master/spec/fixtures/example/example-preview.html)).
 
 [Changelog](https://github.com/FontCustom/fontcustom/blob/master/CHANGELOG.md)<br>
@@ -16,20 +16,34 @@ from a collection of SVGs
 
 ### Installation
 
-Requires **Ruby 1.9.2+**, **FontForge** with Python scripting.
+Requires **Ruby 1.9.3+**, **WOFF2**, **FontForge** with Python scripting.
 
 ```sh
 # On Mac
+brew tap bramstein/webfonttools
+brew update
+brew install woff2
+
 brew install fontforge --with-python
 brew install eot-utils
 gem install fontcustom
 
 # On Linux
-sudo apt-get install fontforge
+sudo apt-get install zlib1g-dev fontforge
 wget http://people.mozilla.com/~jkew/woff/woff-code-latest.zip
 unzip woff-code-latest.zip -d sfnt2woff && cd sfnt2woff && make && sudo mv sfnt2woff /usr/local/bin/
+git clone --recursive https://github.com/google/woff2.git && cd woff2 && make clean all && sudo mv woff2_compress /usr/local/bin/ && sudo mv woff2_decompress /usr/local/bin/
 gem install fontcustom
 ```
+####Note for windows:
+
+1. Install fontforge:  http://fontforge.github.io/en-US/downloads/windows/
+-  Install to a path without spaces, eg c:\FontForgeBuilds
+-  At the end of the installer check the 'run fontforge' box. It finishes some set up.
+2. Add the installation path to your System PATH variable (c:\FontForgeBuilds\bin)
+3. Open up a new command prompt and test it. `fontforge -help`
+4. gem install fontcustom
+
 
 ### Quick Start
 
@@ -66,11 +80,82 @@ compatible font-url() helper. You'll most likely also need to set
 `preprocessor_path` as the relative path from your compiled CSS to your output
 directory.
 
+**Example Use in Rails**
+
+Add `gem 'fontcustom'` to your gem file.
+```
+bundle
+```
+Create a `fontcustom.yml` file with something like this:
+```yml
+# config/fontcustom.yml
+
+font_name: icons
+css_selector: .icon-{{glyph}}
+preprocessor_path: ""
+autowidth: false
+no_hash: true
+force: false
+debug: false
+quiet: false
+
+input:
+  vectors: app/assets/icons
+
+output:
+  fonts: app/assets/fonts
+  css: app/assets/stylesheets
+
+templates:
+ - scss
+```
+
+This tells the gem to take the vectors from `app/assets/icons` and create fonts and stylesheets for them.
+
+Create a file in lib/tasks called `icons.rake` :
+
+```ruby
+namespace :icons do
+  task :compile do
+    puts "Compiling icons..."
+    puts %x(fontcustom compile)
+  end
+end
+```
+
+Load up the icons directory and test it out.
+
+Run this command with
+```sh
+rake icons:compile
+```
+
+This should run the installed and configured gem to create your icons:
+
+```sh
+Compiling icons...
+      create  .fontcustom-manifest.json
+      create  app/assets/fonts
+      create  app/assets/fonts/icons.ttf
+              app/assets/fonts/icons.svg
+              app/assets/fonts/icons.woff
+              app/assets/fonts/icons.eot
+      create  app/assets/stylesheets/_icons.scss
+```
+Access these new icons by creating a tag with the class `icon-{{glyph}}` where the {{glyph}} is the name of the svg you put in the icon folder.
+For example, if you added a file called 'cars54' icon would look something like this:
+
+```html
+<i class="icon-cars54"</i>
+```
+
+Now the font is adjustable to css 'font-size' and 'color'.
+
 **Save CSS and fonts to different locations**
 
 You can save generated fonts, CSS, and other files to different locations by
 using `fontcustom.yml`. Font Custom can also read input vectors and templates
-from different places. 
+from different places.
 
 Just edit the `input` and `output` YAML hashes and their corresponding keys.
 
@@ -101,6 +186,7 @@ helpers:
 * `@manifest`: a hash of options, generated file paths, code points, and just about everything else Font Custom knows.
 * `@font_path`: the path from CSS to font files (without an extension)
 * `@font_path_alt`: if `preprocessor_path` was set, this is the modified path
+* `pseudo_element`: if `css3` was set to true, then it will print `::before`. Otherwise the PseudoElement will be `:before`
 
 `font_face` accepts a hash that modifies the CSS url() function and the path of
 the font files (`font_face(url: "font-url", path: @font_path_alt)`).

data/fontcustom.gemspec

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

data/gemfiles/Gemfile.listen_2

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

data/lib/fontcustom.rb

@@ -36,8 +36,10 @@ module Fontcustom
     :preprocessor_path => nil,
     :autowidth => false,
     :no_hash => false,
+    :css3 => false,
     :debug => false,
     :force => false,
-    :quiet => false
+    :quiet => false,
+    :copyright => ''
   }
 end

data/lib/fontcustom/base.rb

@@ -6,7 +6,8 @@ module Fontcustom
 
     def initialize(raw_options)
       check_fontforge
-      manifest = ".fontcustom-manifest.json"
+      check_woff2
+      manifest = '.fontcustom-manifest.json'
       raw_options[:manifest] = manifest
       @options = Fontcustom::Options.new(raw_options).options
       @manifest = Fontcustom::Manifest.new(manifest, @options)
@@ -30,12 +31,23 @@ module Fontcustom
     private
 
     def check_fontforge
-      fontforge = `which fontforge`
+        if !Gem.win_platform?
+            fontforge = `which fontforge`
+        else
+            fontforge = `where fontforge`
+        end
       if fontforge == "" || fontforge == "fontforge not found"
         raise Fontcustom::Error, "Please install fontforge first. Visit <http://fontcustom.com> for instructions."
       end
     end
 
+    def check_woff2
+      woff2 = `which woff2_compress`
+      if woff2 == "" || woff2 == "woff2_compress not found"
+        fail Fontcustom::Error, "Please install woff2 first. Visit <https://github.com/google/woff2> for instructions."
+      end
+    end
+
     # Calculates a hash of vectors, options, and templates (content and filenames)
     def checksum
       files = Dir.glob(File.join(@options[:input][:vectors], "*.svg")).select { |fn| File.file?(fn) }

data/lib/fontcustom/cli.rb

@@ -25,7 +25,7 @@ module Fontcustom
     class_option :font_name, :aliases => %w|--name -n|, :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 => %s|--size -s|, :type => :numeric,
       :desc => "Size (in pica points) for which this font is designed.",
       :default => DEFAULT_OPTIONS[:font_design_size]
@@ -52,6 +52,9 @@ module Fontcustom
     class_option :autowidth, :aliases => "-A", :type => :boolean,
       :desc => "Horizontally fit glyphs to their individual vector widths."
 
+    class_option :css3, :type => :boolean,
+      :desc => "Use CSS3 Pseudo Elements"
+
     class_option :no_hash, :aliases => "-h", :type => :boolean,
       :desc => "Generate fonts without asset-busting hashes."
 
@@ -67,6 +70,9 @@ module Fontcustom
     class_option :quiet, :aliases => "-q", :type => :boolean,
       :desc => "Hide status messages."
 
+    class_option :copyright, :aliases => %w|--copyright -r|, :type => :string,
+      :desc => "Copyright information."
+
     # Required for Thor::Actions#template
     def self.source_root
       File.join Fontcustom.gem_lib, "templates"
@@ -78,6 +84,7 @@ module Fontcustom
     rescue Fontcustom::Error => e
       say_status :error, e.message, :red
       puts e.backtrace.join("\n") if options[:debug]
+      exit 1
     end
 
     desc "watch [INPUT] [OPTIONS]", "Watches INPUT for changes and regenerates files automatically. Ctrl + C to stop. Default: `pwd`"
@@ -90,6 +97,7 @@ module Fontcustom
       Watcher.new(opts).watch
     rescue Fontcustom::Error => e
       say_status :error, e.message, :red
+      exit 1
     end
 
     desc "config [DIR]", "Generates a starter configuration file (fontcustom.yml) in DIR. Default: `pwd`"

data/lib/fontcustom/generator/template.rb

@@ -12,6 +12,12 @@ module Fontcustom
       def initialize(manifest)
         @manifest = Fontcustom::Manifest.new manifest
         @options = @manifest.get :options
+
+        @pseudo_element = ':before';
+        if @options[:css3]
+          @pseudo_element = '::before';
+        end
+
       end
 
       def generate
@@ -146,6 +152,7 @@ module Fontcustom
 @font-face {
   font-family: "#{font_name}";
   src: url("data:application/x-font-woff;charset=utf-8;base64,#{woff_base64}") format("woff"),
+       #{url}("#{path}.woff2") format("woff2"),
        #{url}("#{path}.ttf") format("truetype"),
        #{url}("#{path}.svg##{font_name}") format("svg");
   font-weight: normal;
@@ -156,6 +163,7 @@ module Fontcustom
   font-family: "#{font_name}";
   src: #{url}("#{path}.eot");
   src: #{url}("#{path}.eot?#iefix") format("embedded-opentype"),
+       #{url}("#{path}.woff2") format("woff2"),
        #{url}("#{path}.woff") format("woff"),
        #{url}("#{path}.ttf") format("truetype"),
        #{url}("#{path}.svg##{font_name}") format("svg");
@@ -183,7 +191,7 @@ module Fontcustom
 
       def glyph_selectors
         output = @glyphs.map do |name, value|
-          @options[:css_selector].sub("{{glyph}}", name.to_s) + ":before"
+          @options[:css_selector].sub("{{glyph}}", name.to_s) + @pseudo_element
         end
         output.join ",\n"
       end
@@ -205,10 +213,14 @@ module Fontcustom
 
       def glyphs
         output = @glyphs.map do |name, value|
-          %Q|#{@options[:css_selector].sub('{{glyph}}', name.to_s)}:before { content: "\\#{value[:codepoint].to_s(16)}"; }|
+          %Q|#{@options[:css_selector].sub('{{glyph}}', name.to_s)}#{@pseudo_element} { content: "\\#{value[:codepoint].to_s(16)}"; }|
         end
         output.join "\n"
       end
+
+      def pseudo_element
+        @pseudo_element
+      end
     end
   end
 end

data/lib/fontcustom/options.rb

@@ -165,7 +165,11 @@ module Fontcustom
     def check_template_paths
       @options[:templates].each do |template|
         next if %w|preview css scss scss-rails|.include? template
-        path = File.expand_path File.join(@options[:input][:templates], template) unless template[0] == "/"
+        if template[0] == "/"
+          path = template
+        else
+          path = File.expand_path File.join(@options[:input][:templates], template)
+        end
         unless File.exists? path
           raise Fontcustom::Error,
             "Custom template `#{template}` wasn't found in `#{@options[:input][:templates]}/`. Check your options."
@@ -184,7 +188,7 @@ module Fontcustom
     end
 
     def print_debug
-      message = line_break(16) 
+      message = line_break(16)
       message << @options.pretty_inspect.split("\n ").join(line_break(16))
       say_message :debug, "Using options:#{message}"
     end

data/lib/fontcustom/scripts/eotlitetool.py

@@ -225,7 +225,7 @@ class FontError(Exception):
     pass
 
 def multichar(str):
-    vals = struct.unpack('4B', str[:4])
+    vals = struct.unpack('4B', str[:4].encode('utf-8'))
     return (vals[0] << 24) + (vals[1] << 16) + (vals[2] << 8) + vals[3]
 
 def multicharval(v):
@@ -289,10 +289,10 @@ def get_table_directory(data):
     datalen = len(data)
     sfntsize = struct.calcsize(OpenType.SFNT_UNPACK)
     if sfntsize > datalen:
-        raise FontError, 'truncated font data'
+        raise FontError('truncated font data')
     sfntvers, numTables = struct.unpack(OpenType.SFNT_UNPACK, data[:sfntsize])[:2]
     if sfntvers != OpenType.SFNT_CFF and sfntvers != OpenType.SFNT_TRUE:
-        raise FontError, 'invalid font type';
+        raise FontError('invalid font type')
     
     font = {}
     font['version'] = sfntvers
@@ -301,7 +301,7 @@ def get_table_directory(data):
     # create set of offsets, lengths for tables
     table_dir_size = struct.calcsize(OpenType.TABLE_DIR_UNPACK)
     if sfntsize + table_dir_size * numTables > datalen:
-        raise FontError, 'truncated font data, table directory extends past end of data'
+        raise FontError('truncated font data, table directory extends past end of data')
     table_dir = {}
     for i in range(0, numTables):
         start = sfntsize + i * table_dir_size
@@ -321,7 +321,7 @@ def get_name_records(nametable):
     count, strOffset = struct.unpack('>2H', nametable[2:6])
     namerecsize = struct.calcsize(OpenType.NAME_RECORD_UNPACK)
     if count * namerecsize + headersize > len(nametable):
-        raise FontError, 'names exceed size of name table'
+        raise FontError('names exceed size of name table')
     name['count'] = count
     name['strOffset'] = strOffset
     
@@ -363,7 +363,7 @@ def make_eot_name_headers(fontdata, nameTableDir):
         else:
             nameheaders.append(struct.pack('4x'))  # len = 0, padding = 0
     
-    return ''.join(nameheaders)
+    return b''.join(nameheaders)
 
 # just return a null-string (len = 0)
 def make_root_string():
@@ -381,7 +381,7 @@ def make_eot_header(fontdata):
     required = (OpenType.TABLE_HEAD, OpenType.TABLE_NAME, OpenType.TABLE_OS2)
     for table in required:
         if not (table in tableDir):
-            raise FontError, 'missing required table ' + multicharval(table)
+            raise FontError('missing required table ' + multicharval(table))
             
     # read name strings
     
@@ -398,7 +398,7 @@ def make_eot_header(fontdata):
     os2size = struct.calcsize(OpenType.OS2_UNPACK)
     
     if os2size > os2Dir['length']:
-        raise FontError, 'OS/2 table invalid length'
+        raise FontError('OS/2 table invalid length')
     
     os2fields = struct.unpack(OpenType.OS2_UNPACK, fontdata[os2offset : os2offset + os2size])
     
@@ -420,7 +420,7 @@ def make_eot_header(fontdata):
     headsize = struct.calcsize(OpenType.HEAD_UNPACK)
     
     if headsize > headDir['length']:
-        raise FontError, 'head table invalid length'
+        raise FontError('head table invalid length')
         
     headfields = struct.unpack(OpenType.HEAD_UNPACK, fontdata[headoffset : headoffset + headsize])
     checkSumAdjustment = headfields[0]
@@ -435,11 +435,11 @@ def make_eot_header(fontdata):
                         *([eotSize, fontDataSize, version, flags] + panose + [charset, italic] +
                           [weight, fsType, magicNumber] + urange + codepage + [checkSumAdjustment]))
     
-    return ''.join((fixed, nameheaders, rootstring))
+    return b''.join((fixed, nameheaders, rootstring))
  
     
 def write_eot_font(eot, header, data):
-    open(eot,'wb').write(''.join((header, data)))
+    open(eot,'wb').write(b''.join((header, data)))
     return
 
 def main():
@@ -453,7 +453,7 @@ def main():
     for f in args:
         data = readfont(f)
         if len(data) == 0:
-            print 'Error reading %s' % f
+            print('Error reading %s' % f)
         else:
             eot = eotname(f)
             header = make_eot_header(data)
@@ -463,4 +463,4 @@ def main():
 if __name__ == '__main__':
     main()
     
-    
+    

data/lib/fontcustom/scripts/generate.py

@@ -39,6 +39,7 @@ font.descent = options['font_descent']
 font.fontname = options['font_name']
 font.familyname = options['font_name']
 font.fullname = options['font_name']
+font.copyright = options['copyright']
 if options['autowidth']:
     font.autoWidth(0, 0, options['font_em'])
 
@@ -53,7 +54,7 @@ def removeSwitchFromSvg( file ):
     tmpsvgfile = tempfile.NamedTemporaryFile(suffix=".svg", delete=False)
     svgtext = svgtext.replace('<switch>', '')
     svgtext = svgtext.replace('</switch>', '')
-    tmpsvgfile.file.write(svgtext)
+    tmpsvgfile.file.write(svgtext.encode('utf-8'))
     tmpsvgfile.file.close()
 
     return tmpsvgfile.name
@@ -63,7 +64,7 @@ def createGlyph( name, source, code ):
 
     if ext == '.svg':
         temp = removeSwitchFromSvg(source)
-        glyph = font.createChar(code)
+        glyph = font.createChar(code, name)
         glyph.importOutlines(temp)
         os.unlink(temp)
 
@@ -83,7 +84,7 @@ def createGlyph( name, source, code ):
 glyph = font.createChar(32)
 glyph.width = 200
 
-for glyph, data in manifest['glyphs'].iteritems():
+for glyph, data in manifest['glyphs'].items():
     name = createGlyph(glyph, data['source'], data['codepoint'])
 
 #
@@ -112,7 +113,11 @@ try:
     # Convert WOFF
     scriptPath = os.path.dirname(os.path.realpath(__file__))
     try:
-        subprocess.Popen([scriptPath + '/sfnt2woff', fontfile + '.ttf'], stdout=subprocess.PIPE)
+        # check if on windows
+        if os.name == 'nt':
+            subprocess.Popen([scriptPath + '/sfnt2woff.exe', fontfile + '.ttf'], stdout=subprocess.PIPE)
+        else:
+            subprocess.Popen([scriptPath + '/sfnt2woff', fontfile + '.ttf'], stdout=subprocess.PIPE)
     except OSError:
         # If the local version of sfnt2woff fails (i.e., on Linux), try to use the
         # global version. This allows us to avoid forcing OS X users to compile
@@ -122,9 +127,17 @@ try:
 
     # Convert EOT for IE7
     subprocess.call('python ' + scriptPath + '/eotlitetool.py ' + fontfile + '.ttf -o ' + fontfile + '.eot', shell=True)
-    subprocess.call('mv ' + fontfile + '.eotlite ' + fontfile + '.eot', shell=True)
+    # check if windows
+    if os.name == 'nt':
+        subprocess.call('move ' + fontfile + '.eotlite ' + fontfile + '.eot', shell=True)
+    else:
+        subprocess.call('mv ' + fontfile + '.eotlite ' + fontfile + '.eot', shell=True)
     manifest['fonts'].append(fontfile + '.eot')
 
+    # Convert TTF to WOFF2
+    subprocess.call('woff2_compress \'' + fontfile + '.ttf\'', shell=True)
+    manifest['fonts'].append(fontfile + '.woff2')
+
 finally:
     manifestfile.seek(0)
     manifestfile.write(json.dumps(manifest, indent=2, sort_keys=True))

data/lib/fontcustom/templates/_fontcustom-rails.scss

@@ -4,9 +4,9 @@
 
 <%= font_face(url: "font-url", path: @font_path_alt) %>
 
-[data-icon]:before { content: attr(data-icon); }
+[data-icon]<%= pseudo_element %> { content: attr(data-icon); }
 
-[data-icon]:before,
+[data-icon]<%= pseudo_element %>,
 <%= glyph_selectors %> {
 <%= glyph_properties %>
 }

data/lib/fontcustom/templates/_fontcustom.scss

@@ -4,9 +4,9 @@
 
 <%= font_face(path: @font_path_alt) %>
 
-[data-icon]:before { content: attr(data-icon); }
+[data-icon]<%= pseudo_element %> { content: attr(data-icon); }
 
-[data-icon]:before,
+[data-icon]<%= pseudo_element %>,
 <%= glyph_selectors %> {
 <%= glyph_properties %>
 }

data/lib/fontcustom/templates/fontcustom.css

@@ -4,9 +4,9 @@
 
 <%= font_face %>
 
-[data-icon]:before { content: attr(data-icon); }
+[data-icon]<%= pseudo_element %> { content: attr(data-icon); }
 
-[data-icon]:before,
+[data-icon]<%= pseudo_element %>,
 <%= glyph_selectors %> {
 <%= glyph_properties %>
 }

data/lib/fontcustom/templates/fontcustom.yml

@@ -30,6 +30,9 @@
 # Hide status messages.
 #quiet: true
 
+# Copyright information.
+#copyright: 
+
 
 # -----------------------------------------------------------------------------
 # Input / Output Locations

data/lib/fontcustom/version.rb

@@ -1,3 +1,3 @@
 module Fontcustom
-  VERSION = "1.3.8"
+  VERSION = "2.0.0"
 end

data/lib/fontcustom/watcher.rb

@@ -39,7 +39,7 @@ module Fontcustom
       else
         listen_options[:filter] = /(#{templates.join("|")}|.+\.svg)$/
         listen_options[:relative_paths] = true
-        @listener = Listen::Listener.new(listen_dirs, listen_options, &callback)
+        @listener = Listen::Listener.new(*listen_dirs, listen_options, &callback)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Kai Zau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -48,7 +48,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,21 +58,21 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,7 @@ files:
 - bin/fontcustom
 - fontcustom.gemspec
 - gemfiles/Gemfile.listen_1
+- gemfiles/Gemfile.listen_2
 - lib/fontcustom.rb
 - lib/fontcustom/base.rb
 - lib/fontcustom/cli.rb
@@ -133,6 +134,7 @@ files:
 - lib/fontcustom/scripts/eotlitetool.py
 - lib/fontcustom/scripts/generate.py
 - lib/fontcustom/scripts/sfnt2woff
+- lib/fontcustom/scripts/sfnt2woff.exe
 - lib/fontcustom/templates/_fontcustom-rails.scss
 - lib/fontcustom/templates/_fontcustom.scss
 - lib/fontcustom/templates/fontcustom-preview.html
@@ -203,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Generate icon fonts from the command line.