neruda 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 439ad28e63d071bfd98bd52e99c39ff1bfbfcde9f0e6c4e48bd501143b3a62f1
-  data.tar.gz: ac080451123c740352e8a6c0259d294ab03a40f375981cb05e68ece0c6c6243a
+  metadata.gz: f704b888004971a0ee3c321f41874132283f7f42a3c6b57f267356b7723b2260
+  data.tar.gz: 54c3738824f1b80b46b00654aedd805ef0a999a096f1ff320c42001027419147
 SHA512:
-  metadata.gz: bb9e592d2a1b61f5b0682023157f8a5b429fd21feb494e328fe0185ddbd27ba182ca5cfd77d82d63c66db208d4713478cec20c5f1d6c9a1bbe7de0e867f8973e
-  data.tar.gz: 827b583c447d97c43bfb8667b75c9e80b82903b1ce9ecb316e6c95c2dc407e7b601f2f2f3dc02969ca0eeaf487e022765cac070af8d68734462bf09c48b65995
+  metadata.gz: ba08196581125aa378a938cb34413d856d7126800cbe692b9237f6e3ffb7bf45743d7dd6fa0ab77c9adb13000dd266085a7ebb4fe556b3d223f620596b237074
+  data.tar.gz: efc4308eb4c1d43091f6134fbdee4054feb80535e01fa1cff7f79656f22540bd55011c66c6ac7ca33fb01c0b6c4dbcab6012db44f1726285dc6be85fb8236953

data/bin/pablo

@@ -15,26 +15,21 @@ module PabloCommands
   def pablo_init
     cnf = @options.merge
     cnf.delete(:verbose)
-    cnf.delete(:directory)
     cnf.transform_keys!(&:to_s)
     Neruda::Config.save(Neruda::Config.settings.merge(cnf))
     @rake.options.build_all = true
     @rake.invoke_task('org:install')
     return if File.exist? 'src/index.org'
     Neruda::OrgFile.new('src/index.org', @options).write
+    pablo_open 'src/index.org'
   end
   alias_method :pablo_config, :pablo_init
 
-  def pablo_build(file = ARGV[0])
+  def pablo_build
     @rake.options.build_all = true
-    # Update org-config.el, if necessary
-    suffix = ''
-    if !file.nil?
-      suffix = ":one[#{file}]"
-    elsif @options[:force]
-      suffix = '[true]'
-    end
-    @rake.invoke_task("site:build#{suffix}")
+    task = 'site:build'
+    task = "#{task}[true]" if @options[:force]
+    @rake.invoke_task task
   end
 
   def pablo_preview
@@ -55,13 +50,17 @@ module PabloCommands
     @rake.invoke_task('site:preview')
   end
 
-  def pablo_open
-    filename = new_file_name(ARGV[0])
-    FileUtils.mkdir_p File.dirname(filename)
-    o = Neruda::OrgFile.new(filename, @options)
-    o.write unless File.exist? filename
+  def pablo_open(file_path = ARGV[0])
     editor = ENV['EDITOR'] || ENV['VISUAL'] || 'emacs'
-    cmd = [editor, '+6', filename]
+    cmd = [editor]
+    if file_path.nil? || !File.file?(file_path)
+      # file_path may be updated with title given in options
+      file_path = create_new_file(file_path)
+      # Only move to the end of file for new file. Let the editor handle
+      # the best position for already existing files
+      cmd << '+6'
+    end
+    cmd << file_path
     system(*cmd)
   end
   alias_method :pablo_edit, :pablo_open
@@ -86,12 +85,27 @@ module PabloCommands
 
   private
 
-  def new_file_name(title)
-    title ||= @options[:title]
-    title = 'new' if title.nil? || title == ''
-    filename = Neruda::OrgFile.slug title
-    return "#{filename}.org" unless @options[:directory]
-    "#{filename}/index.org"
+  def new_file_name(file_path)
+    file_path = File.expand_path(file_path || '')
+    return file_path if file_path[-4..] == '.org'
+    # file_path seems to be a dir path. Thus we have to create the new
+    # filename from its title
+    title = @options[:title]
+    # No title, nor a reliable file_path? Better abort
+    return nil if title.nil? || title == ''
+    filename = "#{Neruda::OrgFile.slug(title)}.org"
+    File.join file_path, filename
+  end
+
+  def create_new_file(file_path)
+    filename = new_file_name(file_path)
+    if filename.nil?
+      warn R18n.t.pablo.error.no_file
+      exit 1
+    end
+    FileUtils.mkdir_p File.dirname(filename)
+    Neruda::OrgFile.new(filename, @options).write
+    filename
   end
 
   def help_command_body(command)

data/lib/neruda/config/lisp_config.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'json'
 require 'open-uri'
 require 'neruda/version'
 
@@ -16,17 +17,13 @@ module Neruda
         @org_version = IO.read('tmp/__last_org_version__')
         return @org_version
       end
-      index = URI('https://orgmode.org/index.html').open.read
-      last_ver = index.match(/https:\/\/orgmode\.org\/org-([0-9.]+)\.tar\.gz/)
-      # :nocov:
-      if last_ver.nil?
-        warn 'Org last version not found'
-        return nil
-      end
+      versions = JSON.parse(
+        URI('https://updates.orgmode.org/data/releases').open.read
+      ).sort { |a, b| b['date'] <=> a['date'] }
+      @org_version = versions.first['version']
       FileUtils.mkdir_p 'tmp'
-      IO.write('tmp/__last_org_version__', last_ver[1])
-      # :nocov:
-      @org_version = last_ver[1]
+      IO.write('tmp/__last_org_version__', @org_version)
+      @org_version
     end
 
     # Generate emacs lisp configuration file for Org and write it.
@@ -145,8 +142,6 @@ module Neruda
          #{other_lines.join("\n ")}
          :publishing-directory "#{publish_in}"
          :publishing-function org-html-publish-to-html
-         :section-numbers nil
-         :with-toc nil
          #{opts['org_headers']})
         ("#{project_name}-assets"
          :base-directory "#{opts['path']}"
@@ -178,17 +173,20 @@ module Neruda
     end
 
     def org_default_html_options(project)
-      curtheme = project['theme'] || settings['theme']
-      if curtheme.nil? || curtheme == 'default'
-        return { 'html-head' => '__ATOM_FEED__',
-                 'html-postamble' => org_default_postamble,
-                 'html-head-include-default-style' => 't',
-                 'html-head-include-scripts' => 't' }
-      end
-      { 'html-head' => org_default_html_head,
+      defaults = {
+        'section-numbers' => 'nil',
+        'with-toc' => 'nil',
         'html-postamble' => org_default_postamble,
-        'html-head-include-default-style' => 'nil',
-        'html-head-include-scripts' => 'nil' }
+        'html-head' => '__ATOM_FEED__',
+        'html-head-include-default-style' => 't',
+        'html-head-include-scripts' => 't'
+      }
+      curtheme = project['theme'] || settings['theme']
+      return defaults if curtheme.nil? || curtheme == 'default'
+      defaults['html-head'] = org_default_html_head
+      defaults['html-head-include-default-style'] = 'nil'
+      defaults['html-head-include-scripts'] = 'nil'
+      defaults
     end
 
     def expand_vars_in_html_head(head, project)

data/lib/neruda/emacs.rb

@@ -11,34 +11,27 @@ module Neruda
     end
 
     def publish
-      if @file.nil?
-        emacs_args = ['--eval \'(org-publish "website")\'']
-      else
-        emacs_args = ['-f org-publish-current-file']
+      command = emacs_command(
+        '-l ./org-config.el', '--eval \'(org-publish "website")\''
+      )
+      if @verbose
+        warn command
+        return system(command, exception: true)
       end
-      call_emacs emacs_args
+      system command, out: '/dev/null', err: '/dev/null', exception: true
     end
 
     private
 
-    def emacs_command(arguments = [])
+    def emacs_command(*arguments)
       default_emacs = Neruda::Config.settings['emacs']
-      emacs_cmd = [default_emacs || 'emacs -Q --batch -nw']
-      emacs_cmd << '--eval \'(setq enable-dir-local-variables nil)\''
+      emacs_cmd = [
+        default_emacs || 'emacs -Q --batch -nw',
+        '--eval \'(setq enable-dir-local-variables nil)\''
+      ]
       emacs_cmd << '--eval \'(setq inhibit-message t)\'' unless @verbose
-      emacs_cmd << '-l ./org-config.el'
-      emacs_cmd << "--eval '(find-file \"#{@file}\")'" unless @file.nil?
       emacs_cmd.concat(arguments)
       emacs_cmd.join(' ')
     end
-
-    def call_emacs(arguments = [])
-      command = emacs_command arguments
-      if @verbose
-        warn command
-        return system(command, exception: true)
-      end
-      system command, out: '/dev/null', err: '/dev/null', exception: true
-    end
   end
 end

data/lib/neruda/org_file/htmlizer.rb

@@ -7,15 +7,6 @@ module Neruda
   # This module holds HTML formatter methods for the {Neruda::OrgFile}
   # class.
   module OrgFileHtmlizer
-    # Publish the current file
-    #
-    # @return [Boolean, nil] the underlying ~system~ method return value
-    def publish
-      Neruda::Emacs.new(
-        file_path: @file, verbose: @options[:verbose]
-      ).publish
-    end
-
     private
 
     # Format {Neruda::OrgFile#keywords} list in an HTML listing.

data/lib/neruda/templater.rb

@@ -11,7 +11,7 @@ module Neruda
       @dom = dom
       @org_file = source
       @position = opts['type'] || 'after'
-      @content = opts['content']
+      @content = extract_content opts
       @element = @dom.css(opts['selector'])
       digest = Digest::MD5.hexdigest(@content)
       @check_line = " Neruda Template: #{digest} "
@@ -54,15 +54,7 @@ module Neruda
       def filter_templates(file_name)
         templates = Neruda::Config.settings['templates']
         return [] if templates.nil? || templates.empty?
-        templates.filter do |t|
-          if !t.has_key?('selector') || !t.has_key?('content')
-            false
-          elsif t.has_key?('path') && !check_path(file_name, t['path'])
-            false
-          else
-            true
-          end
-        end
+        templates.filter { |t| check_required_keys(t, file_name) }
       end
 
       def open_dom(file_name)
@@ -90,6 +82,13 @@ module Neruda
         File.fnmatch?("#{pub_folder}#{pathes}",
                       file_name, File::FNM_DOTMATCH)
       end
+
+      def check_required_keys(opts, file_name)
+        return false unless opts.has_key?('selector')
+        return false unless opts.has_key?('content') || opts.has_key?('source')
+        return check_path(file_name, opts['path']) if opts.has_key?('path')
+        true
+      end
     end
 
     private
@@ -108,5 +107,12 @@ module Neruda
         elem.add_next_sibling content
       end
     end
+
+    def extract_content(opts)
+      return opts['content'] if opts['content']
+      # If we don't have a content option, then we must have a source
+      # one.
+      @dom.css(opts['source']).unlink.to_s
+    end
   end
 end

data/lib/neruda/utils.rb

@@ -26,7 +26,6 @@ module Neruda
     #   configuration
     PABLO_OPTIONS = {
       '-a' => { long: 'author' },
-      '-d' => { long: 'directory', boolean: true },
       '-f' => { long: 'force', boolean: true },
       '-h' => { long: 'help', boolean: true, meth: :on_tail },
       '-l' => { long: 'lang', keyword: 'LOCALE' },
@@ -42,7 +41,7 @@ module Neruda
       'init' => { opts: ['-a', '-h', '-l', '-t', '-v'] },
       'config' => { alias: 'init' },
       'preview' => { opts: ['-h'] },
-      'open' => { opts: ['-a', '-d', '-h', '-l', '-p', '-t', '-v'] },
+      'open' => { opts: ['-a', '-h', '-l', '-p', '-t', '-v'] },
       'edit' => { alias: 'open' },
       'build' => { opts: ['-f', '-h'] },
       'publish' => { opts: ['-h'] },

data/lib/neruda/version.rb

@@ -2,5 +2,5 @@
 
 module Neruda
   # @return [String] the version number of the current Neruda release.
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/lib/tasks/site.rake

@@ -23,7 +23,7 @@ namespace :site do
     Neruda::Config.write_org_lisp_config(with_tags: true)
   end
 
-  desc 'Convert all org files'
+  desc 'Convert and customize all org files'
   task :build, [:force?] => ['org-config.el', :index] do |_, args|
     args.with_defaults(:force? => false)
     build_html = Thread.new do
@@ -47,38 +47,6 @@ namespace :site do
     Neruda::Utils.throbber(customize_html, 'Customizing:')
   end
 
-  namespace :build do
-    desc 'Convert one org file'
-    task :one, [:source] => ['org-config.el'] do |_, args|
-      if args[:source].nil?
-        warn 'No source file given'
-        next
-      end
-      verbose = Rake::FileUtilsExt.verbose_flag
-      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, build_html[:org_file])
-    end
-  end
-
   desc 'Start a test server'
   task :preview do
     require 'neruda/preview'

data/locales/en.yml

@@ -2,6 +2,7 @@
 pablo:
   error:
     no_command: 'ERROR: no command or unknown command given.'
+    no_file: 'ERROR: no file to open or edit.'
   usage: 'Usage: pablo %1 [options]'
   commands:
     cmd_title: Commands

data/locales/fr.yml

@@ -1,7 +1,8 @@
 ---
 pablo:
   error:
-    no_command: 'ERREUR: Aucune commande ou commande inconnue donnée.'
+    no_command: 'ERREUR : Aucune commande ou commande inconnue donnée.'
+    no_file: 'ERREUR : Aucun fichier à ouvrir ou éditer.'
   usage: 'Usage : pablo %1 [options]'
   commands:
     cmd_title: Commandes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neruda
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Étienne Deparis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri