itamae-plugin-recipe-highlight 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d2e267ae55d36488f4df5ae57d5c694ec8ce0d278d5d49b89b3c03815ea4d9
-  data.tar.gz: '098472c06e01065d04ec2d9a77e3dbdcc73025fc00910aad8a6de97b44fae4ea'
+  metadata.gz: 2160685314e586f026eaf4e5f082bcb54e6b384f0b137ee7dc141825fe63c2ac
+  data.tar.gz: 212ac98b6198685f296f5f73ad047086b39b8e5bca74fc68a9a225dee7f03a95
 SHA512:
-  metadata.gz: c7afc0742d8d19f72904a5d23c2d1cda086a6f83bdaea22d063cc02e1decbf9772bd6029767a62abbef013db428a6d664be19bb29c58ca1096d515bdd2e93d93
-  data.tar.gz: 31b7c7c97f3b0877ca0298fb82bee46c5a39ad9a448a92c7761fe865a22822f16e5d38bae0707812f398f8009a0f538b407d222c7ddb2a941ec9f3993270b18e
+  metadata.gz: 8ad25864df90cf5ff7c36eb0f02c9e417a4c8ccca1e1d440451c08d2b40ca6e778e1648e13d2cb9e16f8307b38ee4b7c50905ee09e1213e07efcd55de7db592f
+  data.tar.gz: e71483e9ab2c9b6396db6e76eb09a42a3d885c0c5d210e353a4dc1a22d38b9c085186219b2d371ad1e1ce15e3def2c367790f92594ea1f627d4b2e7fa02e4fe6

data/CHANGELOG.md

@@ -1,6 +1,27 @@
-## [Unreleased]
+# Change log for Itamae plugin recipe Highlight
 
-## [0.2.0] - 2023-09-11
+## Unreleased
+
+## 0.3.0 - 2023-11-14
+
+### Changed
+
+* Update Highlight version to v4.10.
+* The role of `node[:highlight][:tmp]`.
+  It is now a prefix for temporary directory path, and the full path is auto generated.
+
+### Added
+
+* `highlight` / `commands` / `wget` node attribute.
+  [GNU Wget][wget] is used for downloading the archive file.
+
+[wget]: https://www.gnu.org/software/wget/
+
+### Fixed
+
+* Changed to use GNU Wget instead of the Itamae's HTTP request resource since updating archive files might somehow fail.
+
+## 0.2.0 - 2023-09-11
 
 ### Added
 
@@ -13,6 +34,6 @@
 * Skip downloading the signature when it exists.
 * Skip fetching the public key when it's already imported.
 
-## [0.1.0] - 2023-09-10
+## 0.1.0 - 2023-09-10
 
 - Initial release

data/lib/itamae/plugin/recipe/highlight/default.rb

@@ -1,28 +1,29 @@
 require 'shellwords'
 require 'uri'
 
-defaults = {
-  highlight: {
-    tmp: '/tmp',
-    version: '4.8',
-    command: 'highlight',
-    verify: true,
-    dependencies: {
-      lua: 'liblua5.4-dev',
-      boost: 'libboost-dev'
-    },
-    commands: {
-      gpg: 'gpg',
-      grep: 'grep',
-      make: 'make',
-      tar: 'tar',
-      test: 'test',
-      type: 'type',
+node.reverse_merge!(
+  {
+    highlight: {
+      tmp: '/tmp',
+      version: '4.10',
+      command: 'highlight',
+      verify: true,
+      dependencies: {
+        lua: 'liblua5.4-dev',
+        boost: 'libboost-dev'
+      },
+      commands: {
+        gpg: 'gpg',
+        grep: 'grep',
+        make: 'make',
+        tar: 'tar',
+        test: 'test',
+        type: 'type',
+        wget: 'wget',
+      }
     }
   }
-}
-
-node.replace(defaults.merge(node))
+)
 
 node.validate! do
   {
@@ -41,123 +42,107 @@ node.validate! do
         make: string,
         tar: string,
         type: string,
+        wget: string,
       }
     }
   }
 end
 
-tmp = node.dig(:highlight, :tmp)
+command_exists = [node[:highlight][:commands][:type], node[:highlight][:command]].shelljoin
 
-command = node.dig(:highlight, :command)
+grep_version = [node[:highlight][:commands][:grep], "highlight version #{ node[:highlight][:version] }"].shelljoin
+print_version = [node[:highlight][:command], '--version'].shelljoin
+updated = "#{ print_version } | #{ grep_version }"
 
-command_exists = [node.dig(:highlight, :commands, :type), command].shelljoin
+Dir.mktmpdir(node[:highlight][:tmp]) do |tmp_dir|
+  source_dir = File.join(tmp_dir, "highlight-#{ node[:highlight][:version] }")
+  makefile_exists = [node[:highlight][:commands][:test], '-f', File.join(source_dir, 'makefile')].shelljoin
 
-version = node.dig(:highlight, :version)
+  archive_file_name = "highlight-#{ node[:highlight][:version] }.tar.bz2"
+  archive_file_path = File.join(tmp_dir, archive_file_name)
+  download_root_url = 'http://www.andre-simon.de/zip/'
 
-grep = node.dig(:highlight, :commands, :grep)
+  directory tmp_dir
 
-grep_version = [grep, "highlight version #{ version }"].shelljoin
-print_version = [command, '--version'].shelljoin
-updated = "#{ print_version } | #{ grep_version }"
+  package 'wget'
 
-test = node.dig(:highlight, :commands, :test)
+  execute 'download archive file' do
+    cwd tmp_dir
+    download = [node[:highlight][:commands][:wget], URI.join(download_root_url, archive_file_name).to_s].shelljoin
+    command download
 
-source_dir = File.join(tmp, "highlight-#{ version }")
-makefile = File.join(source_dir, 'makefile')
-makefile_exists = [test, '-f', makefile].shelljoin
+    not_if command_exists
+    not_if updated
+    not_if makefile_exists
+  end
 
-directory tmp do
-  not_if command_exists
-  not_if updated
-  not_if makefile_exists
-end
+  if node[:highlight][:verify]
+    signature_name = "highlight-#{ node[:highlight][:version] }.tar.bz2.asc"
+    signature_path = File.join(tmp_dir, signature_name)
 
-archive_file_name = "highlight-#{ version }.tar.bz2"
-archive_file_path = File.join(tmp, archive_file_name)
-download_root_url = 'http://www.andre-simon.de/zip/'
+    http_request signature_path do
+      url URI.join(download_root_url, signature_name).to_s
 
-http_request archive_file_path do
-  url URI.join(download_root_url, archive_file_name).to_s
+      not_if command_exists
+      not_if updated
+      not_if [node[:highlight][:commands][:test], '-f', signature_path].shelljoin
+    end
 
-  not_if command_exists
-  not_if updated
-  not_if makefile_exists
-end
+    execute 'receive key' do
+      key_id = 'D805A7C7'
 
-if node.dig(:highlight, :verify)
-  signature_name = "highlight-#{ version }.tar.bz2.asc"
-  signature_path = File.join(tmp, signature_name)
+      fetch_key = [node[:highlight][:commands][:gpg], '--keyserver', 'pgp.mit.edu', '--recv-key', key_id].shelljoin
+      command fetch_key
 
-  http_request signature_path do
-    url URI.join(download_root_url, signature_name).to_s
+      not_if command_exists
+      not_if updated
 
-    not_if command_exists
-    not_if updated
-    not_if [test, '-f', signature_path].shelljoin
-  end
+      export_public_key = [node[:highlight][:commands][:gpg], '--export', '--armor', key_id].shelljoin
+      check_not_yet_imported = [node[:highlight][:commands][:grep], 'nothing exported'].shelljoin
+      only_if "#{ export_public_key } | #{ check_not_yet_imported }"
+    end
 
-  gpg = node.dig(:highlight, :commands, :gpg)
+    execute 'verify' do
+      verify_archive = [node[:highlight][:commands][:gpg], '--verify', signature_path, archive_file_path].shelljoin
+      command verify_archive
 
-  execute 'receive key' do
-    key_id = 'D805A7C7'
+      not_if command_exists
+      not_if updated
+    end
+  end
 
-    fetch_key = [gpg, '--keyserver', 'pgp.mit.edu', '--recv-key', key_id].shelljoin
-    command fetch_key
+  execute 'extract' do
+    extract_archive = [node[:highlight][:commands][:tar], 'axf', archive_file_path].shelljoin
+    command extract_archive
+    cwd tmp_dir
 
     not_if command_exists
     not_if updated
+    not_if makefile_exists
+  end
 
-    export_public_key = [gpg, '--export', '--armor', key_id].shelljoin
-    check_not_yet_imported = [grep, 'nothing exported'].shelljoin
-    only_if "#{ export_public_key } | #{ check_not_yet_imported }"
+  [node[:highlight][:dependencies][:lua], node[:highlight][:dependencies][:boost]].each do |pack|
+    package pack do
+      not_if command_exists
+      not_if updated
+    end
   end
 
-  execute 'verify' do
-    verify_archive = [gpg, '--verify', signature_path, archive_file_path].shelljoin
-    command verify_archive
+  execute 'compile' do
+    compile_cli = [node[:highlight][:commands][:make], 'cli'].shelljoin
+    command compile_cli
+    cwd source_dir
 
     not_if command_exists
     not_if updated
   end
-end
-
-execute 'extract' do
-  extract_archive = [node.dig(:highlight, :commands, :tar), 'axf', archive_file_path].shelljoin
-  command extract_archive
-  cwd tmp
-
-  not_if command_exists
-  not_if updated
-  not_if makefile_exists
-end
-
-lua = node.dig(:highlight, :dependencies, :lua)
-boost = node.dig(:highlight, :dependencies, :boost)
 
-[lua, boost].each do |pack|
-  package pack do
+  execute 'install' do
+    install_files = [node[:highlight][:commands][:make], 'install'].shelljoin
+    command install_files
+    cwd source_dir
 
     not_if command_exists
     not_if updated
   end
 end
-
-make = node.dig(:highlight, :commands, :make)
-
-execute 'compile' do
-  compile_cli = [make, 'cli'].shelljoin
-  command compile_cli
-  cwd source_dir
-
-  not_if command_exists
-  not_if updated
-end
-
-execute 'install' do
-  install_files = [make, 'install'].shelljoin
-  command install_files
-  cwd source_dir
-
-  not_if command_exists
-  not_if updated
-end

data/lib/itamae/plugin/recipe/highlight/version.rb

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module Highlight
-        VERSION = '0.2.0'
+        VERSION = '0.3.0'
       end
     end
   end

data/lib/itamae/plugin/recipe/highlight.rb

@@ -5,7 +5,6 @@ module Itamae
     module Recipe
       module Highlight
         class Error < StandardError; end
-        # Your code goes here...
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-highlight
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - gemmaro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae