itamae-plugin-recipe-highlight 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29f4729ace2c86bb91175dd17de087b59a51424044ec85e61d52bb4e31be2fc3
-  data.tar.gz: 35249ac240b005f451668ee33aa4a049a3677a4784b21d60858099a5cb720474
+  metadata.gz: 196f40a9df5acd16e6325b7e918beecba5f512a66c73d8331623faf0dc30a693
+  data.tar.gz: d954111255bd6edda21a797b39f6b28cdecaaf394b8cbe4cacfd6026f657bf95
 SHA512:
-  metadata.gz: 3519396bee3343a961870d09e20b1e12c6070aa87c3462f27f885537e845840d67906e709e448f6c6c5ce0a3462eb71879f23ba9d2268cb88c8092625de2b9d6
-  data.tar.gz: 1dd7385622869db646985b33eb26ead89b5efe170a343996ea2cb25f1412eccdef9467f6753961c8830e118e4ebe0bb963be996c4308742ba9b708c0ef658a3c
+  metadata.gz: 8908129d1308649432d11b0f947bcd74b2a1406bcea96ea38f1d6ea9d0b5db60187bdfb4f086e99876bb704b1972b85fcb800d4df7d35e72c95964babafbc391
+  data.tar.gz: bf70c7b4df96e94fa914d9492a4e0e172606936331e725623846cd61f214495124fe2c3f01148c022734b0800ecba2c83408637b404500d71d36aff2cab15712

data/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ## Unreleased
 
+## 0.6.0 - 2024-11-14
+
+### Added
+
+* `node[:highlight][:download_root_url]`,
+  `node[:highlight][:archive_file_name]`,
+  `node[:highlight][:archive_file_path]`, `node[:highlight][:tmpdir]`,
+  `node[:highlight][:srcdir]`, `node[:highlight][:makefile]`,
+  `node[:highlight][:exist]`, `node[:highlight][:updated]`,
+  `node[:highlight][:makefile_exist]`
+
+### Removed
+
+* Verify recipe.  So `node[:highlight][:verify]` now doesn't have any
+  efffect.
+* `node[:highlight][:commands][:wget]`, `node[:highlight][:tmp]`,
+  `node[:highlight][:commands][:gpg]`
+
+## 0.5.0 - 2024-06-02
+
+### Changed
+
+* Update Highlight version to v4.12.
+
 ## 0.4.0 - 2024-03-29
 
 ### Changed

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rubocop', '~> 1.21'
+gem 'rubocop', '~> 1.48'

data/Gemfile.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: .
+  specs:
+    itamae-plugin-recipe-highlight (0.5.0)
+      itamae (~> 1.14)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    hashie (5.0.0)
+    itamae (1.14.1)
+      ansi
+      hashie
+      schash (~> 0.1.0)
+      specinfra (>= 2.64.0, < 3.0.0)
+      thor (>= 1.0.0)
+    json (2.8.1)
+    language_server-protocol (3.17.0.3)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-ssh (7.3.0)
+    net-telnet (0.2.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
+      ast (~> 2.4.1)
+      racc
+    racc (1.8.1)
+    rainbow (3.1.1)
+    regexp_parser (2.9.2)
+    rubocop (1.68.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.36.1)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    schash (0.1.2)
+    sfl (2.3)
+    specinfra (2.91.0)
+      base64
+      net-scp
+      net-ssh (>= 2.7)
+      net-telnet
+      sfl
+    thor (1.3.2)
+    unicode-display_width (2.6.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  itamae-plugin-recipe-highlight!
+  rubocop (~> 1.48)
+
+BUNDLED WITH
+   2.3.26

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

@@ -4,23 +4,21 @@ require 'uri'
 node.reverse_merge!(
   {
     highlight: {
-      tmp: '/tmp',
-      version: '4.11',
+      version: '4.12',
       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',
-      }
+        type: 'type'
+      },
+      download_root_url: 'http://www.andre-simon.de/zip/',
+      tmpdir: '/tmp/itamae-highlight'
     }
   }
 )
@@ -28,121 +26,120 @@ node.reverse_merge!(
 node.validate! do
   {
     highlight: {
-      tmp: string,
       version: string,
       command: string,
-      verify: boolean,
       dependencies: {
         lua: string,
-        boost: string,
+        boost: string
       },
       commands: {
-        gpg: string,
         grep: string,
         make: string,
         tar: string,
-        type: string,
-        wget: string,
-      }
+        type: string
+      },
+      download_root_url: string,
+      tmpdir: string
     }
   }
 end
 
-command_exists = [node[:highlight][:commands][:type], node[:highlight][:command]].shelljoin
-
-grep_version = [node[:highlight][:commands][:grep], "highlight version #{ node[:highlight][:version] }"].shelljoin
-print_version = [node[:highlight][:command], '--version'].shelljoin
-updated = "#{ print_version } | #{ grep_version }"
-
-tmp_dir = run_command(["mktemp", "--directory", "--tmpdir=#{node[:highlight][:tmp]}"].shelljoin).stdout
-
-source_dir = File.join(tmp_dir, "highlight-#{ node[:highlight][:version] }")
-makefile_exists = [node[:highlight][:commands][:test], '-f', File.join(source_dir, 'makefile')].shelljoin
-
-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/'
-
-directory tmp_dir
-
-package 'wget'
-
-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
+node.reverse_merge!(
+  {
+    highlight: {
+      archive_file_name: "highlight-#{node[:highlight][:version]}.tar.bz2",
+      srcdir: File.join(node[:highlight][:tmpdir], "highlight-#{node[:highlight][:version]}"),
+      exist: [node[:highlight][:commands][:type], node[:highlight][:command]].shelljoin,
+      updated:
+        begin
+          grep_version = [node[:highlight][:commands][:grep], "highlight version #{node[:highlight][:version]}"].shelljoin
+          print_version = [node[:highlight][:command], '--version'].shelljoin
+          "#{print_version} | #{grep_version}"
+        end
+    }
+  }
+)
 
-  not_if command_exists
-  not_if updated
-  not_if makefile_exists
+node.validate! do
+  {
+    highlight: {
+      archive_file_name: string,
+      srcdir: string,
+      exist: string,
+      updated: string
+    }
+  }
 end
 
-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 [node[:highlight][:commands][:test], '-f', signature_path].shelljoin
-  end
-
-  execute 'receive key' do
-    key_id = 'D805A7C7'
+node.reverse_merge!(
+  {
+    highlight: {
+      archive_file_path: File.join(node[:highlight][:tmpdir], node[:highlight][:archive_file_name]),
+      makefile: File.join(node[:highlight][:srcdir], 'makefile')
+    }
+  }
+)
 
-    fetch_key = [node[:highlight][:commands][:gpg], '--keyserver', 'pgp.mit.edu', '--recv-key', key_id].shelljoin
-    command fetch_key
+node.validate! do
+  {
+    highlight: {
+      archive_file_path: string,
+      makefile: string
+    }
+  }
+end
 
-    not_if command_exists
-    not_if updated
+node.reverse_merge!(
+  {
+    highlight: {
+      makefile_exist: [node[:highlight][:commands][:test], '-f', node[:highlight][:makefile]].shelljoin
+    }
+  }
+)
 
-    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
+node.validate! do
+  {
+    highlight: {
+      makefile_exist: string
+    }
+  }
+end
 
-  execute 'verify' do
-    verify_archive = [node[:highlight][:commands][:gpg], '--verify', signature_path, archive_file_path].shelljoin
-    command verify_archive
+directory node[:highlight][:tmpdir]
 
-    not_if command_exists
-    not_if updated
-  end
+http_request node[:highlight][:archive_file_path] do
+  url URI.join(node[:highlight][:download_root_url], node[:highlight][:archive_file_name]).to_s
+  cwd node[:highlight][:tmpdir]
+  not_if node[:highlight][:exist]
+  not_if node[:highlight][:updated]
+  not_if node[:highlight][:makefile_exist]
 end
 
 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
+  command [node[:highlight][:commands][:tar], 'axf', node[:highlight][:archive_file_path]].shelljoin
+  cwd node[:highlight][:tmpdir]
+  not_if node[:highlight][:exist]
+  not_if node[:highlight][:updated]
+  not_if node[:highlight][:makefile_exist]
 end
 
-[node[:highlight][:dependencies][:lua], node[:highlight][:dependencies][:boost]].each do |pack|
-  package pack do
-    not_if command_exists
-    not_if updated
+node[:highlight][:dependencies].each do |_, name|
+  package name do
+    not_if node[:highlight][:exist]
+    not_if node[:highlight][:updated]
   end
 end
 
 execute 'compile' do
-  compile_cli = [node[:highlight][:commands][:make], 'cli'].shelljoin
-  command compile_cli
-  cwd source_dir
-
-  not_if command_exists
-  not_if updated
+  command [node[:highlight][:commands][:make], 'cli'].shelljoin
+  cwd node[:highlight][:srcdir]
+  not_if node[:highlight][:exist]
+  not_if node[:highlight][: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
+  command [node[:highlight][:commands][:make], 'install'].shelljoin
+  cwd node[:highlight][:srcdir]
+  not_if node[:highlight][:exist]
+  not_if node[:highlight][:updated]
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-highlight
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - gemmaro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -34,6 +34,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -41,10 +42,16 @@ files:
 - lib/itamae/plugin/recipe/highlight/default.rb
 - lib/itamae/plugin/recipe/highlight/version.rb
 homepage: https://codeberg.org/gemmaro/itamae-plugin-recipe-highlight
-licenses: []
+licenses:
+- Apache-2.0
 metadata:
+  rubygems_mfa_required: 'true'
+  bug_tracker_uri: https://codeberg.org/gemmaro/itamae-plugin-recipe-highlight/issues
+  changelog_uri: https://codeberg.org/gemmaro/itamae-plugin-recipe-highlight/src/branch/main/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/itamae-plugin-recipe-highlight
   homepage_uri: https://codeberg.org/gemmaro/itamae-plugin-recipe-highlight
-  source_code_uri: https://codeberg.org/gemmaro/itamae-plugin-recipe-highlight.git
+  source_code_uri: https://codeberg.org/gemmaro/itamae-plugin-recipe-highlight
+  wiki_uri: https://codeberg.org/gemmaro/itamae-plugin-recipe-highlight/wiki
 post_install_message:
 rdoc_options: []
 require_paths: