fontcustom 1.3.0.beta3 → 1.3.0.beta4

data/lib/fontcustom/options.rb

@@ -7,6 +7,7 @@ module Fontcustom
     attr_accessor :options
 
     def initialize(cli_options = {})
+      @manifest = cli_options[:manifest]
       @cli_options = symbolize_hash(cli_options)
       parse_options
     end
@@ -20,10 +21,9 @@ module Fontcustom
       merge_options
       clean_font_name
       clean_css_selector
-      set_manifest_path
       set_input_paths
       set_output_paths
-      set_template_paths
+      check_template_paths
     end
 
     # We give Thor fake defaults to generate more useful help messages.
@@ -34,33 +34,23 @@ module Fontcustom
         @cli_options.delete(key) if @cli_options[key] == EXAMPLE_OPTIONS[key]
       end
       @cli_options = DEFAULT_OPTIONS.dup.merge @cli_options
-      @cli_options[:project_root] ||= Dir.pwd
     end
 
     def set_config_path
       @cli_options[:config] = if @cli_options[:config]
-        path = expand_path @cli_options[:config]
-
-        # :config is the path to fontcustom.yml
+        path = @cli_options[:config]
         if File.exists?(path) && ! File.directory?(path)
           path
-
-        # :config is a dir containing fontcustom.yml
         elsif File.exists? File.join(path, "fontcustom.yml")
           File.join path, "fontcustom.yml"
-
         else
-          raise Fontcustom::Error, "No configuration file found at `#{relative_path(path)}`."
+          raise Fontcustom::Error, "No configuration file found at `#{path}`."
         end
       else
-        # fontcustom.yml is in the project_root
-        if File.exists? File.join(@cli_options[:project_root], "fontcustom.yml")
-          File.join @cli_options[:project_root], "fontcustom.yml"
-
-        # config/fontcustom.yml is in the project_root
-        elsif File.exists? File.join(@cli_options[:project_root], "config", "fontcustom.yml")
-          File.join @cli_options[:project_root], "config", "fontcustom.yml"
-
+        if File.exists? "fontcustom.yml"
+          "fontcustom.yml"
+        elsif File.exists? File.join("config", "fontcustom.yml")
+          File.join "config", "fontcustom.yml"
         else
           false
         end
@@ -70,23 +60,25 @@ module Fontcustom
     def load_config
       @config_options = {}
       if @cli_options[:config]
-        say_message :debug, "Using settings from `#{relative_path(@cli_options[:config])}`." if @cli_options[:debug]
+        say_message :debug, "Using settings from `#{@cli_options[:config]}`." if @cli_options[:debug]
         begin
           config = YAML.load File.open(@cli_options[:config])
           if config # empty YAML returns false
             @config_options = symbolize_hash(config)
           else
-            say_message :warn, "`#{relative_path(@cli_options[:config])}` was empty. Using defaults."
+            say_message :warn, "`#{@cli_options[:config]}` was empty. Using defaults."
           end
         rescue Exception => e
-          raise Fontcustom::Error, "Error parsing `#{relative_path(@cli_options[:config])}`:\n#{e.message}"
+          raise Fontcustom::Error, "Error parsing `#{@cli_options[:config]}`:\n#{e.message}"
         end
       end
     end
 
+    # TODO validate keys
     def merge_options
       @cli_options.delete_if { |key, val| val == DEFAULT_OPTIONS[key] }
       @options = DEFAULT_OPTIONS.merge(@config_options).merge(@cli_options)
+      @options.delete :manifest
     end
 
     def clean_font_name
@@ -101,21 +93,10 @@ module Fontcustom
       @options[:css_selector] = @options[:css_selector].strip.gsub(/[^\.#\{\}\w]/, "-")
     end
 
-    def set_manifest_path
-      @options[:manifest] = if ! @options[:manifest].nil?
-        expand_path @options[:manifest]
-      elsif @options[:config]
-        File.join File.dirname(@options[:config]), ".fontcustom-manifest.json"
-      else
-        File.join @options[:project_root], ".fontcustom-manifest.json"
-      end
-    end
-
     def set_input_paths
       if @options[:input].is_a? Hash
         @options[:input] = symbolize_hash(@options[:input])
         if @options[:input].has_key? :vectors
-          @options[:input][:vectors] = expand_path @options[:input][:vectors]
           check_input @options[:input][:vectors]
         else
           raise Fontcustom::Error,
@@ -123,19 +104,18 @@ module Fontcustom
         end
 
         if @options[:input].has_key? :templates
-          @options[:input][:templates] = expand_path @options[:input][:templates]
           check_input @options[:input][:templates]
         else
           @options[:input][:templates] = @options[:input][:vectors]
         end
       else
-        input = @options[:input] ? expand_path(@options[:input]) : @options[:project_root]
-        check_input input 
+        input = @options[:input] ? @options[:input] : "."
+        check_input input
         @options[:input] = { :vectors => input, :templates => input }
       end
 
       if Dir[File.join(@options[:input][:vectors], "*.svg")].empty?
-        raise Fontcustom::Error, "`#{relative_path(@options[:input][:vectors])}` doesn't contain any SVGs."
+        raise Fontcustom::Error, "`#{@options[:input][:vectors]}` doesn't contain any SVGs."
       end
     end
 
@@ -148,10 +128,10 @@ module Fontcustom
         end
 
         @options[:output].each do |key, val|
-          @options[:output][key] = expand_path val
+          @options[:output][key] = val
           if File.exists?(val) && ! File.directory?(val)
             raise Fontcustom::Error,
-              "Output `#{relative_path(@options[:output][key])}` exists but isn't a directory. Check your options."
+              "Output `#{@options[:output][key]}` exists but isn't a directory. Check your options."
           end
         end
 
@@ -159,14 +139,14 @@ module Fontcustom
         @options[:output][:preview] ||= @options[:output][:fonts]
       else
         if @options[:output].is_a? String
-          output = expand_path @options[:output]
+          output = @options[:output]
           if File.exists?(output) && ! File.directory?(output)
             raise Fontcustom::Error,
-              "Output `#{relative_path(output)}` exists but isn't a directory. Check your options."
+              "Output `#{output}` exists but isn't a directory. Check your options."
           end
         else
-          output = File.join @options[:project_root], @options[:font_name]
-          say_message :debug, "Generated files will be saved to `#{relative_path(output)}/`." if @options[:debug]
+          output = @options[:font_name]
+          say_message :debug, "Generated files will be saved to `#{output}/`." if @options[:debug]
         end
 
         @options[:output] = {
@@ -177,39 +157,13 @@ module Fontcustom
       end
     end
 
-    # Translates shorthand to full path of packages templates, otherwise,
-    # it checks input and pwd for the template.
-    #
-    # Could arguably belong in Generator::Template, however, it's nice to
-    # be able to catch template errors before any generator runs.
-    def set_template_paths
-      template_path = File.join Fontcustom.gem_lib, "templates"
-
-      @options[:templates] = @options[:templates].map do |template|
-        case template
-        when "preview"
-          File.join template_path, "fontcustom-preview.html"
-        when "css"
-          File.join template_path, "fontcustom.css"
-        when "scss"
-          File.join template_path, "_fontcustom.scss"
-        when "scss-rails"
-          File.join template_path, "_fontcustom-rails.scss"
-        when "bootstrap"
-          File.join template_path, "fontcustom-bootstrap.css"
-        when "bootstrap-scss"
-          File.join template_path, "_fontcustom-bootstrap.scss"
-        when "bootstrap-ie7"
-          File.join template_path, "fontcustom-bootstrap-ie7.css"
-        when "bootstrap-ie7-scss"
-          File.join template_path, "_fontcustom-bootstrap-ie7.scss"
-        else
-          template = File.expand_path File.join(@options[:input][:templates], template) unless template[0] == "/"
-          unless File.exists? template
-            raise Fontcustom::Error,
-              "Custom template `#{relative_path(template)}` doesn't exist. Check your options."
-          end
-          template
+    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] == "/"
+        unless File.exists? path
+          raise Fontcustom::Error,
+            "Custom template `#{template}` doesn't exist. Check your options."
         end
       end
     end
@@ -217,10 +171,10 @@ module Fontcustom
     def check_input(dir)
       if ! File.exists? dir
         raise Fontcustom::Error,
-          "Input `#{relative_path(dir)}` doesn't exist. Check your options."
+          "Input `#{dir}` doesn't exist. Check your options."
       elsif ! File.directory? dir
         raise Fontcustom::Error,
-          "Input `#{relative_path(dir)}` isn't a directory. Check your options."
+          "Input `#{dir}` isn't a directory. Check your options."
       end
     end
   end

data/lib/fontcustom/utility.rb

@@ -4,7 +4,9 @@ require "thor/shell"
 require "thor/shell/basic"
 require "thor/shell/color"
 
-# Requires access to @options or @cli_options
+# Requires access to:
+#   @options or @cli_options
+#   @manifest
 module Fontcustom
   module Utility
     include Thor::Actions
@@ -12,30 +14,30 @@ module Fontcustom
     #
     # Hacks that allow Thor::Actions and Thor::Shell to be used in Fontcustom classes.
     #
-    
+
     def self.shell
       @shell || Thor::Shell::Color.new
     end
 
-    def behavior
-      :invoke
-    end
-
     def shell
       Fontcustom::Utility.shell
     end
 
+    def behavior
+      :invoke
+    end
+
     def say_status(*args)
       shell.say_status *args
     end
 
     def destination_root
-      @destination_stack ||= [_options[:project_root]]
+      @destination_stack ||= [project_root]
       @destination_stack.last
     end
 
     def source_paths
-      @source_paths ||= [File.join(Fontcustom.gem_lib, "templates")]
+      @source_paths ||= [File.join(Fontcustom.gem_lib, "templates"), Dir.pwd]
     end
 
     #
@@ -64,77 +66,39 @@ module Fontcustom
     # Paths
     #
 
-    def expand_path(path)
-      return path if path[0] == "/" # ignore absolute paths
-      File.expand_path File.join(_options[:project_root], path)
-    end
-
-    # TODO Is this robust enough?
-    def relative_path(path)
-      path = path.sub(_options[:project_root], "")
-      path = path[1..-1] if path[0] == "/"
-      path = "." if path.empty?
-      path
+    def project_root
+      if @manifest.is_a? String
+        File.dirname @manifest
+      else
+        File.dirname @manifest.manifest
+      end
     end
 
     #
-    # Manifest / Files
+    # File Manipulation
     #
 
     def write_file(file, content = "", message = nil, message_body = nil)
       File.open(file, "w") { |f| f.write(content) }
       if message
-        body = message_body || relative_path(file)
+        body = message_body || file
         say_message message, body
       end
     end
 
-    def get_manifest(file = _options[:manifest])
-      begin
-        json = File.read file
-        JSON.parse(json, :symbolize_names => true)
-      rescue JSON::ParserError
-        raise Fontcustom::Error, 
-          "Couldn't parse `#{relative_path file}`. Fix the invalid "\
-          "JSON or delete the file to start from scratch."
-      end
-    end
-
-    def save_manifest
-      json = JSON.pretty_generate @manifest
-      write_file _options[:manifest], json
-    end
-
-    def delete_from_manifest(key)
-      files = @manifest[key]
-      return if files.empty?
-      begin
-        deleted = []
-        @manifest[key].each do |file|
-          remove_file file, :verbose => false
-          deleted << file
-        end
-      ensure
-        @manifest[key] = @manifest[key] - deleted
-        save_manifest
-        say_changed :delete, deleted
-      end
-    end
-
     #
     # Messages
     #
 
     def say_message(status, message, color = nil)
-      return if _options[:quiet] && status != :error
+      return if options[:quiet] && status != :error
       color = :red if [:error, :debug, :warn].include?(status)
       say_status status, message, color
     end
 
     def say_changed(status, changed)
-      return if _options[:quiet]
-      message = changed.map { |file| relative_path(file) }
-      say_status status, message.join(line_break)
+      return if options[:quiet]
+      say_status status, changed.join(line_break)
     end
 
    # magic number for Thor say_status line breaks
@@ -144,7 +108,7 @@ module Fontcustom
 
     private
 
-    def _options
+    def options
       @options || @cli_options
     end
   end

data/lib/fontcustom/version.rb

@@ -1,3 +1,3 @@
 module Fontcustom
-  VERSION = "1.3.0.beta3"
+  VERSION = "1.3.0.beta4"
 end

data/spec/fontcustom/base_spec.rb

@@ -1,17 +1,23 @@
 require "spec_helper"
 
 describe Fontcustom::Base do
+  before(:each) { Fontcustom::Manifest.any_instance.stub(: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 :init_manifest
         Fontcustom::Base.any_instance.stub :check_fontforge
-        base = Fontcustom::Base.new({})
-        base.stub(:checksum).and_return("abc")
-        base.instance_variable_set :@manifest, {:checksum => {:previous => "abc", :current => ""}}
-        base.instance_variable_set :@options, {:quiet => false}
+        options = double("options")
+        options.stub(:options).and_return({})
+        Fontcustom::Options.stub(:new).and_return options
 
-        output = capture(:stdout) { base.compile }
+        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"
+          base.compile
+        end
         output.should match(/No changes/)
       end
     end
@@ -19,33 +25,15 @@ describe Fontcustom::Base do
 
   context ".check_fontforge" do
     it "should raise error if fontforge isn't installed" do
-      Fontcustom::Base.any_instance.stub :init_manifest
       Fontcustom::Base.any_instance.stub(:"`").and_return("")
       expect { Fontcustom::Base.new(:option => "foo") }.to raise_error Fontcustom::Error, /fontforge/
     end
   end
 
-  context ".init_manifest" do
-    before(:each) do
-      Fontcustom::Base.any_instance.stub :check_fontforge
-      manifest = double("manifest")
-      manifest.should_receive(:manifest).and_return(manifest_contents)
-      Fontcustom::Manifest.stub(:new).and_return manifest
-    end
-
-    it "should pass CLI options to FC::Options" do
-      opts = double "options"
-      opts.should_receive :options
-      Fontcustom::Options.should_receive(:new).with({:foo => "bar"}).and_return opts
-      Fontcustom::Base.new :foo => "bar"
-    end
-  end
-
   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
-      Fontcustom::Base.any_instance.stub :init_manifest
       base = Fontcustom::Base.new({})
       base.instance_variable_set :@options, {
         :input => {:vectors => fixture("shared/vectors")},

data/spec/fontcustom/cli_spec.rb

@@ -8,7 +8,7 @@ describe Fontcustom::CLI do
         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":.+sandbox\/test\/fontcustom\/fontcustom_.+\.ttf"/m)
+        File.read(manifest).should match(/"fonts":.+fontcustom\/fontcustom_.+\.ttf"/m)
       end
     end
   end

data/spec/fontcustom/generator/font_spec.rb

@@ -2,14 +2,15 @@ require "spec_helper"
 
 describe Fontcustom::Generator::Font do
   def generator
-    Fontcustom::Generator::Font.any_instance.stub(:get_manifest).and_return :options => {}
+    Fontcustom::Manifest.any_instance.stub :write_file
     Fontcustom::Generator::Font.new("")
   end
 
   context "#generate" do
     it "should set manifest[:glyphs] (integration)", :integration => true do
       live_test do |testdir|
-        manifest = test_manifest
+        test_manifest
+        manifest = File.join Dir.pwd, ".fontcustom-manifest.json"
         gen = Fontcustom::Generator::Font.new manifest
         gen.stub :create_fonts
         gen.generate
@@ -19,10 +20,11 @@ describe Fontcustom::Generator::Font do
 
     it "should generate fonts (integration)", :integration => true do
       live_test do |testdir|
-        manifest = test_manifest
+        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":.+sandbox\/test\/fontcustom\/fontcustom_.+\.ttf"/m)
+        File.read(manifest).should match(/"fonts":.*fontcustom\/fontcustom_.+\.ttf"/m)
       end
     end
   end
@@ -45,30 +47,26 @@ describe Fontcustom::Generator::Font do
     it "should set :glyphs in manifest" do
       gen = generator
       gen.instance_variable_set :@options, :input => {:vectors => fixture("shared/vectors")}
-      gen.instance_variable_set :@manifest, :glyphs => {}
+      manifest = gen.instance_variable_get(:@manifest)
 
-      gen.should_receive(:save_manifest)
       gen.send :set_glyph_info
-      manifest = gen.instance_variable_get(:@manifest)
-      manifest[:glyphs][:C].should include(:codepoint => 61696)
-      manifest[:glyphs][:D].should include(:codepoint => 61697)
-      manifest[:glyphs][:"a_R3ally-eXotic-f1Le-Name"].should include(:codepoint => 61698)
+      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)
     end
 
     it "should not change codepoints of existing glyphs" do
       gen = generator
       gen.instance_variable_set :@options, :input => {:vectors => fixture("shared/vectors")}
-      gen.instance_variable_set :@manifest, :glyphs => {:C => {:source => "foo", :codepoint => 61699}}
+      manifest = gen.instance_variable_get(:@manifest)
+      manifest.set :glyphs, {:C => {:source => "foo", :codepoint => 61699}}
 
-      gen.should_receive(:save_manifest)
       gen.send :set_glyph_info
-      manifest = gen.instance_variable_get(:@manifest)
-      manifest[:glyphs][:C].should include(:codepoint => 61699)
-      manifest[:glyphs][:D].should include(:codepoint => 61700)
-      manifest[:glyphs][:"a_R3ally-eXotic-f1Le-Name"].should include(:codepoint => 61701)
+      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)
     end
   end
-
-  #context ".run_fontforge" do
-  #end
 end