fronde 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f351a91fd7e7e674a9e7b3120725960cd36cc02a4c7d6d39715f760f4527b75
-  data.tar.gz: 4b371b41a1658aed730c2cb533bc8f68178d3a0d1ae791fb598aa7ab9eda5372
+  metadata.gz: 65f4af03cc2839a3557f78f99d6417b2d92667d5990d925064cbd958a7035085
+  data.tar.gz: 0c782594530540f5ef9e900cc41d8d67529baeeaeceeed391e54c4601ba4bb47
 SHA512:
-  metadata.gz: bb1c612a0e6139a16ef798847579018494a171965e05b4535621906c4c488f62796fbbaa234b2b6566596335c47b9bce49d32d47eda772941ae8829e3ee2443f
-  data.tar.gz: 10b549865a13777b2e37e8beff967603b030d51bb7e3d7ea1bd664e2883d4b9c5c13271c1c6c718d8d6f6b8e70064ed5e032e81e7a84aecb70d3fc95e7480685
+  metadata.gz: dcf7cd50cf7911edb9cacc7c13c9cff26e666a344c04d6e841c5196623d20648bf6d82a42e429683703a2e58a47a0d50196b86c13148e9291bddb048e1506af7
+  data.tar.gz: 3602b6dd333cec5c7b1a072260577c0a291a8e833d0615ae8533a1c43b616560cbe97bf68dc15781979735f8e7d565e331d3346673977596df2142e76bafce9c

data/lib/fronde/config/data/org-config.el

@@ -1,5 +1,5 @@
 ;; Add org-mode to load path
-(add-to-list 'load-path (expand-file-name "org-{{ org_version }}/lisp" "{{ work_dir }}/lib"))
+(add-to-list 'load-path (expand-file-name "org-{{ org_version }}" "{{ work_dir }}/lib"))
 ;; Load last version of htmlize.el
 (load-file (expand-file-name "htmlize.el" "{{ work_dir }}/lib"))
 

data/lib/fronde/index.rb

@@ -96,7 +96,7 @@ module Fronde
       all_keys = all_tags
       {
         by_name: all_keys.sort,
-        by_weight: all_keys.sort_by { [-@index[_1].length, _1] }
+        by_weight: all_keys.sort_by { [-@index[it].length, it] }
       }
     end
   end

data/lib/fronde/org/file.rb

@@ -270,7 +270,7 @@ module Fronde
       end
 
       def find_source_for_org_file
-        Fronde::CONFIG.sources.find { _1.source_for? @file }
+        Fronde::CONFIG.sources.find { it.source_for? @file }
       end
 
       def find_source_for_publication_file

data/lib/fronde/org.rb

@@ -10,7 +10,7 @@ module Fronde
   # of the Emacs package. It also serves as a namespace for the class
   # responsible for handling Org files: {Fronde::Org::File}.
   module Org
-    CGIT_BASE_URL = 'https://cgit.git.savannah.gnu.org/cgit/emacs/org-mode.git/'
+    GNU_ELPA_URL = 'https://elpa.gnu.org/packages/org'
 
     class << self
       def current_version
@@ -41,26 +41,27 @@ module Fronde
         org_version
       end
 
-      def http_get_client(uri)
+      def http_get_client(uri, &)
         Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
           request = Net::HTTP::Get.new(uri)
           request['User-Agent'] = Fronde::USER_AGENT
-          yield http, request
+          http.request request, &
         end
       end
 
       def fetch_version_number
-        # Retrieve last org version from git repository tags page.
-        tag_rx = Regexp.new(
-          '<a href=\'/cgit/emacs/org-mode.git/tag/\?h=' \
-          '(?<tag>release_(?<number>[^\']+))\'>\k<tag></a>'
-        )
-        uri = URI(CGIT_BASE_URL)
-        response = http_get_client(uri) { |http, req| http.request req }
-        versions = response.body.each_line(chomp: true).filter_map do |line|
-          line.match(tag_rx) { |matchdata| matchdata[:number] }
+        # Retrieve last org version from GNU ELPA page.
+        uri = URI("#{GNU_ELPA_URL}.html")
+        response = http_get_client(uri).body
+        version_line = response.each_line(chomp: true).find do |line|
+          line.start_with? '<dt>Latest</dt> <dd><a href='
         end
-        versions.compact.max_by { Gem::Version.new _1 }
+        return unless version_line
+
+        version_match = version_line.match(/org-(?<version>[0-9.]+)\.tar/)
+        return version_match[:version] if version_match
+
+        nil
       end
 
       # Download latest org-mode tarball.
@@ -69,49 +70,29 @@ module Fronde
       # @return [String] the downloaded org-mode version
       def download(destination = 'var/tmp')
         org_last_version = last_version(force: false, cookie_dir: destination)
-        tarball = "org-mode-release_#{org_last_version}.tar.gz"
-        uri = URI("#{CGIT_BASE_URL}snapshot/#{tarball}")
+        uri = URI("#{GNU_ELPA_URL}-#{org_last_version}.tar")
         # Will crash on purpose if anything goes wrong
-        http_get_client(uri) do |http, request|
-          fetch_org_tarball http, request, destination
+        http_get_client(uri) do |response|
+          fetch_org_tarball response, destination
         end
         org_last_version
       end
 
-      def fetch_org_tarball(http, request, destination)
+      def fetch_org_tarball(response, destination)
         # Remove version number in dest file to allow easy rake file
         # task naming
-        dest_file = ::File.expand_path('org.tar.gz', destination)
-        http.request request do |response|
-          ::File.open(dest_file, 'w') do |io|
-            response.read_body { |chunk| io.write chunk }
-          end
+        dest_file = ::File.expand_path('org.tar', destination)
+        ::File.open(dest_file, 'w') do |io|
+          response.read_body { |chunk| io.write chunk }
         end
       end
 
-      def make_org_cmd(org_dir, target, verbose: false)
-        make = ['make', '-C', org_dir, target]
-        return make.join(' ') if verbose
-
-        make.insert(3, '-s')
-        make << 'EMACSQ="emacs -Q --eval \'(setq inhibit-message t)\'"'
-        make.join(' ')
-      end
-
-      # Compile downloaded Org package
+      # Extract downloaded Org tarball
       #
       # @param source [String] path to the org-mode tarball to install
-      # @param version [String] version of the org package to install
       # @param target [String] path to the final install directory
-      # @param verbose [Boolean] whether the process should be verbose
-      def compile(source, version, target, verbose: false)
-        untar_cmd = ['tar', '-xzf', source]
-        system(*untar_cmd)
-        FileUtils.mv "org-mode-release_#{version}", target
-        # Fix a weird unknown package version
-        ::File.write("#{target}/mk/version.mk", "ORGVERSION ?= #{version}")
-        system(*make_org_cmd(target, 'compile', verbose:))
-        system(*make_org_cmd(target, 'autoloads', verbose:))
+      def extract(source, target)
+        system 'tar', '-C', target, '-xf', source
       end
     end
   end

data/lib/fronde/source.rb

@@ -17,29 +17,19 @@ module Fronde
       render_heading
     end
 
-    def [](key)
-      @config[key]
-    end
+    def [](key) = @config[key]
 
     def []=(key, value)
       @config[key] = value
     end
 
-    def type
-      @config['type']
-    end
+    def type = @config['type']
 
-    def recursive?
-      !!@config['recursive']
-    end
+    def recursive? = !!@config['recursive']
 
-    def blog?
-      !!@config['is_blog']
-    end
+    def blog? = !!@config['is_blog']
 
-    def to_h
-      @config
-    end
+    def to_h = @config
 
     def source_for?(file_name)
       relative_file_path = file_name.delete_prefix "#{@config['path']}/"
@@ -76,10 +66,9 @@ module Fronde
     end
 
     def target_for(file_name)
-      target = File.expand_path file_name
-      target.delete_prefix! "#{Dir.pwd}/"
+      target = File.expand_path(file_name).delete_prefix "#{Dir.pwd}/"
       target.sub!(/\.org\z/, @config['ext'])
-      project_relative_path = @config['path'].delete_prefix("#{Dir.pwd}/")
+      project_relative_path = @config['path'].delete_prefix "#{Dir.pwd}/"
       target.delete_prefix! "#{project_relative_path}/"
       public_absolute_path + target
     end

data/lib/fronde/sync/neocities.rb

@@ -85,8 +85,8 @@ module Fronde
       end
 
       def select_orphans(to_apply, current_list, &)
-        paths_to_apply = to_apply.map { _1['path'] }
-        current_paths = current_list.map { _1['path'] }
+        paths_to_apply = to_apply.map { it['path'] }
+        current_paths = current_list.map { it['path'] }
         (current_paths - paths_to_apply).filter_map(&)
       end
 

data/lib/fronde/templater.rb

@@ -58,14 +58,14 @@ module Fronde
 
       def apply_templates(source)
         public_file = source.pub_file absolute: true
-        dom = File.open(public_file, 'r') { Nokogiri::HTML _1 }
+        dom = File.open(public_file, 'r') { Nokogiri::HTML it }
         changes = Fronde::CONFIG.get('templates', []).map do |config|
           template = Fronde::Templater.new(source, dom, config)
           next if !template.valid? || template.applied?
 
           template.apply
         end
-        File.open(public_file, 'w') { dom.write_to _1 } if changes.any?
+        File.open(public_file, 'w') { dom.write_to it } if changes.any?
       end
     end
 

data/lib/fronde/version.rb

@@ -2,7 +2,7 @@
 
 module Fronde
   # @return [String] the version number of the current Fronde release.
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 
   USER_AGENT = ["Fronde/#{Fronde::VERSION}",
                 "(#{RUBY_ENGINE} #{RUBY_VERSION} #{RUBY_PLATFORM})",

data/lib/tasks/cli.rake

@@ -28,7 +28,7 @@ namespace :cli do
     data['commands'] = all_commands.filter_map do |command, options|
       next if options[:alias] || command == 'basic'
 
-      opts = (options[:opts] || []).map { comp_opt_to_liquid(_1, command) }
+      opts = (options[:opts] || []).map { comp_opt_to_liquid(it, command) }
       { 'name' => command,
         'translation' => I18n.t("fronde.bin.commands.#{command}"),
         'options' => opts }

data/lib/tasks/org.rake

@@ -10,14 +10,16 @@ CLOBBER.push(
 )
 
 HTMLIZE_TAG = 'release/1.58'
+TMP_ORG_TARBALL = 'var/tmp/org.tar'
 
 namespace :org do
+  directory 'lib'
   directory 'var/tmp'
 
   desc 'Download last version of Org'
-  file 'var/tmp/org.tar.gz' => 'var/tmp' do
+  file TMP_ORG_TARBALL => 'var/tmp' do
     # Weird Rake issue, still executing the task even if the file exists
-    next if File.exist? 'var/tmp/org.tar.gz'
+    next if File.exist? TMP_ORG_TARBALL
 
     download = Thread.new do
       version = Fronde::Org.download
@@ -30,18 +32,19 @@ namespace :org do
     warn I18n.t('fronde.tasks.org.no_download') if verbose
   end
 
-  desc 'Compile Org'
-  multitask compile: ['var/tmp/org.tar.gz', 'lib'] do |task|
+  desc 'Extract Org tarball'
+  multitask extract: [TMP_ORG_TARBALL, 'lib'] do |task|
     # No need to force fetch last version as it is only interesting as
     # part of the upgrade task
     version = Fronde::Org.last_version
 
     org_dir = "lib/org-#{version}"
-    next if Dir.exist?("#{org_dir}/lisp")
+    next if File.exist?("#{org_dir}/org-version.el")
 
     build = Thread.new do
-      Fronde::Org.compile(task.prerequisites[0], version, org_dir, verbose:)
-      Dir.glob('lib/org-[0-9.]*').each { rm_r _1 unless _1 == org_dir }
+      Fronde::Org.extract task.prerequisites[0], 'lib'
+      # Remove old versions
+      Dir.glob('lib/org-[0-9.]*').each { rm_r it unless it == org_dir }
       puts I18n.t('fronde.tasks.org.installed', version:) if verbose
     end
     Fronde::CLI::Throbber.run(
@@ -51,8 +54,6 @@ namespace :org do
     next
   end
 
-  directory 'lib'
-
   file 'lib/htmlize.el' => 'lib' do
     uri = URI(
       "https://raw.githubusercontent.com/hniksic/emacs-htmlize/refs/tags/#{HTMLIZE_TAG}/htmlize.el"
@@ -79,15 +80,15 @@ namespace :org do
   end
 
   desc 'Install Org'
-  multitask install: ['org:compile', '.gitignore'] do
+  multitask install: ['org:extract', '.gitignore'] do
     # lib/htmlize.el cannot be generated in parallel of org:compilation,
     # as it will leads to a weird SSL error. Thus finishing file generation
     # "manually" here.
     Rake::Task['var/lib/org-config.el'].invoke
     sources = Fronde::CONFIG.sources
-    sources.each { mkdir_p _1['path'] }
+    sources.each { mkdir_p it['path'] }
 
-    outputs = sources.map { _1['type'] }.uniq
+    outputs = sources.map { it['type'] }.uniq
     if outputs.include?('html')
       mkdir_p "#{Fronde::CONFIG.get('html_public_folder')}/assets"
     end
@@ -99,7 +100,7 @@ namespace :org do
   desc 'Upgrade Org'
   task :upgrade do
     Rake::Task['clobber'].execute
-    if File.exist? 'var/tmp/org.tar.gz'
+    if File.exist? TMP_ORG_TARBALL
       # Cleanup cached tarball only if a new version is available.
       # Also cached the new remote org version in the same time.
       org_version = Fronde::Org.current_version
@@ -108,7 +109,7 @@ namespace :org do
       rescue RuntimeError
         last_version = org_version
       end
-      File.unlink 'var/tmp/org.tar.gz' unless org_version == last_version
+      File.unlink TMP_ORG_TARBALL unless org_version == last_version
     end
     Rake::Task['org:install'].invoke
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fronde
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Étienne Pflieger
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -57,28 +57,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.12'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.2'
+        version: '13.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.2'
+        version: '13.4'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -209,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - emacs
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: An opinionated static website generator for Org
 test_files: []