natour 0.1.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a465921bd4e696f168be735851b576e1ec95eca0396eb52581801a16d9c75e1
-  data.tar.gz: 5c0fd93836e21d57752a185842c17787894b8c56d1850564240a6f88b514dcb5
+  metadata.gz: b125a5ba293c91fa5efcb56ee32bc6e5ed52c1b8daf82439bcbec6c7b279a29d
+  data.tar.gz: bda03749fc2db89b56adadbb8bfb1522b8e116d294be244f918f9a6142005d07
 SHA512:
-  metadata.gz: d39f3f80ab7bc2ee632d3458d623e8f7bb517c19b2f8c3d3fcc110c15ff8c09c646e52fb59623ca3be7c7f08877e527991c5f2774c41f1f17f4752d8b7a636ff
-  data.tar.gz: d20556324500e26c3d428c6925f0e5ceefad9dfd790f78083e25d38fe28e27756653f5eecb5f9545b978a36a28a761dd9d257fafa8ca1ff0c75b62d9d0670308
+  metadata.gz: c3ddac7902534aec8e14fb546287a45d6fd589c3b4c445b1291bef15d209b7eb9c43484f169ee7e3b9dcac44939b57f4d19d6fae07a261edf6d12499af11d16a
+  data.tar.gz: e1eebd6fa2c8704e25afe48c2120a146d0513f17a55df883d68aad05bbedd08e04173455119abe06ab8ef15894358b650a5590be74435ffd166f27e698c6aef6

data/CHANGELOG.adoc

@@ -6,6 +6,62 @@ The format is based on https://keepachangelog.com/en/1.0.0/[Keep a Changelog^],
 
 == Unreleased
 
+== 0.5.0 - 2021-08-16
+
+=== Added
+
+- Reflect the date of the last update in the revision date
+- Add captions to species lists in the AsciiDoc output
+- Group species lists by taxonomic groups in the AsciiDoc output
+
+=== Fixed
+
+- Support species lists of Flora Helvetica exported from Favoriten
+- Consider botanical names with the authority name preceding the subspecies
+
+== 0.4.0 - 2021-05-02
+
+=== Added
+
+- Show date/time of images in draft output
+- Support preferred conversion backend for draft output
+
+=== Changed
+
+- Remove redundant method `Image.portrait?`
+
+== 0.3.0 - 2021-03-07
+
+=== Changed
+
+- Sort the reports according to their GPS track
+- Bump minimum required Ruby version to 2.5
+- Change font in PDF output to support ♀ and ♂ symbols
+
+=== Fixed
+
+- Make source code compatible with Ruby version 2.5
+
+== 0.2.0 - 2021-01-24
+
+=== Added
+
+- Add this gem's name to the footer of the PDF output
+- Support species lists from https://www.ornitho.ch/[ornitho.ch^] (KML format only)
+- Classify species lists by taxonomic groups (i.e. `SpeciesList.group`)
+
+=== Changed
+
+- Change `SpeciesList.name` to `SpeciesList.title`
+- Return an empty array from `SpeciesList.load_file` if the format is unknown
+- Change the format of the start time in the AsciiDoc output from _12:30_ to _12:30 Uhr_
+- Change the format of the duration in the AsciiDoc output from _1h30_ to _1:30 h_
+
+=== Fixed
+
+- Get the date from images even if the orientation tag is missing
+- Fix typo in help message
+
 == 0.1.0 - 2020-12-04
 
 === Added

data/README.adoc

@@ -45,7 +45,7 @@ sudo apt install build-essential patch ruby-dev zlib1g-dev liblzma-dev
 +
 [source,shell]
 ----
-sudo apt install libvips42
+sudo apt install libvips
 ----
 
 . Install https://www.google.com/chrome/[Google Chrome-Webbroser^]

data/bin/natour

@@ -17,6 +17,7 @@ config = Natour::Config.load_file(
     'adoc-author' => nil,
     'backend' => 'pdf',
     'draft' => false,
+    'draft-backend' => nil,
     'image-maxdim' => 1800
   }
 )
@@ -27,9 +28,9 @@ option_parser = OptionParser.new do |opts|
   opts.separator(WordWrap.ww(
     'If PATH refers to a directory, one or more reports are created in ' \
     'AsciiDoc format. GPS tracks, images and species lists (Kosmos ' \
-    'Vogelführer, Flora Helvetica, Info Flora Online-Feldbuch) are ' \
-    'included. Images of the map section covered by the GPS tracks are also ' \
-    'created and included. If PATH refers to an AsciiDoc file, it is ' \
+    'Vogelführer, ornitho.ch, Flora Helvetica, Info Flora Online-Feldbuch) ' \
+    'are included. Images of the map section covered by the GPS tracks are ' \
+    'also created and included. If PATH refers to an AsciiDoc file, it is ' \
     'converted to PDF (or any other supported format).'
   ))
   opts.separator('')
@@ -49,7 +50,7 @@ option_parser = OptionParser.new do |opts|
   end
   opts.separator('')
   opts.separator('Creation:')
-  opts.on('--track-formats FORMATS', Array, 'GPS track formats (gpx, fit') do |value|
+  opts.on('--track-formats FORMATS', Array, 'GPS track formats (gpx, fit)') do |value|
     config['track-formats'] = value.map(&:to_sym)
   end
   opts.on('--[no-]map', 'Create map images') do |value|
@@ -69,6 +70,9 @@ option_parser = OptionParser.new do |opts|
   opts.on('--[no-]draft', 'Show additional information (e.g. image paths)') do |value|
     config['draft'] = value
   end
+  opts.on('--draft-backend BACKEND', 'Preferred conversion backend for draft (pdf, html5 ...)') do |value|
+    config['draft-backend'] = value
+  end
   opts.on('--image-maxdim DIM', 'Shrink oversized images (PDF only)') do |value|
     config['image-maxdim'] = value.to_i
   end
@@ -106,6 +110,7 @@ else
     overwrite: config['overwrite'],
     backend: config['backend'],
     draft: config['draft'],
+    draft_backend: config['draft-backend'],
     image_maxdim: config['image-maxdim']
   )
 end

data/lib/natour.rb

@@ -1,7 +1,8 @@
-require 'natour/cli/convert'
-require 'natour/cli/create'
-require 'natour/helpers/date_parser'
-require 'natour/helpers/suppress_output'
+require 'natour/utils/botanical_name_utils'
+require 'natour/utils/date_utils'
+require 'natour/utils/stdout_utils'
+require 'natour/convert'
+require 'natour/create'
 require 'natour/asciinurse'
 require 'natour/config'
 require 'natour/gps_track'

data/lib/natour/asciinurse.rb

@@ -30,9 +30,10 @@ module Natour
       doc << "= #{title}"
       if author
         doc << author
-        doc << Date.today.strftime('%d.%m.%Y')
+        doc << ':revdate: {docdate}'
       end
       doc << ':figure-caption!:'
+      doc << ':table-caption!:'
       doc << ':pdf-page-mode: none'
       doc << ':title-page:'
       if title_image
@@ -51,8 +52,8 @@ module Natour
       doc << '[cols="h,3"]'
       doc << '|==='
       doc << "|Datum      |#{gps_track&.date&.strftime('%d.%m.%Y')}"
-      doc << "|Startzeit  |#{gps_track&.start_point&.time&.strftime('%H:%M')}"
-      doc << "|Dauer      |#{gps_track&.duration&.strftime('%thh%M')}"
+      doc << "|Startzeit  |#{gps_track&.start_point&.time&.strftime('%H:%M Uhr')}"
+      doc << "|Dauer      |#{gps_track&.duration&.strftime('%th:%M h')}"
       doc << "|Strecke    |#{distance.call(gps_track)}"
       doc << "|Aufstieg   |#{ascent.call(gps_track)}"
       doc << "|Abstieg    |#{descent.call(gps_track)}"
@@ -77,10 +78,10 @@ module Natour
         doc << '== Bilder'
         doc << ''
         images.each do |image|
-          width = if image.portrait?
-                    '40%'
-                  else
+          width = if image.landscape?
                     '80%'
+                  else
+                    '40%'
                   end
           doc << '.Abbildung {counter:image}'
           doc << "image::#{Pathname(doc_root).join(image.path)}[width=#{width}]"
@@ -88,36 +89,45 @@ module Natour
         end
       end
       unless species_lists.empty?
-        birds_info = OpenStruct.new(
-          title: 'Vogelarten',
-          headers: %w[Deutscher\ Name Wissenschaftlicher\ Name],
-          columns: %i[name_de name]
-        )
-        plants_info = OpenStruct.new(
-          title: 'Pflanzenarten',
-          headers: %w[Wissenschaftlicher\ Name Deutscher\ Name],
-          columns: %i[name name_de]
-        )
         doc << '<<<'
         doc << ''
         doc << '== Artenlisten'
         doc << ''
-        species_lists.each.with_index(1) do |species_list, index|
-          info = {
-            kosmos_vogelfuehrer: birds_info,
-            flora_helvetica: plants_info,
-            info_flora: plants_info
-          }[species_list.type]
+        index = 1
+        groups = species_lists.group_by(&:group)
+        [
+          OpenStruct.new(
+            group: :plants,
+            title: 'Pflanzenarten',
+            headers: %w[Wissenschaftlicher\ Name Deutscher\ Name],
+            columns: %i[name name_de]
+          ),
+          OpenStruct.new(
+            group: :birds,
+            title: 'Vogelarten',
+            headers: %w[Deutscher\ Name Wissenschaftlicher\ Name],
+            columns: %i[name_de name]
+          )
+        ].each do |info|
+          group = groups.fetch(info.group, [])
+          next if group.empty?
+
           doc << "=== #{info.title}"
           doc << ''
-          doc << '[cols="1,5,5",options=header]'
-          doc << '|==='
-          doc << "|Nr.|#{info.headers.join('|')}"
-          species_list.each do |species|
-            doc << "|{counter:species_list#{index}}|#{info.columns.map { |method| species.send(method) }.join('|')}"
+          group.each do |species_list|
+            caption = '.Tabelle {counter:species_lists}'
+            caption << ": #{species_list.description}" if species_list.description
+            doc << caption
+            doc << '[cols="1,5,5",options=header]'
+            doc << '|==='
+            doc << "|Nr.|#{info.headers.join('|')}"
+            species_list.each do |species|
+              doc << "|{counter:species_list#{index}}|#{info.columns.map { |method| species.send(method) }.join('|')}"
+            end
+            doc << '|==='
+            doc << ''
+            index += 1
           end
-          doc << '|==='
-          doc << ''
         end
       end
       doc.join("\n")

data/lib/natour/config.rb

@@ -5,14 +5,12 @@ module Natour
   class Config
     def self.load_file(filename, default: {}, dirs: [Dir.home, Dir.pwd])
       dirs.map do |dir|
-        begin
-          YAML.safe_load(
-            File.read(Pathname(dir).join(filename)),
-            permitted_classes: [Symbol]
-          )
-        rescue Errno::ENOENT
-          {}
-        end
+        YAML.safe_load(
+          File.read(Pathname(dir).join(filename)),
+          [Symbol]
+        )
+      rescue Errno::ENOENT
+        {}
       end.reduce(default, &:merge)
     end
   end

data/lib/natour/{cli/convert.rb → convert.rb}

@@ -3,17 +3,29 @@ require 'pathname'
 require 'asciidoctor'
 require 'asciidoctor-pdf'
 require 'vips'
+require 'time'
 
 module Natour
   module_function
 
   def convert(filename, out_dir: nil, out_file: nil, overwrite: false,
-              backend: 'pdf', draft: false, image_maxdim: 16000)
+              backend: 'pdf', draft: false, draft_backend: nil, image_maxdim: 16000)
+    backend = if draft
+                draft_backend || backend
+              else
+                backend
+              end
+
     doc = Asciidoctor.load_file(
       filename,
       backend: backend,
       safe: :unsafe,
-      standalone: true
+      standalone: true,
+      attributes: {
+        'pdf-theme' => 'natour',
+        'pdf-themesdir' => "#{__dir__}/data/themes",
+        'pdf-fontsdir' => "#{__dir__}/data/fonts"
+      }
     )
 
     dir = Pathname(filename).dirname
@@ -24,7 +36,28 @@ module Natour
 
     if draft
       doc.find_by(context: :image).each do |node|
-        node.title = "#{node.title} [#{node.attr('target')}]"
+        target = node.attr('target')
+        image = Image.load_file(dir.join(target).to_s)
+        node.title = "#{node.title} [#{[target, image.date_time].compact.join('|')}]"
+      end
+    end
+
+    %w[
+      revdate
+      docdate
+      doctime
+      docdatetime
+      localdate
+      localtime
+      localdatetime
+    ].each do |attr_name|
+      date_time = Time.parse(doc.attr(attr_name))
+      if attr_name.end_with?('datetime')
+        doc.set_attr(attr_name, date_time.strftime('%d.%m.%Y %H:%M:%S'))
+      elsif attr_name.end_with?('date')
+        doc.set_attr(attr_name, date_time.strftime('%d.%m.%Y'))
+      elsif attr_name.end_with?('time')
+        doc.set_attr(attr_name, date_time.strftime('%H:%M:%S'))
       end
     end
 
@@ -35,25 +68,17 @@ module Natour
         title_logo_image = doc.attr('title-logo-image')
         if title_logo_image
           target = title_logo_image[/^image:{1,2}(.*?)\[(.*?)\]$/, 1]
-          options = {}
-          options[:autorotate] = true if target =~ /\.jpe?g$/i
-          image = Vips::Image.new_from_file(dir.join(target).to_s, options)
-          scale = image_maxdim / image.size.max.to_f
-          image = image.resize(scale) if scale < 1.0
+          image = Image.load_file(dir.join(target).to_s).autorotate.shrink_to(image_maxdim)
           new_target = tmp_dir.join("title_logo_image_#{Pathname(target).basename}").to_s
-          suppress_output { image.write_to_file(new_target) }
+          image.save_as(new_target)
           doc.set_attr('title-logo-image', title_logo_image.gsub(target, new_target))
         end
 
         doc.find_by(context: :image).each.with_index do |node, index|
           target = node.attr('target')
-          options = {}
-          options[:autorotate] = true if target =~ /\.jpe?g$/i
-          image = Vips::Image.new_from_file(dir.join(target).to_s, options)
-          scale = image_maxdim / image.size.max.to_f
-          image = image.resize(scale) if scale < 1.0
+          image = Image.load_file(dir.join(target).to_s).autorotate.shrink_to(image_maxdim)
           new_target = tmp_dir.join("image#{index}_#{Pathname(target).basename}").to_s
-          suppress_output { image.write_to_file(new_target) }
+          image.save_as(new_target)
           node.set_attr('target', new_target)
         end
 

data/lib/natour/data/themes/natour-theme.yml

@@ -0,0 +1,22 @@
+---
+extends: default
+font:
+  catalog:
+    DejaVu Serif Condensed:
+      normal: dejavuserifcondensed-normal.ttf
+      italic: dejavuserifcondensed-italic.ttf
+      bold: dejavuserifcondensed-bold.ttf
+      bold_italic: dejavuserifcondensed-bold_italic.ttf
+base:
+  font-family: DejaVu Serif Condensed
+footer:
+  recto:
+    left:
+      content: 'by natour'
+    right:
+      content: '{page-number}'
+  verso:
+    left:
+      content: $footer_recto_right_content
+    right:
+      content: $footer_recto_left_content

data/lib/natour/image.rb

@@ -1,33 +1,57 @@
 require 'vips'
 require 'timeliness'
+require 'fileutils'
+require 'pathname'
 
 module Natour
   class Image
     attr_reader :path
     attr_reader :date_time
 
-    def initialize(path)
+    def initialize(path, image)
       @path = path
-      image = Vips::Image.new_from_file(path)
-      width, height = image.size
-      @portrait = width < height
-      orientation = image.get('exif-ifd0-Orientation')
-      @portrait = orientation[/^(\d) \(/, 1].to_i.between?(5, 8)
-      date_time = image.get('exif-ifd0-DateTime')
-      @date_time = Timeliness.parse(
-        date_time[/^(.*?) \(/, 1],
-        format: 'yyyy:mm:dd hh:nn:ss'
-      )
-    rescue Vips::Error => e
-      raise unless e.to_s =~ /exif-ifd0-(Orientation|DateTime)/
+      @image = image
+      orientation = get_field('exif-ifd0-Orientation')
+      @landscape = if orientation
+                     orientation[/^(\d) \(/, 1].to_i.between?(1, 4)
+                   else
+                     image.width >= image.height
+                   end
+      date_time = get_field('exif-ifd0-DateTime')
+      @date_time = Timeliness.parse(date_time[/^(.*?) \(/, 1], format: 'yyyy:mm:dd hh:nn:ss') if date_time
     end
 
-    def portrait?
-      @portrait
+    def self.load_file(filename)
+      Image.new(filename, Vips::Image.new_from_file(filename))
     end
 
     def landscape?
-      !portrait?
+      @landscape
+    end
+
+    def autorotate
+      Image.new(@path, @image.autorot)
+    end
+
+    def shrink_to(maxdim)
+      scale = maxdim / @image.size.max.to_f
+      image = if scale < 1.0
+                @image.resize(scale)
+              else
+                @image.copy
+              end
+      Image.new(@path, image)
+    end
+
+    def save_as(filename)
+      FileUtils.mkdir_p(Pathname(filename).dirname)
+      StdoutUtils.suppress_output { @image.write_to_file(filename) }
+    end
+
+    private
+
+    def get_field(name)
+      @image.get(name) if @image.get_fields.include?(name)
     end
   end
 end

data/lib/natour/map_geo_admin.rb

@@ -9,7 +9,7 @@ module Natour
   class MapGeoAdmin
     def initialize(port: 0)
       @doc_root = Dir.mktmpdir
-      FileUtils.cp_r("#{__dir__}/js", @doc_root)
+      FileUtils.cp_r("#{__dir__}/data/js", @doc_root)
       event = Concurrent::Event.new
       @server = WEBrick::HTTPServer.new(
         StartCallback: -> { event.set },

data/lib/natour/report.rb

@@ -35,10 +35,10 @@ module Natour
         title = Pathname.pwd.basename.to_s.encode('utf-8')
                         .gsub(/^\d{4}-\d{2}-\d{2}( |_|-)?/, '')
         images = Pathname.glob('**/*.{jpg,jpeg}', File::FNM_CASEFOLD)
-                         .map { |filename| Image.new(filename.to_s) }
+                         .map { |filename| Image.load_file(filename.to_s) }
                          .sort_by { |image| [image.date_time ? 0 : 1, image.date_time, image.path] }
         species_lists =
-          Pathname.glob('**/*.csv', File::FNM_CASEFOLD)
+          Pathname.glob('**/*.{csv,kml}', File::FNM_CASEFOLD)
                   .map { |filename| SpeciesList.load_file(filename.to_s) }
                   .flatten
                   .sort_by { |species_list| [species_list.type, species_list.date ? 0 : 1, species_list.date] }
@@ -47,6 +47,7 @@ module Natour
                      else
                        Pathname.glob("**/*.{#{track_formats.join(',')}}", File::FNM_CASEFOLD)
                                .map { |filename| GPSTrack.load_file(filename.to_s) }
+                               .sort_by { |gps_track| [gps_track.date, gps_track.path] }
                      end
 
         if create_map
@@ -57,7 +58,7 @@ module Natour
                 gps_track.save_gpx(track, overwrite: true)
                 filename = Pathname(gps_track.path).sub_ext('.jpg')
                 map.save_image(filename, tracks: [track], layers: map_layers)
-                Image.new(filename.to_s)
+                Image.load_file(filename.to_s)
               end
             end
           end

data/lib/natour/species_list.rb

@@ -1,4 +1,5 @@
 require 'csv'
+require 'nokogiri'
 require 'pathname'
 
 module Natour
@@ -6,51 +7,64 @@ module Natour
     attr_reader :path
     attr_reader :date
     attr_reader :type
-    attr_reader :name
+    attr_reader :group
+    attr_reader :title
     attr_reader :description
 
-    def initialize(path, date, type, name, description, items)
+    def initialize(path, date, type, group, title, description, items)
       @path = path
       @date = date
       @type = type
-      @name = name
+      @group = group
+      @title = title
       @description = description
       @items = items
     end
 
     def self.load_file(filename)
-      block = IO.binread(filename, 32)
+      block = IO.binread(filename, 128)
       header = if block.unpack('CC') == [0xff, 0xfe]
                  block[2..-1].force_encoding('utf-16le').encode('utf-8')
                elsif block.unpack('CCC') == [0xef, 0xbb, 0xbf]
                  block[3..-1].force_encoding('utf-8')
                else
-                 block.force_encoding('utf-8')
+                 block
                end
 
       case header
       when /^Primary/
         CSV.open(filename, 'r:windows-1252:utf-8', headers: true, liberal_parsing: true) do |csv|
-          date = DateParser.parse(Pathname(filename).basename).compact.first
+          date = DateUtils.parse(Pathname(filename).basename).compact.first
           items = csv.map { |row| Species.new(row[1], row[0]) }
                      .sort_by(&:name_de).uniq
-          [SpeciesList.new(filename, date, :kosmos_vogelfuehrer, nil, nil, items)]
+          [SpeciesList.new(filename, date, :kosmos_vogelfuehrer, :birds, nil, nil, items)]
         end
-      when /^Favoriten/
+      when /^<\?xml.*?www\.ornitho\.ch/m
+        date = DateUtils.parse(Pathname(filename).basename).compact.first
+        doc = Nokogiri.XML(File.read(filename, mode: 'r:utf-8'))
+        folder = doc.at('/xmlns:kml/xmlns:Document/xmlns:Folder/xmlns:Folder/xmlns:Folder')
+        name = folder.at('./xmlns:name').text
+        items = folder.xpath('./xmlns:Placemark/xmlns:description')
+                      .map(&:text)
+                      .map { |description| Species.new(*description.scan(/&gt;([^&(]+)&lt;/).flatten.reverse) }
+                      .sort_by(&:name_de).uniq
+        [SpeciesList.new(filename, date, :ornitho_ch, :birds, name, nil, items)]
+      when /^(Favoriten|NUMMER_FLORA)/
         CSV.open(filename, 'r:bom|utf-8', col_sep: ';', skip_blanks: true) do |csv|
-          chunks = csv.reject { |row| row.count == 1 && row[0] != 'Favoriten' }
-                      .reject { |row| row.count == 4 && row[0] == 'NUMMER_FLORA' }
+          chunks = csv.reject { |row| row.count == 1 }
+                      .map { |row| row[0] == 'NUMMER_FLORA' ? ['Favoriten'] : row }
                       .slice_before { |row| row.count == 1 || row.count == 3 }
                       .reject { |rows| rows.count == 1 }
           chunks.map do |rows|
             name, description = rows.shift
-            date = DateParser.parse(name, Pathname(filename).basename).compact.first
-            items = rows.map { |row| Species.new(row[1][/^(([^ ]+ [^ ]+)(( aggr\.)|( subsp\. [^ ]+))?)/, 1], row[2]) }
+            date = DateUtils.parse(name, Pathname(filename).basename).compact.first
+            items = rows.map { |row| Species.new(BotanicalNameUtils.parse(row[1]), row[2]) }
                         .sort_by(&:name).uniq
             SpeciesList.new(
               filename,
               date,
               :flora_helvetica,
+              :plants,
               name&.gsub(/^(\d{4}-)?\d{2}-\d{2}( |_|-)?/, ''),
               description,
               items
@@ -59,12 +73,14 @@ module Natour
         end
       when /^obs_id/
         CSV.open(filename, 'r:bom|utf-16le:utf-8', col_sep: "\t", headers: true) do |csv|
-          date = DateParser.parse(Pathname(filename).basename).compact.first
+          date = DateUtils.parse(Pathname(filename).basename).compact.first
           items = csv.select { |row| row[0] }
-                     .map { |row| Species.new(row[11][/^(([^ ]+ [^ ]+)(( aggr\.)|( subsp\. [^ ]+))?)/, 1], nil) }
+                     .map { |row| Species.new(BotanicalNameUtils.parse(row[11]), nil) }
                      .sort_by(&:name).uniq
-          [SpeciesList.new(filename, date, :info_flora, nil, nil, items)]
+          [SpeciesList.new(filename, date, :info_flora, :plants, nil, nil, items)]
         end
+      else
+        []
       end
     end
 

data/lib/natour/utils/botanical_name_utils.rb

@@ -0,0 +1,12 @@
+module Natour
+  module BotanicalNameUtils
+    module_function
+
+    def parse(name)
+      result = name.match(/^([^ ]+ [^ ]+)(( aggr\.)|(.*( subsp\. [^ ]+)))?.*$/)
+      return unless result
+
+      "#{result[1]}#{result[3]}#{result[5]}"
+    end
+  end
+end

data/lib/natour/{helpers/date_parser.rb → utils/date_utils.rb}

@@ -1,7 +1,7 @@
 require 'timeliness'
 
 module Natour
-  module DateParser
+  module DateUtils
     module_function
 
     def parse(*args)

data/lib/natour/utils/stdout_utils.rb

@@ -0,0 +1,16 @@
+module Natour
+  module StdoutUtils
+    module_function
+
+    def suppress_output
+      orig_stdout = $stdout.clone
+      orig_stderr = $stderr.clone
+      $stdout.reopen(File.new(File::NULL, 'w'))
+      $stderr.reopen(File.new(File::NULL, 'w'))
+      yield
+    ensure
+      $stdout.reopen(orig_stdout)
+      $stderr.reopen(orig_stderr)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natour
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Simon Gysi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -70,14 +70,14 @@ dependencies:
   name: fit4ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: '3.7'
 - !ruby/object:Gem::Dependency
@@ -177,29 +177,37 @@ files:
 - bin/natour
 - lib/natour.rb
 - lib/natour/asciinurse.rb
-- lib/natour/cli/convert.rb
-- lib/natour/cli/create.rb
 - lib/natour/config.rb
+- lib/natour/convert.rb
+- lib/natour/create.rb
+- lib/natour/data/fonts/dejavuserifcondensed-bold.ttf
+- lib/natour/data/fonts/dejavuserifcondensed-bold_italic.ttf
+- lib/natour/data/fonts/dejavuserifcondensed-italic.ttf
+- lib/natour/data/fonts/dejavuserifcondensed-normal.ttf
+- lib/natour/data/js/bootstrap.min.js
+- lib/natour/data/js/jquery-3.5.1.slim.min.js
+- lib/natour/data/js/loader.js
+- lib/natour/data/themes/natour-theme.yml
 - lib/natour/fit_file.rb
 - lib/natour/gps_track.rb
 - lib/natour/gps_track_point.rb
 - lib/natour/gpx_file.rb
-- lib/natour/helpers/date_parser.rb
-- lib/natour/helpers/suppress_output.rb
 - lib/natour/image.rb
-- lib/natour/js/bootstrap.min.js
-- lib/natour/js/jquery-3.5.1.slim.min.js
-- lib/natour/js/loader.js
 - lib/natour/map_geo_admin.rb
 - lib/natour/public_transport.rb
 - lib/natour/report.rb
 - lib/natour/species.rb
 - lib/natour/species_list.rb
 - lib/natour/station.rb
+- lib/natour/utils/botanical_name_utils.rb
+- lib/natour/utils/date_utils.rb
+- lib/natour/utils/stdout_utils.rb
 homepage: https://rubygems.org/gems/natour
 licenses:
 - MIT
 metadata:
+  bug_tracker_uri: https://github.com/simongysi/natour/issues
+  changelog_uri: https://github.com/simongysi/natour/blob/main/CHANGELOG.adoc
   source_code_uri: https://github.com/simongysi/natour
 post_install_message:
 rdoc_options: []
@@ -209,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/natour/helpers/suppress_output.rb

@@ -1,14 +0,0 @@
-module Natour
-  module_function
-
-  def suppress_output
-    orig_stdout = $stdout.clone
-    orig_stderr = $stderr.clone
-    $stdout.reopen(File.new(File::NULL, 'w'))
-    $stderr.reopen(File.new(File::NULL, 'w'))
-    yield
-  ensure
-    $stdout.reopen(orig_stdout)
-    $stderr.reopen(orig_stderr)
-  end
-end