fontist 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eabd37a359d5d16263d7aacc3e3c4ed215619eb257d20bbe9c1505786a4ba70
-  data.tar.gz: 491a3dbdf9b4d2a2b1d74b3f07bb11d65e238bcf87f316d1d48b9707739d8202
+  metadata.gz: fbead3aabe1b99a416f96322c97681a9a693526c719d3fcf55658645ca6eb6ae
+  data.tar.gz: c45621c68c5b456104f2f6bc07b8af5dcba2f60a180ddb700bb6ad4373fee775
 SHA512:
-  metadata.gz: a9921980bec05a202f13786302e859f2f7660492ff8db9339c02a7088989d6bb0478139cf1846c05e9967272914c3a87822e827a658c5046ca1611f7ed0588b0
-  data.tar.gz: 2ac883da0ac5488ae0d58fa81da7473e40dfeb610a91bdc1286059c1edad816f99e892ec19a5e4ee57df835af8a27ba511c6359062cf8dba15b9d0fb07ba1619
+  metadata.gz: e69aa36d462a3e554da1435f5194c12b9ad4103739d58ecc1bce0659d3fa730dcbedf1881c561535b2af2386038c42cff70535f62fc8c63ee4c1c86a7f429e67
+  data.tar.gz: f94bb6c098e06eca1efbd16fa79e2ea5ec525c05caddb1a043a7ba6e34a2d869c50125d1aa3af96f14b40bddbb95244ada63d5045126a7e621f9e2f9b634add3

data/lib/fontist/errors.rb

@@ -3,7 +3,7 @@ module Fontist
     class LicensingError < StandardError; end
     class MissingFontError < StandardError; end
     class NonSupportedFontError < StandardError; end
-    class TemparedFileError < StandardError; end
+    class TamperedFileError < StandardError; end
     class InvalidResourceError < StandardError; end
     class TimeoutError < StandardError; end
   end

data/lib/fontist/font_formula.rb

@@ -106,7 +106,7 @@ module Fontist
 
     def download_file(source)
       downloaded_file = Fontist::Utils::Downloader.download(
-        source[:urls].sample,
+        source[:urls].first,
         sha: source[:sha256],
         file_size: source[:file_size],
         progress_bar: is_progress_bar_enabled

data/lib/fontist/formulas/andale_font.rb

@@ -7,6 +7,7 @@ module Fontist
 
       resource "andale32.exe" do
         urls [
+          "https://gitlab.com/fontmirror/archive/-/raw/master/andale32.exe",
           "https://nchc.dl.sourceforge.net/project/corefonts/the%20fonts/final/andale32.exe",
           "http://sft.if.usp.br/msttcorefonts/andale32.exe"
         ]

data/lib/fontist/formulas/arial_black_font.rb

@@ -7,6 +7,7 @@ module Fontist
 
       resource "arialb32.exe" do
         urls [
+          "https://gitlab.com/fontmirror/archive/-/raw/master/arialb32.exe",
           "https://nchc.dl.sourceforge.net/project/corefonts/the%20fonts/final/arialb32.exe",
           "http://sft.if.usp.br/msttcorefonts/arialb32.exe"
         ]

data/lib/fontist/formulas/cleartype_fonts.rb

@@ -8,6 +8,7 @@ module Fontist
       display_progress_bar(true)
       resource "PowerPointViewer.exe" do
         urls [
+          "https://gitlab.com/fontmirror/archive/-/raw/master/PowerPointViewer.exe",
           "https://nchc.dl.sourceforge.net/project/mscorefonts2/cabs/PowerPointViewer.exe",
           "https://sourceforge.net/projects/mscorefonts2/files/cabs/PowerPointViewer.exe/download",
           "https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe",

data/lib/fontist/formulas/comic_font.rb

@@ -6,6 +6,7 @@ module Fontist
 
       resource "comic32.exe" do
         urls [
+          "https://gitlab.com/fontmirror/archive/-/raw/master/comic32.exe",
           "https://nchc.dl.sourceforge.net/project/corefonts/the%20fonts/final/comic32.exe",
           "http://sft.if.usp.br/msttcorefonts/comic32.exe"
         ]

data/lib/fontist/formulas/courier_font.rb

@@ -6,6 +6,7 @@ module Fontist
 
       resource "courie32.exe" do
         urls [
+          "https://gitlab.com/fontmirror/archive/-/raw/master/courie32.exe",
           "https://nchc.dl.sourceforge.net/project/corefonts/the%20fonts/final/courie32.exe",
           "http://sft.if.usp.br/msttcorefonts/courie32.exe"
         ]

data/lib/fontist/formulas/georgia_font.rb

@@ -6,6 +6,7 @@ module Fontist
 
       resource "georgi32.exe" do
         urls [
+          "https://gitlab.com/fontmirror/archive/-/raw/master/georgi32.exe",
           "https://nchc.dl.sourceforge.net/project/corefonts/the%20fonts/final/georgi32.exe",
           "http://sft.if.usp.br/msttcorefonts/georgi32.exe"
         ]

data/lib/fontist/formulas/impact_font.rb

@@ -6,6 +6,7 @@ module Fontist
 
       resource "impact32.exe" do
         urls [
+          "https://gitlab.com/fontmirror/archive/-/raw/master/impact32.exe",
           "https://nchc.dl.sourceforge.net/project/corefonts/the%20fonts/final/impact32.exe",
           "http://sft.if.usp.br/msttcorefonts/impact32.exe"
         ]

data/lib/fontist/formulas/ms_truetype_fonts.rb

@@ -6,6 +6,7 @@ module Fontist
 
       resource "EUupdate.EXE" do
         urls [
+          "https://gitlab.com/fontmirror/archive/-/raw/master/EUupdate.EXE",
           "https://download.microsoft.com/download/a/1/8/a180e21e-9c2b-4b54-9c32-bf7fd7429970/EUupdate.EXE",
         ]
         sha256 "464dd2cd5f09f489f9ac86ea7790b7b8548fc4e46d9f889b68d2cdce47e09ea8"

data/lib/fontist/formulas/tahoma_font.rb

@@ -6,6 +6,7 @@ module Fontist
 
       resource "IELPKTH.CAB" do
         urls [
+          "https://gitlab.com/fontmirror/archive/-/raw/master/IELPKTH.CAB",
           "https://master.dl.sourceforge.net/project/corefonts/OldFiles/IELPKTH.CAB"
         ]
 
@@ -141,6 +142,6 @@ module Fontist
   serving your country, or write: Microsoft Sales Information Center/One
   Microsoft Way/Redmond, WA  98052-6399.
       EOS
-    end 
+    end
   end
 end

data/lib/fontist/formulas/webding_font.rb

@@ -6,6 +6,7 @@ module Fontist
 
       resource "webdin32.exe" do
         urls [
+          "https://gitlab.com/fontmirror/archive/-/raw/master/webdin32.exe",
           "https://nchc.dl.sourceforge.net/project/corefonts/the%20fonts/final/webdin32.exe",
           "http://sft.if.usp.br/msttcorefonts/webdin32.exe"
         ]

data/lib/fontist/system.yml

@@ -6,10 +6,13 @@ system:
   windows:
     paths:
       - C:/Windows/Fonts/**/**.{ttc,ttf}
+      - C:/Users/{username}/AppData/Local/Microsoft/Windows/Fonts/**/**.{ttc,ttf}
 
-  macosx:
+  macos:
     paths:
+      - /Library/Fonts/**/**.{ttf,ttc}
       - /System/Library/Fonts/**/**.{ttf,ttc}
+      - /Users/{username}/Library/Fonts/**.{ttf,ttc}
       - /Applications/Microsoft**/Contents/Resources/**/**.{ttf,ttc}
 
   unix:

data/lib/fontist/system_font.rb

@@ -20,10 +20,19 @@ module Fontist
 
     attr_reader :font, :user_sources
 
+    def normalize_default_paths
+      @normalize_default_paths ||= default_sources["paths"].map do |path|
+        require "etc"
+        passwd = Etc.getpwuid
+
+        passwd ? path.gsub("{username}", passwd.name) : path
+      end
+    end
+
     def font_paths
       Dir.glob((
         user_sources +
-        default_sources["paths"] +
+        normalize_default_paths +
         [fontist_fonts_path.join("**")]
       ).flatten.uniq)
     end
@@ -45,7 +54,7 @@ module Fontist
         when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
           :windows
         when /darwin|mac os/
-          :macosx
+          :macos
         when /linux/
           :linux
         when /solaris|bsd/

data/lib/fontist/utils/downloader.rb

@@ -2,6 +2,7 @@ module Fontist
   module Utils
     class Downloader
       def initialize(file, file_size: nil, sha: nil, progress_bar: nil)
+        # TODO: If the first mirror fails, try the second one
         @file = file
         @progress_bar = progress_bar
         @sha = [sha].flatten.compact
@@ -12,7 +13,7 @@ module Fontist
         file = download_file
 
         if !sha.empty? && !sha.include?(Digest::SHA256.file(file).to_s)
-          raise(Fontist::Errors::TemparedFileError.new(
+          raise(Fontist::Errors::TamperedFileError.new(
             "The downloaded file from #{@file} doesn't " \
             "match with the expected sha256 checksum!"
           ))

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.1".freeze
 end

data/spec/fontist/system_font_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Fontist::SystemFont do
   describe ".find" do
-    context "with a vlaid existing font" do
+    context "with a valid existing font" do
       it "returns the complete font path" do
         name = "DejaVuSerif.ttf"
         dejavu_ttf = Fontist::SystemFont.find(name, sources: [font_sources])

data/spec/fontist/utils/downloader_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Fontist::Utils::Downloader do
           sha: sample_file[:sha] + "mm",
           file_size: sample_file[:file_size]
         )
-      }.to raise_error(Fontist::Errors::TemparedFileError)
+      }.to raise_error(Fontist::Errors::TamperedFileError)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A libarary find or download fonts