fontcustom 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dc2597df3b94e7657fbaa82856e909f1b762baa7
-  data.tar.gz: 8f6437cb607c18c0c47228abc212058af9d58769
+SHA256:
+  metadata.gz: c9c63851bbd063f14094fb75fc2923cd649443d3111e6da671533a93846f921a
+  data.tar.gz: 0cb1109485f1ed214cbbcce83368746dff0f28d8ed217f6c445a302894a6b806
 SHA512:
-  metadata.gz: 3faa26c666038c1e5b9ad4436ec849005fb5c32d2c8d255dc39065b08d4ea60a0e8faf10c1b4d606f63f7593b7a4019312e6f6823b830478ae7b124cb3fe4a08
-  data.tar.gz: afef84481d791bba0492fe284dffdb9331aeebae95ad03385ecc9e5a07fe53ea9c687e9b7a3baf8ec5b8ba74e9d98f43dd2f88d3e79514ed7e1b81e44028b95e
+  metadata.gz: 176657d61300735fc782aae9771126d9525ad2dee623b531a033ff2fa0e2107e04fbf334e13184b072b959d9a9b11cb5c2b0de95fed561ab134c31c8d7c8eed9
+  data.tar.gz: 273ca5993efe80d6df862ca0b467aa0f811926566c3e38d334cf6c4f9c920f52776d485c5efde5f17b03d9b14aa20f237685a26462c99fc863b939c42c97d030

data/.travis.yml

@@ -9,9 +9,7 @@ addons:
       - gcc-4.8
       - g++-4.8
 before_install:
-  - wget http://people.mozilla.com/~jkew/woff/woff-code-latest.zip
-  - unzip woff-code-latest.zip -d sfnt2woff && cd sfnt2woff && make && mkdir -p bin && mv sfnt2woff bin && cd ..
-  - export PATH=$PATH:$PWD/sfnt2woff/bin/
+  - git clone https://github.com/bramstein/sfnt2woff-zopfli.git sfnt2woff-zopfli && cd sfnt2woff-zopfli && make && sudo mv sfnt2woff-zopfli /usr/local/bin/sfnt2woff
   - if [ $TRAVIS_OS_NAME == "linux" ]; then
       export CC="gcc-4.8";
       export CXX="g++-4.8";

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.0.0 (1/9/2026)
+
+* Minimum Ruby version bumped to 2.6
+* Updated dependencies: thor ~> 1.0, listen ~> 3.0, rake ~> 13.0, rspec ~> 3.0
+* Removed json dependency (now part of Ruby stdlib)
+* Fixed Python script to use `sys.executable` for correct interpreter path
+
 ## 2.0.0 (6/14/2017)
 
 * Adds support for Woff2 ([#313](https://github.com/FontCustom/fontcustom/pull/313))

data/README.md

@@ -16,22 +16,17 @@ from a collection of SVGs
 
 ### Installation
 
-Requires **Ruby 1.9.3+**, **WOFF2**, **FontForge** with Python scripting.
+Requires **Ruby 2.6+**, **WOFF2**, **FontForge** with Python scripting.
 
 ```sh
 # On Mac
 brew tap bramstein/webfonttools
-brew update
-brew install woff2
-
-brew install fontforge --with-python
-brew install eot-utils
+brew install woff2 sfnt2woff fontforge eot-utils
 gem install fontcustom
 
 # On Linux
 sudo apt-get install zlib1g-dev fontforge
-wget http://people.mozilla.com/~jkew/woff/woff-code-latest.zip
-unzip woff-code-latest.zip -d sfnt2woff && cd sfnt2woff && make && sudo mv sfnt2woff /usr/local/bin/
+git clone https://github.com/bramstein/sfnt2woff-zopfli.git sfnt2woff-zopfli && cd sfnt2woff-zopfli && make && mv sfnt2woff-zopfli /usr/local/bin/sfnt2woff
 git clone --recursive https://github.com/google/woff2.git && cd woff2 && make clean all && sudo mv woff2_compress /usr/local/bin/ && sudo mv woff2_decompress /usr/local/bin/
 gem install fontcustom
 ```

data/fontcustom.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.required_ruby_version = ">= 2.6"
 
-  gem.add_dependency "json", "~>1.4"
-  gem.add_dependency "thor", "~>0.14"
-  gem.add_dependency "listen", ">=1.0","<4.0"
+  gem.add_dependency "thor", "~> 1.0"
+  gem.add_dependency "listen", "~> 3.0"
+  gem.add_dependency "ffi", "~> 1.15.0"
 
-  gem.add_development_dependency "rake", "~> 10"
+  gem.add_development_dependency "rake", "~> 13.0"
   gem.add_development_dependency "bundler"
-  gem.add_development_dependency "rspec", "~>3.1.0"
+  gem.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/fontcustom/scripts/generate.py

@@ -1,6 +1,7 @@
 import fontforge
 import os
 import subprocess
+import sys
 import tempfile
 import json
 
@@ -115,9 +116,9 @@ try:
     try:
         # check if on windows
         if os.name == 'nt':
-            subprocess.Popen([scriptPath + '/sfnt2woff.exe', fontfile + '.ttf'], stdout=subprocess.PIPE)
+            subprocess.Popen([scriptPath + '/sfnt2woff.exe', fontfile + '.ttf'], stdout=subprocess.PIPE).wait()
         else:
-            subprocess.Popen([scriptPath + '/sfnt2woff', fontfile + '.ttf'], stdout=subprocess.PIPE)
+            subprocess.Popen([scriptPath + '/sfnt2woff', fontfile + '.ttf'], stdout=subprocess.PIPE).wait()
     except OSError:
         # If the local version of sfnt2woff fails (i.e., on Linux), try to use the
         # global version. This allows us to avoid forcing OS X users to compile
@@ -126,7 +127,8 @@ try:
     manifest['fonts'].append(fontfile + '.woff')
 
     # Convert EOT for IE7
-    subprocess.call('python ' + scriptPath + '/eotlitetool.py ' + fontfile + '.ttf -o ' + fontfile + '.eot', shell=True)
+    python_cmd = sys.executable
+    subprocess.call(python_cmd + ' ' + scriptPath + '/eotlitetool.py ' + fontfile + '.ttf -o ' + fontfile + '.eot', shell=True)
     # check if windows
     if os.name == 'nt':
         subprocess.call('move ' + fontfile + '.eotlite ' + fontfile + '.eot', shell=True)

data/lib/fontcustom/version.rb

@@ -1,3 +1,3 @@
 module Fontcustom
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/lib/fontcustom.rb

@@ -19,7 +19,7 @@ module Fontcustom
   EXAMPLE_OPTIONS = {
     :output => "./FONT_NAME",
     :config => "./fontcustom.yml -or- ./config/fontcustom.yml",
-    :templates => "css preview"
+    :templates => %w|css preview|
   }
 
   DEFAULT_OPTIONS = {

data/spec/fontcustom/options_spec.rb

@@ -26,15 +26,19 @@ 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 :config => "options/any-file-name.yml"
-        o.send :set_config_path
-        expect(o.instance_variable_get(:@cli_options)[:config]).to eq("options/any-file-name.yml")
+        FileUtils.cd fixture do
+          o = options :config => "options/any-file-name.yml"
+          o.send :set_config_path
+          expect(o.instance_variable_get(:@cli_options)[:config]).to eq("options/any-file-name.yml")
+        end
       end
 
       it "should search for fontcustom.yml if options[:config] is a dir" do
-        o = options :config => "options/config-is-in-dir"
-        o.send :set_config_path
-        expect(o.instance_variable_get(:@cli_options)[:config]).to eq("options/config-is-in-dir/fontcustom.yml")
+        FileUtils.cd fixture do
+          o = options :config => "options/config-is-in-dir"
+          o.send :set_config_path
+          expect(o.instance_variable_get(:@cli_options)[:config]).to eq("options/config-is-in-dir/fontcustom.yml")
+        end
       end
 
       it "should raise error if :config doesn't exist" do

data/spec/fontcustom/watcher_spec.rb

@@ -21,8 +21,8 @@ describe Fontcustom::Watcher do
       expect_any_instance_of(Fontcustom::Base).to receive(:compile).once
 
       w = watcher(
-        :input => "shared/vectors",
-        :output => "output"
+        :input => fixture("shared/vectors"),
+        :output => fixture("output")
       )
 
       # silence output
@@ -36,8 +36,8 @@ describe Fontcustom::Watcher do
       expect_any_instance_of(Fontcustom::Base).to_not receive(:compile).once
 
       w = watcher(
-        :input => "shared/vectors",
-        :output => "output",
+        :input => fixture("shared/vectors"),
+        :output => fixture("output"),
         :skip_first => true
       )
 
@@ -51,8 +51,8 @@ describe Fontcustom::Watcher do
       expect_any_instance_of(Fontcustom::Base).to receive(:compile).once
 
       w = watcher(
-        :input => "shared/vectors",
-        :output => "output",
+        :input => fixture("shared/vectors"),
+        :output => fixture("output"),
         :skip_first => true
       )
 
@@ -73,9 +73,9 @@ describe Fontcustom::Watcher do
       expect_any_instance_of(Fontcustom::Base).to receive(:compile)
 
       w = watcher(
-        :input => {:vectors => "shared/vectors", :templates => "shared/templates"},
+        :input => {:vectors => fixture("shared/vectors"), :templates => fixture("shared/templates")},
         :templates => %w|css preview custom.css|,
-        :output => "output",
+        :output => fixture("output"),
         :skip_first => false
       )
 
@@ -101,8 +101,8 @@ describe Fontcustom::Watcher do
       expect_any_instance_of(Fontcustom::Base).to_not receive(:compile).once
 
       w = watcher(
-        :input => "shared/vectors",
-        :output => "output",
+        :input => fixture("shared/vectors"),
+        :output => fixture("output"),
         :skip_first => true
       )
 

data/spec/spec_helper.rb

@@ -4,11 +4,6 @@ require "fileutils"
 require File.expand_path("../../lib/fontcustom.rb", __FILE__)
 
 RSpec.configure do |c|
-  c.before(:all) do
-    FileUtils.cd fixture
-    puts "Running `cd #{Dir.pwd}`"
-  end
-
   def fixture(path = "")
     File.join(File.expand_path("../fixtures", __FILE__), path)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontcustom
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Kai Zau
@@ -9,70 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2026-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.0'
 description: Font Custom makes using vector icons easy. Generate icon fonts and supporting
   templates (e.g. @font-face CSS) from a collection of SVGs.
 email:
@@ -197,15 +191,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Generate icon fonts from the command line.