fileverse 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f609f1f8013055b606d5202c6acadee64bf13e51b23d157a06d5ae86ead7a920
-  data.tar.gz: 691d5a36f90d9c06798ac40823f832134524997a4eaae936e33659abf0914d6a
+  metadata.gz: b739dd6750e9f37a5720e9789800efa69c545abb67855d8f38630841f3c30870
+  data.tar.gz: d575e0eec8c760353b5b61d54f5e5e923cd6d261dd55d8a75533ed7079e7ecf4
 SHA512:
-  metadata.gz: 51aa99351f24296543e10893ca5977c07c9042e2d30b60e684637967e98a60ce2cbdb88870a2f2e49d0c2f5ca7b898d88ef0a05a757b756704ca2742e1fef93b
-  data.tar.gz: a5810560fe7c016d57c622afe108e54322e95caf658d95989a2c0db6dd57db192639329831216b7ecb4e3a9af7ae9747801b4094bd3c778bf7cb7a3eda1ae52a
+  metadata.gz: 5c64c1dca0991f50667bf048d74f88971b0611da8e309a9287f7bb679b8b8332c7cfc221e63eb4b411a6ce144a29243ee512a25c3f48e5f75173a25fe0e382fb
+  data.tar.gz: f551ff2f97acabd6299fea567425425261822361b789ef6065a966a25edaebc413c6938ad0db52068ba9d8d4c1a4527ae180176acb9ed38cef95f6ac0dbde98b

data/exe/fileverse

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+require "bundler/setup"
 require "fileverse"
 
 Fileverse::CLI.start

data/lib/fileverse/cli.rb

@@ -10,7 +10,7 @@ module Fileverse
     def snap(path)
       setup path
       @parser.parse
-      @parser.add_snapshot(Files.read(@path), is_template: options[:template], template_name: options[:name])
+      @parser.add_snapshot(Files.read(@path), options[:name])
       Files.write_content(@path)
       Files.write_content(@hidden_path, @parser.to_writable_lines)
     end
@@ -26,12 +26,12 @@ module Fileverse
     map "r" => "restore"
 
     desc "preview snapshot", "preview snapshot at different index or name"
-    options bwd: :boolean, fwd: :boolean, index: :numeric, name: :string
+    options bwd: :boolean, fwd: :boolean, index: :numeric, name: :string, template: :boolean
     def preview(path)
       setup path
       @parser.parse
       @previewer.parse
-      update_preview_content
+      @previewer.preview_content = preview_content
       Files.write_content(@path, @previewer.to_writable_lines)
       Files.write_content(@hidden_path, @parser.to_writable_lines)
     end
@@ -61,7 +61,7 @@ module Fileverse
 
     def setup(path)
       @path = Files.expand_path(path)
-      @hidden_path = Files.expand_hidden_path(path)
+      @hidden_path = options[:template] ? Files.template_path : Files.expand_hidden_path(path)
       @parser = Parser.new(@hidden_path)
       @previewer = Previewer.new(@path)
     end
@@ -73,21 +73,22 @@ module Fileverse
     end
 
     def restore_template
-      template_content = @parser.template_content(options[:name])
+      template_content = @parser.snapshot_content_by_name(options[:name])
       return if template_content.nil?
 
       Files.write_content(@path, template_content)
     end
 
-    def update_preview_content
-      if options[:bwd]
-        @parser.decrement_cursor
+    def preview_content
+      if options[:name]
+        @parser.snapshot_content_by_name(options[:name])
+      elsif options[:bwd]
+        @parser.snapshot_content_backward
       elsif options[:fwd]
-        @parser.increment_cursor
+        @parser.snapshot_content_forward
       elsif options[:index]
-        @parser.cursor = options[:index]
+        @parser.snapshot_content_by_index(options[:index])
       end
-      @previewer.preview_content = @parser.cursor_content
     end
   end
 end

data/lib/fileverse/files.rb

@@ -22,5 +22,9 @@ module Fileverse
       full_path = File.expand_path path, Dir.pwd
       File.open(full_path, "w") { |file| file.puts content }
     end
+
+    def template_path
+      File.expand_path ".fileverse.template", Dir.home
+    end
   end
 end

data/lib/fileverse/parser.rb

@@ -7,7 +7,7 @@ module Fileverse
   # == Storage file Example content
   #
   # <######0
-  # template>shot> 6 ~> 9
+  # shot> 6 ~> 9
   # 9 ~> 12
   # 12 ~> 15
   # 15 ~> 18
@@ -28,12 +28,11 @@ module Fileverse
   #
   # == Example end
   #
-  # It uses the head section which is what is between "<######{cursor}" and "######>".
-  # It starts with "templates" and then "files". Each has a range which is represented like "{start} ~> {stop}".
-  # templates are represented as "template>{name}>{range}". While files are just represented as "{range}".
+  # It uses the head section which is what is between "<######{cursor}" and "######>" as the table to parse the file.
+  # Each line is a range represented like "{name}> {start} ~> {stop}". the "{name}>" part is optional.
   # so the above example will parse as follows:
   #
-  # - template>shot> 6 ~> 9
+  # - shot> 6 ~> 9
   #
   # =======================================
   # |   // New file
@@ -77,14 +76,12 @@ module Fileverse
       @line_index = 0
       @cursor = -1
       @snapshots = []
-      @templates = []
     end
 
     def parse
       return unless File.exist?(@path) && !peek_line.nil?
 
       verify_first_header
-      parse_header_template_lines
       parse_header_snapshot_lines
       parse_snapshots
 
@@ -95,14 +92,15 @@ module Fileverse
       @snapshots.length
     end
 
-    def add_snapshot(content, is_template: false, template_name: nil)
-      prev_snapshot = last_snapshot is_template: is_template
+    def add_snapshot(content, name = nil)
+      return if name && update_named_snapshot(name, content)
+
+      prev_snapshot = @snapshots[-1]
       start = prev_snapshot&.stop || 3
-      snapshot = Snapshot.new(start, start + content.length, template_name)
+      snapshot = Snapshot.new(start, start + content.length, name)
       snapshot.content = content
       prev_snapshot&.next_snapshot = snapshot
-      snapshot.next_snapshot = @snapshots[0] if is_template
-      (is_template ? @templates : @snapshots).push(snapshot)
+      @snapshots.push(snapshot)
       reset
     end
 
@@ -112,8 +110,25 @@ module Fileverse
       @snapshots[@cursor].content
     end
 
-    def template_content(name)
-      @templates.find { |template| template.name == name }&.content
+    def snapshot_content_by_name(name)
+      find_named_snapshot(name)&.content
+    end
+
+    def snapshot_content_by_index(index)
+      raise InvalidCursorPointer if index.negative? || index > @snapshots.length
+
+      @cursor = value
+      cursor_content
+    end
+
+    def snapshot_content_backward
+      decrement_cursor
+      cursor_content
+    end
+
+    def snapshot_content_forward
+      increment_cursor
+      cursor_content
     end
 
     def remove_cursor_snapshot
@@ -127,53 +142,46 @@ module Fileverse
     end
 
     def to_writable_lines
-      [*head_lines, *template_lines, *snapshot_lines]
-    end
-
-    def increment_cursor
-      raise InvalidCursorPointer if @cursor + 1 >= @snapshots.length
-
-      @cursor += 1
-    end
-
-    def decrement_cursor
-      raise InvalidCursorPointer if (@cursor - 1).negative?
-
-      @cursor -= 1
-    end
-
-    def cursor=(value)
-      raise InvalidCursorPointer if value.negative? || value > @snapshots.length
-
-      @cursor = value
+      [*head_lines, *snapshot_lines]
     end
 
     def reset
       @cursor = @snapshots.length - 1
-      all_snapshots = [*@templates, *@snapshots]
-      all_snapshots[0]&.update_start all_snapshots.length + 2
+      @snapshots[0]&.update_start @snapshots.length + 2
     end
 
     def parse_head
       return unless File.exist?(@path) && !peek_line.nil?
 
       verify_first_header
-      parse_header_template_lines
       parse_header_snapshot_lines
     end
 
-    def summary
-      [
-        "#{@snapshots.length} snapshots",
-        "#{@templates.length} templates",
-        (@templates.length.positive? ? "template name:    #{@templates.map(&:name).join(",")}" : "").to_s
-      ]
+    private
+
+    def update_named_snapshot(name, content)
+      snapshot = find_named_snapshot(name)
+      return false unless snapshot
+
+      snapshot.content = content
+      reset
+      true
     end
 
-    private
+    def find_named_snapshot(name)
+      @snapshots.find { |snapshot| snapshot.name == name }
+    end
+
+    def decrement_cursor
+      raise InvalidCursorPointer if (@cursor - 1).negative?
 
-    def last_snapshot(is_template: false)
-      is_template ? @templates[-1] : @snapshots[-1] || @templates[-1]
+      @cursor -= 1
+    end
+
+    def increment_cursor
+      raise InvalidCursorPointer if @cursor + 1 >= @snapshots.length
+
+      @cursor += 1
     end
 
     def verify_first_header
@@ -184,32 +192,23 @@ module Fileverse
       @cursor = cursor.to_i
     end
 
-    def parse_header_template_lines
-      loop do
-        break unless /\A\s*template>(?<name>\w+)>\s*(?<start>\d+)\s*~>\s*(?<stop>\d+)\s*\z/ =~ peek_line
-
-        next_line
-        @templates.push(Snapshot.new(start.to_i, stop.to_i, name))
-      end
-    end
-
     def parse_header_snapshot_lines
       loop do
         line = next_line
-        unless /\A\s*(?<start>\d+)\s*~>\s*(?<stop>\d+)\s*\z/ =~ line
+        unless /\A\s*(?<name>\w*>)?\s*(?<start>\d+)\s*~>\s*(?<stop>\d+)\s*\z/ =~ line
           break if line == CLOSE_TAG
 
-          raise CorruptFormat
+          raise CorruptFormat, "Unknow format found."
         end
-        raise CorruptFormat if stop.to_i < start.to_i
+        raise CorruptFormat, "Start index cannot be larger than stop." if stop.to_i < start.to_i
 
-        @snapshots.push Snapshot.new(start.to_i, stop.to_i)
+        @snapshots.push Snapshot.new(start.to_i, stop.to_i, name&.chomp(">"))
       end
     end
 
     def parse_snapshots
       last_snap = nil
-      [*@templates, *@snapshots].each do |snap|
+      [*@snapshots].each do |snap|
         raise CorruptFormat, " Wrong indexing in header." if line_index != snap.start
 
         snap.content = parse_snap_content(snap)
@@ -241,16 +240,11 @@ module Fileverse
     def head_lines
       [
         "#{START_TAG}#{cursor}",
-        *@templates.map { |template| "template>#{template.name}> #{template.start} ~> #{template.stop}" },
-        *@snapshots.map { |snap| "#{snap.start} ~> #{snap.stop}" },
+        *@snapshots.map { |snap| "#{snap.name ? "#{snap.name}>" : ""}#{snap.start} ~> #{snap.stop}" },
         CLOSE_TAG
       ]
     end
 
-    def template_lines
-      @templates.map(&:content).flatten
-    end
-
     def snapshot_lines
       @snapshots.map(&:content).flatten
     end

data/lib/fileverse/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fileverse
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/fileverse.rb

@@ -7,7 +7,6 @@ require_relative "fileverse/parser"
 require_relative "fileverse/previewer"
 
 # Parent module
-module Fileverse
-end
+module Fileverse; end
 
 require_relative "fileverse/cli"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileverse
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Unegbu Kingsley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 2025-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor