fontcustom 1.3.0.beta3 → 1.3.0.beta4

data/spec/fontcustom/generator/template_spec.rb

@@ -5,15 +5,17 @@ describe Fontcustom::Generator::Template do
     it "should generate templates (integration)", :integration => true do
       live_test do |testdir|
         FileUtils.cp_r fixture("generators/mixed-output"), "fontcustom"
-        manifest = test_manifest(
+        test_manifest(
           :input => "vectors", 
           :quiet => true,
           :templates => %w|preview css scss scss-rails|
         )
+        manifest = File.join testdir, ".fontcustom-manifest.json"
         Fontcustom::Generator::Font.new(manifest).generate
-        gen = Fontcustom::Generator::Template.new manifest
+        Fontcustom::Generator::Template.new(manifest).generate
 
-        gen.generate
+        content = File.read manifest
+        content.should match(/fontcustom\/fontcustom-preview.html/)
       end
     end
   end

data/spec/fontcustom/manifest_spec.rb

@@ -2,14 +2,15 @@ require "spec_helper"
 
 describe Fontcustom::Manifest do
   context "#initialize" do
-    it "should create a manifest file and set manifest[:options] (integration)", :integration => true do
+    it "should create a manifest file and assign :options", :integration => true do
       live_test do |testdir|
-        capture(:stdout) do 
-          options = Fontcustom::Options.new(:input => "vectors").options
-          Fontcustom::Manifest.new(options)
+        capture(:stdout) do
+          manifest = File.join testdir, ".fontcustom-manifest.json"
+          options = Fontcustom::Options.new(:manifest => manifest, :input => "vectors").options
+          Fontcustom::Manifest.new manifest, options
         end
-        manifest = File.read File.join(testdir, ".fontcustom-manifest.json")
-        manifest.should match(/"options":.+sandbox\/test\/fontcustom/m)
+        content = File.read File.join(testdir, ".fontcustom-manifest.json")
+        content.should match(/"options":.+"input":/m)
       end
     end
   end

data/spec/fontcustom/options_spec.rb

@@ -3,6 +3,7 @@ require "spec_helper"
 
 describe Fontcustom::Options do
   def options(args = {})
+    args[:manifest] = fixture(".fontcustom-manifest.json") if args[:manifest].nil?
     Fontcustom::Options.new(args)
   end
 
@@ -13,11 +14,11 @@ describe Fontcustom::Options do
 
   context ".overwrite_examples" do
     it "should overwite example defaults with real defaults" do
-      o = options(Fontcustom::EXAMPLE_OPTIONS.dup)
+      o = options Fontcustom::EXAMPLE_OPTIONS.dup
       o.send :overwrite_examples
       cli = o.instance_variable_get(:@cli_options)
       Fontcustom::EXAMPLE_OPTIONS.keys.each do |key|
-        cli[key].should == Fontcustom::DEFAULT_OPTIONS[key] unless key == :project_root
+        cli[key].should == Fontcustom::DEFAULT_OPTIONS[key]
       end
     end
   end
@@ -25,49 +26,52 @@ describe Fontcustom::Options do
   context ".set_config_path" do
     context "when :config is set" do
       it "should use options[:config] if it's a file" do
-        o = options(
-          :project_root => fixture,
-          :config => "options/any-file-name.yml"
-        )
-        o.send :set_config_path
-        o.instance_variable_get(:@cli_options)[:config].should == fixture("options/any-file-name.yml")
+        FileUtils.cd fixture do
+          o = options :config => "options/any-file-name.yml"
+          o.send :set_config_path
+          o.instance_variable_get(:@cli_options)[:config].should == "options/any-file-name.yml"
+        end
       end
 
       it "should search for fontcustom.yml if options[:config] is a dir" do
-        o = options(
-          :project_root => fixture,
-          :config => "options/config-is-in-dir"
-        )
-        o.send :set_config_path
-        o.instance_variable_get(:@cli_options)[:config].should == fixture("options/config-is-in-dir/fontcustom.yml")
+        FileUtils.cd fixture do
+          o = options :config => "options/config-is-in-dir"
+          o.send :set_config_path
+          o.instance_variable_get(:@cli_options)[:config].should == "options/config-is-in-dir/fontcustom.yml"
+        end
       end
 
       it "should raise error if :config doesn't exist" do
-        o = options(
-          :project_root => fixture,
-          :config => "does-not-exist"
-        )
-        expect { o.send :set_config_path }.to raise_error Fontcustom::Error, /configuration file/
+        FileUtils.cd fixture do
+          o = options :config => "does-not-exist"
+          expect { o.send :set_config_path }.to raise_error Fontcustom::Error, /configuration file/
+        end
       end
     end
 
     context "when :config is not set" do
-      it "should find fontcustom.yml at :project_root/fontcustom.yml" do
-        o = options :project_root => fixture("options")
-        o.send :set_config_path
-        o.instance_variable_get(:@cli_options)[:config].should == fixture("options/fontcustom.yml")
+      it "should find fontcustom.yml in the same dir as the manifest" do
+        FileUtils.cd fixture("options") do
+          o = options
+          o.send :set_config_path
+          o.instance_variable_get(:@cli_options)[:config].should == "fontcustom.yml"
+        end
       end
 
-      it "should find fontcustom.yml at :project_root/config/fontcustom.yml" do
-        o = options :project_root => fixture("options/rails-like")
-        o.send :set_config_path
-        o.instance_variable_get(:@cli_options)[:config].should == fixture("options/rails-like/config/fontcustom.yml")
+      it "should find fontcustom.yml at config/fontcustom.yml" do
+        FileUtils.cd fixture("options/rails-like") do
+          o = options
+          o.send :set_config_path
+          o.instance_variable_get(:@cli_options)[:config].should == "config/fontcustom.yml"
+        end
       end
 
       it "should be false if nothing is found" do
-        o = options :project_root => fixture("options/no-config-here")
-        o.send :set_config_path
-        o.instance_variable_get(:@cli_options)[:config].should == false
+        FileUtils.cd fixture do
+          o = options :manifest => "options/no-config-here/.fontcustom-manifest.json"
+          o.send :set_config_path
+          o.instance_variable_get(:@cli_options)[:config].should == false
+        end
       end
     end
   end
@@ -75,29 +79,20 @@ describe Fontcustom::Options do
   context ".load_config" do
     it "should warn if fontcustom.yml is blank" do
       o = options
-      o.instance_variable_set :@cli_options, {
-        :project_root => fixture,
-        :config => fixture("options/fontcustom-empty.yml")
-      }
+      o.instance_variable_set :@cli_options, {:config => fixture("options/fontcustom-empty.yml")}
       o.should_receive(:say_message).with :warn, /was empty/
       o.send :load_config
     end
 
     it "should raise error if fontcustom.yml isn't valid" do
       o = options
-      o.instance_variable_set :@cli_options, {
-        :project_root => fixture,
-        :config => fixture("options/fontcustom-malformed.yml")
-      }
+      o.instance_variable_set :@cli_options, {:config => fixture("options/fontcustom-malformed.yml")}
       expect { o.send :load_config }.to raise_error Fontcustom::Error, /Error parsing/
     end
 
     it "should assign empty hash :config is false" do
       o = options
-      o.instance_variable_set :@cli_options, {
-        :project_root => fixture,
-        :config => false
-      }
+      o.instance_variable_set :@cli_options, {:config => false}
       o.send :load_config
       o.instance_variable_get(:@config_options).should == {}
     end
@@ -106,7 +101,6 @@ describe Fontcustom::Options do
       it "should report which configuration file it's using" do
         o = options
         o.instance_variable_set :@cli_options, {
-          :project_root => fixture,
           :config => fixture("options/any-file-name.yml"),
           :debug => true
         }
@@ -143,125 +137,93 @@ describe Fontcustom::Options do
     end
   end
 
-  context ".set_manifest_path" do
-    it "should set :manifest in the config dir by default" do
-      o = options
-      o.options = { :config => "path/to/config/fontcustom.yml" }
-      o.send :set_manifest_path
-      o.options[:manifest].should == "path/to/config/.fontcustom-manifest.json"
-    end
-
-    it "should set :manifest in :project_root if :config doesn't exist" do
-      o = options
-      o.options = { :project_root => "project/root" }
-      o.send :set_manifest_path
-      o.options[:manifest].should == "project/root/.fontcustom-manifest.json"
-    end
-  end
-
   context ".set_input_paths" do
     it "should raise error if input[:vectors] doesn't contain SVGs" do
-      o = options
-      o.options = {
-        :project_root => fixture,
-        :input => "shared/vectors-empty"
-      }
-      expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /doesn't contain any SVGs/
+      FileUtils.cd fixture("shared") do
+        o = options
+        o.options = { :input => "vectors-empty" }
+        expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /doesn't contain any SVGs/
+      end
     end
 
     context "when :input is a hash" do
       it "should set :templates as :vectors if :templates isn't set" do
-        o = options
-        o.options = {
-          :project_root => fixture,
-          :input => { :vectors => "shared/vectors" }
-        }
-        o.send :set_input_paths
-        o.options[:input][:templates].should == fixture("shared/vectors")
+        FileUtils.cd fixture("shared") do
+          o = options
+          o.options = { :input => { :vectors => "vectors" } }
+          o.send :set_input_paths
+          o.options[:input][:templates].should == "vectors"
+        end
       end
 
       it "should preserve :templates if it's set" do
-        o = options
-        o.options = {
-          :project_root => fixture,
-          :input => { :vectors => "shared/vectors", :templates => "shared/templates" }
-        }
-        o.send :set_input_paths
-        o.options[:input][:templates].should == fixture("shared/templates")
+        FileUtils.cd fixture("shared") do
+          o = options
+          o.options = { :input => { :vectors => "vectors", :templates => "templates" } }
+          o.send :set_input_paths
+          o.options[:input][:templates].should == "templates"
+        end
       end
 
       it "should raise an error if :vectors isn't set" do
-        o = options
-        o.options = {
-          :project_root => fixture,
-          :config => "fontcustom.yml",
-          :input => { :templates => "shared/templates" }
-        }
-        expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /have a :vectors key/
+        FileUtils.cd fixture("shared") do
+          o = options
+          o.options = { :input => { :templates => "templates" } }
+          expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /have a :vectors key/
+        end
       end
 
       it "should raise an error if :vectors doesn't point to an existing directory" do
-        o = options
-        o.options = {
-          :project_root => fixture,
-          :config => "fontcustom.yml",
-          :input => { :vectors => "shared/not-a-dir" }
-        }
-        expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /isn't a directory/
+        FileUtils.cd fixture("shared") do
+          o = options
+          o.options = {
+            :config => "fontcustom.yml",
+            :input => { :vectors => "not-a-dir" }
+          }
+          expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /isn't a directory/
+        end
       end
     end
 
     context "when :input is a string" do
       it "should return a hash of locations" do
-        o = options
-        o.options = {
-          :project_root => fixture,
-          :input => "shared/vectors"
-        }
-        o.send :set_input_paths
-        o.options[:input].should have_key(:vectors)
-        o.options[:input].should have_key(:templates)
+        FileUtils.cd fixture("shared") do
+          o = options
+          o.options = { :input => "vectors" }
+          o.send :set_input_paths
+          o.options[:input].should have_key(:vectors)
+          o.options[:input].should have_key(:templates)
+        end
       end
 
       it "should set :templates to match :vectors" do
-        o = options
-        o.options = {
-          :project_root => fixture,
-          :input => "shared/vectors"
-        }
-        o.send :set_input_paths
-        o.options[:input][:templates].should == fixture("shared/vectors")
+        FileUtils.cd fixture("shared") do
+          o = options
+          o.options = { :input => "vectors" }
+          o.send :set_input_paths
+          o.options[:input][:templates].should == "vectors"
+        end
       end
 
       it "should raise an error if :vectors doesn't point to a directory" do
-        o = options
-        o.options = {
-          :project_root => fixture,
-          :config => "fontcustom.yml",
-          :input => "shared/not-a-dir"
-        }
-        expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /isn't a directory/
+        FileUtils.cd fixture("shared") do
+          o = options
+          o.options = {
+            :config => "fontcustom.yml",
+            :input => "not-a-dir"
+          }
+          expect { o.send :set_input_paths }.to raise_error Fontcustom::Error, /isn't a directory/
+        end
       end
     end
   end
 
   context ".set_output_paths" do
     context "when :output is nil" do
-      it "should default to :project_root/:font_name" do
-        o = options
-        o.options = {
-          :project_root => fixture,
-          :font_name => "Test-Font"
-        }
-        o.send :set_output_paths
-        o.options[:output][:fonts].should == fixture("Test-Font")
-      end
-
       context "when :debug is true" do
         it "should print a warning" do
           o = options
           o.options = {
-            :project_root => fixture,
             :debug => true,
             :font_name => "Test-Font"
           }
@@ -274,19 +236,15 @@ describe Fontcustom::Options do
     context "when :output is a hash" do
       it "should set :css and :preview to match :fonts if either aren't set" do
         o = options
-        o.options = {
-          :project_root => fixture,
-          :output => { :fonts => "output/fonts" }
-        }
+        o.options = { :output => { :fonts => "output/fonts" } }
         o.send :set_output_paths
-        o.options[:output][:css].should == fixture("output/fonts")
-        o.options[:output][:preview].should == fixture("output/fonts")
+        o.options[:output][:css].should == "output/fonts"
+        o.options[:output][:preview].should == "output/fonts"
       end
 
       it "should preserve :css and :preview if they do exist" do
         o = options
         o.options = {
-          :project_root => fixture,
           :output => {
             :fonts => "output/fonts",
             :css => "output/styles",
@@ -294,27 +252,25 @@ describe Fontcustom::Options do
           }
         }
         o.send :set_output_paths
-        o.options[:output][:css].should == fixture("output/styles")
-        o.options[:output][:preview].should == fixture("output/preview")
+        o.options[:output][:css].should == "output/styles"
+        o.options[:output][:preview].should == "output/preview"
       end
 
       it "should create additional paths if they are given" do
         o = options
         o.options = {
-          :project_root => fixture,
           :output => {
             :fonts => "output/fonts",
             "special.js" => "assets/javascripts"
           }
         }
         o.send :set_output_paths
-        o.options[:output][:"special.js"].should == fixture("assets/javascripts")
+        o.options[:output][:"special.js"].should == "assets/javascripts"
       end
 
       it "should raise an error if :fonts isn't set" do
         o = options
         o.options = {
-          :project_root => fixture,
           :config => "fontcustom.yml",
           :output => { :css => "output/styles" }
         }
@@ -325,10 +281,7 @@ describe Fontcustom::Options do
     context "when :output is a string" do
       it "should return a hash of output locations" do
         o = options
-        o.options = {
-          :project_root => fixture,
-          :output => "output/fonts"
-        }
+        o.options = { :output => "output/fonts" }
         o.send :set_output_paths
         o.options[:output].should be_a(Hash)
         o.options[:output].should have_key(:fonts)
@@ -338,67 +291,33 @@ describe Fontcustom::Options do
 
       it "should set :css and :preview to match :fonts" do
         o = options
-        o.options = {
-          :project_root => fixture,
-          :output => "output/fonts"
-        }
+        o.options = { :output => "output/fonts" }
         o.send :set_output_paths
-        o.options[:output][:css].should == fixture("output/fonts")
-        o.options[:output][:preview].should == fixture("output/fonts")
+        o.options[:output][:css].should == "output/fonts"
+        o.options[:output][:preview].should == "output/fonts"
       end
 
       it "should raise an error if :fonts exists but isn't a directory" do
-        o = options
-        o.options = {
-          :project_root => fixture,
-          :config => "fontcustom.yml",
-          :output => "shared/not-a-dir"
-        }
-        expect { o.send :set_output_paths }.to raise_error Fontcustom::Error, /isn't a directory/
+        FileUtils.cd fixture("shared") do
+          o = options
+          o.options = {
+            :config => "fontcustom.yml",
+            :output => "not-a-dir"
+          }
+          expect { o.send :set_output_paths }.to raise_error Fontcustom::Error, /isn't a directory/
+        end
       end
     end
   end
 
-  context ".set_template_paths" do
-    it "should expand shorthand for packaged templates" do
-      o = options
-      o.options = {
-        :project_root => fixture,
-        :input => { :templates => "shared/templates" },
-        :templates => %w|preview css scss scss-rails bootstrap bootstrap-scss bootstrap-ie7 bootstrap-ie7-scss|
-      }
-      o.send :set_template_paths
-      o.options[:templates].should =~ [
-        File.join(Fontcustom.gem_lib, "templates", "fontcustom-preview.html"),
-        File.join(Fontcustom.gem_lib, "templates", "fontcustom.css"),
-        File.join(Fontcustom.gem_lib, "templates", "_fontcustom.scss"),
-        File.join(Fontcustom.gem_lib, "templates", "_fontcustom-rails.scss"),
-        File.join(Fontcustom.gem_lib, "templates", "fontcustom-bootstrap.css"),
-        File.join(Fontcustom.gem_lib, "templates", "_fontcustom-bootstrap.scss"),
-        File.join(Fontcustom.gem_lib, "templates", "fontcustom-bootstrap-ie7.css"),
-        File.join(Fontcustom.gem_lib, "templates", "_fontcustom-bootstrap-ie7.scss")
-      ]
-    end
-
-    it "should find custom templates in :template_path" do
-      o = options
-      o.options = {
-        :project_root => fixture,
-        :input => { :templates => fixture("shared/templates") },
-        :templates => %w|custom.css|
-      }
-      o.send :set_template_paths
-      o.options[:templates].should =~ [fixture("shared/templates/custom.css")]
-    end
-
+  context ".check_template_paths" do
     it "should raise an error if a template does not exist" do
       o = options
       o.options = {
-        :project_root => fixture,
         :input => { :templates => fixture("shared/templates") },
         :templates => %w|fake-template.txt|
       }
-      expect { o.send :set_template_paths }.to raise_error Fontcustom::Error, /doesn't exist/
+      expect { o.send :check_template_paths }.to raise_error Fontcustom::Error, /doesn't exist/
     end
   end
 end