fontcustom 0.1.0 → 0.1.1

data/LICENSES.txt

@@ -24,12 +24,6 @@ fontcustom
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-ttf2eot
-
-    Author: taviso@sdf.lonestar.org 15-Mar-2009
-    License: Derived from WebKit, so BSD/LGPL 2/LGPL 2.1.
-
-
 sfnt2woff
 
     Version: MPL 1.1/GPL 2.0/LGPL 2.1

data/README.md

@@ -1,4 +1,4 @@
-FontCustom v0.0.2
+FontCustom v0.1.1
 ==========
 
 **Generate custom icon webfonts from the comfort of the command line.**
@@ -12,7 +12,7 @@ Installation
 
 ```sh
 # Requires FontForge
-brew install fontforge
+brew install fontforge eot-utils ttfautohint
 gem install fontcustom
 ```
 

data/lib/fontcustom/scripts/generate.py

@@ -3,7 +3,7 @@ import os
 import argparse
 import md5
 import json
-from subprocess import call
+import subprocess
 
 parser = argparse.ArgumentParser(description='Convert a directory of svg and eps files into a unified font file.')
 parser.add_argument('dir', metavar='directory', type=unicode, nargs=2, help='directory of vector files')
@@ -53,7 +53,8 @@ f.fullname = args.name
 f.generate(fontfile + '.ttf')
 f.generate(fontfile + '.svg')
 
-# Fix SVG header for webkit (from: https://github.com/fontello/font-builder/blob/master/bin/fontconvert.py)
+# Fix SVG header for webkit
+# from: https://github.com/fontello/font-builder/blob/master/bin/fontconvert.py
 svgfile = open(fontfile + '.svg', 'r+')
 svgtext = svgfile.read()
 svgfile.seek(0)
@@ -61,8 +62,15 @@ svgfile.write(svgtext.replace('''<svg>''', '''<svg xmlns="http://www.w3.org/2000
 svgfile.close()
 
 scriptPath = os.path.dirname(os.path.realpath(__file__))
-call([scriptPath + '/sfnt2woff', fontfile + '.ttf'])
-call(scriptPath + '/ttf2eot ' + fontfile + '.ttf > ' + fontfile + '.eot', shell=True)
+try:
+	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
+	# sfnt2woff from source, simplifying install.
+	subprocess.call(['sfnt2woff', fontfile + '.ttf'])
+
+subprocess.call('mkeot ' + fontfile + '.ttf > ' + fontfile + '.eot', shell=True)
 
 # Hint the TTF file
-call(scriptPath + '/ttfautohint -s -n ' + fontfile + '.ttf ' + fontfile + '-hinted.ttf && mv ' + fontfile + '-hinted.ttf ' + fontfile + '.ttf', shell=True)
+subprocess.call('ttfautohint -s -n ' + fontfile + '.ttf ' + fontfile + '-hinted.ttf > /dev/null 2>&1 && mv ' + fontfile + '-hinted.ttf ' + fontfile + '.ttf', shell=True)

data/lib/fontcustom/version.rb

@@ -1,3 +1,3 @@
 module Fontcustom
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -212,8 +212,6 @@ files:
 - lib/fontcustom/generator.rb
 - lib/fontcustom/scripts/generate.py
 - lib/fontcustom/scripts/sfnt2woff
-- lib/fontcustom/scripts/ttf2eot
-- lib/fontcustom/scripts/ttfautohint
 - lib/fontcustom/templates/fontcustom.css
 - lib/fontcustom/version.rb
 - lib/fontcustom/watcher.rb
@@ -237,18 +235,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4274866861207866495
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4274866861207866495
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24