itamae-plugin-recipe-highlight 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2160685314e586f026eaf4e5f082bcb54e6b384f0b137ee7dc141825fe63c2ac
-  data.tar.gz: 212ac98b6198685f296f5f73ad047086b39b8e5bca74fc68a9a225dee7f03a95
+  metadata.gz: 29f4729ace2c86bb91175dd17de087b59a51424044ec85e61d52bb4e31be2fc3
+  data.tar.gz: 35249ac240b005f451668ee33aa4a049a3677a4784b21d60858099a5cb720474
 SHA512:
-  metadata.gz: 8ad25864df90cf5ff7c36eb0f02c9e417a4c8ccca1e1d440451c08d2b40ca6e778e1648e13d2cb9e16f8307b38ee4b7c50905ee09e1213e07efcd55de7db592f
-  data.tar.gz: e71483e9ab2c9b6396db6e76eb09a42a3d885c0c5d210e353a4dc1a22d38b9c085186219b2d371ad1e1ce15e3def2c367790f92594ea1f627d4b2e7fa02e4fe6
+  metadata.gz: 3519396bee3343a961870d09e20b1e12c6070aa87c3462f27f885537e845840d67906e709e448f6c6c5ce0a3462eb71879f23ba9d2268cb88c8092625de2b9d6
+  data.tar.gz: 1dd7385622869db646985b33eb26ead89b5efe170a343996ea2cb25f1412eccdef9467f6753961c8830e118e4ebe0bb963be996c4308742ba9b708c0ef658a3c

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 0.4.0 - 2024-03-29
+
+### Changed
+
+* Update Highlight version to v4.11.
+
+### Fixed
+
+* Fixed not to create a temporary directory on the host system.
+
 ## 0.3.0 - 2023-11-14
 
 ### Changed

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

@@ -5,7 +5,7 @@ node.reverse_merge!(
   {
     highlight: {
       tmp: '/tmp',
-      version: '4.10',
+      version: '4.11',
       command: 'highlight',
       verify: true,
       dependencies: {
@@ -54,95 +54,95 @@ grep_version = [node[:highlight][:commands][:grep], "highlight version #{ node[:
 print_version = [node[:highlight][:command], '--version'].shelljoin
 updated = "#{ print_version } | #{ grep_version }"
 
-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
+tmp_dir = run_command(["mktemp", "--directory", "--tmpdir=#{node[:highlight][:tmp]}"].shelljoin).stdout
 
-  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/'
+source_dir = File.join(tmp_dir, "highlight-#{ node[:highlight][:version] }")
+makefile_exists = [node[:highlight][:commands][:test], '-f', File.join(source_dir, 'makefile')].shelljoin
 
-  directory tmp_dir
+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/'
 
-  package 'wget'
+directory tmp_dir
 
-  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
+package 'wget'
 
-    not_if command_exists
-    not_if updated
-    not_if makefile_exists
-  end
+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
 
-  if node[:highlight][:verify]
-    signature_name = "highlight-#{ node[:highlight][:version] }.tar.bz2.asc"
-    signature_path = File.join(tmp_dir, signature_name)
-
-    http_request signature_path do
-      url URI.join(download_root_url, signature_name).to_s
+  not_if command_exists
+  not_if updated
+  not_if makefile_exists
+end
 
-      not_if command_exists
-      not_if updated
-      not_if [node[:highlight][:commands][:test], '-f', signature_path].shelljoin
-    end
+if node[:highlight][:verify]
+  signature_name = "highlight-#{ node[:highlight][:version] }.tar.bz2.asc"
+  signature_path = File.join(tmp_dir, signature_name)
 
-    execute 'receive key' do
-      key_id = 'D805A7C7'
+  http_request signature_path do
+    url URI.join(download_root_url, signature_name).to_s
 
-      fetch_key = [node[:highlight][:commands][:gpg], '--keyserver', 'pgp.mit.edu', '--recv-key', key_id].shelljoin
-      command fetch_key
+    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
+  execute 'receive key' do
+    key_id = 'D805A7C7'
 
-      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
+    fetch_key = [node[:highlight][:commands][:gpg], '--keyserver', 'pgp.mit.edu', '--recv-key', key_id].shelljoin
+    command fetch_key
 
-    execute 'verify' do
-      verify_archive = [node[:highlight][:commands][:gpg], '--verify', signature_path, archive_file_path].shelljoin
-      command verify_archive
+    not_if command_exists
+    not_if updated
 
-      not_if command_exists
-      not_if updated
-    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
 
-  execute 'extract' do
-    extract_archive = [node[:highlight][:commands][:tar], 'axf', archive_file_path].shelljoin
-    command extract_archive
-    cwd tmp_dir
+  execute 'verify' do
+    verify_archive = [node[:highlight][:commands][:gpg], '--verify', signature_path, archive_file_path].shelljoin
+    command verify_archive
 
     not_if command_exists
     not_if updated
-    not_if makefile_exists
   end
+end
 
-  [node[:highlight][:dependencies][:lua], node[:highlight][:dependencies][:boost]].each do |pack|
-    package pack do
-      not_if command_exists
-      not_if updated
-    end
-  end
+execute 'extract' do
+  extract_archive = [node[:highlight][:commands][:tar], 'axf', archive_file_path].shelljoin
+  command extract_archive
+  cwd tmp_dir
 
-  execute 'compile' do
-    compile_cli = [node[:highlight][:commands][:make], 'cli'].shelljoin
-    command compile_cli
-    cwd source_dir
+  not_if command_exists
+  not_if updated
+  not_if makefile_exists
+end
 
+[node[:highlight][:dependencies][:lua], node[:highlight][:dependencies][:boost]].each do |pack|
+  package pack do
     not_if command_exists
     not_if updated
   end
+end
 
-  execute 'install' do
-    install_files = [node[:highlight][:commands][:make], 'install'].shelljoin
-    command install_files
-    cwd source_dir
+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
+  not_if command_exists
+  not_if updated
+end
+
+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

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

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

metadata

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