fontcustom 1.0.0.pre → 1.0.0.pre2

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-## 1.0.0-RC1 (4/4/2013)
+## 1.0.0 (4/18/2013)
+
+Big changes, more flexibility, better workflow. Be sure to check out the [docs](http://fontcustom.com) to see how it all ties together.
 
 * Improved preview html to show glyphs at various sizes
 * Added support for fontcustom.yml config file ([#49](https://github.com/FontCustom/fontcustom/issues/49))
@@ -7,9 +9,15 @@
 * Added support for custom CSS selector namespaces ([#32](https://github.com/FontCustom/fontcustom/issues/32))
 * Added support for --verbose=false ([#54](https://github.com/FontCustom/fontcustom/pull/54))
 * Improved ascent/decent heights ([#33](https://github.com/FontCustom/fontcustom/issues/33))
-* Fixed bug where watcher could fall into an infinite loop
+* Added clean Ruby API ([#62](https://github.com/FontCustom/fontcustom/issues/62))
+* Workaround for Sprockets compatibility ([#61](https://github.com/FontCustom/fontcustom/pull/61))
+* Added clean (bootstrap free) CSS and made it the default choice ([#59](https://github.com/FontCustom/fontcustom/pull/59))
+* Added option to pass different path to @font-face for SCSS partials ([#64](https://github.com/FontCustom/fontcustom/issues/64))
+* Addes SCSS versions of Bootstrap and IE7 stylesheets
+* Fixed CSS bug on IE8 and IE9's compatibility mode
+* Fixed gem bug where watcher could fall into an infinite loop
 * Added error messages for faulty input
-* Refactored gem internals to reflect saner usage of Thor
+* Refactored gem internals to use Thor more sanely
 * Refactored tests
 
 ## 0.1.4 (2/19/2013)

data/CONTRIBUTING.md

@@ -1,6 +1,6 @@
-# FontCustom Contributing Guidelines
+# Contributor Guidelines
 
-Thanks for helping make FontCustom better! This project was born out of an over-heard conversation between two devs in a coffee shop — it's come a long ways thanks to the support of folks like you.
+Thanks for helping make Font Custom better. This project was born out of an over-heard conversation between two devs in a coffee shop — it's come a long ways thanks to the support of folks like you.
 
 ## Conventions
 
@@ -12,7 +12,8 @@ If you catch a typo or a particularly unsightly piece of code — please _do_ le
 
 * Visit [issues](https://github.com/FontCustom/fontcustom/issues) for ideas.
 * Fork the repo if you haven't done so already.
+* `master` == current stable release
 * Create a topic branch. `git checkout -b my_sweet_feature`
-* Add tests. Run tests with `rake`.
+* Add your tests. Run tests with `rake`.
 * Develop your feature.
 * Once all tests are passing, submit a pull request!

data/README.md

@@ -1,14 +1,14 @@
-FontCustom v0.1.3
-==========
+# FontCustom v0.1.4
+
+**(v1.0.0 is currently in pre-release until docs are updated. Install the latest with `gem install fontcustom --pre`)**
 
 **Generate custom icon webfonts from the comfort of the command line.**
 
-[Full documentation](http://fontcustom.github.com/fontcustom/)<br/>
+[Full documentation](http://fontcustom.com)<br/>
+[Changelog](https://github.com/FontCustom/fontcustom/blob/master/CHANGELOG.md)<br/>
 [Feedback and issues](https://github.com/FontCustom/fontcustom/issues)
 
-
-Installation
-------------
+## Installation
 
 ```sh
 # Requires FontForge
@@ -16,19 +16,29 @@ brew install fontforge eot-utils ttfautohint
 gem install fontcustom
 ```
 
-
-Usage
------
+## Quick Start
 
 ```sh
-fontcustom compile path/to/vectors  # Compile icons and css to path/to/fontcustom/*
-fontcustom watch path/to/vectors    # Watch for changes
+fontcustom compile path/to/vectors                  # Compiles into `fontcustom`
+fontcustom compile path/to/vectors -o assets/fonts  # Compiles into `assets/fonts`
+fontcustom watch path/to/vectors -t=scss preview    # Compiles when vectors are changed/added/deleted
+                                                    # and includes a scss partial and glyph preview
+
+fontcustom help                                     # to see all options
 ```
 
-Optional second parameter allows you to specify an output directory.
+## Config
 
-Need help?
+To avoid finger-fatigue, include a fontcustom.yml configuration file with your vectors:
 
 ```sh
-fontcustom --help
+fontcustom config path/to/vectors       # Creates annotated config file
+vim path/to/vectors/fontcustom.yml      # Edit your fontcustom options
 ```
+
+---
+
+[Contributor Guidelines](https://github.com/FontCustom/fontcustom/blob/master/CONTRIBUTING.md)<br/>
+[Licenses](https://github.com/FontCustom/fontcustom/blob/master/LICENSES.txt)
+
+Brought to you by [@endtwist](https://github.com/endtwist) and [@ezYZ](https://github.com/ezYZ)

data/fontcustom.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Yifei Zhang", "Joshua Gross"]
   gem.email         = ["yz@yifei.co", "joshua@gross.is"]
   gem.summary       = %q{Generate custom icon webfonts from the comfort of the command line.}
-  gem.description   = %q{Transforms EPS and SVG vectors into icon webfonts. Generates CSS (or your preferred alternative) for easy inclusion in your projects.}
+  gem.description   = %q{Transforms EPS and SVG vectors into icon webfonts. Generates CSS (or any custom template) for easy inclusion in your projects.}
   gem.homepage      = "http://fontcustom.com"
 
   gem.files         = `git ls-files`.split($/)

data/lib/fontcustom.rb

@@ -4,3 +4,18 @@ require "fontcustom/error"
 require "fontcustom/util"
 require "fontcustom/generator/font"
 require "fontcustom/generator/template"
+
+module Fontcustom
+
+  ##
+  # Clean Ruby API to workaround Thor
+  def compile(options)
+    opts = Fontcustom::Util.collect_options options
+    Fontcustom::Generator::Font.start [opts]
+    Fontcustom::Generator::Template.start [opts]
+  rescue Fontcustom::Error => e
+    puts "ERROR: #{e.message}"
+  end
+
+  module_function :compile
+end

data/lib/fontcustom/cli.rb

@@ -10,10 +10,11 @@ module Fontcustom
     # Actual defaults are stored in Fontcustom::DEFAULT_OPTIONS instead of Thor
     class_option :output, :aliases => "-o", :desc => "The output directory (will be created if it doesn't exist). Default: INPUT/fontcustom/"
     class_option :config, :aliases => "-c", :desc => "Path to or containing directory of the config file. Default: INPUT/fontcustom.yml" 
-    class_option :templates, :aliases => "-t", :type => :array, :desc => "List of templates to compile alongside fonts. Accepts 'css', 'css-ie7', 'scss', 'preview' or arbitrary paths (relative to INPUT or PWD). Default: 'css preview'"
+    class_option :templates, :aliases => "-t", :type => :array, :desc => "List of templates to compile alongside fonts. Accepts 'preview css scss bootstrap bootstrap-scss bootstrap-ie7 bootstrap-ie7-scss' or arbitrary paths relative to INPUT or PWD. Default: 'css preview'"
     class_option :font_name, :aliases => "-n", :desc => "The font name used in your templates (automatically normalized to lowercase spinal case). Default: 'fontcustom'"
     class_option :file_hash, :aliases => "-h", :type => :boolean, :desc => "Generate font files with asset-busting hashes. Default: true"
     class_option :css_prefix, :aliases => "-p", :desc => "The prefix for each glyph's CSS class. Default: 'icon-'"
+    class_option :font_face_path, :alias => "-f", :desc => "The http path used in @font-face declarations. Only used in .scss partials. Default: none"
     class_option :debug, :aliases => "-d", :type => :boolean, :desc => "Display debug messages from fontforge. Default: false"
     class_option :verbose, :aliases => "-v", :type => :boolean, :desc => "Display output messages. Default: true"
 

data/lib/fontcustom/options.rb

@@ -7,6 +7,7 @@ module Fontcustom
     :font_name => "fontcustom",
     :file_hash => true,
     :css_prefix => "icon-",
+    :font_face_path => false,
     :debug => false,
     :verbose => true
   }

data/lib/fontcustom/scripts/generate.py

@@ -88,7 +88,7 @@ if args.nohash:
 	fontfile = outdir + '/' + args.name
 else:
 	hashStr = m.hexdigest()
-	fontfile = outdir + '/' + args.name + '-' + hashStr
+	fontfile = outdir + '/' + args.name + '_' + hashStr
 
 f.fontname = args.name
 f.familyname = args.name

data/lib/fontcustom/templates/{fontcustom-ie7.css → _fontcustom-bootstrap-ie7.scss}

@@ -1,3 +1,7 @@
+/* 
+ * Font Custom: Bootstrap CSS for IE7
+ */
+
 [class^="<%= @opts[:css_prefix] %>"],
 [class*=" <%= @opts[:css_prefix] %>"] {
   font-family: "<%= @opts[:font_name] %>";
@@ -7,7 +11,6 @@
 
 .btn.dropdown-toggle [class^="<%= @opts[:css_prefix] %>"],
 .btn.dropdown-toggle [class*=" <%= @opts[:css_prefix] %>"] {
-  /* keeps button heights with and without icons the same */
   line-height: 1.4em;
 }
 

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

@@ -0,0 +1,68 @@
+<%
+file_name = if @opts[:font_face_path]
+  File.join @opts[:font_face_path], @data[:file_name]
+else
+  @data[:file_name]
+end
+%>/*
+ * Font Custom: Bootstrap CSS
+ */
+
+@font-face {
+  font-family: "<%= @opts[:font_name] %>";
+  src: url("<%= file_name %>.eot");
+  src: url("<%= file_name %>.eot?#iefix") format("embedded-opentype"),
+       url("<%= file_name %>.woff") format("woff"),
+       url("<%= file_name %>.ttf") format("truetype"),
+       url("<%= file_name %>.svg#<%= @opts[:font_name] %>") format("svg");
+  font-weight: normal;
+  font-style: normal;
+}
+
+[class^="<%= @opts[:css_prefix] %>"]:before, [class*=" <%= @opts[:css_prefix] %>"]:before {
+  font-family: "<%= @opts[:font_name] %>";
+  font-weight: normal;
+  font-style: normal;
+  display: inline-block;
+  text-decoration: inherit;
+}
+
+a [class^="<%= @opts[:css_prefix] %>"], a [class*=" <%= @opts[:css_prefix] %>"] {
+  display: inline-block;
+  text-decoration: inherit;
+}
+
+.<%= @opts[:css_prefix] %>large:before {
+  vertical-align: top;
+  font-size: 1.333em;
+}
+
+.btn [class^="<%= @opts[:css_prefix] %>"], .btn [class*=" <%= @opts[:css_prefix] %>"] {
+  line-height: 0.9em;
+}
+
+li [class^="<%= @opts[:css_prefix] %>"], li [class*=" <%= @opts[:css_prefix] %>"] {
+  display: inline-block;
+  width: 1.25em;
+  text-align: center;
+}
+
+li .<%= @opts[:css_prefix] %>large[class^="<%= @opts[:css_prefix] %>"], li .<%= @opts[:css_prefix] %>large[class*=" <%= @opts[:css_prefix] %>"] {
+  width: 1.875em;
+}
+
+li[class^="<%= @opts[:css_prefix] %>"], li[class*=" <%= @opts[:css_prefix] %>"] {
+  margin-left: 0;
+  list-style-type: none;
+}
+
+li[class^="<%= @opts[:css_prefix] %>"]:before, li[class*=" <%= @opts[:css_prefix] %>"]:before {
+  text-indent: -2em;
+  text-align: center;
+}
+
+li[class^="<%= @opts[:css_prefix] %>"].<%= @opts[:css_prefix] %>large:before, li[class*=" <%= @opts[:css_prefix] %>"].<%= @opts[:css_prefix] %>large:before {
+  text-indent: -1.333em;
+}
+<% @data[:glyphs].each_with_index do |name, index| %>
+.<%= @opts[:css_prefix] + name %>:before { content: "\<%= (61696+index).to_s(16) %>"; }<% end %>

data/lib/fontcustom/templates/_fontcustom.scss

@@ -1,72 +1,34 @@
-/*
-  Font Custom
-*/
+<%
+file_name = if @opts[:font_face_path]
+  File.join @opts[:font_face_path], @data[:file_name]
+else
+  @data[:file_name]
+end
+%>/* 
+ * Font Custom: bare CSS
+ */
 
 @font-face {
   font-family: "<%= @opts[:font_name] %>";
-  src: url("<%= @data[:file_name] %>.eot?#iefix") format("embedded-opentype"),
-       url("<%= @data[:file_name] %>.woff") format("woff"),
-       url("<%= @data[:file_name] %>.ttf") format("truetype"),
-       url("<%= @data[:file_name] %>.svg#<%= @opts[:font_name] %>") format("svg");
+  src: url("<%= file_name %>.eot");
+  src: url("<%= file_name %>.eot?#iefix") format("embedded-opentype"),
+       url("<%= file_name %>.woff") format("woff"),
+       url("<%= file_name %>.ttf") format("truetype"),
+       url("<%= file_name %>.svg#<%= @opts[:font_name] %>") format("svg");
   font-weight: normal;
   font-style: normal;
 }
 
-/*
-  Bootstrap Overrides
-*/
-
-[class^="<%= @opts[:css_prefix] %>"]:before, [class*=" <%= @opts[:css_prefix] %>"]:before {
+<%= @data[:glyphs].map {|name| ".#{@opts[:css_prefix] + name}:before"}.join(",\n") %> {
   font-family: "<%= @opts[:font_name] %>";
-  font-weight: normal;
   font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
   display: inline-block;
   text-decoration: inherit;
 }
-
-a [class^="<%= @opts[:css_prefix] %>"], a [class*=" <%= @opts[:css_prefix] %>"] {
-  display: inline-block;
-  text-decoration: inherit;
-}
-
-/* makes the font 33% larger relative to the icon container */
-.<%= @opts[:css_prefix] %>large:before {
-  vertical-align: top;
-  font-size: 1.333em;
-}
-
-/* keeps button heights with and without icons the same */
-.btn [class^="<%= @opts[:css_prefix] %>"], .btn [class*=" <%= @opts[:css_prefix] %>"] {
-  line-height: 0.9em;
-}
-
-li [class^="<%= @opts[:css_prefix] %>"], li [class*=" <%= @opts[:css_prefix] %>"] {
-  display: inline-block;
-  width: 1.25em;
-  text-align: center;
-}
-
-/* 1.5 increased font size for <%= @opts[:css_prefix] %>large * 1.25 width */
-li .<%= @opts[:css_prefix] %>large[class^="<%= @opts[:css_prefix] %>"], li .<%= @opts[:css_prefix] %>large[class*=" <%= @opts[:css_prefix] %>"] {
-  width: 1.875em;
-}
-
-li[class^="<%= @opts[:css_prefix] %>"], li[class*=" <%= @opts[:css_prefix] %>"] {
-  margin-left: 0;
-  list-style-type: none;
-}
-
-li[class^="<%= @opts[:css_prefix] %>"]:before, li[class*=" <%= @opts[:css_prefix] %>"]:before {
-  text-indent: -2em;
-  text-align: center;
-}
-
-li[class^="<%= @opts[:css_prefix] %>"].<%= @opts[:css_prefix] %>large:before, li[class*=" <%= @opts[:css_prefix] %>"].<%= @opts[:css_prefix] %>large:before {
-  text-indent: -1.333em;
-}
-
-/*
-  Icon Classes
-*/
 <% @data[:glyphs].each_with_index do |name, index| %>
 .<%= @opts[:css_prefix] + name %>:before { content: "\<%= (61696+index).to_s(16) %>"; }<% end %>

data/lib/fontcustom/templates/fontcustom-bootstrap-ie7.css

@@ -0,0 +1,21 @@
+/* 
+ * Font Custom: Bootstrap CSS for IE7
+ */
+
+[class^="<%= @opts[:css_prefix] %>"],
+[class*=" <%= @opts[:css_prefix] %>"] {
+  font-family: "<%= @opts[:font_name] %>";
+  font-style: normal;
+  font-weight: normal;
+}
+
+.btn.dropdown-toggle [class^="<%= @opts[:css_prefix] %>"],
+.btn.dropdown-toggle [class*=" <%= @opts[:css_prefix] %>"] {
+  line-height: 1.4em;
+}
+
+.<%= @opts[:css_prefix] %>large {
+  font-size: 1.3333em;
+}
+<% @data[:glyphs].each_with_index do |name, index| %>
+.<%= @opts[:css_prefix] + name %> { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x<%= (61696+index).to_s(16) %>;&nbsp;'); }<% end %>

data/lib/fontcustom/templates/fontcustom-bootstrap.css

@@ -0,0 +1,62 @@
+/*
+ * Font Custom: Bootstrap CSS
+ */
+
+@font-face {
+  font-family: "<%= @opts[:font_name] %>";
+  src: url("<%= @data[:file_name] %>.eot");
+  src: url("<%= @data[:file_name] %>.eot?#iefix") format("embedded-opentype"),
+       url("<%= @data[:file_name] %>.woff") format("woff"),
+       url("<%= @data[:file_name] %>.ttf") format("truetype"),
+       url("<%= @data[:file_name] %>.svg#<%= @opts[:font_name] %>") format("svg");
+  font-weight: normal;
+  font-style: normal;
+}
+
+[class^="<%= @opts[:css_prefix] %>"]:before, [class*=" <%= @opts[:css_prefix] %>"]:before {
+  font-family: "<%= @opts[:font_name] %>";
+  font-weight: normal;
+  font-style: normal;
+  display: inline-block;
+  text-decoration: inherit;
+}
+
+a [class^="<%= @opts[:css_prefix] %>"], a [class*=" <%= @opts[:css_prefix] %>"] {
+  display: inline-block;
+  text-decoration: inherit;
+}
+
+.<%= @opts[:css_prefix] %>large:before {
+  vertical-align: top;
+  font-size: 1.333em;
+}
+
+.btn [class^="<%= @opts[:css_prefix] %>"], .btn [class*=" <%= @opts[:css_prefix] %>"] {
+  line-height: 0.9em;
+}
+
+li [class^="<%= @opts[:css_prefix] %>"], li [class*=" <%= @opts[:css_prefix] %>"] {
+  display: inline-block;
+  width: 1.25em;
+  text-align: center;
+}
+
+li .<%= @opts[:css_prefix] %>large[class^="<%= @opts[:css_prefix] %>"], li .<%= @opts[:css_prefix] %>large[class*=" <%= @opts[:css_prefix] %>"] {
+  width: 1.875em;
+}
+
+li[class^="<%= @opts[:css_prefix] %>"], li[class*=" <%= @opts[:css_prefix] %>"] {
+  margin-left: 0;
+  list-style-type: none;
+}
+
+li[class^="<%= @opts[:css_prefix] %>"]:before, li[class*=" <%= @opts[:css_prefix] %>"]:before {
+  text-indent: -2em;
+  text-align: center;
+}
+
+li[class^="<%= @opts[:css_prefix] %>"].<%= @opts[:css_prefix] %>large:before, li[class*=" <%= @opts[:css_prefix] %>"].<%= @opts[:css_prefix] %>large:before {
+  text-indent: -1.333em;
+}
+<% @data[:glyphs].each_with_index do |name, index| %>
+.<%= @opts[:css_prefix] + name %>:before { content: "\<%= (61696+index).to_s(16) %>"; }<% end %>

data/lib/fontcustom/templates/fontcustom.css

@@ -1,9 +1,10 @@
-/*
-  Font Custom
-*/
+/* 
+ * Font Custom: bare CSS
+ */
 
 @font-face {
   font-family: "<%= @opts[:font_name] %>";
+  src: url("<%= @data[:file_name] %>.eot");
   src: url("<%= @data[:file_name] %>.eot?#iefix") format("embedded-opentype"),
        url("<%= @data[:file_name] %>.woff") format("woff"),
        url("<%= @data[:file_name] %>.ttf") format("truetype"),
@@ -12,61 +13,16 @@
   font-style: normal;
 }
 
-/*
-  Bootstrap Overrides
-*/
-
-[class^="<%= @opts[:css_prefix] %>"]:before, [class*=" <%= @opts[:css_prefix] %>"]:before {
+<%= @data[:glyphs].map {|name| ".#{@opts[:css_prefix] + name}:before"}.join(",\n") %> {
   font-family: "<%= @opts[:font_name] %>";
-  font-weight: normal;
   font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
   display: inline-block;
   text-decoration: inherit;
 }
-
-a [class^="<%= @opts[:css_prefix] %>"], a [class*=" <%= @opts[:css_prefix] %>"] {
-  display: inline-block;
-  text-decoration: inherit;
-}
-
-/* makes the font 33% larger relative to the icon container */
-.<%= @opts[:css_prefix] %>large:before {
-  vertical-align: top;
-  font-size: 1.333em;
-}
-
-/* keeps button heights with and without icons the same */
-.btn [class^="<%= @opts[:css_prefix] %>"], .btn [class*=" <%= @opts[:css_prefix] %>"] {
-  line-height: 0.9em;
-}
-
-li [class^="<%= @opts[:css_prefix] %>"], li [class*=" <%= @opts[:css_prefix] %>"] {
-  display: inline-block;
-  width: 1.25em;
-  text-align: center;
-}
-
-/* 1.5 increased font size for <%= @opts[:css_prefix] %>large * 1.25 width */
-li .<%= @opts[:css_prefix] %>large[class^="<%= @opts[:css_prefix] %>"], li .<%= @opts[:css_prefix] %>large[class*=" <%= @opts[:css_prefix] %>"] {
-  width: 1.875em;
-}
-
-li[class^="<%= @opts[:css_prefix] %>"], li[class*=" <%= @opts[:css_prefix] %>"] {
-  margin-left: 0;
-  list-style-type: none;
-}
-
-li[class^="<%= @opts[:css_prefix] %>"]:before, li[class*=" <%= @opts[:css_prefix] %>"]:before {
-  text-indent: -2em;
-  text-align: center;
-}
-
-li[class^="<%= @opts[:css_prefix] %>"].<%= @opts[:css_prefix] %>large:before, li[class*=" <%= @opts[:css_prefix] %>"].<%= @opts[:css_prefix] %>large:before {
-  text-indent: -1.333em;
-}
-
-/*
-  Icon Classes
-*/
 <% @data[:glyphs].each_with_index do |name, index| %>
 .<%= @opts[:css_prefix] + name %>:before { content: "\<%= (61696+index).to_s(16) %>"; }<% end %>

data/lib/fontcustom/templates/fontcustom.yml

@@ -1,23 +1,80 @@
 ##
 # FONTCUSTOM CONFIG
 #
-# Include this file along with your vectors or pass it to any command with:
-#   --config=path/to/config.yml 
-#   -c path/to/containing/dir/
+# This file will automatically be loaded if located inside your vector dir.
+# Otherwise, pass it to `compile` or `watch` with:
 #
-# Run `fontcustom help` to learn about various options
+#   --config=path/to/config.yml
+#   -c path/to/containing/dir/
 ##
 
-#output: /path/to/output
+# ---------------------------------------------------------------------------- #
+# Output Directory
+# absolute path OR relative path from `pwd`
+#
+# default: INPUT/fontcustom
+
+#output: path/to/output
+
+# ---------------------------------------------------------------------------- #
+# Templates
+# array of templates to generate alongside fonts
+# accepts shortcuts or paths (absolute, relative to INPUT, or relative to `pwd`)
+#
+# shortcuts: 
+#   preview
+#   css, scss
+#   bootstrap, bootstrap-scss
+#   bootstrap-ie7, bootstrap-ie7-scss
+#
+# default: [ css, preview ]
 
-#templates: [ scss, preview, relative/path/from/INPUT, relative/path/from/PWD ]
+#templates: [ scss, preview, path/from/INPUT ]
+
+# ---------------------------------------------------------------------------- #
+# Font Name
+# automatically normalized to lower-spinal-case
+#
+# default: fontcustom
 
 #font_name: my-font
+  
+# ---------------------------------------------------------------------------- #
+# Font Hash
+# option to attach a cache-breaking fingerprint to each font file
+#
+# default: true
 
 #file_hash: false
 
-#css_prefix: glyph-
+# ---------------------------------------------------------------------------- #
+# CSS Class Prefix
+#
+# default: icon-
+
+  #css_prefix: glyph-
+
+# ---------------------------------------------------------------------------- #
+# @Font-face Path
+# font path used in @font-face declarations
+# only affects SCSS shortcut templates and custom templates
+#
+# default: none
+
+#font_face_path: assets/fonts/fontcustom
+
+# ---------------------------------------------------------------------------- #
+# Debug
+# show raw output from Font Forge
+#
+# default: false
 
 #debug: true
 
+# ---------------------------------------------------------------------------- #
+# Verbose
+# print out all file operations
+#
+# default: true
+
 #verbose: false

data/lib/fontcustom/util.rb

@@ -58,13 +58,19 @@ module Fontcustom
         options[:templates].map do |template|
           case template
           when "preview"
-            File.join gem_lib_path, "templates", "fontcustom.html"
+            File.join gem_lib_path, "templates", "fontcustom-preview.html"
           when "css"
             File.join gem_lib_path, "templates", "fontcustom.css"
           when "scss"
             File.join gem_lib_path, "templates", "_fontcustom.scss"
-          when "css-ie7"
-            File.join gem_lib_path, "templates", "fontcustom-ie7.css"
+          when "bootstrap"
+            File.join gem_lib_path, "templates", "fontcustom-bootstrap.css"
+          when "bootstrap-scss"
+            File.join gem_lib_path, "templates", "_fontcustom-bootstrap.scss"
+          when "bootstrap-ie7"
+            File.join gem_lib_path, "templates", "fontcustom-bootstrap-ie7.css"
+          when "bootstrap-ie7-scss"
+            File.join gem_lib_path, "templates", "_fontcustom-bootstrap-ie7.scss"
           else
             if File.exists?(template)
               template

data/lib/fontcustom/version.rb

@@ -1,3 +1,3 @@
 module Fontcustom
-  VERSION = "1.0.0.pre"
+  VERSION = "1.0.0.pre2"
 end

data/spec/fixtures/mixed-output/.fontcustom-data

@@ -1,14 +1,14 @@
 {
   "fonts": [
-    "fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff",
-    "fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf",
-    "fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot",
-    "fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg"
+    "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff",
+    "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf",
+    "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot",
+    "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg"
   ],
   "templates": [
     "fontcustom.css"
   ],
-  "file_name": "fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e",
+  "file_name": "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e",
   "glyphs": [
     "a_r3ally-exotic-f1le-name",
     "c",

data/spec/fixtures/mixed-output/fontcustom.css

@@ -4,10 +4,10 @@ Font Custom - icon webfonts made simple
 
 @font-face {
   font-family: "fontcustom";
-  src: url("fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot?#iefix") format("embedded-opentype"),
-       url("fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff") format("woff"),
-       url("fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf") format("truetype"),
-       url("fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg#fontcustom") format("svg");
+  src: url("fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot?#iefix") format("embedded-opentype"),
+       url("fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff") format("woff"),
+       url("fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf") format("truetype"),
+       url("fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg#fontcustom") format("svg");
   font-weight: normal;
   font-style: normal;
 }

data/spec/fontcustom/generator/font_spec.rb

@@ -62,7 +62,7 @@ describe Fontcustom::Generator::Font do
     end
 
     it "should delete fonts from @data[:fonts]" do
-      subject.should_receive(:remove_file).exactly(4).times.with(/fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e/, :verbose => true)
+      subject.should_receive(:remove_file).exactly(4).times.with(/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e/, :verbose => true)
       subject.reset_output
     end
 
@@ -128,12 +128,12 @@ describe Fontcustom::Generator::Font do
       gen.collect_data
       data = gen.instance_variable_get(:@data)
       data[:glyphs].should =~ ["c", "d", "a_r3ally-exotic-f1le-name"]
-      data[:file_name].should == "fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e" 
+      data[:file_name].should == "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e" 
       data[:fonts].should =~ [
-        "fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot", 
-        "fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg", 
-        "fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf", 
-        "fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff"
+        "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot", 
+        "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg", 
+        "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf", 
+        "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff"
       ]
     end
   end

data/spec/fontcustom/generator/template_spec.rb

@@ -44,7 +44,7 @@ describe Fontcustom::Generator::Template do
     it "should not delete non-template files" do
       subject.should_not_receive(:remove_file).with("dont-delete-me.bro")
       subject.should_not_receive(:remove_file).with("another-font.ttf")
-      subject.should_not_receive(:remove_file).with(/fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e/)
+      subject.should_not_receive(:remove_file).with(/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e/)
       subject.reset_output
     end
 

data/spec/fontcustom/util_spec.rb

@@ -71,18 +71,22 @@ describe Fontcustom::Util do
       templates = util.get_template_paths options
       templates.should =~ [
         File.join(lib, "templates", "fontcustom.css"), 
-        File.join(lib, "templates", "fontcustom.html")
+        File.join(lib, "templates", "fontcustom-preview.html")
       ]
     end
 
     it "should expand shorthand for packaged templates" do
       lib = util.gem_lib_path
-      options = { :input => fixture("vectors"), :templates => %W|css scss preview| }
+      options = { :input => fixture("vectors"), :templates => %W|preview css scss bootstrap bootstrap-scss bootstrap-ie7 bootstrap-ie7-scss| }
       templates = util.get_template_paths options
       templates.should =~ [
+        File.join(lib, "templates", "fontcustom-preview.html"),
         File.join(lib, "templates", "fontcustom.css"), 
         File.join(lib, "templates", "_fontcustom.scss"),
-        File.join(lib, "templates", "fontcustom.html")
+        File.join(lib, "templates", "fontcustom-bootstrap.css"), 
+        File.join(lib, "templates", "_fontcustom-bootstrap.scss"), 
+        File.join(lib, "templates", "fontcustom-bootstrap-ie7.css"), 
+        File.join(lib, "templates", "_fontcustom-bootstrap-ie7.scss") 
       ]
     end
 

data/spec/spec_helper.rb

@@ -10,13 +10,13 @@ RSpec.configure do |c|
   def data_file_contents
     {
       :fonts => %w|
-        fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff
-        fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf
-        fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot
-        fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg
+        fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff
+        fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf
+        fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot
+        fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg
       |,
       :templates => %w|fontcustom.css|,
-      :file_name => "fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e", 
+      :file_name => "fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e", 
       :glyphs => %w|a_r3ally-exotic-f1le-name c d|
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Transforms EPS and SVG vectors into icon webfonts. Generates CSS (or
-  your preferred alternative) for easy inclusion in your projects.
+  any custom template) for easy inclusion in your projects.
 email:
 - yz@yifei.co
 - joshua@gross.is
@@ -122,7 +122,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Guardfile
 - LICENSES.txt
 - README.md
 - Rakefile
@@ -137,10 +136,13 @@ files:
 - lib/fontcustom/scripts/eotlitetool.py
 - lib/fontcustom/scripts/generate.py
 - lib/fontcustom/scripts/sfnt2woff
+- lib/fontcustom/templates/_fontcustom-bootstrap-ie7.scss
+- lib/fontcustom/templates/_fontcustom-bootstrap.scss
 - lib/fontcustom/templates/_fontcustom.scss
-- lib/fontcustom/templates/fontcustom-ie7.css
+- lib/fontcustom/templates/fontcustom-bootstrap-ie7.css
+- lib/fontcustom/templates/fontcustom-bootstrap.css
+- lib/fontcustom/templates/fontcustom-preview.html
 - lib/fontcustom/templates/fontcustom.css
-- lib/fontcustom/templates/fontcustom.html
 - lib/fontcustom/templates/fontcustom.yml
 - lib/fontcustom/util.rb
 - lib/fontcustom/version.rb
@@ -151,11 +153,11 @@ files:
 - spec/fixtures/mixed-output/.fontcustom-data
 - spec/fixtures/mixed-output/another-font.ttf
 - spec/fixtures/mixed-output/dont-delete-me.bro
-- spec/fixtures/mixed-output/fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot
-- spec/fixtures/mixed-output/fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg
-- spec/fixtures/mixed-output/fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf
-- spec/fixtures/mixed-output/fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff
 - spec/fixtures/mixed-output/fontcustom.css
+- spec/fixtures/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot
+- spec/fixtures/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg
+- spec/fixtures/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf
+- spec/fixtures/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff
 - spec/fixtures/not-a-dir
 - spec/fixtures/vectors/C.svg
 - spec/fixtures/vectors/D.svg
@@ -179,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3519366396623315767
+      hash: 549091687675706102
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,11 +201,11 @@ test_files:
 - spec/fixtures/mixed-output/.fontcustom-data
 - spec/fixtures/mixed-output/another-font.ttf
 - spec/fixtures/mixed-output/dont-delete-me.bro
-- spec/fixtures/mixed-output/fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot
-- spec/fixtures/mixed-output/fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg
-- spec/fixtures/mixed-output/fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf
-- spec/fixtures/mixed-output/fontcustom-cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff
 - spec/fixtures/mixed-output/fontcustom.css
+- spec/fixtures/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot
+- spec/fixtures/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg
+- spec/fixtures/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf
+- spec/fixtures/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff
 - spec/fixtures/not-a-dir
 - spec/fixtures/vectors/C.svg
 - spec/fixtures/vectors/D.svg

data/Guardfile

@@ -1,15 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'spork' do
-  watch('Gemfile.lock')
-  watch('spec/spec_helper.rb') { :rspec }
-end
-
-guard 'rspec', :cli => '--color --drb' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/fontcustom/(.+)\.rb$})    { |m| "spec/fontcustom/#{m[1]}_spec.rb" }
-  watch('lib/fontcustom.rb')              { 'spec/fontcustom/fontcustom_spec.rb' }
-  watch('lib/fontcustom/core.rb')         { 'spec/fontcustom/fontcustom_spec.rb' }
-  watch('spec/spec_helper.rb')            { 'spec' }
-end