fontist 1.21.3 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1f643e0f29ca1df23bf363fbac476a18eac1f7d94a5531ba57c3e067b257510
-  data.tar.gz: e1c1b437145c267b8eab870bc201af9be5c4b0f6cafb8fd5fd87c15232b7a0f9
+  metadata.gz: 722a298384ffed9d696e836b150d354e874211c9927ff3482e68a6e0a26367fc
+  data.tar.gz: d8b57e7f9223bc56f0b83e0a4ef1b48db4a35e8a8fd41e9af2fe109e0ffda152
 SHA512:
-  metadata.gz: 8a0f1a24057b83018f2d7ea44b5e4026a1b22759eecc900c9854cb72c51ead62faa0b6250bc79dc0bb04c6a4929f000b99ace89d20e617b480da54b589dcd354
-  data.tar.gz: 0f90c437007d9493a8d4e3fd2949c2532ba7dd2e0a9d10deb7960d0ff88481a21e43a485261db755b25a4a61730afbbfdf952f97f9e52816c168d24daeb9e20b
+  metadata.gz: 63aed7061e821c6cc0d30f73de923f1dcf2badcee91855bd99e3618ab6bb859bb6a33935e77ed586be49ae640c97457bdaa148482f02a04fd5694e7c93bc1dfc
+  data.tar.gz: f682fc64dafb10898e5d6d676f35f7e2208f46c3fab1d58ddaf95b047fb9c94feacaffe293cdbb6cab951d47dfc28dc738e207d0eaa48b19ce1aac41be858c6a

data/.github/workflows/rake.yml

@@ -4,7 +4,11 @@ on:
   push:
     branches: [ main ]
     tags: [ 'v*' ]
+    paths-ignore:
+      - '**.adoc'
   pull_request:
+    paths-ignore:
+      - '**.adoc'
 
 concurrency:
   group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'

data/Gemfile

@@ -2,3 +2,14 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in fontist.gemspec
 gemspec
+
+gem "pry"
+gem "bundler"
+gem "rake"
+gem "rspec"
+gem "rspec-benchmark"
+gem "rubocop"
+gem "rubocop-rails"
+gem "rubocop-performance"
+gem "vcr"
+gem "webmock"

data/README.adoc

@@ -331,10 +331,10 @@ Fontist supports system-wide settings for the following parameters:
 `fonts_path`:: Sets path where to install fonts (default: `~/.fontist/fonts`)
 
 `open_timeout`:: Sets timeout for opening a connection during download
-(default: `10`)
+(default: `60`)
 
 `read_timeout`:: Sets timeout for reading the opened connection during download
-(default: `10`)
+(default: `60`)
 
 Show current attributes in the config:
 
@@ -534,7 +534,7 @@ Fontist.preferred_family = true
 ----
 
 [[fontist-locations]]
-==== `Fontist::Manifest::Locations`
+==== Locations
 
 Fontist lets you find font locations from a defined manifest Hash in the
 following format:
@@ -552,7 +552,7 @@ Font name is useful to choose a specific font in a font collection file (TTC).
 
 [source,ruby]
 ----
-Fontist::Manifest::Locations.from_hash(manifest)
+Fontist::Manifest.from_hash(manifest, locations: true)
 ----
 
 [source,ruby]
@@ -578,14 +578,14 @@ Fontist::Manifest::Locations.from_hash(manifest)
 ----
 
 [[fontist-install]]
-==== `Fontist::Manifest::Install`
+==== Install
 
 Fontist lets you not only to obtain font locations but also to install fonts
 from the manifest:
 
 [source,ruby]
 ----
-Fontist::Manifest::Install.from_hash(manifest, confirmation: "yes")
+manifest.install(confirmation: "yes")
 ----
 
 It will install fonts and return their locations:
@@ -631,8 +631,8 @@ Then the following calls would return font names and paths, as from the
 
 [source,ruby]
 ----
-Fontist::Manifest::Locations.from_file("manifest.yml")
-Fontist::Manifest::Install.from_file("manifest.yml", confirmation: "yes")
+manifest = Fontist::Manifest.from_file("manifest.yml")
+manifest.install(confirmation: "yes")
 ----
 
 === `Fontist::Fontconfig`

data/docs/guide/api-ruby.md

@@ -91,7 +91,7 @@ Fontist can be switched to use the preferred family names. This format was used
 Fontist.preferred_family = true
 ```
 
-### Fontist::Manifest::Locations
+### Manifest from YAML file or Hash
 
 Fontist lets you find font locations from a defined manifest Hash in the following format:
 
@@ -105,7 +105,8 @@ Fontist lets you find font locations from a defined manifest Hash in the followi
 Calling the following code returns a nested Hash with font paths and names. Font name is useful to choose a specific font in a font collection file (TTC).
 
 ```ruby
-Fontist::Manifest::Locations.from_hash(manifest)
+Fontist::Manifest.from_yaml(manifest)
+Fontist::Manifest.from_hash(manifest)
 ```
 
 ```ruby
@@ -129,12 +130,10 @@ Fontist::Manifest::Locations.from_hash(manifest)
 }
 ```
 
-### Fontist::Manifest::Install
-
 Fontist lets you not only obtain font locations but also install fonts from the manifest:
 
 ```ruby
-Fontist::Manifest::Install.from_hash(manifest, confirmation: "yes")
+manifest.install(confirmation: "yes")
 ```
 
 It will install fonts and return their locations:
@@ -159,7 +158,7 @@ It will install fonts and return their locations:
 }
 ```
 
-### Support of YAML format
+#### Support of YAML format
 
 Both commands support a YAML file as an input with a `from_file` method. For example, if there is a `manifest.yml` file containing:
 
@@ -172,11 +171,11 @@ Roboto Mono:
   - Regular
 ```
 
-Then the following calls would return font names and paths, as from the `from_hash` method (see Fontist::Manifest::Install and Fontist::Manifest::Locations).
+Then the following calls would return font names and paths, as from the `from_hash` method (see Fontist::Manifest).
 
 ```ruby
-Fontist::Manifest::Locations.from_file("manifest.yml")
-Fontist::Manifest::Install.from_file("manifest.yml", confirmation: "yes")
+manifest = Fontist::Manifest.from_file("manifest.yml")
+manifest.install(confirmation: "yes")
 ```
 
 ## Fontist::Fontconfig

data/docs/reference/index.md

@@ -36,8 +36,8 @@ fontist config show
 $ fontist config keys
 Available keys:
 fonts_path (default: /home/octocat/.fontist/fonts)
-open_timeout (default: 10)
-read_timeout (default: 10)
+open_timeout (default: 60)
+read_timeout (default: 60)
 
 $ fontist config set fonts_path /var/myfonts
 'fonts_path' set to '/var/myfonts'.
@@ -55,9 +55,9 @@ Config is empty.
 
 - **`fonts_path`:** Where to put the `.ttf` files. Defaults to `~/.fontist/fonts`
 
-- **`open_timeout`:** Defaults to 10.
+- **`open_timeout`:** Defaults to 60.
 
-- **`read_timeout`:** Defaults to 10.
+- **`read_timeout`:** Defaults to 60.
 
 ## `fontist status [font-name]`
 

data/fontist.gemspec

@@ -29,28 +29,18 @@ Gem::Specification.new do |spec|
   spec.executables   = ["fontist"]
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
-  spec.add_runtime_dependency "down", "~> 5.0"
-  spec.add_runtime_dependency "extract_ttc", "~> 0.1"
-  spec.add_runtime_dependency "fuzzy_match", "~> 2.1"
-  spec.add_runtime_dependency "json", "~> 2.0"
-  spec.add_runtime_dependency "nokogiri", "~> 1.0"
-  spec.add_runtime_dependency "mime-types", "~> 3.0"
-  spec.add_runtime_dependency "sys-uname", "~> 1.2"
-  spec.add_runtime_dependency "thor", "~> 1.2", ">= 1.2.1"
-  spec.add_runtime_dependency "git", "~> 1.0"
-  spec.add_runtime_dependency "ttfunk", "~> 1.6"
-  spec.add_runtime_dependency "plist", "~> 3.0"
-  spec.add_runtime_dependency "excavate", "~> 0.3", '>= 0.3.4'
-  spec.add_runtime_dependency "socksify", "~> 1.7"
-
-  spec.add_development_dependency "pry", "~> 0.14"
-  spec.add_development_dependency "bundler", "~> 2.3"
-  spec.add_development_dependency "rake", "~> 13"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec-benchmark", "~> 0.6"
-  spec.add_development_dependency "rubocop", "~> 1.22.1"
-  spec.add_development_dependency "rubocop-rails", "~> 2.9"
-  spec.add_development_dependency "rubocop-performance", "~> 1.10"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
+  spec.add_dependency "down", "~> 5.0"
+  spec.add_dependency "extract_ttc", "~> 0.1"
+  spec.add_dependency "fuzzy_match", "~> 2.1"
+  spec.add_dependency "json", "~> 2.0"
+  spec.add_dependency "nokogiri", "~> 1.0"
+  spec.add_dependency "mime-types", "~> 3.0"
+  spec.add_dependency "sys-uname", "~> 1.2"
+  spec.add_dependency "thor", "~> 1.2", ">= 1.2.1"
+  spec.add_dependency "git", "~> 1.0"
+  spec.add_dependency "ttfunk", "~> 1.6"
+  spec.add_dependency "plist", "~> 3.0"
+  spec.add_dependency "excavate", "~> 0.3", '>= 0.3.4'
+  spec.add_dependency "socksify", "~> 1.7"
+  spec.add_dependency "lutaml-model", "~> 0.7"
 end