fontcustom 1.2.0 → 1.3.0.beta

data/spec/fontcustom/utility_spec.rb

@@ -0,0 +1,163 @@
+require "spec_helper"
+
+describe Fontcustom::Utility do
+  class Generator
+    include Fontcustom::Utility
+    attr_accessor :options
+
+    def initialize
+      @options = { :project_root => fixture, :quiet => false }
+    end
+  end
+
+  it "should include Thor::Action methods" do
+    gen = Generator.new
+    %w|template add_file remove_file|.each do |method|
+      gen.should respond_to(method.to_sym)
+    end
+  end
+
+  context "#symbolize_hash" do
+    it "should turn string keys into symbols" do
+      gen = Generator.new
+      hash = gen.symbolize_hash "foo" => "bar"
+      hash.should == { :foo => "bar" }
+    end
+  end
+
+  context "#methodize_hash" do
+    it "should define getter method" do
+      gen = Generator.new
+      hash = gen.methodize_hash :foo => "bar"
+      hash.foo.should == "bar"
+    end
+
+    it "should define setter method" do
+      gen = Generator.new
+      hash = gen.methodize_hash :foo => "bar"
+      hash.foo = "baz"
+      hash.foo.should == "baz"
+    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 parent (../../) relative paths" do
+      gen = Generator.new
+      gen.options[:project_root] = fixture "shared/vectors"
+      path = gen.expand_path "../../generators"
+      path.should == fixture("generators")
+    end
+  end
+
+  context "#write_file" do
+    it "should replace the contents of a file" do
+      gen = Generator.new
+      file = double "file"
+      File.should_receive(:open).with(fixture("shared/test"), "w").and_yield file
+      file.should_receive(:write).with("testing")
+      gen.write_file fixture("shared/test"), "testing"
+    end
+
+    #it "should output a message"
+  end
+
+  #context "#garbage_collect" do
+    #it "should delete files from passed array"
+    #it "should update the manifest after completion"
+  #end
+
+  context "#get_manifest" do
+    it "should return a manifest hash" do
+      gen = Generator.new
+      options = { :project_root => fixture("generators"), :manifest => fixture("generators/.fontcustom-manifest.json") }
+      gen.instance_variable_set :@options, options
+      gen.get_manifest.keys.should == manifest_contents.keys
+    end
+
+    it "should raise an error if the file is empty" do
+      gen = Generator.new
+      options = { :project_root => fixture("generators"), :manifest => fixture("generators/.fontcustom-manifest-empty.json") }
+      gen.instance_variable_set :@options, options
+      expect { gen.get_manifest }.to raise_error Fontcustom::Error, /Couldn't parse/
+    end
+
+    it "should raise an error if the file is corrupted" do
+      gen = Generator.new
+      options = { :project_root => fixture("generators"), :manifest => fixture("generators/.fontcustom-manifest-corrupted.json") }
+      gen.instance_variable_set :@options, options
+      expect { gen.get_manifest }.to raise_error Fontcustom::Error, /Couldn't parse/
+    end
+  end
+
+  #context "#save_manifest" do
+    #it "should update the manifest" do
+    #end
+  #end
+
+  context "#delete_from_manifest" do
+    it "should empty key from manifest" do
+      gen = Generator.new
+      gen.stub :say_changed
+      manifest = {:fonts => %w|fonts/a.ttf fonts/a.eot fonts/a.woff fonts/a.svg|}
+      gen.instance_variable_set :@manifest, manifest
+      gen.should_receive(:save_manifest)
+      gen.delete_from_manifest :fonts
+      gen.instance_variable_get(:@manifest)[:fonts].should == []
+    end
+  end
+
+  context "#relative_to_root" do
+    it "should trim project root from paths" do
+      gen = Generator.new
+      path = gen.relative_to_root fixture "test/path"
+      path.should == "test/path"
+    end
+
+    it "should trim beginning slash" do
+      gen = Generator.new
+      path = gen.relative_to_root "/test/path"
+      path.should == "test/path"
+    end
+  end
+
+  #context "#say_message" do
+    #it "should not respond if :quiet is true" do
+      #pending
+      #gen = Generator.new
+      #gen.options[:quiet] = true
+      #output = capture(:stdout) { gen.say_message(:test, "Hello") }
+      #output.should == ""
+    #end
+  #end
+
+  #context "#say_changed" do
+    #it "should strip :project_root from changed paths" do
+      #pending
+      #changed = %w|a b c|.map { |file| fixture(file) }
+      #gen = Generator.new
+      #output = capture(:stdout) { gen.say_changed(:success, changed) }
+      #output.should_not match(fixture)
+    #end
+
+    #it "should not respond if :quiet is true " do
+      #pending
+      #changed = %w|a b c|.map { |file| fixture(file) }
+      #gen = Generator.new
+      #gen.options[:quiet] = true
+      #output = capture(:stdout) { gen.say_changed(:success, changed) }
+      #output.should == ""
+    #end
+  #end
+end

data/spec/spec_helper.rb

@@ -1,34 +1,71 @@
-require 'rspec'
-require 'json'
-require File.expand_path('../../lib/fontcustom.rb', __FILE__)
+require "rspec"
+require "json"
+require "fileutils"
+require File.expand_path("../../lib/fontcustom.rb", __FILE__)
 
 RSpec.configure do |c|
   def fixture(path = "")
-    File.join(File.expand_path('../fixtures', __FILE__), path)
+    File.join(File.expand_path("../fixtures", __FILE__), path)
   end
 
-  # TODO more aptly named fontforge_data?
-  def data_file_contents
+  def manifest_contents(root = Dir.pwd)
     {
-      :fonts => %w|
-        fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff
-        fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf
-        fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot
-        fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg
-      |,
-      :templates => %w|fontcustom.css|,
-      :glyphs => %w|a_r3ally-exotic-f1le-name c d|
+      :checksum => {
+        :current => "82a59e769bc60192484f2620570bbb59e225db97c1aac3f242a2e49d6060a19c", 
+        :previous => "82a59e769bc60192484f2620570bbb59e225db97c1aac3f242a2e49d6060a19c"
+      },
+      :fonts => [
+        "#{root}/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.ttf",
+        "#{root}/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.svg",
+        "#{root}/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.woff",
+        "#{root}/fontcustom/fontcustom_82a59e769bc60192484f2620570bbb59.eot"
+      ],
+      :glyphs => {
+        :"a_r3ally-exotic-f1le-name" => {
+          :codepoint => 61696,
+          :source => "#{root}/vectors/a_R3ally-eXotic f1Le Name.svg"
+        },
+        :c => {
+          :codepoint => 61697,
+          :source => "#{root}/vectors/C.svg"
+        },  
+        :d => {
+          :codepoint => 61698,
+          :source => "#{root}/vectors/D.svg"}
+        },
+      :options => {
+        :autowidth => false,
+        :config => false,
+        :css_selector => ".icon-{{glyph}}",
+        :debug => false,
+        :font_name => "fontcustom",
+        :input => {
+          :templates => "#{root}/vectors",
+          :vectors => "#{root}/vectors"
+        },
+        :manifest => "#{root}/.fontcustom-manifest.json",
+        :no_hash => false,
+        :output => {
+          :css => "#{root}/fontcustom",
+          :fonts => "#{root}/fontcustom",
+          :preview => "#{root}/fontcustom"
+        },
+        :preprocessor_path => nil,
+        :project_root => "#{root}",
+        :quiet => true,
+        :templates => [
+          "#{Fontcustom.gem_lib}/templates/fontcustom.css",
+          "#{Fontcustom.gem_lib}/templates/fontcustom-preview.html"
+        ]
+      },
+      :templates => []
     }
   end
 
