fontist 1.7.2 → 1.8.4

data/lib/fontist/utils/cpio/cpio.rb

@@ -0,0 +1,199 @@
+# code is obtained from https://github.com/jordansissel/ruby-arr-pm/blob/8071591173ebb90dea27d5acfdde69a37dcb2744/cpio.rb
+# rubocop:disable all
+class BoundedIO
+  attr_reader :length
+  attr_reader :remaining
+
+  def initialize(io, length, &eof_callback)
+    @io = io
+    @length = length
+    @remaining = length
+
+    @eof_callback = eof_callback
+    @eof = false
+  end
+
+  def read(size=nil)
+    return nil if eof?
+    size = @remaining if size.nil?
+    data = @io.read(size)
+    @remaining -= data.bytesize
+    eof?
+    data
+  end
+
+  def sysread(size)
+    raise EOFError, "end of file reached" if eof?
+    read(size)
+  end
+
+  def eof?
+    return false if @remaining > 0
+    return @eof if @eof
+
+    @eof_callback.call
+    @eof = true
+  end
+end
+
+module CPIO
+  FIELDS = [
+    :magic, :ino, :mode, :uid, :gid, :nlink, :mtime, :filesize, :devmajor,
+    :devminor, :rdevmajor, :rdevminor, :namesize, :check
+  ]
+end
+
+class CPIO::ASCIIReader
+  FIELD_SIZES = {
+    :magic => 6,
+    :ino => 8,
+    :mode => 8,
+    :uid => 8,
+    :gid => 8,
+    :nlink => 8,
+    :mtime => 8,
+    :filesize => 8,
+    :devmajor => 8,
+    :devminor => 8,
+    :rdevmajor => 8,
+    :rdevminor => 8,
+    :namesize => 8,
+    :check => 8
+  }
+  HEADER_LENGTH = FIELD_SIZES.reduce(0) { |m, (_, v)| m + v }
+  HEADER_PACK = FIELD_SIZES.collect { |_, v| "A#{v}" }.join
+
+  FIELD_ORDER = [
+    :magic, :ino, :mode, :uid, :gid, :nlink, :mtime, :filesize, :devmajor,
+    :devminor, :rdevmajor, :rdevminor, :namesize, :check
+  ]
+
+  def initialize(io)
+    @io = io
+  end
+
+  private
+
+  def io
+    @io
+  end
+
+  def each(&block)
+    while true
+      entry = read
+      break if entry.nil?
+      # The CPIO format has the end-of-stream marker as a file called "TRAILER!!!"
+      break if entry.name == "TRAILER!!!"
+      block.call(entry, entry.file)
+      verify_correct_read(entry) unless entry.directory?
+    end
+  end
+
+  def verify_correct_read(entry)
+    # Read and throw away the whole file if not read at all.
+    entry.file.tap do |file|
+      if file.nil? ||  file.remaining == 0
+        # All OK! :)
+      elsif file.remaining == file.length
+        file.read(16384) while !file.eof?
+      else
+        # The file was only partially read? This should be an error by the
+        # user.
+        consumed = file.length - file.remaining
+        raise BadState, "Only #{consumed} bytes were read of the #{file.length} byte file: #{entry.name}"
+      end
+    end
+  end
+
+  def read
+    entry = CPIOEntry.new
+    header = io.read(HEADER_LENGTH)
+    return nil if header.nil?
+    FIELD_ORDER.zip(header.unpack(HEADER_PACK)).each do |field, value|
+      entry.send("#{field}=", value.to_i(16))
+    end
+
+    entry.validate
+    entry.mtime = Time.at(entry.mtime)
+    read_name(entry, @io)
+    read_file(entry, @io)
+    entry
+  end
+
+  def read_name(entry, io)
+    entry.name = io.read(entry.namesize - 1) # - 1 for null terminator
+    nul = io.read(1)
+    raise ArgumentError, "Corrupt CPIO or bug? Name null terminator was not null: #{nul.inspect}" if nul != "\0"
+    padding_data = io.read(padding_name(entry))
+    # Padding should be all null bytes
+    if padding_data != ("\0" * padding_data.bytesize)
+      raise ArgumentError, "Corrupt CPIO or bug? Name null padding was #{padding_name(entry)} bytes: #{padding_data.inspect}"
+    end
+  end
+
+  def read_file(entry, io)
+    if entry.directory?
+      entry.file = nil
+      #read_file_padding(entry, io)
+      nil
+    else
+      entry.file = BoundedIO.new(io, entry.filesize) do
+        read_file_padding(entry, io)
+      end
+    end
+  end
+
+  def read_file_padding(entry, io)
+    padding_data = io.read(padding_file(entry))
+    if padding_data != ("\0" * padding_data.bytesize)
+      raise ArgumentError, "Corrupt CPIO or bug? File null padding was #{padding_file(entry)} bytes: #{padding_data.inspect}"
+    end
+  end
+
+  def padding_name(entry)
+    # name padding is padding up to a multiple of 4 after header+namesize
+    -(HEADER_LENGTH + entry.namesize) % 4
+  end
+
+  def padding_file(entry)
+    (-(HEADER_LENGTH + entry.filesize + 2) % 4)
+  end
+  public(:each)
+end
+
+class CPIOEntry
+  CPIO::FIELDS.each do |field|
+    attr_accessor field
+  end
+
+  attr_accessor :name
+  attr_accessor :file
+
+  DIRECTORY_FLAG = 0040000
+
+  def validate
+    raise "Invalid magic #{magic.inspect}" if magic != 0x070701
+    raise "Invalid ino #{ino.inspect}" if ino < 0
+    raise "Invalid mode #{mode.inspect}" if mode < 0
+    raise "Invalid uid #{uid.inspect}" if uid < 0
+    raise "Invalid gid #{gid.inspect}" if gid < 0
+    raise "Invalid nlink #{nlink.inspect}" if nlink < 0
+    raise "Invalid mtime #{mtime.inspect}" if mtime < 0
+    raise "Invalid filesize #{filesize.inspect}" if filesize < 0
+    raise "Invalid devmajor #{devmajor.inspect}" if devmajor < 0
+    raise "Invalid devminor #{devminor.inspect}" if devminor < 0
+    raise "Invalid rdevmajor #{rdevmajor.inspect}" if rdevmajor < 0
+    raise "Invalid rdevminor #{rdevminor.inspect}" if rdevminor < 0
+    raise "Invalid namesize #{namesize.inspect}" if namesize < 0
+    raise "Invalid check #{check.inspect}" if check < 0
+  end # def validate
+
+  def read(*args)
+    return nil if directory?
+    file.read(*args)
+  end
+
+  def directory?
+    mode & DIRECTORY_FLAG > 0
+  end
+end

