fontist 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d083618f330800ccb94e30d93fa8b5bf65d5e0a
-  data.tar.gz: 133e64a85156c8fa5dcfc284ef57b3047fdbec0e
+SHA256:
+  metadata.gz: 1fea467133e3e6a8a287dd36a2a03790fb63859f983b0398f0f558de519a0a64
+  data.tar.gz: b8c717aef31834b5a9b3c3f903dacf0d267ddd85aa6f0a1eca34566a45b219bf
 SHA512:
-  metadata.gz: f5a33afe8b4157afadbaa8530e39de7a0b51222904101c396668e6e5d030fc51f6895f9f60478d9a32dc46af1bda7f1cef1aff0f27e2bc10bc3ae0e7b661d71f
-  data.tar.gz: 3b1d0e38e2b42cf5e24f568cec75a34666ff7b3a98b36b673969365a4ec87b4add38b5fe3dac79a16871596d19b9454eac9fd6ada0097764a26af364f7fd5fee
+  metadata.gz: 20d44b20267db6f15f1b36be660f91690cef7c6f4b0653341231b3f18658ec0f88ea8225884b7b2ac1d06f3e8aa5be79aea600fed5be91513f43031a10b5de5b
+  data.tar.gz: 6138e6bed40c741f21c6d116f021aef9f6c7cca24506337fe681ba5e6c6e996c8e8e6a84e50103601231d6cab9f5cafc7b5527b418d65fbd6c1477c67ceda201

data/README.md

