neruda 0.1.0 → 0.2.2

data/lib/neruda/version.rb

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

data/lib/tasks/org.rake

@@ -1,28 +1,45 @@
 # frozen_string_literal: true
 
+require 'open-uri'
+
 # Neruda::Config is required by Neruda::Utils
 require 'neruda/utils'
 
+require 'rake/clean'
+
+CLOBBER.push(
+  'tmp/org.tar.gz', 'tmp/__last_org_version__',
+  'org-config.el', '.dir-locals.el', 'htmlize.el'
+)
+
 namespace :org do
-  desc 'Download last version of org-mode'
-  task :download do
+  desc 'Download last version of Org'
+  file 'tmp/org.tar.gz' 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: 'tmp/org.tar.gz' do |task|
     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(' ')
-      sh "tar xzf #{tarball}"
-      File.unlink tarball
+      sh "tar xzf #{task.prerequisites[0]}"
       sh((make + ['compile']).join(' '))
       sh((make + ['autoloads']).join(' '))
       Dir.glob('org-[0-9.]*').each do |ov|
@@ -34,26 +51,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(' ') }
-    if verbose
-      build.join
-      warn 'htmlize.el has been locally installed'
-    else
-      Neruda::Utils.throbber(build, 'Installing htmlize.el:')
-    end
+    htmlize = URI(
+      'https://raw.githubusercontent.com/hniksic/emacs-htmlize/master/htmlize.el'
+    ).open.read
+    IO.write 'htmlize.el', htmlize
   end
 
   file 'org-config.el' => 'htmlize.el' do
-    next if Neruda::Config.org_last_version.nil?
     Neruda::Config.write_org_lisp_config
   end
 
@@ -61,9 +70,22 @@ namespace :org do
     Neruda::Config.write_dir_locals
   end
 
-  desc 'Install org'
-  task install: ['org:download', 'org-config.el', '.dir-locals.el'] do
+  desc 'Install Org'
+  multitask 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
+
+  # The following task only run the clobber task (not provided by us)
+  # and the org:install one, which is already tested. Thus, we can
+  # safely remove it from coverage.
+  # :nocov:
+  desc 'Upgrade Org'
+  task :upgrade do
+    Rake::Task['clobber'].execute
+    Rake::Task['org:install'].invoke
   end
+  # :nocov:
 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,17 +16,28 @@ 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
+  task :build, [:force?] => [:index] do |_, args|
+    args.with_defaults(:force? => false)
     build_html = Thread.new do
-      Neruda::OrgFile.new(nil, verbose: Rake::FileUtilsExt.verbose_flag).publish
+      rm_r 'tmp/timestamps', force: true if args[:force?]
+      Neruda::Emacs.new(verbose: Rake::FileUtilsExt.verbose_flag).publish
     end
-    Neruda::Utils.throbber(build_html, 'Publishing:')
+    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|
@@ -46,39 +55,33 @@ namespace :site do
         next
       end
       verbose = Rake::FileUtilsExt.verbose_flag
-      o = Neruda::OrgFile.new(args[:source], verbose: verbose)
-      o.publish
-      target = Neruda::OrgFile.target_for_source(args[:source])
+      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(build_html, 'Building:')
+      rescue RuntimeError
+        warn 'Aborting'
+        next
+      end
+      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
-
-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
-    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
-    puts index.sort_by(:weight).join("\n")
-  end
 end

data/lib/tasks/sync.rake

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'neruda/config'
+require 'neruda/utils'
 
 def rsync_command(verbose, test = nil)
   rsync_command = Neruda::Config.settings['rsync']
@@ -24,7 +25,10 @@ namespace :sync do
       next
     end
     public_folder = Neruda::Config.settings['public_folder']
-    sh [rsync_command(Rake::FileUtilsExt.verbose_flag, args[:test?]),
-        "#{public_folder}/", remote_path].join(' ')
+    publish_thread = Thread.new do
+      sh [rsync_command(Rake::FileUtilsExt.verbose_flag, args[:test?]),
+          "#{public_folder}/", remote_path].join(' ')
+    end
+    Neruda::Utils.throbber(publish_thread, 'Publishing:')
   end
 end

data/lib/tasks/tags.rake

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'neruda/index'
+
+namespace :tags do
+  desc 'List all tags by name'
+  task :name do
+    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
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neruda
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Étienne Deparis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: org-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -100,70 +100,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '0.93'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '0.93'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.43'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.43'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -179,8 +207,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 description: |
-  An opinionated org-mode static website generator.
-  Write your org files, we take care of the rest.
+  An opinionated Org static website generator.
+  Write your org-mode files, we take care of the rest.
 email: etienne@depar.is
 executables:
 - pablo
@@ -194,6 +222,7 @@ files:
 - lib/neruda/config/lisp_config.rb
 - lib/neruda/config/org-config.el
 - lib/neruda/config/ox-neruda.el
+- lib/neruda/emacs.rb
 - lib/neruda/index.rb
 - lib/neruda/index/atom_generator.rb
 - lib/neruda/index/org_generator.rb
@@ -208,16 +237,14 @@ files:
 - lib/tasks/org.rake
 - lib/tasks/site.rake
 - lib/tasks/sync.rake
+- lib/tasks/tags.rake
 - locales/en.yml
 - locales/fr.yml
-- themes/default/css/style.css
-- themes/default/fonts/Yanone_Kaffeesatz_400.woff
-- themes/default/fonts/Yanone_Kaffeesatz_400.woff2
-homepage: https://hg.deparis.io/neruda/
+homepage: https://git.umaneti.net/neruda/about/
 licenses:
 - WTFPL
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "-m"
 - org
@@ -227,15 +254,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
-summary: A simplistic way to create an org-mode static website.
+summary: A simplistic way to create an Org static website.
 test_files: []