data/lib/fontist/utils/cpio_extractor.rb

@@ -0,0 +1,47 @@
+module Fontist
+  module Utils
+    module CpioExtractor
+      def cpio_extract(resource)
+        file = @downloaded ? resource : download_file(resource)
+
+        dir = extract_cpio_file(file)
+
+        largest_file_in_dir(dir)
+      end
+
+      private
+
+      def extract_cpio_file(archive_path)
+        archive_file = File.open(archive_path, "rb")
+        dir = Dir.mktmpdir
+        extract_cpio_file_to_dir(archive_file, dir)
+
+        dir
+      end
+
+      def extract_cpio_file_to_dir(archive_file, dir)
+        cpio_reader_class.new(archive_file).each do |entry, file|
+          path = File.join(dir, entry.name)
+          if entry.directory?
+            FileUtils.mkdir_p(path)
+          else
+            File.write(path, file.read, mode: "wb")
+          end
+        end
+      end
+
+      def cpio_reader_class
+        @cpio_reader_class ||= begin
+                                 require "fontist/utils/cpio/cpio"
+                                 CPIO::ASCIIReader
+                               end
+      end
+
+      def largest_file_in_dir(dir)
+        Dir.glob(File.join(dir, "**/*")).max_by do |path|
+          File.size(path)
+        end
+      end
+    end
+  end
+end

data/lib/fontist/utils/exe_extractor.rb

@@ -6,7 +6,7 @@ module Fontist
 
         exe_file = download_file(exe_file).path if download
 
-        Fontist.ui.say(%(Installing font "#{key}".))
+        Fontist.ui.say(%(Installing font "#{formula.key}".))
         cab_file = decompressor.search(exe_file)
         cabbed_fonts = grep_fonts(cab_file.files) || []
         fonts_paths = extract_cabbed_fonts_to_assets(cabbed_fonts)

data/lib/fontist/utils/gzip_extractor.rb

@@ -0,0 +1,24 @@
+module Fontist
+  module Utils
+    module GzipExtractor
+      def gzip_extract(resource)
+        file = @downloaded ? resource : download_file(resource)
+
+        extract_gzip_file(file)
+      end
+
+      private
+
+      def extract_gzip_file(file)
+        Zlib::GzipReader.open(file) do |gz|
+          basename = File.basename(file, ".*")
+          dir = Dir.mktmpdir
+          path = File.join(dir, basename)
+          File.write(path, gz.read, mode: "wb")
+
+          path
+        end
+      end
+    end
+  end
+end

data/lib/fontist/utils/locking.rb

@@ -0,0 +1,17 @@
+module Fontist
+  module Utils
+    module Locking
+      def lock(lock_path)
+        File.dirname(lock_path).tap do |dir|
+          FileUtils.mkdir_p(dir) unless File.exist?(dir)
+        end
+
+        f = File.open(lock_path, File::CREAT)
+        f.flock(File::LOCK_EX)
+        yield
+      ensure
+        f.flock(File::LOCK_UN)
+      end
+    end
+  end
+end

data/lib/fontist/utils/rpm_extractor.rb

@@ -0,0 +1,37 @@
+module Fontist
+  module Utils
+    module RpmExtractor
+      def rpm_extract(resource)
+        file = download_file(resource)
+
+        extract_rpm_file(file)
+      end
+
+      private
+
+      def extract_rpm_file(file)
+        rpm = rpm_class.new(file)
+        content = rpm.payload.read
+        path = rpm_target_path(file.path, rpm.tags)
+        File.write(path, content, mode: "wb")
+
+        path
+      end
+
+      def rpm_class
+        @rpm_class ||= begin
+                         require "arr-pm"
+                         RPM::File
+                       end
+      end
+
+      def rpm_target_path(archive, tags)
+        basename = File.basename(archive, ".*")
+        archive_format = tags[:payloadformat]
+        compression_format = tags[:payloadcompressor] == "gzip" ? "gz" : tags[:payloadcompressor]
+        filename = basename + "." + archive_format + "." + compression_format
+        File.join(Dir.mktmpdir, filename)
+      end
+    end
+  end
+end

data/lib/fontist/utils/tar_extractor.rb

@@ -0,0 +1,61 @@
+module Fontist
+  module Utils
+    module TarExtractor
+      def tar_extract(resource)
+        file = @downloaded ? resource : download_file(resource)
+
+        dir = extract_tar_file(file)
+
+        save_fonts(dir)
+      end
+
+      private
+
+      def extract_tar_file(file)
+        archive_file = File.open(file, "rb")
+        dir = Dir.mktmpdir
+        tar_reader_class.new(archive_file) do |tar|
+          tar.each do |tarfile|
+            save_tar_file(tarfile, dir)
+          end
+        end
+
+        dir
+      end
+
+      def tar_reader_class
+        @tar_reader_class ||= begin
+                            require "rubygems/package"
+                            Gem::Package::TarReader
+                          end
+      end
+
+      def save_tar_file(file, dir)
+        path = File.join(dir, file.full_name)
+
+        if file.directory?
+          FileUtils.mkdir_p(path)
+        else
+          File.open(path, "wb") do |f|
+            f.print(file.read)
+          end
+        end
+      end
+
+      def save_fonts(dir)
+        Array.new.tap do |fonts_paths|
+          Dir.glob(File.join(dir, "**/*")).each do |path|
+            filename = File.basename(path)
+            next unless font_file?(filename)
+
+            target_filename = target_filename(filename)
+            font_path = fonts_path.join(target_filename).to_s
+            FileUtils.mv(path, font_path)
+
+            fonts_paths << font_path
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fontist/utils/zip_extractor.rb

@@ -8,7 +8,7 @@ module Fontist
         zip_file = download_file(resource) if download
         zip_file ||= resource.urls.first
 
-        Fontist.ui.say(%(Installing font "#{key}".))
+        Fontist.ui.say(%(Installing font "#{formula.key}".))
         fonts_paths = unzip_fonts(zip_file, fonts_sub_dir)
         block_given? ? yield(fonts_paths) : fonts_paths
       end

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "1.7.2".freeze
+  VERSION = "1.8.4".freeze
 end

metadata

@@ -1,16 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.4
 platform: ruby
 authors:
 - Ribose Inc.
-- Abu Nashir
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: arr-pm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: down
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +178,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !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
@@ -249,19 +290,17 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: A libarary find or download fonts
+description: Install openly-licensed fonts on Windows, Linux and Mac!
 email:
-- operations@ribose.com
-- abunashir@gmail.com
+- open.source@ribose.com
 executables:
 - fontist
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/check_google.yml"
-- ".github/workflows/macosx.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -270,32 +309,29 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/check_google
-- bin/console
-- bin/convert_formulas
-- bin/fontist
-- bin/generate_otfinfo
-- bin/import_google
-- bin/rspec
-- bin/setup
+- exe/fontist
 - fontist.gemspec
 - lib/fontist.rb
 - lib/fontist/cli.rb
 - lib/fontist/errors.rb
 - lib/fontist/font.rb
-- lib/fontist/font_formula.rb
+- lib/fontist/font_installer.rb
 - lib/fontist/fontist_font.rb
 - lib/fontist/formula.rb
-- lib/fontist/formula_template.rb
-- lib/fontist/formulas.rb
+- lib/fontist/formula_paths.rb
+- lib/fontist/helpers.rb
 - lib/fontist/import.rb
 - lib/fontist/import/convert_formulas.rb
 - lib/fontist/import/create_formula.rb
 - lib/fontist/import/extractors.rb
 - lib/fontist/import/extractors/cab_extractor.rb
+- lib/fontist/import/extractors/cpio_extractor.rb
 - lib/fontist/import/extractors/extractor.rb
+- lib/fontist/import/extractors/gzip_extractor.rb
 - lib/fontist/import/extractors/ole_extractor.rb
+- lib/fontist/import/extractors/rpm_extractor.rb
 - lib/fontist/import/extractors/seven_zip_extractor.rb
+- lib/fontist/import/extractors/tar_extractor.rb
 - lib/fontist/import/extractors/zip_extractor.rb
 - lib/fontist/import/files/collection_file.rb
 - lib/fontist/import/files/file_requirement.rb
@@ -319,25 +355,33 @@ 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
+- lib/fontist/index_formula.rb
 - lib/fontist/manifest.rb
 - lib/fontist/manifest/install.rb
 - lib/fontist/manifest/locations.rb
-- lib/fontist/registry.rb
 - lib/fontist/system.yml
 - lib/fontist/system_font.rb
 - lib/fontist/system_index.rb
 - lib/fontist/utils.rb
 - lib/fontist/utils/cache.rb
+- lib/fontist/utils/cpio/cpio.rb
+- lib/fontist/utils/cpio_extractor.rb
 - lib/fontist/utils/downloader.rb
 - lib/fontist/utils/dsl.rb
 - lib/fontist/utils/dsl/collection_font.rb
 - lib/fontist/utils/dsl/font.rb
 - lib/fontist/utils/exe_extractor.rb
+- lib/fontist/utils/gzip_extractor.rb
+- lib/fontist/utils/locking.rb
 - lib/fontist/utils/msi_extractor.rb
+- lib/fontist/utils/rpm_extractor.rb
 - lib/fontist/utils/seven_zip_extractor.rb
 - lib/fontist/utils/system.rb
+- lib/fontist/utils/tar_extractor.rb
 - lib/fontist/utils/ui.rb
 - lib/fontist/utils/zip_extractor.rb
 - lib/fontist/version.rb
@@ -348,7 +392,7 @@ metadata:
   homepage_uri: https://github.com/fontist/fontist
   source_code_uri: https://github.com/fontist/fontist
   changelog_uri: https://github.com/fontist/fontist
-post_install_message: Please run `fontist update` to fetch formulas
+post_install_message: Please run `fontist update` to fetch formulas.
 rdoc_options: []
 require_paths:
 - lib
@@ -366,5 +410,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
-summary: A libarary find or download fonts
+summary: Install openly-licensed fonts on Windows, Linux and Mac!
 test_files: []