fontcustom 1.1.0.pre → 1.1.0.pre2

data/spec/fontcustom/util_spec.rb

@@ -1,359 +1,61 @@
 require 'spec_helper'
 
 describe Fontcustom::Util do
-  def util
-    Fontcustom::Util
-  end
-
-  context ".check_fontforge" do
-    it "should raise error if fontforge isn't installed" do
-      util.stub(:"`").and_return("")
-      expect { util.check_fontforge }.to raise_error Fontcustom::Error, /install fontforge/
-    end
-  end
-
-  context ".collect_options" do
-    it "should raise error if fontcustom.yml isn't valid" do
-      options = { 
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :config => "util/fontcustom-malformed.yml" 
-      }
-      expect { util.collect_options(options) }.to raise_error Fontcustom::Error, /couldn't read your configuration/
-    end
-
-    it "should overwrite defaults with config file" do
-      options = { 
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :config => "util/fontcustom.yml" 
-      }
-      options = util.collect_options options
-      options[:font_name].should == "Custom-Name-From-Config"
-    end
+  class Generator
+    include Fontcustom::Util
+    attr_accessor :cli_options
 
-    it "should overwrite config file and defaults with CLI options" do
-      options = { 
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :font_name => "custom-name-from-cli",
-        :config => "util/fontcustom.yml" 
-      }
-      options = util.collect_options options
-      options[:font_name].should == "custom-name-from-cli"
-    end
-
-    it "should normalize file name" do
-      options = { 
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :font_name => " A_stR4nG3  nAm3 Ø&  "
-      }
-      options = util.collect_options options
-      options[:font_name].should == "A_stR4nG3--nAm3---"
+    def initialize
+      @cli_options = { :project_root => fixture, :verbose => true }
+      @shell = Thor::Shell::Color.new
     end
   end
 
-  context ".get_config_path" do
-    it "should search for fontcustom.yml if options[:config] is a dir" do
-      options = { 
-        :project_root => fixture,
-        :config => "util/config-is-in-dir"
-      }
-      util.get_config_path(options).should == fixture("util/config-is-in-dir/fontcustom.yml")
-    end
-
-    it "should use options[:config] if it's a file" do
-      options = { 
-        :project_root => fixture,
-        :config => "util/fontcustom.yml"
-      }
-      util.get_config_path(options).should == fixture("util/fontcustom.yml")
-    end
-
-    it "should find fontcustom.yml in :project_root/config" do
-      options = { :project_root => fixture("util/rails-like") }
-      util.get_config_path(options).should == fixture("util/rails-like/config/fontcustom.yml")
-    end
-
-    it "should follow ../../ paths" do 
-      options = { 
-        :project_root => fixture("shared"),
-        :input => "vectors",
-        :config => "../util"
-      }
-      util.get_config_path(options).should == fixture("util/fontcustom.yml")
-    end
-
-    it "should print out which fontcustom.yml it's using"
-
-    it "should raise error if fontcustom.yml was specified but doesn't exist" do
-      options = { 
-        :project_root => fixture,
-        :input => "shared/vectors",
-        :config => "does-not-exist"
-      }
-      expect { util.get_config_path(options) }.to raise_error Fontcustom::Error, /couldn't find/
+  context "#check_fontforge" do
+    it "should raise error if fontforge isn't installed" do
+      gen = Generator.new
+      gen.stub(:"`").and_return("")
+      expect { gen.check_fontforge }.to raise_error Fontcustom::Error, /install fontforge/
     end
-
-    it "should print a warning if fontcustom.yml was NOT specified and doesn't exist"
   end
 
-  context ".get_input_paths" do
-    it "should raise error if input[:vectors] doesn't contain vectors" do
-      options = {
-        :project_root => fixture,
-        :input => "shared/vectors-empty"
-      }
-      expect { util.get_input_paths(options) }.to raise_error Fontcustom::Error, /doesn't contain any vectors/
-    end
-
-    it "should follow ../../ paths" do
-      options = { 
-        :project_root => fixture("util"),
-        :input => {:vectors => "../shared/vectors", :templates => "../shared/templates"}
-      }
-      paths = util.get_input_paths(options)
-      paths[:vectors].should eq(fixture("shared/vectors"))
-      paths[:templates].should eq(fixture("shared/templates"))
+  context "#say_changed" do
+    it "should strip :project_root from changed paths" do
+      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
 
-    context "when passed a hash" do
-      it "should return a hash of input locations" do
-        options = {
-          :input => { :vectors => "shared/vectors" },
-          :project_root => fixture
-        }
-        paths = util.get_input_paths(options)
-        paths.should have_key("vectors")
-        paths.should have_key("templates")
-      end
-
-      it "should set :templates as :vectors if :templates isn't passed" do
-        options = {
-          :input => { :vectors => "shared/vectors" },
-          :project_root => fixture
-        }
-        paths = util.get_input_paths(options)
-        paths[:vectors].should equal(paths[:templates])
-      end
-
-      it "should preserve :templates if it is passed" do
-        options = {
-          :input => { :vectors => "shared/vectors", :templates => "shared/templates" },
-          :project_root => fixture
-        }
-        paths = util.get_input_paths(options)
-        paths[:templates].should_not equal(paths[:vectors])
-      end
-
-      it "should raise an error if :vectors isn't included" do
-        options = {
-          :input => { :templates => "shared/templates" },
-          :project_root => fixture
-        }
-        expect { util.get_input_paths(options) }.to raise_error Fontcustom::Error, /should be a string or a hash/
-      end
-
-      it "should raise an error if :vectors doesn't point to an existing directory" do
-        options = {
-          :input => { :vectors => "shared/not-a-dir" },
-          :project_root => fixture
-        }
-        expect { util.get_input_paths(options) }.to raise_error Fontcustom::Error, /should be a directory/
-      end
-    end
-
-    context "when passed a string" do
-      it "should return a hash of input locations" do
-        options = { 
-          :input => "shared/vectors",
-          :project_root => fixture
-        }
-        paths = util.get_input_paths(options)
-        paths.should have_key("vectors")
-        paths.should have_key("templates")
-      end
-
-      it "should set :templates to match :vectors" do
-        options = { 
-          :input => "shared/vectors",
-          :project_root => fixture
-        }
-        paths = util.get_input_paths(options)
-        paths[:vectors].should equal(paths[:templates])
-      end
-
-      it "should raise an error if :vectors doesn't point to a directory" do
-        options = { 
-          :input => "shared/not-a-dir",
-          :project_root => fixture
-        }
-        expect { util.collect_options options }.to raise_error Fontcustom::Error, /should be a directory/
-      end
+    it "should not respond if :verbose is false" do
+      changed = %w|a b c|.map { |file| fixture(file) }
+      gen = Generator.new
+      gen.cli_options[:verbose] = false
+      output = capture(:stdout) { gen.say_changed(:success, changed) }
+      output.should == ""
     end
   end
 
-  context ".get_output_paths" do
-    it "should default to :project_root/:font_name if no output is specified" do
-      options = { :project_root => fixture, :font_name => "test" }
-      paths = util.get_output_paths(options)
-      paths[:fonts].should eq(fixture("test"))
-    end
-
-    it "should print a warning when defaulting to :project_root/:font_name"
-
-    it "should follow ../../ paths" do
-      options = { 
-        :project_root => fixture("shared"),
-        :input => "vectors",
-        :output => {
-          :fonts => "../output/fonts",
-          :css => "../output/css",
-          :preview => "../output/views"
-        }
-      }
-      paths = util.get_output_paths(options)
-      paths[:fonts].should eq(fixture("output/fonts"))
-      paths[:css].should eq(fixture("output/css"))
-      paths[:preview].should eq(fixture("output/views"))
-    end
-
-    context "when passed a hash" do
-      it "should return a hash of output locations" do 
-        options = {
-          :output => { :fonts => "output/fonts" },
-          :project_root => fixture
-        }
-        paths = util.get_output_paths(options)
-        paths.should have_key("fonts")
-        paths.should have_key("css")
-        paths.should have_key("preview")
-      end
-
-      it "should set :css and :preview to match :fonts if either aren't passed" do
-        options = {
-          :output => { :fonts => "output/fonts" },
-          :project_root => fixture
-        }
-        paths = util.get_output_paths(options)
-        paths[:css].should equal(paths[:fonts])
-        paths[:preview].should equal(paths[:fonts])
-      end
-
-      it "should preserve :css and :preview if they do exist" do
-        options = {
-          :output => { 
-            :fonts => "output/fonts",
-            :css => "output/styles",
-            :preview => "output/preview"
-          },
-          :project_root => fixture
-        }
-        paths = util.get_output_paths(options)
-        paths[:css].should_not equal(paths[:fonts])
-        paths[:preview].should_not equal(paths[:fonts])
-      end
-
-      it "should create additional paths if they are given" do
-        options = {
-          :output => { 
-            :fonts => "output/fonts",
-            "special.js" => "assets/javascripts"
-          },
-          :project_root => fixture
-        }
-        paths = util.get_output_paths(options)
-        paths["special.js"].should eq(File.join(options[:project_root], "assets/javascripts"))
-      end
-      
-      it "should raise an error if :fonts isn't included" do
-        options = {
-          :output => { :css => "output/styles" },
-          :project_root => fixture
-        }
-        expect { util.get_output_paths(options) }.to raise_error Fontcustom::Error, /containing a "fonts" key/
-      end
-    end
-
-    context "when passed a string" do
-      it "should return a hash of output locations" do
-        options = {
-          :output => "output/fonts",
-          :project_root => fixture
-        }
-        paths = util.get_output_paths(options)
-        paths.should have_key("fonts")
-        paths.should have_key("css")
-        paths.should have_key("preview")
-      end
-
-      it "should set :css and :preview to match :fonts" do
-        options = {
-          :output => "output/fonts",
-          :project_root => fixture
-        }
-        paths = util.get_output_paths(options)
-        paths[:css].should equal(paths[:fonts])
-        paths[:preview].should equal(paths[:fonts])
-      end
-
-      it "should raise an error if :fonts exists but isn't a directory" do
-        options = {
-          :output => "shared/not-a-dir",
-          :project_root => fixture
-        }
-        expect { util.get_output_paths(options) }.to raise_error Fontcustom::Error, /directory, not a file/
-      end
+  context "#say_message" do 
+    it "should not respond if :verbose is false" do
+      gen = Generator.new
+      gen.cli_options[:verbose] = false
+      output = capture(:stdout) { gen.say_message(:test, "Hello") }
+      output.should == ""
     end
   end
 
-  context ".get_templates" do
-    it "should ensure that 'css' is included with 'preview'" do
-      lib = util.gem_lib_path
-      options = { :input => fixture("shared/vectors"), :templates => %W|preview| }
-      templates = util.get_templates options
-      templates.should =~ [
-        File.join(lib, "templates", "fontcustom.css"),
-        File.join(lib, "templates", "fontcustom-preview.html")
-      ]
-    end
-
-    it "should expand shorthand for packaged templates" do
-      lib = util.gem_lib_path
-      options = { :input => fixture("shared/vectors"), :templates => %W|preview css scss bootstrap bootstrap-scss bootstrap-ie7 bootstrap-ie7-scss| }
-      templates = util.get_templates 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-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
-
-    it "should find custom templates in :template_path" do
-      options = { 
-        :project_root => fixture, 
-        :input => { 
-          :vectors => fixture("shared/vectors"), 
-          :templates => fixture("shared/templates") 
-        },
-        :templates => %W|custom.css|
-      }
-      templates = util.get_templates options
-      templates.should eq([ fixture("shared/templates/custom.css") ])
+  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 raise an error if a template does not exist" do
-      options = {
-        :project_root => fixture,
-        :input => { :templates => "shared/templates" },
-        :templates => %W|css fake-template|
-      }
-      expect { util.get_templates options }.to raise_error Fontcustom::Error, /couldn't find.+fake-template/
+    it "should trim beginning slash" do
+      gen = Generator.new
+      path = gen.relative_to_root "/test/path"
+      path.should == "test/path"
     end
   end
 end

data/spec/fontcustom/watcher_spec.rb

@@ -3,11 +3,16 @@ require "fileutils"
 require "fontcustom/watcher"
 
 describe Fontcustom::Watcher do
+  # Silence messages without passing :verbose => false to everything
+  before(:each) do
+    Fontcustom::Options.any_instance.stub :say_message
+  end
+
   def watcher(options)
     Fontcustom::Generator::Font.stub :start
     Fontcustom::Generator::Template.stub :start
-    opts = Fontcustom::Util.collect_options options
-    opts[:blocking] = false # undocumented — non-blocking use of watcher for testing
+    opts = Fontcustom::Options.new(options)
+    opts.instance_variable_set :@is_test, true # undocumented — non-blocking use of watcher for testing
     Fontcustom::Watcher.new opts
   end
 

data/spec/spec_helper.rb

@@ -20,8 +20,7 @@ RSpec.configure do |c|
       :glyphs => %w|a_r3ally-exotic-f1le-name c d|,
       :paths => {
         :css_to_fonts => "",
-        :preprocessor_to_fonts => "",
-        :preview_to_css => ""
+        :preprocessor_to_fonts => ""
       }
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre
+  version: 1.1.0.pre2
 platform: ruby
 authors:
 - Kai Zau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -116,7 +116,6 @@ files:
 - bin/fontcustom
 - fontcustom.gemspec
 - lib/fontcustom.rb
-- lib/fontcustom/actions.rb
 - lib/fontcustom/cli.rb
 - lib/fontcustom/error.rb
 - lib/fontcustom/generator/font.rb
@@ -127,6 +126,7 @@ files:
 - 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
@@ -137,6 +137,8 @@ files:
 - lib/fontcustom/version.rb
 - lib/fontcustom/watcher.rb
 - spec/fixtures/generators/.fontcustom-data
+- spec/fixtures/generators/.fontcustom-data-corrupted
+- 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
@@ -144,6 +146,13 @@ files:
 - 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/options/any-file-name.yml
+- spec/fixtures/options/config-is-in-dir/fontcustom.yml
+- spec/fixtures/options/fontcustom-empty.yml
+- spec/fixtures/options/fontcustom-malformed.yml
+- spec/fixtures/options/fontcustom.yml
+- spec/fixtures/options/no-config-here/.gitkeep
+- spec/fixtures/options/rails-like/config/fontcustom.yml
 - spec/fixtures/shared/not-a-dir
 - spec/fixtures/shared/templates/custom.css
 - spec/fixtures/shared/templates/regular.css
@@ -151,13 +160,9 @@ files:
 - spec/fixtures/shared/vectors/C.svg
 - spec/fixtures/shared/vectors/D.svg
 - spec/fixtures/shared/vectors/a_R3ally-eXotic f1Le Name.svg
-- spec/fixtures/util/config-is-in-dir/fontcustom.yml
-- spec/fixtures/util/fontcustom-malformed.yml
-- spec/fixtures/util/fontcustom.yml
-- spec/fixtures/util/rails-like/config/fontcustom.yml
-- spec/fontcustom/actions_spec.rb
 - spec/fontcustom/generator/font_spec.rb
 - spec/fontcustom/generator/template_spec.rb
+- spec/fontcustom/options_spec.rb
 - spec/fontcustom/util_spec.rb
 - spec/fontcustom/watcher_spec.rb
 - spec/spec_helper.rb
@@ -186,6 +191,8 @@ specification_version: 4
 summary: Generate custom icon webfonts from the comfort of the command line.
 test_files:
 - spec/fixtures/generators/.fontcustom-data
+- spec/fixtures/generators/.fontcustom-data-corrupted
+- 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
@@ -193,6 +200,13 @@ test_files:
 - 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/options/any-file-name.yml
+- spec/fixtures/options/config-is-in-dir/fontcustom.yml
+- spec/fixtures/options/fontcustom-empty.yml
+- spec/fixtures/options/fontcustom-malformed.yml
+- spec/fixtures/options/fontcustom.yml
+- spec/fixtures/options/no-config-here/.gitkeep
+- spec/fixtures/options/rails-like/config/fontcustom.yml
 - spec/fixtures/shared/not-a-dir
 - spec/fixtures/shared/templates/custom.css
 - spec/fixtures/shared/templates/regular.css
@@ -200,13 +214,9 @@ 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/fixtures/util/config-is-in-dir/fontcustom.yml
-- spec/fixtures/util/fontcustom-malformed.yml
-- spec/fixtures/util/fontcustom.yml
-- spec/fixtures/util/rails-like/config/fontcustom.yml
-- spec/fontcustom/actions_spec.rb
 - spec/fontcustom/generator/font_spec.rb
 - spec/fontcustom/generator/template_spec.rb
+- spec/fontcustom/options_spec.rb
 - spec/fontcustom/util_spec.rb
 - spec/fontcustom/watcher_spec.rb
 - spec/spec_helper.rb