neruda 0.1.3 → 0.2.0

data/lib/neruda/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module Neruda
-  VERSION = '0.1.3'
+  # @return [String] the version number of the current Neruda release.
+  VERSION = '0.2.0'
 end

data/lib/tasks/org.rake

@@ -1,26 +1,38 @@
 # frozen_string_literal: true
 
+require 'open-uri'
+
 # Neruda::Config is required by Neruda::Utils
 require 'neruda/utils'
 
 namespace :org do
-  desc 'Download last version of org-mode'
+  desc 'Download last version of Org'
   task :download do
+    verbose = Rake::FileUtilsExt.verbose_flag
+    download = Thread.new do
+      Thread.current[:org_version] = Neruda::Config.org_last_version
+      Neruda::Utils.download_org
+    end
+    if verbose
+      download.join
+      warn "Org version #{download[:org_version]} has been downloaded"
+    else
+      Neruda::Utils.throbber(download, 'Downloading Org:')
+    end
+  end
+
+  desc 'Compile Org'
+  task compile: ['org:download'] do
     verbose = Rake::FileUtilsExt.verbose_flag
     org_version = "org-#{Neruda::Config.org_last_version}"
-    next if Neruda::Config.org_last_version.nil?
     next if Dir.exist?("#{org_version}/lisp")
-    tarball = "#{org_version}.tar.gz"
-    curl = ['curl', '--progress-bar', '-O',
-            "https://orgmode.org/#{tarball}"]
     make = ['make', '-C', org_version]
     unless verbose
-      curl[1] = '-s'
       make << '-s'
       make << 'EMACSQ="emacs -Q --eval \'(setq inhibit-message t)\'"'
     end
     build = Thread.new do
-      sh curl.join(' ')
+      tarball = "tmp/#{org_version}.tar.gz"
       sh "tar xzf #{tarball}"
       File.unlink tarball
       sh((make + ['compile']).join(' '))
@@ -34,16 +46,18 @@ namespace :org do
       build.join
       warn "#{org_version} has been locally installed"
     else
-      Neruda::Utils.throbber(build, 'Installing org mode:')
+      Neruda::Utils.throbber(build, 'Installing Org:')
     end
   end
 
   file 'htmlize.el' do
     verbose = Rake::FileUtilsExt.verbose_flag
-    curl = ['curl', '--progress-bar', '-O',
-            'https://raw.githubusercontent.com/hniksic/emacs-htmlize/master/htmlize.el']
-    curl[1] = '-s' unless verbose
-    build = Thread.new { sh curl.join(' ') }
+    build = Thread.new do
+      htmlize = URI(
+        'https://raw.githubusercontent.com/hniksic/emacs-htmlize/master/htmlize.el'
+      ).open.read
+      IO.write 'htmlize.el', htmlize
+    end
     if verbose
       build.join
       warn 'htmlize.el has been locally installed'
@@ -53,7 +67,6 @@ namespace :org do
   end
 
   file 'org-config.el' => 'htmlize.el' do
-    next if Neruda::Config.org_last_version.nil?
     Neruda::Config.write_org_lisp_config
   end
 
@@ -62,8 +75,10 @@ namespace :org do
   end
 
   desc 'Install org'
-  task install: ['org:download', 'org-config.el', '.dir-locals.el'] do
+  task install: ['org:compile', 'org-config.el', '.dir-locals.el'] do
     mkdir_p "#{Neruda::Config.settings['public_folder']}/assets"
-    mkdir_p 'src'
+    Neruda::Config.sources.each do |s|
+      mkdir_p s['path'] unless Dir.exist? s['path']
+    end
   end
 end

data/lib/tasks/site.rake

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'neruda/emacs'
 require 'neruda/index'
 require 'neruda/utils'
 require 'neruda/org_file'
@@ -8,9 +9,6 @@ require 'neruda/templater'
 namespace :site do
   desc 'Generates all index files'
   task :index do
-    blog_path = Neruda::Config.settings['blog_path']
-    next if blog_path.nil?
-    next unless Dir.exist?("src/#{blog_path}")
     index = Neruda::Index.new
     verbose = Rake::FileUtilsExt.verbose_flag
     if verbose
@@ -18,22 +16,27 @@ namespace :site do
       next
     end
     build = Thread.new do
-      index.write_all(false)
+      index.write_all(verbose: false)
     end
     Neruda::Utils.throbber(build, 'Generating indexes:')
+    next if index.empty?
+    Neruda::Config.write_org_lisp_config(with_tags: true)
   end
 
   desc 'Convert all org files'
   task build: :index do
     build_html = Thread.new do