-  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
@@ -40,4 +77,25 @@ RSpec.configure do |c|
     end
     result
   end
+
+  def live_test(cleanup = true)
+    testdir = fixture File.join("sandbox", "test")
+    begin
+      FileUtils.mkdir testdir
+      FileUtils.cp_r fixture("shared/vectors"), testdir
+      FileUtils.cd testdir do
+        yield(testdir)
+      end
+    ensure
+      FileUtils.rm_r testdir if cleanup
+    end
+  end
+
+  def test_manifest(options = {:input => fixture("shared/vectors"), :quiet => true})
+    base = Fontcustom::Base.new options
+    manifest = base.instance_variable_get :@manifest
+    manifest[:checksum] = {:current => base.send(:checksum), :previous => ""}
+    base.save_manifest
+    base.instance_variable_get(:@options)[:manifest]
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.3.0.beta
 platform: ruby
 authors:
 - Kai Zau
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,49 +56,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Font Custom makes using vector icons easy. Generate icon fonts and supporting
@@ -126,39 +113,39 @@ files:
 - LICENSES.txt
 - README.md
 - Rakefile
+- TODO.md
 - bin/fontcustom
 - fontcustom.gemspec
 - lib/fontcustom.rb
+- lib/fontcustom/base.rb
 - lib/fontcustom/cli.rb
 - lib/fontcustom/error.rb
 - lib/fontcustom/generator/font.rb
 - lib/fontcustom/generator/template.rb
+- lib/fontcustom/manifest.rb
 - lib/fontcustom/options.rb
 - 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-rails.scss
 - lib/fontcustom/templates/_fontcustom.scss
-- 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.yml
-- lib/fontcustom/util.rb
+- lib/fontcustom/utility.rb
 - lib/fontcustom/version.rb
 - lib/fontcustom/watcher.rb
 - spec/fixtures/generators/.fontcustom-manifest-corrupted.json
+- spec/fixtures/generators/.fontcustom-manifest-empty.json
 - spec/fixtures/generators/.fontcustom-manifest.json
 - spec/fixtures/generators/fontcustom.yml
 - spec/fixtures/generators/mixed-output/another-font.ttf
 - spec/fixtures/generators/mixed-output/dont-delete-me.bro
 - spec/fixtures/generators/mixed-output/fontcustom.css
-- spec/fixtures/generators/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot
-- spec/fixtures/generators/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg
-- spec/fixtures/generators/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf
-- spec/fixtures/generators/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff
+- spec/fixtures/generators/mixed-output/fontcustom_82a59e769bc60192484f2620570bbb59.eot
+- spec/fixtures/generators/mixed-output/fontcustom_82a59e769bc60192484f2620570bbb59.svg
+- spec/fixtures/generators/mixed-output/fontcustom_82a59e769bc60192484f2620570bbb59.ttf
+- spec/fixtures/generators/mixed-output/fontcustom_82a59e769bc60192484f2620570bbb59.woff
 - spec/fixtures/options/any-file-name.yml
 - spec/fixtures/options/config-is-in-dir/fontcustom.yml
 - spec/fixtures/options/fontcustom-empty.yml
@@ -166,6 +153,7 @@ files:
 - spec/fixtures/options/fontcustom.yml
 - spec/fixtures/options/no-config-here/.gitkeep
 - spec/fixtures/options/rails-like/config/fontcustom.yml
+- spec/fixtures/sandbox/.gitkeep
 - spec/fixtures/shared/not-a-dir
 - spec/fixtures/shared/templates/custom.css
 - spec/fixtures/shared/templates/regular.css
@@ -173,55 +161,52 @@ files:
 - spec/fixtures/shared/vectors/C.svg
 - spec/fixtures/shared/vectors/D.svg
 - spec/fixtures/shared/vectors/a_R3ally-eXotic f1Le Name.svg
+- spec/fontcustom/base_spec.rb
+- spec/fontcustom/cli_spec.rb
 - spec/fontcustom/generator/font_spec.rb
 - spec/fontcustom/generator/template_spec.rb
+- spec/fontcustom/generator/template_spec.rb.off
+- spec/fontcustom/manifest_spec.rb
 - spec/fontcustom/options_spec.rb
-- spec/fontcustom/util_spec.rb
-- spec/fontcustom/watcher_spec.rb
+- spec/fontcustom/utility_spec.rb
+- spec/fontcustom/watcher_spec.rb.off
 - spec/spec_helper.rb
 homepage: http://fontcustom.com
 licenses: []
-post_install_message: ! '>> Thanks for installing Font Custom! Please ensure that
-  fontforge is installed before compiling any icons. Visit <http://fontcustom.com>
-  for instructions.'
+metadata: {}
+post_install_message: '>> Thanks for installing Font Custom! Please ensure that fontforge
+  is installed before compiling any icons. Visit <http://fontcustom.com> for instructions.'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1146963489862796142
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1146963489862796142
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate icon fonts from the command line.
 test_files:
 - spec/fixtures/generators/.fontcustom-manifest-corrupted.json
+- spec/fixtures/generators/.fontcustom-manifest-empty.json
 - spec/fixtures/generators/.fontcustom-manifest.json
 - spec/fixtures/generators/fontcustom.yml
 - spec/fixtures/generators/mixed-output/another-font.ttf
 - spec/fixtures/generators/mixed-output/dont-delete-me.bro
 - spec/fixtures/generators/mixed-output/fontcustom.css
-- spec/fixtures/generators/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.eot
-- spec/fixtures/generators/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.svg
-- spec/fixtures/generators/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.ttf
-- spec/fixtures/generators/mixed-output/fontcustom_cc5ce52f2ae4f9ce2e7ee8131bbfee1e.woff
+- spec/fixtures/generators/mixed-output/fontcustom_82a59e769bc60192484f2620570bbb59.eot
+- spec/fixtures/generators/mixed-output/fontcustom_82a59e769bc60192484f2620570bbb59.svg
+- spec/fixtures/generators/mixed-output/fontcustom_82a59e769bc60192484f2620570bbb59.ttf
+- spec/fixtures/generators/mixed-output/fontcustom_82a59e769bc60192484f2620570bbb59.woff
 - spec/fixtures/options/any-file-name.yml
 - spec/fixtures/options/config-is-in-dir/fontcustom.yml
 - spec/fixtures/options/fontcustom-empty.yml
@@ -229,6 +214,7 @@ test_files:
 - spec/fixtures/options/fontcustom.yml
 - spec/fixtures/options/no-config-here/.gitkeep
 - spec/fixtures/options/rails-like/config/fontcustom.yml
+- spec/fixtures/sandbox/.gitkeep
 - spec/fixtures/shared/not-a-dir
 - spec/fixtures/shared/templates/custom.css
 - spec/fixtures/shared/templates/regular.css
@@ -236,9 +222,13 @@ test_files:
 - spec/fixtures/shared/vectors/C.svg
 - spec/fixtures/shared/vectors/D.svg
 - spec/fixtures/shared/vectors/a_R3ally-eXotic f1Le Name.svg
+- spec/fontcustom/base_spec.rb
+- spec/fontcustom/cli_spec.rb
 - spec/fontcustom/generator/font_spec.rb
 - spec/fontcustom/generator/template_spec.rb
+- spec/fontcustom/generator/template_spec.rb.off
+- spec/fontcustom/manifest_spec.rb
 - spec/fontcustom/options_spec.rb
-- spec/fontcustom/util_spec.rb
-- spec/fontcustom/watcher_spec.rb
+- spec/fontcustom/utility_spec.rb
+- spec/fontcustom/watcher_spec.rb.off
 - spec/spec_helper.rb