fontcustom 1.1.0.pre2 → 1.1.0

data/spec/fontcustom/options_spec.rb

@@ -24,17 +24,6 @@ describe Fontcustom::Options do
 
   context ".set_config_path" do
     context "when :config is set" do
-      # TODO abstract this into Util?
-      it "should follow ../../ relative paths" do
-        args = {
-          :project_root => fixture("shared/vectors"),
-          :config => "../../options"
-        }
-        o = options args
-        o.send :set_config_path
-        o.instance_variable_get(:@config).should == fixture("options/fontcustom.yml")
-      end
-
       it "should use options[:config] if it's a file" do
         args = {
           :project_root => fixture,
@@ -61,7 +50,7 @@ describe Fontcustom::Options do
           :config => "does-not-exist"
         }
         o = options args
-        expect { o.send :set_config_path }.to raise_error Fontcustom::Error, /configuration file was not found/
+        expect { o.send :set_config_path }.to raise_error Fontcustom::Error, /configuration file wasn't found/
       end
     end
 
@@ -91,7 +80,7 @@ describe Fontcustom::Options do
 
   context ".load_config" do
     def args
-      { :project_root => fixture, :verbose => false }
+      { :project_root => fixture, :quiet => true }
     end
 
     it "should raise error if fontcustom.yml isn't valid" do
@@ -113,6 +102,20 @@ describe Fontcustom::Options do
       o.send :load_config
       o.instance_variable_get(:@config_options).should == {}
     end
+
+    it "should report which configuration file it's using" do
+      o = options
+      o.instance_variable_set :@config, fixture("options/any-file-name.yml")
+      stdout = capture(:stdout) { o.send :load_config }
+      stdout.should match /options\/any-file-name\.yml/
+    end
+
+    it "should warn if no configuration file is used" do
+      o = options
+      o.instance_variable_set :@config, false
+      stdout = capture(:stdout) { o.send :load_config }
+      stdout.should match /No configuration/
+    end
   end
 
   context ".merge_options" do
@@ -156,6 +159,7 @@ describe Fontcustom::Options do
       o = options
       o.instance_variable_set :@config, "path/to/config/fontcustom.yml"
       o.instance_variable_set :@data_cache, nil
+      o.remove_instance_variable :@cli_options
       o.send :set_data_path
       o.instance_variable_get(:@data_cache).should == "path/to/config/.fontcustom-data"
     end
@@ -166,6 +170,7 @@ describe Fontcustom::Options do
       o = options
       o.instance_variable_set :@project_root, fixture
       o.instance_variable_set :@input, "shared/vectors-empty"
+      o.remove_instance_variable :@cli_options
       expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /doesn't contain any vectors/
     end
 
@@ -175,6 +180,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, hash
+        o.remove_instance_variable :@cli_options
         o.send :set_input_paths
         input = o.instance_variable_get :@input
         input[:templates].should == fixture("shared/vectors")
@@ -185,6 +191,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, hash
+        o.remove_instance_variable :@cli_options
         o.send :set_input_paths
         input = o.instance_variable_get :@input
         input[:templates].should == fixture("shared/templates")
@@ -195,7 +202,8 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, hash
-        expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /contain a "vectors" key/
+        o.remove_instance_variable :@cli_options
+        expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /contain a :vectors key/
       end
 
       it "should raise an error if :vectors doesn't point to an existing directory" do
@@ -203,19 +211,9 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, hash
+        o.remove_instance_variable :@cli_options
         expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /should be a directory/
       end
-
-      it "should follow ../../ relative paths" do
-        hash = { :vectors => "../../shared/vectors", :templates => "../../shared/templates" }
-        o = options
-        o.instance_variable_set :@project_root, fixture("generators/mixed-output")
-        o.instance_variable_set :@input, hash
-        o.send :set_input_paths
-        input = o.instance_variable_get(:@input)
-        input[:vectors].should == fixture("shared/vectors")
-        input[:templates].should == fixture("shared/templates")
-      end
     end
 
     context "when @input is a string" do
@@ -223,16 +221,18 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, "shared/vectors"
+        o.remove_instance_variable :@cli_options
         o.send :set_input_paths
         input = o.instance_variable_get :@input
-        input.should have_key("vectors")
-        input.should have_key("templates")
+        input.should have_key(:vectors)
+        input.should have_key(:templates)
       end
 
       it "should set :templates to match :vectors" do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, "shared/vectors"
+        o.remove_instance_variable :@cli_options
         o.send :set_input_paths
         input = o.instance_variable_get :@input
         input[:templates].should == fixture("shared/vectors")
@@ -242,18 +242,9 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@input, "shared/not-a-dir"
+        o.remove_instance_variable :@cli_options
         expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /should be a directory/
       end
-
-      it "should follow ../../ relative paths" do
-        o = options
-        o.instance_variable_set :@project_root, fixture("generators/mixed-output")
-        o.instance_variable_set :@input, "../../shared/vectors"
-        o.send :set_input_paths
-        input = o.instance_variable_get(:@input)
-        input[:vectors].should == fixture("shared/vectors")
-        input[:templates].should == fixture("shared/vectors")
-      end
     end
   end
 
@@ -265,6 +256,7 @@ describe Fontcustom::Options do
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@font_name, "Test-Font"
         o.instance_variable_set :@output, nil
+        o.remove_instance_variable :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
         output[:fonts].should == fixture("Test-Font")
@@ -275,6 +267,7 @@ describe Fontcustom::Options do
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@font_name, "Test-Font"
         o.instance_variable_set :@output, nil
+        o.remove_instance_variable :@cli_options
         stdout = capture(:stdout) { o.send :set_output_paths }
         stdout.should match("Test-Font")
       end
@@ -286,6 +279,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, hash
+        o.remove_instance_variable :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
         output[:css].should == fixture("output/fonts")
@@ -301,6 +295,7 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, hash
+        o.remove_instance_variable :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
         output[:css].should == fixture("output/styles")
@@ -315,9 +310,10 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, hash
+        o.remove_instance_variable :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
-        output["special.js"].should == fixture("assets/javascripts")
+        output[:"special.js"].should == fixture("assets/javascripts")
       end
 
       it "should raise an error if :fonts isn't set" do
@@ -325,23 +321,8 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, hash
-        expect { o.send :set_output_paths }.to raise_error Fontcustom::Error, /contain a "fonts" key/
-      end
-
-      it "should follow ../../ relative paths" do
-        hash = {
-          :fonts => "../../output/fonts",
-          :css => "../../output/css",
-          :preview => "../../output/views"
-        }
-        o = options
-        o.instance_variable_set :@project_root, fixture("generators/mixed-output")
-        o.instance_variable_set :@output, hash
-        o.send :set_output_paths
-        output = o.instance_variable_get :@output
-        output[:fonts].should == fixture("output/fonts")
-        output[:css].should == fixture("output/css")
-        output[:preview].should == fixture("output/views")
+        o.remove_instance_variable :@cli_options
+        expect { o.send :set_output_paths }.to raise_error Fontcustom::Error, /contain a :fonts key/
       end
     end
 
@@ -350,18 +331,20 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, "output/fonts"
+        o.remove_instance_variable :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
         output.should be_a(Hash)
-        output.should have_key("fonts")
-        output.should have_key("css")
-        output.should have_key("preview")
+        output.should have_key(:fonts)
+        output.should have_key(:css)
+        output.should have_key(:preview)
       end
 
       it "should set :css and :preview to match :fonts" do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, "output/fonts"
+        o.remove_instance_variable :@cli_options
         o.send :set_output_paths
         output = o.instance_variable_get :@output
         output[:css].should == fixture("output/fonts")
@@ -372,19 +355,9 @@ describe Fontcustom::Options do
         o = options
         o.instance_variable_set :@project_root, fixture
         o.instance_variable_set :@output, "shared/not-a-dir"
+        o.remove_instance_variable :@cli_options
         expect { o.send :set_output_paths }.to raise_error Fontcustom::Error, /directory, not a file/
       end
-
-      it "should follow ../../ relative paths" do
-        o = options
-        o.instance_variable_set :@project_root, fixture("generators/mixed-output")
-        o.instance_variable_set :@output, "../../something/else"
-        o.send :set_output_paths
-        output = o.instance_variable_get :@output
-        output[:fonts].should == fixture("something/else")
-        output[:css].should == fixture("something/else")
-        output[:preview].should == fixture("something/else")
-      end
     end
   end
 
@@ -394,6 +367,7 @@ describe Fontcustom::Options do
       o.instance_variable_set :@project_root, fixture
       o.instance_variable_set :@input, { :templates => "shared/templates" }
       o.instance_variable_set :@templates, %w|preview css scss bootstrap bootstrap-scss bootstrap-ie7 bootstrap-ie7-scss|
+      o.remove_instance_variable :@cli_options
       o.send :set_template_paths
       templates = o.instance_variable_get :@templates
       templates.should =~ [
@@ -412,6 +386,7 @@ describe Fontcustom::Options do
       o.instance_variable_set :@project_root, fixture
       o.instance_variable_set :@input, { :templates => fixture("shared/templates") }
       o.instance_variable_set :@templates, %w|custom.css|
+      o.remove_instance_variable :@cli_options
       o.send :set_template_paths
       templates = o.instance_variable_get :@templates
       templates.should =~ [fixture("shared/templates/custom.css")]
@@ -422,6 +397,7 @@ describe Fontcustom::Options do
       o.instance_variable_set :@project_root, fixture
       o.instance_variable_set :@input, { :templates => "shared/templates" }
       o.instance_variable_set :@templates, %w|fake-template.txt|
+      o.remove_instance_variable :@cli_options
       expect { o.send :set_template_paths }.to raise_error Fontcustom::Error, /does not exist/
     end
   end

data/spec/fontcustom/util_spec.rb

@@ -6,7 +6,7 @@ describe Fontcustom::Util do
     attr_accessor :cli_options
 
     def initialize
-      @cli_options = { :project_root => fixture, :verbose => true }
+      @cli_options = { :project_root => fixture, :quiet => false }
       @shell = Thor::Shell::Color.new
     end
   end
@@ -27,24 +27,45 @@ describe Fontcustom::Util do
       output.should_not match(fixture)
     end
 
-    it "should not respond if :verbose is false" do
+    it "should not respond if :quiet is true " do
       changed = %w|a b c|.map { |file| fixture(file) }
       gen = Generator.new
-      gen.cli_options[:verbose] = false
+      gen.cli_options[:quiet] = true
       output = capture(:stdout) { gen.say_changed(:success, changed) }
       output.should == ""
     end
   end
 
   context "#say_message" do 
-    it "should not respond if :verbose is false" do
+    it "should not respond if :quiet is true" do
       gen = Generator.new
-      gen.cli_options[:verbose] = false
+      gen.cli_options[:quiet] = true
       output = capture(:stdout) { gen.say_message(:test, "Hello") }
       output.should == ""
     end
   end
 
+  context "#expand_path" do
+    it "should leave absolute paths alone" do
+      gen = Generator.new
+      path = gen.expand_path "/absolute/path"
+      path.should == "/absolute/path"
+    end
+
+    it "should prepend paths with :project_root" do
+      gen = Generator.new
+      path = gen.expand_path "generators"
+      path.should == fixture("generators")
+    end
+
+    it "should follow ../../ relative paths" do
+      gen = Generator.new
+      gen.cli_options[:project_root] = fixture("shared/vectors")
+      path = gen.expand_path "../../generators"
+      path.should == fixture("generators")
+    end
+  end
+
   context "#relative_to_root" do
     it "should trim project root from paths" do
       gen = Generator.new

data/spec/fontcustom/watcher_spec.rb

@@ -3,7 +3,7 @@ require "fileutils"
 require "fontcustom/watcher"
 
 describe Fontcustom::Watcher do
-  # Silence messages without passing :verbose => false to everything
+  # Silence messages without passing :quiet => true to everything
   before(:each) do
     Fontcustom::Options.any_instance.stub :say_message
   end
@@ -28,7 +28,7 @@ describe Fontcustom::Watcher do
       # silence output
       capture(:stdout) do
         w.watch
-        w.stop
+        w.send :stop
       end
     end
 
@@ -43,7 +43,7 @@ describe Fontcustom::Watcher do
       )
       capture(:stdout) do
         w.watch
-        w.stop
+        w.send :stop
       end
     end
 
@@ -62,7 +62,7 @@ describe Fontcustom::Watcher do
           FileUtils.cp fixture("shared/vectors/C.svg"), fixture("shared/vectors/test.svg")
           sleep 1
         ensure
-          w.stop
+          w.send :stop
           new = fixture("shared/vectors/test.svg")
           FileUtils.rm(new) if File.exists?(new)
         end
@@ -89,7 +89,7 @@ describe Fontcustom::Watcher do
           File.open(template, "w") { |file| file.write(new) }
           sleep 1
         ensure
-          w.stop
+          w.send :stop
           File.open(template, "w") { |file| file.write(content) }
         end
       end
@@ -110,7 +110,7 @@ describe Fontcustom::Watcher do
           w.watch
           FileUtils.touch fixture("shared/vectors/non-vector-file")
         ensure
-          w.stop
+          w.send :stop
           new = fixture("shared/vectors/non-vector-file")
           FileUtils.rm(new) if File.exists?(new)
         end

data/spec/spec_helper.rb

@@ -17,18 +17,18 @@ RSpec.configure do |c|
         fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg
       |,
       :templates => %w|fontcustom.css|,
-      :glyphs => %w|a_r3ally-exotic-f1le-name c d|,
-      :paths => {
-        :css_to_fonts => "",
-        :preprocessor_to_fonts => ""
-      }
+      :glyphs => %w|a_r3ally-exotic-f1le-name c d|
     }
   end
 
-  def fontforge_output
-    "Copyright (c) 2000-2012 by George Williams.\n Executable based on sources from 14:57 GMT 31-Jul-2012-D.\n Library based on sources from 14:57 GMT 31-Jul-2012.\n#{data_file_contents.to_json}"
+  def fontforge_stdout
+    data_file_contents.to_json.to_s
   end
-
+  
+  def fontforge_stderr
+    "Copyright (c) 2000-2012 by George Williams.\n Executable based on sources from 14:57 GMT 31-Jul-2012-D.\n Library based on sources from 14:57 GMT 31-Jul-2012.\n"
+  end
+  
   def capture(stream)
     begin
       stream = stream.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre2
+  version: 1.1.0
 platform: ruby
 authors:
 - Kai Zau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,8 +95,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Transforms EPS and SVG vectors into icon webfonts. Generates CSS (or
-  any custom template) for easy inclusion in your projects.
+description: Transforms EPS and SVG vectors into icon webfonts. Generates CSS or other
+  template files for your projects.
 email:
 - kai@kaizau.com
 - joshua@gross.is
@@ -112,7 +112,6 @@ files:
 - LICENSES.txt
 - README.md
 - Rakefile
-- TODO.md
 - bin/fontcustom
 - fontcustom.gemspec
 - lib/fontcustom.rb
@@ -169,7 +168,8 @@ files:
 homepage: http://fontcustom.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message: '  >> Thanks for installing Font Custom! Please ensure that
+  fontforge is installed before compiling any icons.'
 rdoc_options: []
 require_paths:
 - lib
@@ -180,15 +180,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Generate custom icon webfonts from the comfort of the command line.
+summary: Generate icon webfonts from the comfort of the command line.
 test_files:
 - spec/fixtures/generators/.fontcustom-data
 - spec/fixtures/generators/.fontcustom-data-corrupted