timelime 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87163ebf7ebd03945a2e8da4e22fcae1d56044b4a639b60c1862846824cb65c0
-  data.tar.gz: 4a8001e069cce6faed6bdac488e98a504bcfde14d282bef08e20ee24b6353bd1
+  metadata.gz: a9c4553b5957aaaf6857cc57231d192b17f022c647cdc16e083cf447b563e078
+  data.tar.gz: 652fc40e0b06135bc8eca4920b92c0ca9a98228c333edcd01dfb8b7dd8f13fb0
 SHA512:
-  metadata.gz: c45a00b5ccfd02c89b8993e42099dec6cbb43789eb427221ee0428f87821634ef34d9d0b8af63805f0d64f71183b776e3405e2bd3d12e5393bcb4c4998fe8a74
-  data.tar.gz: e2474eef94d5d6d0b288d6464b21f85d2f0a80b2489badb3ea0c23db5e1aa9a97842bcde87471df822c77f3ebc6ff4ca927c1e964be0d05b8495f6a5ed6babb2
+  metadata.gz: 07a3249a867b8945833111f3d47525e352821f806019d2fa638da114e158babfbbc0c6722fff0ec6724f719ef8e049df1663d2c9ac6e8358d9e0a3dc09a28dd1
+  data.tar.gz: a3076a41a4fc1b0be4b795da40edf701bf2ea051aa6f8bb1e90922deaad5ad47611cd9f86608753940378bbcc6c3dfd89db3060c695d97596feca7241702babb

data/README.md

@@ -1,2 +1,22 @@
 # timelime
 a ruby timeliner
+
+# installation
+run as root \
+`gem install timelime`
+
+# usage
+`timelime --help`
+
+# file syntax
+`.md`-friendly:
+```md
+# Some event
+  *X BCE - Y CE*
+  - comment
+  - comment
+  @tag1 @tag2
+
+# Another event
+...
+```

data/bin/timelime

@@ -1,18 +1,52 @@
 #! /usr/bin/ruby
 
 begin
+  require 'optparse'
   require 'timelime'
 rescue
   puts "lib require failed"
   exit 1
 end
 
-paths = ARGV
-if paths.size == 0
-  paths += ["."]
+$options = {}
+ARGV.options do |opt|
+
+  opt.banner = "Usage: timelime options"
+
+  opt.on("-h", "--help", "print help") do
+    puts opt
+    exit
+  end
+
+  opt.on("-f", "--file [PATH]", "include path recursively") do |path|
+    unless path.nil? or path.empty?
+      $options[:file] = $options[:file].to_a + [path]
+    end
+  end
+
+  opt.on("-p", "--precision [NUM]", "timeline event precision") do |prec|
+    if prec.nil?
+      next
+    end
+    tmp = prec.to_i
+    if tmp.to_s == prec
+      $options[:precision] = tmp
+    end
+  end
+
+=begin
+  opt.on("-T", "--tags-inc [TAG1,TA...]", "process only given tags") do |tags|
+  end
+
+  opt.on("-t", "--tags-exc [TAG1,TA...]", "process all but given tags") do |tags|
+  end
+=end
+
+  opt.parse!
+
 end
 
-tree = Timelime::Tree.new(paths)
+tree  = Timelime::Tree.new( $options[:file].to_a )
 table = Timelime::Table.new
 
 tree.get do |file|
@@ -21,12 +55,13 @@ tree.get do |file|
   end
 end
 
+
 if table.size == 0
-  puts "table is empty"
+  exit
 end
 
 axis = Timelime::Axis.new(table)
-axis.generate 3
+axis.generate $options[:precision]
 
 puts
 Timelime::dump axis

data/lib/timelime/axis.rb

@@ -14,7 +14,13 @@ module Timelime
       @table = table
     end
 
-    def generate precision = 10
+    def to_b
+      true
+    end
+
+    def generate precision = nil
+
+      precision = precision.to_i
 
       @buffer = [
         [], # L side
@@ -23,7 +29,18 @@ module Timelime
       range = @table.range
       @begin = range[0]
       @length = range[1] - range[0]
+      if @length == 0
+        @length = 1
+      end
       size = @table.size
+
+      if precision == 0
+        precision = Math.log(@length).to_i
+        if precision == 0
+          precision = 1
+        end
+      end
+      
       @lines = size * precision
 
       @table.get do |e|

data/lib/timelime/dump.rb

@@ -6,6 +6,9 @@ module Timelime
 
     for c in 0...data[0].size
       for l in 0...data[0][c].size
+        if l - 1 < 0 or l + 1 >= data[0][c].size
+          next
+        end
         e = data[0][c][l]
         check = [e.to_s, "*"]
         above = data[0][c][l - 1].to_s
@@ -21,12 +24,10 @@ module Timelime
     data.map! do |s|
       s.map! do |c|
         c.map! do |e|
-          if e.nil?
-            nil
-          elsif e.class == Timelime::Event
+          if e.class == Timelime::Event
             e.head
           else
-            "*"
+            e
           end
         end
       end
@@ -59,16 +60,20 @@ module Timelime
 
       for s in 0..1
 
+        if s == 1
+          buf[-1] += " │ " + tab(axis.label(l), 6, 0) + " │ "
+        end
+
+        if data[s][l].nil?
+          next
+        end
+
         data[s][l].each_with_index do |txt, c|
 
           buf[-1] += tab(txt, tabs[s][c], s)
 
         end
 
-        if s == 0
-          buf[-1] += " │ " + tab(axis.label(l), 6, 0) + " │ "
-        end
-
       end
 
     end

data/lib/timelime/parse.rb

@@ -36,7 +36,7 @@ module Timelime
         case line[0]
         when "*"
           buf.time.push(line)
-        when "#"
+        when "@"
           buf.tags.push(line)
         else
         end
@@ -44,8 +44,8 @@ module Timelime
 
       rescue
         err = true
-        puts "WARN: invalid definition: #{path} line #{number}"
-        puts "      skipping to next entry"
+        $stderr.puts "WARN: invalid definition: #{path} line #{number}"
+        $stderr.puts "      skipping to next entry"
       end
 
     end

data/lib/timelime/tags.rb

@@ -12,7 +12,7 @@ module Timelime
 
       raw.split.each do |tag|
 
-        unless tag[0] == "#" and tag.length > 1
+        unless tag[0] == "@" and tag.length > 1
           throw :syntax
         end
 

data/lib/timelime/version.rb

@@ -1,3 +1,3 @@
 module Timelime
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timelime
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - patztablook22
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: