fronde 0.5.0 → 0.6.1

data/lib/tasks/org.rake

@@ -11,6 +11,9 @@ CLOBBER.push(
   'var/lib/org-config.el', 'lib/htmlize.el'
 )
 
+HTMLIZE_TAG = 'release/1.58'
+OX_GMI_TAG = 'v0.2'
+
 namespace :org do
   directory 'var/tmp'
 
@@ -19,37 +22,34 @@ namespace :org do
     # Weird Rake issue, still executing the task even if the file exists
     next if File.exist? 'var/tmp/org.tar.gz'
 
-    download = Thread.new { Fronde::Org.download }
-    if verbose
-      warn R18n.t.fronde.tasks.org.downloaded(version: download.value)
-    else
-      Fronde::CLI::Throbber.run(download, R18n.t.fronde.tasks.org.downloading)
+    download = Thread.new do
+      version = Fronde::Org.download
+      puts I18n.t('fronde.tasks.org.downloaded', version:) if verbose
     end
+    Fronde::CLI::Throbber.run(
+      download, I18n.t('fronde.tasks.org.downloading'), verbose
+    )
   rescue RuntimeError, Interrupt
-    warn R18n.t.fronde.tasks.org.no_download if verbose
+    warn I18n.t('fronde.tasks.org.no_download') if verbose
   end
 
   desc 'Compile Org'
   multitask compile: ['var/tmp/org.tar.gz', 'lib'] do |task|
     # No need to force fetch last version as it is only interesting as
     # part of the upgrade task
-    org_version = Fronde::Org.last_version
+    version = Fronde::Org.last_version
 
-    org_dir = "lib/org-#{org_version}"
+    org_dir = "lib/org-#{version}"
     next if Dir.exist?("#{org_dir}/lisp")
 
     build = Thread.new do
-      Fronde::Org.compile(
-        task.prerequisites[0], org_version, org_dir, verbose: verbose
-      )
+      Fronde::Org.compile(task.prerequisites[0], version, org_dir, verbose:)
       Dir.glob('lib/org-[0-9.]*').each { rm_r _1 unless _1 == org_dir }
+      puts I18n.t('fronde.tasks.org.installed', version:) if verbose
     end
-    if verbose
-      build.join
-      warn R18n.t.fronde.tasks.org.installed(version: org_version)
-    else
-      Fronde::CLI::Throbber.run(build, R18n.t.fronde.tasks.org.installing)
-    end
+    Fronde::CLI::Throbber.run(
+      build, I18n.t('fronde.tasks.org.installing'), verbose
+    )
   rescue RuntimeError, Interrupt
     next
   end
@@ -58,14 +58,14 @@ namespace :org do
 
   file 'lib/htmlize.el' => 'lib' do
     htmlize = URI(
-      'https://raw.githubusercontent.com/hniksic/emacs-htmlize/master/htmlize.el'
+      "https://raw.githubusercontent.com/hniksic/emacs-htmlize/refs/tags/#{HTMLIZE_TAG}/htmlize.el"
     ).open.read
     File.write 'lib/htmlize.el', htmlize
   end
 
   file 'lib/ox-gmi.el' => 'lib' do
     ox_gmi = URI(
-      'https://git.umaneti.net/ox-gmi/plain/ox-gmi.el'
+      "https://git.umaneti.net/ox-gmi/plain/ox-gmi.el?h=#{OX_GMI_TAG}"
     ).open.read
     File.write 'lib/ox-gmi.el', ox_gmi
   end

data/lib/tasks/site.rake

@@ -5,79 +5,104 @@ require_relative '../fronde/index'
 require_relative '../fronde/templater'
 require_relative '../fronde/cli/throbber'
 
+def remove_orphan_file_maybe(file_path)
+  print I18n.t('fronde.tasks.site.remove_orphan_file')
+  action = $stdin.gets.strip.downcase
+  return unless action == 'y'
+
+  FileUtils.rm file_path
+end
+
 namespace :site do
   desc 'Build all your projects'
   task :build, [:force?] => ['var/lib/org-config.el'] do |_, args|
     args.with_defaults(force?: false)
+
+    FileUtils.rm_f 'var/tmp/keywords'
     build_index = Thread.new do
       all_index = Fronde::Index.all_blog_index
+      offset = 0
       all_index.each do |index|
-        index.write_all_org(verbose: verbose)
+        index.write_all_org(verbose:)
+        offset = File.write('var/tmp/keywords', index.emacs_keywords, offset)
       end
       Thread.current[:all_indexes] = all_index
     end
-    if verbose
-      build_index.join
-    else
-      Fronde::CLI::Throbber.run(
-        build_index, R18n.t.fronde.tasks.site.generating_indexes
-      )
-    end
+    Fronde::CLI::Throbber.run(
+      build_index, I18n.t('fronde.tasks.site.generating_indexes'), verbose
+    )
     all_indexes = build_index[:all_indexes]
 
     build_html = Thread.new do
-      rm_r 'var/tmp/timestamps', force: true if args[:force?]
-      Fronde::Emacs.new(verbose: verbose).publish
+      Fronde::Emacs.new(verbose:).publish(force: args[:force?])
     end
-    Fronde::CLI::Throbber.run(build_html, R18n.t.fronde.tasks.site.building)
-
+    Fronde::CLI::Throbber.run(
+      build_html, I18n.t('fronde.tasks.site.building'), verbose
+    )
     if all_indexes.any?
-      if verbose
-        all_indexes.each(&:write_all_feeds)
-      else
-        publish_feed = Thread.new do
-          all_indexes.each do |index|
-            index.write_all_feeds(verbose: false)
-          end
+      publish_feed = Thread.new do
+        all_indexes.each do |index|
+          index.write_all_feeds(verbose: false)
         end
-        Fronde::CLI::Throbber.run(
-          publish_feed, R18n.t.fronde.tasks.site.publishing_feeds
-        )
       end
+      Fronde::CLI::Throbber.run(
+        publish_feed, I18n.t('fronde.tasks.site.publishing_feeds'), verbose
+      )
     end
 
     next unless Fronde::CONFIG.sources.any? { |source| source.type == 'html' }
 
     customize_html = Thread.new do
       pubfolder = Fronde::CONFIG.get('html_public_folder')
-      Dir["#{pubfolder}/**/*.html"].each do |f|
+      Dir.glob("#{pubfolder}/**/*.html").each do |f|
+        if verbose
+          short_file = f.sub(/^#{Dir.pwd}/, '.')
+          puts I18n.t('fronde.tasks.site.customizing_file', file: short_file)
+        end
         Fronde::Templater.customize_output(f)
       end
     end
     Fronde::CLI::Throbber.run(
-      customize_html, R18n.t.fronde.tasks.site.customizing
+      customize_html, I18n.t('fronde.tasks.site.customizing'), verbose
     )
     # :nocov:
   rescue RuntimeError, Interrupt
-    warn R18n.t.fronde.tasks.site.aborting
+    warn I18n.t('fronde.tasks.site.aborting')
     next
     # :nocov:
   end
 
+  desc 'Build a single file'
+  task :build_file, %i[path force?] do |_, args|
+    args.with_defaults(force?: false)
+    Fronde::Emacs.new(verbose: true).publish_file(
+      args[:path], force: args[:force?]
+    )
+    puts I18n.t('fronde.tasks.site.customizing_file', file: args[:path])
+    Fronde::Templater.customize_output(args[:path])
+  end
+
   desc 'Cleanup orphaned published files'
   task :clean do
+    Fronde::Index.all_blog_index do |index|
+      project = index.project
+      all_tags = %w[index] + index.all_tags
+      Dir.glob("#{project['path']}/tags/*").each do |file_name|
+        slug = File.basename file_name, '.org'
+        next if all_tags.include?(slug)
+
+        short_file = file_name.sub(/^#{Dir.pwd}/, '.')
+        puts I18n.t('fronde.tasks.site.orphan_tag', file: short_file)
+        remove_orphan_file_maybe file_name
+      end
+    end
     pubfolder = Fronde::CONFIG.get('html_public_folder')
-    Dir["#{pubfolder}/**/*.html"].each do |file_name|
+    Dir.glob("#{pubfolder}/**/*.html").each do |file_name|
       source = Fronde::Org::File.new(file_name)
-
       # Return if an org file has been found for this published file
       next unless source.file == file_name
 
-      print R18n.t.fronde.tasks.site.remove_orphan_file
-      action = $stdin.gets.strip.downcase
-      next unless action == 'y'
-
-      rm file_name
+      remove_orphan_file_maybe file_name
     end
   end
 

data/lib/tasks/sync.rake

@@ -15,13 +15,9 @@ namespace :sync do
       publish_thread = Fronde::Sync.pull_or_push(
         :push, type, test: args[:test?], verbose: verbose
       )
-      if verbose
-        publish_thread.join
-      else
-        Fronde::CLI::Throbber.run(
-          publish_thread, format('Publishing %<fmt>s:', fmt: type)
-        )
-      end
+      Fronde::CLI::Throbber.run(
+        publish_thread, format('Publishing %<fmt>s:', fmt: type), verbose
+      )
     rescue Fronde::Sync::Error => e
       warn e
       next
@@ -36,13 +32,9 @@ namespace :sync do
       pull_thread = Fronde::Sync.pull_or_push(
         :pull, type, test: args[:test?], verbose: verbose
       )
-      if verbose
-        pull_thread.join
-      else
-        Fronde::CLI::Throbber.run(
-          pull_thread, format('Pulling %<fmt>s:', fmt: type)
-        )
-      end
+      Fronde::CLI::Throbber.run(
+        pull_thread, format('Pulling %<fmt>s:', fmt: type), verbose
+      )
     rescue Fronde::Sync::Error => e
       warn e
       next

data/locales/en.yml

@@ -1,86 +1,147 @@
 ---
-fronde:
-  bin:
-    usage: 'Usage: fronde %1 [options]'
-    done: done
-    interrupted: interrupted
-    commands:
-      cmd_title: Commands
-      alias: Alias for ‘%1’.
-      new: Initialize a new Fronde instance.
-      update: >-
-        Update Fronde configuration and dependency (to be run after each
-        modification of the config.yml file and once in a while to stay
-        up-to-date with Org).
-      preview: Start a test web server to preview the generated website.
-      open: Open or create an org file.
-      build: Compile all org files to HTML or gemtext.
-      publish: Push local changes to the public web server.
-      help: Alias for the -h switch.
-    options:
-      cmd_title: Options
-      help: Display help for a command and exit.
-      version: Display Fronde version and exit.
-      default_title: New article
-  error:
+en:
+  fronde:
     bin:
-      label: An error occurred.
-      explanation: >-
-        To see the error, run the same command again with more
-        verbosity, for example, fronde build -v
-      no_command: 'ERROR: no command or unknown command given.'
-      no_file: >-
-        Warning: No file path given. Default file will be used.
-    config:
-      deprecated_public_folder: >-
-        ‘public_folder’ setting is deprecated. Please use either
-        ‘html_public_folder’ or ‘gemini_public_folder’.
-    source:
-      no_path: Skipping %{source} as its ‘path’ key is missing.
-      duplicate: >-
-        Skipping %{source} as it appears at least twice in the sources
-        of type %{type}.
-      inclusion: >-
-        Skipping %{source} as it might be already embedded into the
-        other source %{other_source} of type %{type}.
-    org_file:
-      no_file_or_title: No file or title given.
-      no_project: No project found for %{file}. Publication will fail.
+      usage: 'Usage: fronde %{label} [options]'
+      done: done
+      interrupted: interrupted
+      commands:
+        cmd_title: Commands
+        alias: Alias for ‘%{alias}’.
+        new: Initialize a new Fronde instance.
+        update: >-
+          Update Fronde configuration and dependency (to be run after each
+          modification of the config.yml file and once in a while to stay
+          up-to-date with Org).
+        preview: Start a test web server to preview the generated website.
+        open: Open or create an org file.
+        build: Compile all org files to HTML or gemtext.
+        publish: Push local changes to the public web server.
+        help: Alias for the -h switch.
+      options:
+        cmd_title: Options
+        help: Display help for a command and exit.
+        version: Display Fronde version and exit.
+        default_title: New article
+    error:
+      bin:
+        label: An error occurred.
+        explanation: >-
+          To see the error, run the same command again with more
+          verbosity, for example, fronde build -v
+        no_command: 'ERROR: no command or unknown command given.'
+        no_file: >-
+          Warning: No file path given. Default file will be used.
+      config:
+        deprecated_public_folder: >-
+          ‘public_folder’ setting is deprecated. Please use either
+          ‘html_public_folder’ or ‘gemini_public_folder’.
+      source:
+        no_path: Skipping %{source} as its ‘path’ key is missing.
+        duplicate: >-
+          Skipping %{source} as it appears at least twice in the sources
+          of type %{type}.
+        inclusion: >-
+          Skipping %{source} as it might be already embedded into the
+          other source %{other_source} of type %{type}.
+      org_file:
+        no_file_or_title: No file or title given.
+        no_project: No project found for %{file}. Publication will fail.
+        dangerous_code_block: >-
+          The file %{file} contains at least one code block to eval, which will
+          be ignored for security reasons. You can still evaluate it manually
+          from inside Org in order to have its result exported.
+      index:
+        wrong_sort_kind: '%{kind} not in %{accepted_values}'
+      templater:
+        no_element_found: >-
+          No element found with the selector %{source} in %{file}.
     index:
-      wrong_sort_kind: '%{kind} not in %{accepted_values}'
-    templater:
-      no_element_found: >-
-        No element found with the selector %{source} in %{file}.
-      no_head_element: No head tag found in file %{file}.
-  index:
-    unsorted: Unsorted
-    published_on: Published on %1
-    all_tags: All tags
-    by_name: By alphabetical order
-    by_weight: By publication number
-    full_date_format: '%A %{date}'
-    full_date_with_time_format: '%{date} at %{time}'
-    index_generated: Generated index file for %{tag}.
-    atom_generated: Generated Atom feed for %{tag}.
-  org:
-    generate_blog_index: Generating blog home page for %{name}
-    postamble:
-      written_by: Written by %a
-      last_modification: Last modification on %C
-      with_emacs: with %c, and published with %n
-      with_emacs_html: with %c, and published with %N
-  tasks:
-    site:
-      aborting: Aborting
-      generating_indexes: 'Generating index files:'
-      building_indexes: 'Building index files:'
-      publishing_feeds: 'Publishing Atom feeds:'
-      building: 'Building:'
-      customizing: 'Customizing:'
-      remove_orphan_file: 'Remove it? [y/N]: '
+      unsorted: Unsorted
+      published_on: Published on %{date}
+      all_tags: All tags
+      by_name: By alphabetical order
+      by_weight: By publication number
+      index_generated: Generated index file for %{tag}.
+      atom_generated: Generated Atom feed for %{tag}.
     org:
-      downloaded: Org version %{version} has been downloaded.
-      downloading: 'Downloading Org:'
-      no_download: Impossible to download Org now. Please try again later.
-      installed: Org version %{version} has been locally installed.
-      installing: 'Installing Org:'
+      generate_blog_index: Generating blog home page for %{name}
+      postamble:
+        written_by: Written by %a
+        last_modification: Last modification on %C
+        with_emacs: with %c, and published with %n
+        with_emacs_html: with %c, and published with %N
+    neocities:
+      deleting: deleting %{path}
+      sha1_differ: SHA1 hash differ for %{uri}
+    tasks:
+      site:
+        aborting: Aborting
+        generating_indexes: 'Generating index files:'
+        building_indexes: 'Building index files:'
+        publishing_feeds: 'Publishing Atom feeds:'
+        building: 'Building:'
+        customizing: 'Customizing:'
+        customizing_file: 'Customizing file %{file}'
+        orphan_tag: The file %{file} refers to a tag, which is no more in use.
+        remove_orphan_file: 'Remove it? [y/N]: '
+      org:
+        downloaded: Org version %{version} has been downloaded.
+        downloading: 'Downloading Org:'
+        no_download: Impossible to download Org now. Please try again later.
+        installed: Org version %{version} has been locally installed.
+        installing: 'Installing Org:'
+  time:
+    formats:
+      default: '%a, %b %-d, %Y %H:%M:%S %z'
+      long: '%A, %B %-d, %Y at %R'
+      long_no_year: '%A, %B %-d at %R'
+      long_no_time: '%A, %B %-d, %Y'
+      long_no_time_no_year: '%A, %B %-d'
+  date:
+    abbr_day_names:
+    - Sun
+    - Mon
+    - Tue
+    - Wed
+    - Thu
+    - Fri
+    - Sat
+    abbr_month_names:
+    -
+    - Jan
+    - Feb
+    - Mar
+    - Apr
+    - May
+    - Jun
+    - Jul
+    - Aug
+    - Sep
+    - Oct
+    - Nov
+    - Dec
+    day_names:
+    - Sunday
+    - Monday
+    - Tuesday
+    - Wednesday
+    - Thursday
+    - Friday
+    - Saturday
+    formats:
+      default: '%Y-%m-%d'
+    month_names:
+    -
+    - January
+    - February
+    - March
+    - April
+    - May
+    - June
+    - July
+    - August
+    - September
+    - October
+    - November
+    - December