fontist 1.8.2 → 1.8.7

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/downloader.rb

@@ -3,6 +3,13 @@ require_relative "cache"
 module Fontist
   module Utils
     class Downloader
+      class << self
+        def download(*args)
+          new(*args).download
+        end
+        ruby2_keywords :download if respond_to?(:ruby2_keywords, true)
+      end
+
       def initialize(file, file_size: nil, sha: nil, progress_bar: nil)
         # TODO: If the first mirror fails, try the second one
         @file = file
@@ -27,10 +34,6 @@ module Fontist
         file
       end
 
-      def self.download(file, options = {})
-        new(file, options).download
-      end
-
       private
 
       attr_reader :file, :sha, :file_size

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,44 @@
+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"
+
+                         # fix for Ruby 3.0
+                         unless RPM::File::Header::HEADER_MAGIC == [0x8eade801, 0x00000000].pack("NN")
+                           RPM::File::Header.send(:remove_const, "HEADER_MAGIC")
+                           RPM::File::Header.const_set("HEADER_MAGIC", [0x8eade801, 0x00000000].pack("NN"))
+                         end
+
+                         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/version.rb

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

metadata

@@ -1,16 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.7
 platform: ruby
 authors:
 - Ribose Inc.
-- Abu Nashir
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-02-20 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
@@ -199,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -277,10 +290,9 @@ 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: []
@@ -304,6 +316,7 @@ files:
 - lib/fontist/errors.rb
 - lib/fontist/font.rb
 - lib/fontist/font_installer.rb
+- lib/fontist/font_path.rb
 - lib/fontist/fontist_font.rb
 - lib/fontist/formula.rb
 - lib/fontist/formula_paths.rb
@@ -313,9 +326,13 @@ files:
 - 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
@@ -343,7 +360,10 @@ files:
 - lib/fontist/import/template_helper.rb
 - lib/fontist/import/text_helper.rb
 - lib/fontist/index.rb
-- lib/fontist/index_formula.rb
+- lib/fontist/indexes/base_index.rb
+- lib/fontist/indexes/filename_index.rb
+- lib/fontist/indexes/font_index.rb
+- lib/fontist/indexes/index_formula.rb
 - lib/fontist/manifest.rb
 - lib/fontist/manifest/install.rb
 - lib/fontist/manifest/locations.rb
@@ -352,14 +372,20 @@ files:
 - 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
@@ -370,7 +396,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
@@ -388,5 +414,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: []

data/lib/fontist/index_formula.rb

@@ -1,30 +0,0 @@
-module Fontist
-  class IndexFormula
-    def initialize(path)
-      @path = path
-    end
-
-    def to_s
-      normalized
-    end
-
-    def to_full
-      Formula.new_from_file(full_path)
-    end
-
-    def ==(other)
-      to_s == other.to_s
-    end
-
-    private
-
-    def normalized
-      escaped = Regexp.escape(Fontist.formulas_path.to_s + "/")
-      @path.sub(Regexp.new("^" + escaped), "")
-    end
-
-    def full_path
-      Fontist.formulas_path.join(normalized).to_s
-    end
-  end
-end