-      Neruda::OrgFile.new(nil, verbose: Rake::FileUtilsExt.verbose_flag).publish
+      Neruda::Emacs.new(verbose: Rake::FileUtilsExt.verbose_flag).publish
+      # TODO: Find a way to publish the virtual tag project
     end
     begin
       Neruda::Utils.throbber(build_html, 'Building:')
+    # :nocov:
     rescue RuntimeError
       warn 'Aborting'
       next
     end
+    # :nocov:
     customize_html = Thread.new do
       pubfolder = Neruda::Config.settings['public_folder']
       Dir["#{pubfolder}/**/*.html"].each do |f|
@@ -51,26 +54,33 @@ namespace :site do
         next
       end
       verbose = Rake::FileUtilsExt.verbose_flag
-      o = Thread.new do
-        Neruda::OrgFile.new(args[:source], verbose: verbose).publish
+      project = Neruda::OrgFile.project_for_source(args[:source])
+      if project.nil?
+        warn "No project found for #{args['source']}"
+        next
+      end
+      build_html = Thread.new do
+        o = Neruda::OrgFile.new(
+          args[:source], project: project, verbose: verbose
+        )
+        Thread.current[:org_file] = o
+        o.publish
       end
       begin
-        Neruda::Utils.throbber(o, 'Building:')
+        Neruda::Utils.throbber(build_html, 'Building:')
       rescue RuntimeError
         warn 'Aborting'
         next
       end
-      target = Neruda::OrgFile.target_for_source(args[:source])
+      target = Neruda::OrgFile.target_for_source(args[:source], project)
       warn "Customizing file #{target}" if verbose
-      Neruda::Templater.customize_output(target, o)
+      Neruda::Templater.customize_output(target, build_html[:org_file])
     end
   end
 
-  # :nocov:
   desc 'Start a test server'
   task :preview do
     require 'neruda/preview'
     Neruda.start_preview
   end
-  # :nocov:
 end

data/lib/tasks/tags.rake

@@ -5,19 +5,15 @@ require 'neruda/index'
 namespace :tags do
   desc 'List all tags by name'
   task :name do
-    blog_path = Neruda::Config.settings['blog_path']
-    next if blog_path.nil?
-    next unless Dir.exist?("src/#{blog_path}")
     index = Neruda::Index.new
+    next if index.empty?
     puts index.sort_by(:name).join("\n")
   end
 
   desc 'List all tags by weight'
   task :weight do
-    blog_path = Neruda::Config.settings['blog_path']
-    next if blog_path.nil?
-    next unless Dir.exist?("src/#{blog_path}")
     index = Neruda::Index.new
+    next if index.empty?
     puts index.sort_by(:weight).join("\n")
   end
 end

data/locales/en.yml

@@ -2,7 +2,26 @@
 pablo:
   error:
     no_command: 'ERROR: no command or unknown command given.'
+  usage: 'Usage: pablo %1 [options]'
+  commands:
+    cmd_title: Commands
+    alias: Alias for %1.
+    init: Initialize your Neruda instance (you just need to do it once).
+    preview: 'Start a test web server to preview your website on http://127.0.0.1:5000'
+    open: Open or create an org file.
+    build: Compile your org files to HTML.
+    publish: Push local changes to your public web server.
+    help: Alias for the -h switch.
+  options:
+    cmd_title: Options
+    path: Path to the new file.
+    directory: Wrap the new org file in this named folder.
+    help: Display help for a command and exit.
+    version: Display Neruda version and exit.
 neruda:
+  error:
+    label: An error occured.
+    explanation: To see it, run again your command with more verbosity, i.e. pablo build -v
   index:
     unsorted: Unsorted
     published_on: Published on %1
@@ -14,5 +33,5 @@ neruda:
   org:
     postamble:
       written_by: Written by %a
-      with_emacs: with %c, and published with <a href="https://deparis.io/neruda">Neruda</a>
+      with_emacs: 'with %c, and published with %N'
       last_modification: Last modification on %C

data/locales/fr.yml

@@ -2,7 +2,26 @@
 pablo:
   error:
     no_command: 'ERREUR: Aucune commande ou commande inconnue donnée.'
+  usage: 'Usage : pablo %1 [options]'
+  commands:
+    cmd_title: Commandes
+    alias: Alias pour %1.
+    init: Initialise votre instance de Neruda (vous ne devriez faire cela qu'une fois).
+    preview: "Démarre un serveur web de test pour prévisualiser votre site à l'adresse http://127.0.0.1:5000"
+    open: Ouvre ou crée un fichier org.
+    build: Compile vos fichiers org en HTML.
+    publish: Pousse vos changements locaux vers votre serveur web public.
+    help: Alias pour l'argument -h.
+  options:
+    cmd_title: Options
+    path: Chemin vers le nouveau fichier.
+    directory: Place le nouveau fichier org dans un dossier à ce nom.
+    help: Affiche l'aide pour une commande et quitte.
+    version: Affiche la version de Neruda et quitte.
 neruda:
+  error:
+    label: Une erreur est survenue
+    explanation: Pour voir le détail, lancez de nouveau la commande avec plus de verbosité, par exemple pablo build -v
   index:
     unsorted: Non triés
     published_on: Publié le %1
@@ -14,5 +33,5 @@ neruda:
   org:
     postamble:
       written_by: Écrit par %a
-      with_emacs: avec %c et publié avec <a href="https://deparis.io/neruda">Neruda</a>
+      with_emacs: 'avec %c et publié avec %N'
       last_modification: dernière modification le %C

data/themes/default/css/htmlize.css

@@ -0,0 +1,346 @@
+/**
+ * This file has been generated with the `org-html-htmlize-generate-css'
+ * command of org mode, with the Dracula theme enabled.
+ * The Dracula theme is released under an MIT license and thus the
+ * following is also released under this license.
+ * See https://github.com/dracula/emacs for details.
+ */
+
+.src {
+    color: #f8f8f2;
+    background-color: #282a36;
+    padding: .6em 1em;
+}
+pre.src a:hover {
+    text-decoration: underline;
+}
+
+.org-bold {
+    /* bold */
+    font-weight: bold;
+}
+.org-bold-italic {
+    /* bold-italic */
+    font-weight: bold;
+    font-style: italic;
+}
+
+.org-builtin {
+    /* font-lock-builtin-face */
+    color: #ffb86c;
+}
+.org-button {
+    /* button */
+    color: #8be9fd;
+    text-decoration: underline;
+}
+.org-comment {
+    /* font-lock-comment-face */
+    color: #6272a4;
+}
+.org-comment-delimiter {
+    /* font-lock-comment-delimiter-face */
+    color: #6272a4;
+}
+.org-constant {
+    /* font-lock-constant-face */
+    color: #8be9fd;
+}
+.org-cursor {
+    /* cursor */
+    background-color: #8be9fd;
+}
+.org-doc {
+    /* font-lock-doc-face */
+    color: #6272a4;
+}
+.org-error {
+    /* error */
+    color: #ffc0cb;
+    font-weight: bold;
+}
+.org-escape-glyph {
+    /* escape-glyph */
+    color: #00ffff;
+}
+.org-file-name-shadow {
+    /* file-name-shadow */
+    color: #b3b3b3;
+}
+.org-fringe {
+    /* fringe */
+    color: #b6b6b2;
+    background-color: #282a36;
+}
+.org-function-name {
+    /* font-lock-function-name-face */
+    color: #50fa7b;
+    font-weight: bold;
+}
+.org-glyphless-char {
+    /* glyphless-char */
+    font-size: 60%;
+}
+.org-header-line {
+    /* header-line */
+    background-color: #282a36;
+}
+.org-header-line-highlight {
+    /* header-line-highlight */
+    color: #ccccc7;
+    background-color: #464752;
+}
+.org-help-argument-name {
+    /* help-argument-name */
+    font-style: italic;
+}
+.org-highlight {
+    /* highlight */
+    color: #ccccc7;
+    background-color: #464752;
+}
+.org-hl-line {
+    /* hl-line */
+    background-color: #44475a;
+}
+.org-homoglyph {
+    /* homoglyph */
+    color: #00ffff;
+}
+.org-italic {
+    /* italic */
+    font-style: italic;
+}
+.org-keyword {
+    /* font-lock-keyword-face */
+    color: #ff79c6;
+    font-weight: bold;
+}
+.org-lazy-highlight {
+    /* lazy-highlight */
+    color: #e2e2dc;
+    background-color: #464752;
+}
+.org-line-number-current-line {
+    /* line-number-current-line */
+    color: #b3b3b3;
+    background-color: #282a36;
+}
+.org-link {
+    /* link */
+    color: #8be9fd;
+    text-decoration: underline;
+}
+.org-link-visited {
+    /* link-visited */
+    color: #ee82ee;
+    text-decoration: underline;
+}
+.org-linum {
+    /* linum */
+    color: #565761;
+    background-color: #282a36;
+    font-style: italic;
+}
+.org-match {
+    /* match */
+    background-color: #3a5fcd;
+}
+.org-negation-char {
+    /* font-lock-negation-char-face */
+    color: #8be9fd;
+}
+.org-next-error {
+    /* next-error */
+    color: #282a36;
+    background-color: #f1fa8c;
+}
+.org-nobreak-hyphen {
+    /* nobreak-hyphen */
+    color: #00ffff;
+}
+.org-nobreak-space {
+    /* nobreak-space */
+    color: #00ffff;
+    text-decoration: underline;
+}
+.org-outline-1 {
+    /* outline-1 */
+    color: #50fa7b;
+}
+.org-outline-2 {
+    /* outline-2 */
+    color: #bd93f9;
+}
+.org-outline-3 {
+    /* outline-3 */
+    color: #8be9fd;
+}
+.org-outline-4 {
+    /* outline-4 */
+    color: #ffb86c;
+}
+.org-outline-5 {
+    /* outline-5 */
+    color: #ffb86c;
+}
+.org-outline-6 {
+    /* outline-6 */
+    color: #0189cc;
+}
+.org-outline-7 {
+    /* outline-7 */
+    color: #ffb86c;
+}
+.org-outline-8 {
+    /* outline-8 */
+    color: #f1fa8c;
+}
+.org-page-break-lines {
+    /* page-break-lines */
+    color: #6272a4;
+}
+.org-preprocessor {
+    /* font-lock-preprocessor-face */
+    color: #ffb86c;
+}
+.org-py-builtins {
+    /* py-builtins-face */
+    color: #ffb86c;
+}
+.org-py-class-name {
+    /* py-class-name-face */
+    color: #bd93f9;
+}
+.org-py-decorators {
+    /* py-decorators-face */
+    color: #ff79c6;
+    font-weight: bold;
+}
+.org-py-def-class {
+    /* py-def-class-face */
+    color: #ff79c6;
+    font-weight: bold;
+}
+.org-py-exception-name {
+    /* py-exception-name-face */
+    color: #ffb86c;
+}
+.org-py-import-from {
+    /* py-import-from-face */
+    color: #ff79c6;
+    font-weight: bold;
+}
+.org-py-number {
+    /* py-number-face */
+    color: #f8f8f2;
+    background-color: #282a36;
+}
+.org-py-object-reference {
+    /* py-object-reference-face */
+    color: #ff79c6;
+    font-weight: bold;
+}
+.org-py-pseudo-keyword {
+    /* py-pseudo-keyword-face */
+    color: #ff79c6;
+    font-weight: bold;
+}
+.org-py-try-if {
+    /* py-try-if-face */
+    color: #ff79c6;
+    font-weight: bold;
+}
+.org-py-variable-name {
+    /* py-variable-name-face */
+    color: #f8f8f2;
+    background-color: #282a36;
+}
+.org-py-xxx-tag {
+    /* py-XXX-tag-face */
+    color: #f1fa8c;
+}
+.org-query-replace {
+    /* query-replace */
+    color: #ffb86c;
+    background-color: #464752;
+    font-weight: bold;
+}
+.org-regexp-grouping-backslash {
+    /* font-lock-regexp-grouping-backslash */
+    font-weight: bold;
+}
+.org-regexp-grouping-construct {
+    /* font-lock-regexp-grouping-construct */
+    font-weight: bold;
+}
+.org-region {
+    /* region */
+    color: #282a36;
+    background-color: #f1fa8c;
+}
+.org-shadow {
+    /* shadow */
+    color: #b3b3b3;
+}
+.org-show-paren-match {
+    /* show-paren-match */
+    background-color: #4f94cd;
+}
+.org-show-paren-match-expression {
+    /* show-paren-match-expression */
+    background-color: #4f94cd;
+}
+.org-show-paren-mismatch {
+    /* show-paren-mismatch */
+    color: #ffffff;
+    background-color: #a020f0;
+}
+.org-string {
+    /* font-lock-string-face */
+    color: #f1fa8c;
+}
+.org-success {
+    /* success */
+    color: #00ff00;
+    font-weight: bold;
+}
+.org-tooltip {
+    /* tooltip */
+    color: #000000;
+    background-color: #ffffe0;
+}
+.org-trailing-whitespace {
+    /* trailing-whitespace */
+    background-color: #ffb86c;
+}
+.org-type {
+    /* font-lock-type-face */
+    color: #bd93f9;
+}
+.org-underline {
+    /* underline */
+    text-decoration: underline;
+}
+.org-variable-name {
+    /* font-lock-variable-name-face */
+    color: #f8f8f2;
+}
+.org-vertical-border {
+    /* vertical-border */
+    color: #373844;
+}
+.org-warning {
+    /* warning */
+    color: #ffb86c;
+}
+.org-warning-1 {
+    /* font-lock-warning-face */
+    color: #ffb86c;
+    background-color: #373844;
+}
+.org-which-func {
+    /* which-func */
+    color: #50fa7b;
+    font-weight: bold;
+}