lib/compass/fontcustom/glyph_map.rb in compass-fontcustom-1.2.0 vs lib/compass/fontcustom/glyph_map.rb in compass-fontcustom-1.3.0

@@ -1,7 +1,8 @@
 require 'fontcustom'
 require 'compass/fontcustom/configurable'
+require 'thor'
 
 module Compass
   module Fontcustom
     class GlyphMap < Sass::Script::Literal
       include Configurable
@@ -36,33 +37,28 @@
         @glyphs.index name
       end
 
       # Starts the Fontcustom font generator to write font files to disk.
       def generate
-        unless exists?
-          args = self.class.config.generator_options || {}
-          args.merge!(
-            :input     => path,
-            :output    => output_dir,
-            :font_name => @name,
-            :no_hash   => !Compass.configuration.fontcustom_hash,
-            :quiet     => true
-          )
-          ::Fontcustom::Generator::Font.start [::Fontcustom::Options.new(args)]
-        end
+        args = self.class.config.generator_options || {}
+        args.merge!(
+          :input     => path,
+          :output    => output_dir,
+          :font_name => @name,
+          :no_hash   => !Compass.configuration.fontcustom_hash,
+          :quiet     => true,
+          :fonts     => []
+        )
+        ::Fontcustom::Base.new(args).compile
       end
 
       def filename
         file = glob.first
         File.basename file, File.extname(file)
       end
 
-      def exists?
-        not glob.empty?
-      end
-
       def output_dir
-        Compass.configuration.fonts_path.to_s
+        Compass.configuration.fontcustom_fonts_path
       end
 
       def to_s
         @name.to_s
       end