@@ -434,6 +434,20 @@ git commit -m "Google Fonts update"
 git push
 ```
 
+### Import of SIL fonts
+
+Fontist contains formulas of [SIL fonts](https://software.sil.org/fonts/). They
+can be updated with:
+
+```sh
+fontist import-sil
+cd ~/.fontist/formulas
+git add Formulas/sil
+git add index.yml
+git commit -m "SIL fonts update"
+git push
+```
+
 ### Releasing
 
 Releasing is done automatically with GitHub Action. Just bump and tag with `gem-release`.

data/fontist.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "gem-release"
+  spec.add_development_dependency "nokogiri", "~> 1.0"
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "0.75.0"

data/lib/fontist/cli.rb

@@ -124,6 +124,12 @@ module Fontist
       STATUS_SUCCESS
     end
 
+    desc "import-sil", "Import formulas from SIL"
+    def import_sil
+      require "fontist/import/sil_import"
+      Fontist::Import::SilImport.new.call
+    end
+
     private
 
     def success

data/lib/fontist/font.rb

@@ -3,9 +3,9 @@ require "fontist/font_installer"
 module Fontist
   class Font
     def initialize(options = {})
-      @name = options.fetch(:name, nil)
-      @confirmation = options.fetch(:confirmation, "no")
-      @force = options.fetch(:force, false)
+      @name = options[:name]
+      @confirmation = options[:confirmation] || "no"
+      @force = options[:force] || false
 
       check_or_create_fontist_path!
     end
@@ -121,7 +121,7 @@ module Fontist
       if formula.license_required && !confirmation.casecmp("yes").zero?
         @confirmation = show_license_and_ask_for_input(formula.license)
 
-        if !confirmation.casecmp("yes").zero?
+        unless confirmation&.casecmp?("yes")
           raise Fontist::Errors::LicensingError.new(
             "Fontist will not download these fonts unless you accept the terms."
           )

data/lib/fontist/import/create_formula.rb

@@ -50,9 +50,10 @@ module Fontist
 
       def save(hash)
         filename = Import.name_to_filename(hash[:name])
+        path = @options[:formula_dir] ? File.join(@options[:formula_dir], filename) : filename
         yaml = YAML.dump(Helpers::HashHelper.stringify_keys(hash))
-        File.write(filename, yaml)
-        filename
+        File.write(path, yaml)
+        path
       end
     end
   end

data/lib/fontist/import/google/skiplist.yml

@@ -6,3 +6,6 @@
 - Open Sans
 - Work Sans
 - Fira Code
+- Andika
+- Harmattan
+- Padauk

data/lib/fontist/import/recursive_extraction.rb

@@ -7,7 +7,7 @@ module Fontist
     class RecursiveExtraction
       FONTS_PATTERN = "**/*.{ttf,otf,ttc}".freeze
       ARCHIVE_EXTENSIONS = %w[zip msi exe cab].freeze
-      LICENSE_PATTERN = /(OFL\.txt|UFL\.txt|LICENSE\.txt|COPYING)$/i.freeze
+      LICENSE_PATTERN = /(ofl\.txt|ufl\.txt|licenses?\.txt|copying)$/i.freeze
 
       def initialize(archive, subarchive: nil, subdir: nil)
         @archive = archive

data/lib/fontist/import/sil_import.rb

@@ -0,0 +1,99 @@
+require "nokogiri"
+require "fontist/import/create_formula"
+
+module Fontist
+  module Import
+    class SilImport
+      ROOT = "https://software.sil.org/fonts/".freeze
+
+      def call
+        links = font_links
+        Fontist.ui.success("Found #{links.size} links.")
+
+        paths = []
+        links.each do |link|
+          path = create_formula_by_page_link(link)
+          paths << path if path
+        end
+
+        Fontist::Index.rebuild
+
+        Fontist.ui.success("Created #{paths.size} formulas.")
+      end
+
+      private
+
+      def font_links
+        html = URI.parse(ROOT).open.read
+        document = Nokogiri::HTML.parse(html)
+        document.css("table.products div.title > a")
+      end
+
+      def create_formula_by_page_link(link)
+        url = find_archive_url_by_page_link(link)
+        return unless url
+
+        create_formula_by_archive_url(url)
+      end
+
+      def create_formula_by_archive_url(url)
+        path = Fontist::Import::CreateFormula.new(url, formula_dir: formula_dir).call
+        Fontist.ui.success("Formula has been successfully created: #{path}")
+
+        path
+      end
+
+      def find_archive_url_by_page_link(link)
+        Fontist.ui.print("Searching for an archive of #{link.content}... ")
+
+        page_uri = URI.join(ROOT, link[:href])
+        archive_uri = find_archive_url_by_page_uri(page_uri)
+        unless archive_uri
+          Fontist.ui.error("NOT FOUND")
+          return
+        end
+
+        Fontist.ui.success("DONE")
+
+        archive_uri.to_s
+      end
+
+      def find_archive_url_by_page_uri(uri)
+        response = uri.open
+        current_url = response.base_uri
+        html = response.read
+        document = Nokogiri::HTML.parse(html)
+        link = find_archive_link(document)
+        return URI.join(current_url, link[:href]) if link
+
+        page_link = find_download_page(document)
+        return unless page_link
+
+        page_uri = URI.join(current_url, page_link[:href])
+        find_archive_url_by_page_uri(page_uri)
+      end
+
+      def find_archive_link(document)
+        links = document.css("a.btn-download")
+        download_links = links.select { |tag| tag.content.include?("DOWNLOAD CURRENT VERSION") }
+        return download_links.first unless download_links.empty?
+
+        links = document.css("a")
+        download_links = links.select { |tag| tag.content.match?(/Download.*\.zip/) }
+        download_links.first
+      end
+
+      def find_download_page(document)
+        links = document.css("a.btn-download")
+        page_links = links.select { |tag| tag.content == "DOWNLOADS" }
+        page_links.first
+      end
+
+      def formula_dir
+        @formula_dir ||= Fontist.formulas_path.join("sil").tap do |path|
+          FileUtils.mkdir_p(path) unless File.exist?(path)
+        end
+      end
+    end
+  end
+end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.8.1".freeze
+  VERSION = "1.8.2".freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 - Abu Nashir
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-20 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -179,6 +179,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -325,6 +339,7 @@ files:
 - lib/fontist/import/otfinfo/template.erb
 - lib/fontist/import/otfinfo_generate.rb
 - lib/fontist/import/recursive_extraction.rb
+- lib/fontist/import/sil_import.rb
 - lib/fontist/import/template_helper.rb
 - lib/fontist/import/text_helper.rb
 - lib/fontist/index.rb
@@ -370,9 +385,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14.4
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: A libarary find or download fonts
 test_files: []