timelime 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9c4553b5957aaaf6857cc57231d192b17f022c647cdc16e083cf447b563e078
-  data.tar.gz: 652fc40e0b06135bc8eca4920b92c0ca9a98228c333edcd01dfb8b7dd8f13fb0
+  metadata.gz: d954fb0c35cbf771a5ab7a25cb160835876cc72d2594aaaff06cf124625335c0
+  data.tar.gz: 1099b7d61d179e87af56b5a15fb40e8d4a98c18d0c1504b44c7857e7ee3c1602
 SHA512:
-  metadata.gz: 07a3249a867b8945833111f3d47525e352821f806019d2fa638da114e158babfbbc0c6722fff0ec6724f719ef8e049df1663d2c9ac6e8358d9e0a3dc09a28dd1
-  data.tar.gz: a3076a41a4fc1b0be4b795da40edf701bf2ea051aa6f8bb1e90922deaad5ad47611cd9f86608753940378bbcc6c3dfd89db3060c695d97596feca7241702babb
+  metadata.gz: 1add644820f7b655ffc8cc470773f099c32e4a64c29b061dddb79a0cdb8fecf2133e22f8b6eee05020b3198029b7b2facf273e6c4e990d10928a3bca40aa6c00
+  data.tar.gz: 4d0c758cdf67c4ed07d2d7c063538a81388188e2496c02f2af8d6ac54c9c2ac4a0976c441ef832c115cddbd1232a5f45081501cbc6daa27c9adf0fb74884af89

data/bin/timelime

@@ -18,6 +18,11 @@ ARGV.options do |opt|
     exit
   end
 
+  opt.on("-v", "--version", "print version") do
+    puts "timelime version: #{Timelime::VERSION}"
+    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]
@@ -34,13 +39,35 @@ ARGV.options do |opt|
     end
   end
 
-=begin
-  opt.on("-T", "--tags-inc [TAG1,TA...]", "process only given tags") do |tags|
+  opt.on("-t", "--tags-exc [@tag1 @tag2]", "process all but given tags") do |tags|
+    $options[:tagsExc] = $options[:tagsExc].to_a + [tags]
+  end
+
+  opt.on("-T", "--tags-inc [@tag1 @tag2]", "process only given tags") do |tags|
+    $options[:tagsInc] = $options[:tagsInc].to_a + [tags]
   end
 
-  opt.on("-t", "--tags-exc [TAG1,TA...]", "process all but given tags") do |tags|
+  opt.on("-r", "--range-process [x - y]", "process only events matching given range") do |range|
+    $options[:rangeP] = $options[:rangeP].to_a + [range]
+  end
+
+  opt.on("-R", "--range-display [x - y]", "display axis only within given range") do |range|
+    $options[:rangeD] = range
+  end
+
+  opt.on("-l", "--locate [STR]", "locate event across given files") do |str|
+    if str.nil?
+      next
+    end
+    $options[:locate] = $options[:locate].to_a + [str.downcase]
+  end
+
+  opt.on("-i", "--info [HEAD]", "print HEAD information") do |head|
+    if head.nil?
+      next
+    end
+    $options[:info] = $options[:info].to_a + [head]
   end
-=end
 
   opt.parse!
 
@@ -49,18 +76,72 @@ end
 tree  = Timelime::Tree.new( $options[:file].to_a )
 table = Timelime::Table.new
 
-tree.get do |file|
-  Timelime.parse(file) do |event|
-    table.push event
+$options[:rangeP].to_a.each do |time|
+  begin
+    table.time(time)
+  rescue
+    $stderr.puts "ERR: invalid time syntax: \"#{time}\""
+    exit 1
   end
 end
 
+unless $options[:rangeD].nil?
+  begin
+    Timelime::Time.new($options[:rangeD])
+  rescue
+    $stderr.puts "ERR: invalid time syntax: \"#{$options[:rangeD]}\""
+    exit 1
+  end
+end
 
-if table.size == 0
+[
+  $options[:tagsInc].to_a,
+  $options[:tagsExc].to_a,
+].each_with_index do |tmp, mode|
+  tmp.each do |tags|
+    begin
+      table.tags(tags, mode)
+    rescue
+      $stderr.puts "ERR: invalid tags syntax: \"#{tags}\""
+      exit 1
+    end
+  end
+end
+
+tree.get do |file|
+  Timelime.parse(file) do |event, line|
+
+    unless table.push event
+      next
+    end
+
+    $options[:locate].to_a.each do |str|
+      if event.head.to_s.downcase.include? str
+        puts "#{event.head}: #{file} line #{line}"
+        break
+      end
+    end
+
+    $options[:info].to_a.each do |head|
+      if event.head.to_s == head
+        puts "#{event.time}"
+        puts "#{event.tags}"
+      end
+
+    end
+
+  end
+
+end
+
+if table.size == 0 or !$options[:locate].nil? or !$options[:info].nil?
   exit
 end
 
 axis = Timelime::Axis.new(table)
+unless $options[:rangeD].nil?
+  axis.time($options[:rangeD])
+end
 axis.generate $options[:precision]
 
 puts

data/lib/timelime/axis.rb

@@ -5,6 +5,7 @@ module Timelime
     attr_reader :buffer, :lines
 
     @table
+    @time
     @buffer
     @begin
     @length
@@ -14,6 +15,11 @@ module Timelime
       @table = table
     end
 
+    def time(t)
+      t = Timelime::Time.new(t)
+      @time = t.range!
+    end
+
     def to_b
       true
     end
@@ -26,7 +32,11 @@ module Timelime
         [], # L side
         [], # R side
       ]
-      range = @table.range
+      if @time.nil?
+        range = @table.range
+      else
+        range = @time.data
+      end
       @begin = range[0]
       @length = range[1] - range[0]
       if @length == 0
@@ -52,7 +62,7 @@ module Timelime
     def scale time
       buf = time.data.map do |yr|
         tmp = (1.0 * @lines * (yr - @begin) / @length).to_i
-        if tmp >= @lines
+        if tmp == @lines
           tmp = @lines - 1
         end
         tmp
@@ -64,7 +74,14 @@ module Timelime
           it += 1
         end
       end
-      buf
+
+      if @time.nil?
+        buf
+      else
+        buf.filter do |l|
+          l >= 0 and l < @lines
+        end
+      end
     end
 
     def label line
@@ -76,6 +93,10 @@ module Timelime
     def squeeze event
 
       todo = scale event.time
+      if todo.empty?
+        return
+      end
+
       if ( event.time.size == 2)
         side = 0
       else

data/lib/timelime/dump.rb

@@ -25,7 +25,9 @@ module Timelime
       s.map! do |c|
         c.map! do |e|
           if e.class == Timelime::Event
-            e.head
+            "[#{e.head}]"
+          elsif !e.nil? and e == "*"
+            "* "
           else
             e
           end

data/lib/timelime/parse.rb

@@ -21,7 +21,7 @@ module Timelime
         # new entry
         if line.lstrip == line
           if !buf.nil? and !err and buf.complete?
-            yield buf
+            yield(buf, number)
           end
           buf = Timelime::Event.new(line)
           err = false
@@ -41,7 +41,6 @@ module Timelime
         else
         end
 
-
       rescue
         err = true
         $stderr.puts "WARN: invalid definition: #{path} line #{number}"

data/lib/timelime/table.rb

@@ -4,10 +4,68 @@ module Timelime
 
     def initialize
       @data = []
+      @time = []
+      @tags = [
+        [], # include
+        [], # exclude
+      ]
+    end
+
+    def time(t)
+      t = Timelime::Time.new(t)
+      @time += [t]
+    end
+
+    def tags(tags, mode)
+      tags = Timelime::Tags.new(tags)
+      @tags[mode] += [tags]
     end
 
     def push event
+
+      # check range
+      if @time.empty?
+        ok = true
+      else
+        ok = false
+      end
+
+      @time.each do |time|
+        if event.time.match? time
+          ok = true
+          break
+        end
+      end
+
+      unless ok
+        return false
+      end
+
+      # check tags
+      if @tags[0].empty?
+        ok = true
+      else
+        ok = false
+      end
+
+      @tags.each_with_index do |tmp, mode|
+        tmp.each do |tags|
+          if event.tags.has? tags
+            case mode
+            when 0; ok = true
+            when 1; return false
+            end
+          end
+        end
+      end
+
+      unless ok
+        return false
+      end
+
       @data += [event]
+      return true
+
     end
 
     def get &block

data/lib/timelime/tags.rb

@@ -4,8 +4,11 @@ module Timelime
 
     attr_reader :data
 
-    def initialize 
+    def initialize raw = nil
       @data = []
+      unless raw.nil?
+        push raw
+      end
     end
 
     def push raw
@@ -22,8 +25,19 @@ module Timelime
 
     end
 
+    def has? tags
+      (@data & tags.data) == tags.data
+    end
+
     def to_s
-      @data.to_s
+      buf = ""
+      @data.each do |tag|
+        unless buf.empty?
+          buf += " "
+        end
+        buf += "@#{tag}"
+      end
+      buf
     end
     
   end

data/lib/timelime/time.rb

@@ -4,8 +4,11 @@ module Timelime
 
     attr_reader :data
 
-    def initialize
+    def initialize raw = nil
       @data = []
+      unless raw.nil?
+        push raw
+      end
     end
 
     def size
@@ -77,14 +80,57 @@ module Timelime
 
       if @data.size == 2
         if @data[0] > @data[1]
-          throw
+          throw :syntax
         end
       end
 
     end
 
+    def range!
+      if size == 1
+        @data += [@data[0]]
+      end
+      self
+    end
+
+    def match? time
+
+      if size == 2
+        outer = self.data
+        inner = time.data
+      else
+        outer = time.data
+        inner = self.data
+      end
+
+      if outer[0] > inner[-1]
+        return false
+      elsif outer[-1] < inner[0]
+        return false
+      else
+        return true
+      end
+
+    end
+
     def to_s
-      @data.to_s
+      buf = ""
+      @data.each do |yr|
+
+        unless buf.empty?
+          buf += " - "
+        end
+
+        if yr >= 0
+          buf += yr.to_s
+          buf += " CE"
+        else
+          buf += (yr * -1).to_s
+          buf += " BCE"
+        end
+
+      end
+      buf
     end
 
   end

data/lib/timelime/version.rb

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

metadata

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