neruda 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f3224292de6de88d025190d293fd0e9043f2cb54832986410975343887be77d
-  data.tar.gz: aaf3bf95cf510fc67cd0dcab3f6c9a65d2153ed676b4300c068dda01bfca6241
+  metadata.gz: 819cab1f549a9991714bac07e34be41187f667b67200996e2ef78a6a8c555ef5
+  data.tar.gz: 4cc683d19f3bfdf060ce56c720251f1db58ac88df3a44c55ada1298155e76f77
 SHA512:
-  metadata.gz: 662711c6423eea8c5c554c53761f23e56260fe8c022685d62ef8b234e6ef89f9bffd85707ff8e39e96c460096817bd52964111ad4f2f86f4b8945856e64be693
-  data.tar.gz: 6b95b730be8814ed2d9af07452b34caa6ac07ef58bdfcaef8c653ec901081392e2c2c1e5c85fa392e698a292566b69c25a24297e52beecabe1f8b2211426c141
+  metadata.gz: 4d15fb6bcd865e0493b5f08e6209d7ce6a4e1764b88e2eff9cf9d05b20d832f83d1da81e9d7c9d381c4fd128c1f1ff0ff45524ba2e9412c56c3b17247c89a516
+  data.tar.gz: 05e47deafd1cf2366748100699dcbb8677802be4423191d16ed3f352ba52038665c524aafcf5b205cacbda2b8dad582ad13c161ed3110c5503d18a958aaa2b24

data/bin/pablo

@@ -35,38 +35,55 @@ module PabloCommands
   end
 
   def pablo_preview
+    Thread.new do
+      sleep 1
+      port = Neruda::Config.settings['server_port'] || 5000
+      uri = "http://127.0.0.1:#{port}/"
+      current_os = Neruda::Utils.current_os
+      if current_os == 'windows'
+        system 'start', uri
+      elsif current_os == 'apple'
+        system 'open', uri
+      else
+        system 'gio', 'open', uri
+      end
+    end
     @rake.invoke_task('site:preview')
   end
 
   def pablo_open
-    filename = ARGV[0] || new_file_name
+    filename = new_file_name(ARGV[0])
     FileUtils.mkdir_p File.dirname(filename)
     o = Neruda::OrgFile.new(filename, @options)
     o.write unless File.exist? filename
-
     editor = ENV['EDITOR'] || ENV['VISUAL'] || 'emacs'
     cmd = [editor, filename]
     cmd.insert(1, '+6') if editor.match?(/^emacs/)
     system(*cmd)
   end
+  alias_method :pablo_edit, :pablo_open
+
+  def pablo_publish
+    @rake.invoke_task('sync:push')
+  end
 
   def pablo_help(command = 'basic', error = false)
     warn R18n.t.pablo.error.no_command if error
-    command = 'basic' unless Neruda::Utils::PABLO_COMMANDS.include?(command)
-    cmd_opt = Neruda::Utils::PABLO_COMMANDS[command]
+    cmd = Neruda::Utils.resolve_possible_alias(command)
+    cmd_opt = Neruda::Utils::PABLO_COMMANDS[cmd]
     label = cmd_opt[:label] || command
     warn "Usage: pablo #{label} [options]\n\n"
     warn cmd_opt[:desc] + "\n\n" if cmd_opt.has_key?(:desc)
-    warn "Options\n#{Neruda::Utils.summarize_command(command)}\n"
-    warn "Commands\n#{Neruda::Utils.list_commands}\n" if command == 'basic'
+    warn "Options\n#{Neruda::Utils.summarize_command(cmd)}\n"
+    warn "Commands\n#{Neruda::Utils.list_commands}\n" if cmd == 'basic'
     exit 1 if error
     exit
   end
 
   private
 
-  def new_file_name
-    title = @options[:title]
+  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]
@@ -112,14 +129,14 @@ class Pablo
   end
 end
 
-params = {}
-optparser = OptionParser.new do |opts|
-  opts.version = Neruda::VERSION
-  Neruda::Utils::PABLO_OPTIONS.each do |k, opt|
-    short, long = Neruda::Utils.decorate_option(k)
-    opts.send(opt[:meth] || :on, short, long, opt[:desc])
-  end
+optparser = OptionParser.new
+optparser.version = Neruda::VERSION
+
+Neruda::Utils::PABLO_OPTIONS.each do |k, opt|
+  optparser.send(opt[:meth] || :on, *Neruda::Utils.decorate_option(k))
 end
+
+params = {}
 optparser.parse!(into: params)
 
 if params[:version]
@@ -133,8 +150,11 @@ if ARGV[0] == 'help'
 end
 pablo = Pablo.new(params)
 command = "pablo_#{ARGV[0]}".to_sym
-err = command.nil? || !pablo.respond_to?(command)
-pablo.pablo_help(ARGV[0], err) if err || params[:help]
+cmd_err = !pablo.respond_to?(command)
+if params[:help] || cmd_err
+  cmd_err = false if params[:help] && !ARGV[0]
+  pablo.pablo_help(ARGV[0], cmd_err)
+end
 ARGV.shift
 
 init_cmds = ['pablo_init', 'pablo_config']

data/lib/neruda/config/lisp_config.rb

@@ -91,13 +91,13 @@ module Neruda
       orgtpl = opts['org_headers']
       base_directory = File.expand_path(opts['path'])
       publish_in = [Dir.pwd, settings['public_folder']]
-      publish_in << project_name unless project_name == 'org'
+      publish_in << project_name unless project_name == 'neruda'
       publish_in = publish_in.join('/')
       recline = [opts['recursive'] || 't']
       default_ex_ptrn = settings['exclude_pattern']
       if opts['exclude']
         recline << ":exclude \"#{opts['exclude']}\""
-      elsif project_name == 'org' && default_ex_ptrn
+      elsif project_name == 'neruda' && default_ex_ptrn
         recline << ":exclude \"#{default_ex_ptrn}\""
       end
       <<~ORGPROJECT
@@ -147,17 +147,24 @@ module Neruda
       orgtpl.join("\n ")
     end
 
+    def org_external_projects_opts(seed, orgtpl)
+      opts = { 'org_headers' => orgtpl }
+      if seed.is_a? String
+        opts['path'] = seed
+      elsif seed.is_a? Hash
+        opts.merge! seed
+      end
+      opts
+    end
+
     def org_generate_projects
       orgtpl = org_templates
-      projects = { 'org' => org_project('org', 'org_headers' => orgtpl,
-                                               'path' => './src') }
+      default_project = org_project(
+        'neruda', 'org_headers' => orgtpl, 'path' => './src'
+      )
+      projects = { 'neruda' => default_project }
       settings['external_sources']&.each do |s|
-        opts = { 'org_headers' => orgtpl }
-        if s.is_a? String
-          opts['path'] = s
-        elsif s.is_a? Hash
-          opts.merge! s
-        end
+        opts = org_external_projects_opts(s, orgtpl)
         next unless opts.has_key?('path')
         pname = File.basename(opts['path']).sub(/^\./, '')
         projects[pname] = org_project(pname, opts)

data/lib/neruda/index.rb

@@ -49,7 +49,12 @@ module Neruda
 
     def sort_by(kind)
       if [:name, :weight].include?(kind)
-        return sort_tags_by_name_and_weight["by_#{kind}".to_sym]
+        tags_sorted = sort_tags_by_name_and_weight["by_#{kind}".to_sym]
+        # Reverse in order to have most important or A near next prompt
+        # and avoid to scroll to find the beginning of the list.
+        return tags_sorted.map do |k|
+          @tags_names[k] + " (#{@index[k].length})"
+        end.reverse
       end
       raise ArgumentError, "#{kind} not in [:name, :weight]"
     end

data/lib/neruda/org_file.rb

@@ -252,7 +252,7 @@ module Neruda
       @notime = false
       @author = @options[:author] || Neruda::Config.settings['author']
       @keywords = []
-      @lang = Neruda::Config.settings['lang']
+      @lang = @options[:lang] || Neruda::Config.settings['lang']
       @excerpt = ''
       @content = @options[:content] || <<~ORG
         #+title: #{@title}

data/lib/neruda/org_file/htmlizer.rb

@@ -70,9 +70,9 @@ module Neruda
       command = emacs_command arguments
       if @options[:verbose]
         warn command
-        return system(command)
+        return system(command, exception: true)
       end
-      system command, out: '/dev/null', err: '/dev/null'
+      system command, out: '/dev/null', err: '/dev/null', exception: true
     end
   end
 end

data/lib/neruda/utils.rb

@@ -41,11 +41,16 @@ module Neruda
       'init' => { opts: ['-a', '-l', '-t', '-v', '-h'],
                   desc: 'Initialize your Neruda instance ' \
                         '(you just need to do it once).' },
+      'config' => { alias: 'init' },
       'preview' => { opts: ['-h'],
                      desc: 'Start a test webserver to preview ' \
                            'your website on http://127.0.0.1:5000' },
       'open' => { opts: ['-a', '-l', '-t', '-d', '-p', '-v', '-h'],
                   desc: 'Open or create an org file for edition.' },
+      'edit' => { alias: 'open' },
+      'publish' => { opts: ['-h'],
+                     desc: 'Push local changes to your public ' \
+                           'server online.' },
       'help' => { opts: ['-h'], desc: 'Alias for the -h switch.' },
       'basic' => { opts: ['-h', '-V'], label: '<command>' }
     }.freeze
@@ -66,17 +71,19 @@ module Neruda
       # @param message [String] the message to display before the throbber
       # @return [void]
       def throbber(thread, message)
-        model = Neruda::Config.settings['throbber'] || 'default'
-        model = 'default' unless Neruda::Utils::THROBBER_FRAMES.has_key?(model)
-        frames = Neruda::Utils::THROBBER_FRAMES[model]
-        current = 0
-        while thread.alive?
-          sleep 0.1
-          print "#{message} #{frames[current % frames.length]}\r"
-          current += 1
+        frames = select_throbber_frames
+        begin
+          run_and_decorate_thread thread, message, frames
+        rescue RuntimeError => e
+          done = Rainbow('An error occured.').bold.red + "\n"
+          done += Rainbow('To see it, run again your command with more ' \
+                          'verbosity, i.e. pablo build -v').bold
+          warn "#{message} #{done}"
+          raise e
+        else
+          done = Rainbow('done'.ljust(frames[0].length)).green
+          puts "#{message} #{done}"
         end
-        done = Rainbow('done'.ljust(frames[0].length)).green
-        puts "#{message} #{done}"
       end
 
       # Returns the short and long options specification for a given
@@ -95,8 +102,8 @@ module Neruda
         opt = Neruda::Utils::PABLO_OPTIONS[short]
         long = "--#{opt[:long]}"
         return [short, long] if opt[:boolean]
-        key = ' ' + (opt[:keyword] || opt[:long].upcase)
-        [short + key, long + key]
+        key = opt[:keyword] || opt[:long].upcase
+        [short + key, long + ' ' + key]
       end
 
       # Returns the ~pablo~ help summary for a given command.
@@ -125,6 +132,47 @@ module Neruda
         end
         lines
       end
+
+      # Returns the real command name for a given command, which may be
+      #   an alias.
+      #
+      # @param command [String] the command to resolve
+      # @return [String]
+      def resolve_possible_alias(command)
+        return 'basic' unless Neruda::Utils::PABLO_COMMANDS.include?(command)
+        cmd_opt = Neruda::Utils::PABLO_COMMANDS[command]
+        return cmd_opt[:alias] if cmd_opt.has_key?(:alias)
+        command
+      end
+
+      # Try to discover the current host operating system.
+      #
+      # @return [String] either apple, windows or linux (default)
+      def current_os
+        if ENV['OS'] == 'Windows_NT' || RUBY_PLATFORM =~ /cygwin/
+          return 'windows'
+        end
+        return 'apple' if RUBY_PLATFORM =~ /darwin/
+        'linux'
+      end
+
+      private
+
+      def select_throbber_frames
+        model = Neruda::Config.settings['throbber'] || 'default'
+        model = 'default' unless Neruda::Utils::THROBBER_FRAMES.has_key?(model)
+        Neruda::Utils::THROBBER_FRAMES[model]
+      end
+
+      def run_and_decorate_thread(thread, message, frames)
+        thread.abort_on_exception = true
+        current = 0
+        while thread.alive?
+          sleep 0.1
+          print "#{message} #{frames[current % frames.length]}\r"
+          current += 1
+        end
+      end
     end
   end
 end

data/lib/neruda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Neruda
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 end

data/lib/tasks/site.rake

@@ -28,7 +28,12 @@ namespace :site do
     build_html = Thread.new do
       Neruda::OrgFile.new(nil, verbose: Rake::FileUtilsExt.verbose_flag).publish
     end
-    Neruda::Utils.throbber(build_html, 'Publishing:')
+    begin
+      Neruda::Utils.throbber(build_html, 'Publishing:')
+    rescue RuntimeError
+      warn 'Aborting'
+      next
+    end
     customize_html = Thread.new do
       pubfolder = Neruda::Config.settings['public_folder']
       Dir["#{pubfolder}/**/*.html"].each do |f|
@@ -46,8 +51,15 @@ namespace :site do
         next
       end
       verbose = Rake::FileUtilsExt.verbose_flag
-      o = Neruda::OrgFile.new(args[:source], verbose: verbose)
-      o.publish
+      o = Thread.new do
+        Neruda::OrgFile.new(args[:source], verbose: verbose).publish
+      end
+      begin
+        Neruda::Utils.throbber(o, 'Publishing:')
+      rescue RuntimeError
+        warn 'Aborting'
+        next
+      end
       target = Neruda::OrgFile.target_for_source(args[:source])
       warn "Customizing file #{target}" if verbose
       Neruda::Templater.customize_output(target, o)
@@ -62,23 +74,3 @@ namespace :site do
   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/tags.rake

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+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
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neruda
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Étienne Deparis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -208,12 +208,13 @@ 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.deparis.io/neruda/
 licenses:
 - WTFPL
 metadata: {}
@@ -234,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simplistic way to create an org-mode static website.