stg 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 230caddab1e3d4399c0b45c216170abce501826f39b0b64e760423c9ac09b0e5
-  data.tar.gz: 43ab838f4b5de8ab7c68fa51cd6ae895bf13eaf1e1de1d51f0e64cf04af7cd87
+  metadata.gz: 0f993bbd2bd4575637beb24485c54a88a2679551000551df0f1b1a552249922f
+  data.tar.gz: cca41c04c1ab146a16055debbf6364081993d4afb647222865a219d88d9a40bb
 SHA512:
-  metadata.gz: a0f834b3a3de3f1717c4ec41384aa4170323f85a84732f498d788d95bbb70b054c225096961016bc2869b10736278cc1714f8e7d256927c929ba2572da5e0e43
-  data.tar.gz: 84e35003956f79895a4ac410fb80dd8c40c8fa33b6e724decaf2b56a095c5decac87433dccc363ccf9bf793acfe0509dcd71c10190aab742bd1b4ceb1aad8dea
+  metadata.gz: 745cc975c54fc9e1449a514c711ca2a3ab98df951deb554b6e37de8f5e01ddbacf4e2001a20d0cd512d4ed5411291b4a213e0293928878b805ee5395acbd02c7
+  data.tar.gz: 9afe52e540571bd3330743229d8e267150d243a9e28a815a503841199979c1a156434ad07b4a4d828a3f5db042710a3a5756999c8bf525a10aafa17f3dd0ff26

data/lib/{actions.rb → stg/actions.rb}

@@ -9,6 +9,22 @@ module Actions
   include DiffCalc
 
   def p_initialize
+    begin
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: stg init'
+
+        opts.on_tail('-h', '--help', 'Show this help') do
+          puts opts
+          exit
+        end
+      end.parse!
+    rescue OptionParser::ParseError => e
+      puts e.message
+      puts 'Usage: stg init'
+      puts '  -h, --help    Show this help'
+      exit 1
+    end
+
     # Check if already initialized
     if File.exist?('.stolen-git')
       if confirm?('An instance of stolen-git is already up here do you want to replace it')
@@ -41,6 +57,7 @@ module Actions
 
       # main files
       File.write('.stolen-git/project_info.json', {})
+      File.write('.stg-ignore', JSON.pretty_generate(['.*/']))
       File.write('.stolen-git/commits.json', JSON.pretty_generate({ commits: [] }))
       File.write('.stolen-git/index.json', {})
 
@@ -54,16 +71,36 @@ module Actions
   end
 
   def stage
+    begin
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: stg stage <file> [files...]'
+
+        opts.on_tail('-h', '--help', 'Show this help') do
+          puts opts
+          exit
+        end
+      end.parse!
+    rescue OptionParser::ParseError => e
+      puts e.message
+      puts 'Usage: stg stage <file> [files...]'
+      puts '  -h, --help    Show this help'
+      exit 1
+    end
+
     inp = ARGV
 
     if inp.empty?
-      puts 'Usage: stg stage <directory/> <file.xy>'
+      puts 'Usage: stg stage <file> [files...]'
       return
     end
 
-    index = JSON.parse(File.read('.stolen-git/index.json'))
-
-    define_method(:stage_file) do |file_path|
+    index = read_json('.stolen-git/index.json')
+    ignore = read_json('.stg-ignore')
+    stage_file = lambda do |file_path|
+      ignore&.each do |ignore_pattern|
+        return if File.fnmatch(ignore_pattern, file_path)
+      end
+      file_path = clean_path(file_path)
       file_hash = get_file_hash(file_path)
       file_content = File.read(file_path)
 
@@ -78,30 +115,31 @@ module Actions
       index[file_path]['hash'] = file_hash
     end
 
-    define_method(:stage_directory) do |dir_path|
+    stage_directory = lambda do |dir_path|
+      dir_path = clean_path(dir_path)
       Dir.children(dir_path).each do |entry|
-        # puts "entry: #{entry}"
+        next if entry == '.stolen-git'
+
         path = File.join(dir_path, entry)
         if File.file?(path)
-          # puts "entry_file: #{path}"
-          stage_file(path)
+          stage_file.call(path)
         else
-          # puts "entry_dir: #{path}"
-          stage_directory(path)
+          stage_directory.call(path)
         end
       end
     end
 
     inp.each do |inp_path|
+      inp_path = clean_path(inp_path)
       unless File.exist? inp_path
         puts "#{inp_path} doesn't exist"
         next
       end
 
       if File.file?(inp_path)
-        stage_file(inp_path)
+        stage_file.call(inp_path)
       elsif File.directory? inp_path
-        stage_directory(inp_path)
+        stage_directory.call(inp_path)
       else
         puts "Error logging #{inp_path}. It's neither a file or a directory"
       end
@@ -114,17 +152,31 @@ module Actions
     options = { name: '', description: '' }
 
     # Getting commit name & description
-    OptionParser.new do |opts|
-      opts.banner = 'Usage: stg commit [options]'
+    begin
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: stg commit [options]'
 
-      opts.on('-n', '--name NAME', 'Add a commit name') do |name|
-        options[:name] = name
-      end
+        opts.on('-n', '--name NAME', 'Add a commit name') do |name|
+          options[:name] = name
+        end
 
-      opts.on('-d', '--description DESCRIPTION', 'Add a commit description') do |description|
-        options[:description] = description
-      end
-    end.parse!
+        opts.on('-d', '--description DESCRIPTION', 'Add a commit description') do |description|
+          options[:description] = description
+        end
+
+        opts.on_tail('-h', '--help', 'Show this help') do
+          puts opts
+          exit
+        end
+      end.parse!
+    rescue OptionParser::ParseError => e
+      puts e.message
+      puts 'Usage: stg commit [options]'
+      puts '  -n, --name NAME                Add a commit name'
+      puts '  -d, --description DESCRIPTION  Add a commit description'
+      puts '  -h, --help                     Show this help'
+      exit 1
+    end
 
     options[:name] = ask('Add a commit name: ') if options[:name].empty?
 
@@ -142,35 +194,57 @@ module Actions
     parent_commit = branch_content['commit_pointer']
 
     # Getting differences to last commit
-
     no_insertions = 0
     no_deletions = 0
     no_file_changed = 0
+
     commit_diff = {}
 
     getting_diff = lambda do |entries|
-      parent_index = 0
+      if entries.nil?
+        index.each do |key, value|
+          key = clean_path(key)
+          new_entry_content = File.read(".stolen-git/storage/blobs/#{value['hash']}").lines.to_a
+          compute_diff([], new_entry_content)
+          diff = build_sequences
+          no_insertions += diff[:insertions]
+          no_deletions += diff[:deletions]
+          no_file_changed += 1
+          commit_diff[key] = diff
+        end
+      else
+        parent_map = entries.to_h { |e| [e['path'], e['hash']] }
 
-      index.each do |key, value|
-        if entries && entries[parent_index] && key == entries[parent_index]['path']
+        index.each do |key, value|
+          key = clean_path(key)
           new_hash = value['hash']
-          old_hash = entries[parent_index]['hash']
-          parent_index += 1
-          next if value['hash'] == new_hash
+          old_hash = parent_map[key]
+
+          if old_hash
+            next if old_hash == new_hash
+
+            entry_content = File.read(".stolen-git/storage/blobs/#{old_hash}").lines.to_a
+            new_entry_content = File.read(".stolen-git/storage/blobs/#{new_hash}").lines.to_a
+            compute_diff(entry_content, new_entry_content)
+          else
+            new_entry_content = File.read(".stolen-git/storage/blobs/#{new_hash}").lines.to_a
+            compute_diff([], new_entry_content)
+          end
 
-          entry_content = File.read(".stolen-git/storage/blobs/#{old_hash}").lines.to_a
-          new_entry_content = File.read(".stolen-git/storage/blobs/#{new_hash}").lines.to_a
-          compute_diff(entry_content, new_entry_content)
           diff = build_sequences
           no_insertions += diff[:insertions]
           no_deletions += diff[:deletions]
           no_file_changed += 1
           commit_diff[key] = diff
-        else
-          new_entry_content = File.read(".stolen-git/storage/blobs/#{value['hash']}").lines.to_a
-          compute_diff('', new_entry_content)
-          diff = build_sequences
+        end
 
+        parent_map.each do |key, old_hash|
+          key = clean_path(key)
+          next if index.key?(key)
+
+          entry_content = File.read(".stolen-git/storage/blobs/#{old_hash}").lines.to_a
+          compute_diff(entry_content, [])
+          diff = build_sequences
           no_insertions += diff[:insertions]
           no_deletions += diff[:deletions]
           no_file_changed += 1
@@ -196,6 +270,7 @@ module Actions
 
     # Making the tree
     index.each do |key, value|
+      key = clean_path(key)
       tree_content[:entries].push({
                                     path: key,
                                     type: 'blob',
@@ -246,6 +321,22 @@ module Actions
   end
 
   def reset
+    begin
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: stg reset [commit_id]'
+
+        opts.on_tail('-h', '--help', 'Show this help') do
+          puts opts
+          exit
+        end
+      end.parse!
+    rescue OptionParser::ParseError => e
+      puts e.message
+      puts 'Usage: stg reset [commit_id]'
+      puts '  -h, --help    Show this help'
+      exit 1
+    end
+
     commit_id = ARGV.first
     commit_history = read_json('.stolen-git/commits.json')
     pointer = read_json('.stolen-git/pointer.json')
@@ -275,13 +366,27 @@ module Actions
     options = { commit: false }
 
     # Getting commit name & description
-    OptionParser.new do |opts|
-      opts.banner = 'Usage: stg checkout [options]'
+    begin
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: stg checkout [options]'
+
+        opts.on('-c', '--commit', 'Add a commit id instead') do
+          options[:commit] = true
+        end
+
+        opts.on_tail('-h', '--help', 'Show this help') do
+          puts opts
+          exit
+        end
+      end.parse!
+    rescue OptionParser::ParseError => e
+      puts e.message
+      puts 'Usage: stg checkout [options]'
+      puts '  -c, --commit    Add a commit id instead'
+      puts '  -h, --help      Show this help'
+      exit 1
+    end
 
-      opts.on('-c', '--commit', 'Add a commit id instead') do
-        options[:commit] = true
-      end
-    end.parse!
     inp = ARGV.last
     if !inp
       puts 'Please Enter the name of a branch or commit_id'
@@ -290,7 +395,7 @@ module Actions
       current_commit_hash = commit_history['commits'].find { |x| x['id'] == inp }['hash']
       revert_to_commit(current_commit_hash)
     else
-      # TODO: Handle if user enters branch_id instead
+      # TODO: Handle if user enters branch_id instead of name
       branch_content = {}
       branch_id = ''
       Dir.children('.stolen-git/branches').each do |entry|
@@ -305,28 +410,47 @@ module Actions
         nil
       end
       commit_hash = branch_content['commit_pointer']
-      revert_to_commit(commit_hash)
+      revert_to_commit(commit_hash) if commit_hash&.length&.positive?
       pointer = read_json('.stolen-git/pointer.json')
       pointer['point_to'] = branch_id
       pointer['type'] = 'branch'
       File.write('.stolen-git/pointer.json', JSON.pretty_generate(pointer))
+
     end
   end
 
   def branch
-    name = ARGV.last
+    begin
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: stg branch [name]'
+
+        opts.on_tail('-h', '--help', 'Show this help') do
+          puts opts
+          exit
+        end
+      end.parse!
+    rescue OptionParser::ParseError => e
+      puts e.message
+      puts 'Usage: stg branch [name]'
+      puts '  -h, --help    Show this help'
+      exit 1
+    end
+
+    names = ARGV
     pointer = read_json('.stolen-git/pointer.json')
     pointed_branch = pointer['type'] == 'branch' ? pointer['point_to'] : ''
-    if name
-      first_commit = pointer['type'] == 'branch' ? read_json(".stolen-git/branches/#{pointed_branch}.json")['commit_pointer'] : pointer['point_to']
-      id = SecureRandom.uuid
-      File.write(".stolen-git/branches/#{id}.json", JSON.pretty_generate({
-                                                                           name: name,
-                                                                           created_at: Time.now,
-                                                                           commit_pointer: first_commit
-                                                                         }))
+    if names && names.length.positive?
+      names.each do |name|
+        first_commit = pointer['type'] == 'branch' ? read_json(".stolen-git/branches/#{pointed_branch}.json")['commit_pointer'] : pointer['point_to']
+        id = SecureRandom.uuid
+        File.write(".stolen-git/branches/#{id}.json", JSON.pretty_generate({
+                                                                             name: name,
+                                                                             created_at: Time.now,
+                                                                             commit_pointer: first_commit
+                                                                           }))
+        puts "branch #{name} created"
+      end
       return
-      puts "branch #{name} created"
     end
     Dir.children('.stolen-git/branches').each do |entry|
       branch_content = read_json(".stolen-git/branches/#{entry}")
@@ -341,8 +465,25 @@ module Actions
   end
 
   def diff
+    begin
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: stg diff'
+
+        opts.on_tail('-h', '--help', 'Show this help') do
+          puts opts
+          exit
+        end
+      end.parse!
+    rescue OptionParser::ParseError => e
+      puts e.message
+      puts 'Usage: stg diff'
+      puts '  -h, --help    Show this help'
+      exit 1
+    end
+
     index = read_json('.stolen-git/index.json')
     index.each do |key, value|
+      key = clean_path(key)
       new_file_content = File.exist?(key) ? File.read(key) : nil
       file_name = File.basename(key)
       if new_file_content.nil?
@@ -360,25 +501,65 @@ module Actions
   end
 
   def log
-    limit = ARGV.last
-    limit = limit && !limit.empty? ? limit.to_i : 0
-    commit_history_content = read_json('.stolen-git/commits.json')
+    # Handle if the user wants to -[num]
+    ARGV.map! do |arg|
+      if arg =~ /^-(\d+)$/
+        ['-l', ::Regexp.last_match(1)]
+      else
+        arg
+      end
+    end.flatten!
 
-    commit_history_content['commits'].each_with_index do |commit, i|
-      break if limit > 0 && i >= limit
+    options = { limit: 0 }
+    begin
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: stg log [limit]'
 
-      if limit == 0 && i >= 5
-        q = ask(':')
-        break if q == 'q'
-      end
-      commit_content = read_json(".stolen-git/commits/#{commit['hash']}.json")
+        opts.on('-l', '--limit LIMIT', 'limit showed logs') do |num|
+          options[:limit] = num.to_i
+        end
+
+        opts.on_tail('-h', '--help', 'Show this help') do
+          puts opts
+          exit
+        end
+      end.parse!
+    rescue OptionParser::ParseError => e
+      puts e.message
+      puts 'Usage: stg log [limit]'
+      puts '  -[num], --limit   limit showed logs i.e. stg log -5'
+      puts '  -l, --limit   limit showed logs'
+      puts '  -h, --help    Show this help'
+      exit 1
+    end
+
+    is_limited = options[:limit] > 0
+    pointer = read_json('.stolen-git/pointer.json')
+    last_commit = pointer['type'] == 'commit' ? pointer['point_to'] : read_json(".stolen-git/branches/#{pointer['point_to']}.json")['commit_pointer']
+    unless last_commit
+      puts "Couldn't find last commits. The setup might have been corrupted. If that's the case run 'stg init'"
+    end
+    i = 0
+
+    print_commit = lambda do |commit_hash, commit_content|
       puts
       puts "commit #{commit_content['id']}".green
+      puts "hash:  #{commit_hash[0..5]}...#{commit_hash[-5..]}".green
       puts "Author #{commit_content['author_profile']['username']} <#{commit_content['author_profile']['email']}>"
       puts "Date: #{commit_content['created_at']}"
       puts
       puts "    #{commit_content['name']}"
-      puts
+    end
+
+    while (is_limited && i < options[:limit] || !is_limited) && last_commit && last_commit.length.positive?
+      last_commit_content =  read_json(".stolen-git/commits/#{last_commit}.json")
+      print_commit.call(last_commit, last_commit_content)
+      last_commit = last_commit_content['parent_commit']
+      i += 1
+      if !is_limited && i >= 5
+        q = ask(':')
+        break if q == 'q'
+      end
     end
   end
 end

data/lib/{differencing.rb → stg/differencing.rb}

@@ -27,14 +27,12 @@ module DiffCalc
     if i1 >= @old_s.length
       result = { diff_cnt: @new_s.length - i2, insertions: @new_s.length - i2, deletions: 0, action: :insert }
       @mem[[i1, i2]] = result
-      differencing(i1, i2 + 1) if i2 < @new_s.length
       return result
     end
 
     if i2 >= @new_s.length
       result = { diff_cnt: @old_s.length - i1, insertions: 0, deletions: @old_s.length - i1, action: :delete }
       @mem[[i1, i2]] = result
-      differencing(i1 + 1, i2) if i1 < @old_s.length
       return result
     end
 
@@ -69,7 +67,10 @@ module DiffCalc
     deletion_seq = {}
 
     while i1 < @old_s.length || i2 < @new_s.length
-      action = @mem[[i1, i2]][:action]
+      entry = @mem[[i1, i2]]
+      break unless entry
+
+      action = entry[:action]
 
       case action
       when :done
@@ -82,12 +83,12 @@ module DiffCalc
         deletion_seq[i2].push({ old_index: i1, ma_type: 'bs' })
         i1 += 1
       when :insert
-        insertion_seq[i2] = { value: @new_s[i2], old_index: i1 }
+        insertion_seq[i2] = { value: @new_s[i2].encode('UTF-8', invalid: :replace, undef: :replace, replace: ''), old_index: i1 }
         i2 += 1
       end
     end
 
-    result = @mem[[0, 0]]
+    result = @mem[[0, 0]] || { insertions: 0, deletions: 0, diff_cnt: 0 }
     {
       insertion_seq: insertion_seq,
       deletion_seq: deletion_seq,

data/lib/{help.rb → stg/help.rb}

@@ -8,11 +8,11 @@ module Help
       stage: 'add a file or directory to be tracked ',
       commit: 'Save the current tracked state ',
       diff: 'get the difference between working directory and the last commit ',
-      log: 'print out commit history (limit print by a number `log <number>`) ',
+      log: 'print out commit history',
       reset: 'Revert to commit',
       checkout: 'check a commit or a branch without loss in data',
-      branch: 'List all branches. (or creating a branch by `branch <name>`) '
-
+      branch: 'List all branches.',
+      help: 'show this list'
     }
     max_len = 0
     commands_docs.each_key do |command|

data/lib/{utils.rb → stg/utils.rb}

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'optparse'
 require 'digest'
+require 'pathname'
 module Utils
   def confirm?(prompt)
     loop do
@@ -28,6 +29,8 @@ module Utils
 
   def read_json(path)
     JSON.parse(File.read(path))
+  rescue StandardError
+    nil
   end
 
   def get_file_hash(path)
@@ -58,6 +61,17 @@ module Utils
 
     File.write('.stolen-git/index.json', JSON.pretty_generate(index))
   end
+
+  def clean_path(path)
+    Pathname.new(path).cleanpath.to_s
+  end
+
+  def check_program_exists
+    return true if File.exist? '.stolen-git'
+
+    puts "There is no instance of stolen-git found. Please run 'stg init' first."
+    false
+  end
 end
 
 include Utils

data/lib/stg/version.rb

@@ -0,0 +1,3 @@
+module Stg
+  VERSION = '0.1.5'
+end

data/lib/stg.rb

@@ -1,47 +1,74 @@
-require_relative 'help'
-require_relative 'actions'
+require 'optparse'
+require_relative 'stg/help'
+require_relative 'stg/actions'
+require_relative 'stg/version'
 
-command = ARGV.shift
-NAME = 'stolen-git'
-include Actions
-include Help
-case command
-when 'init'
-  p_initialize
+module Stg
+  class CLI
+    extend Actions
+    extend Help
 
-when 'commit'
-  commit
+    def self.start
+      begin
+        OptionParser.new do |opts|
+          opts.banner = 'Usage: stg <command> [options]'
 
-when 'diff'
-  diff
-when 'test'
-  test
+          opts.on('-v', '--version', 'Show version') do
+            puts "stg version #{VERSION}"
+            exit
+          end
 
-when 'stage'
-  stage
+          opts.on('-h', '--help', 'Show this help') do
+            puts print_usage
+            exit
+          end
+        end.order!
+      rescue OptionParser::ParseError
+        # Ignore unknown options, let command handlers deal with them
+      end
 
-when 'check_router'
-  check_router
-when 'reset'
-  reset
-when 'log'
-  log
+      command = ARGV.shift
+      if !command || command.empty?
+        puts print_usage
+        return
+      elsif command == 'init'
+        p_initialize
+        return
+      else
+        return unless check_program_exists
+      end
 
-when 'checkout'
-  checkout
-
-when 'branch'
-  branch
-
-when 'help'
-  puts print_usage
-  exit 1
-
-when nil
-  puts print_usage
-  exit 1
-
-else
-  puts "Unknown command: #{command}"
-  exit 1
+      case command
+      when 'commit'
+        commit
+      when 'diff'
+        diff
+      when 'test'
+        test
+      when 'stage'
+        stage
+      when 'check_router'
+        check_router
+      when 'reset'
+        reset
+      when 'log'
+        log
+      when 'checkout'
+        checkout
+      when 'branch'
+        branch
+      when 'help'
+        puts print_usage
+        exit 1
+      when nil
+        puts print_usage
+        exit 1
+      else
+        puts "Unknown command: #{command}"
+        exit 1
+      end
+    end
+  end
 end
+
+Stg::CLI.start if __FILE__ == $PROGRAM_NAME

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stg
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Amr ElTaweel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-02 00:00:00.000000000 Z
+date: 2026-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -35,11 +35,12 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/stg
-- lib/actions.rb
-- lib/differencing.rb
-- lib/help.rb
 - lib/stg.rb
-- lib/utils.rb
+- lib/stg/actions.rb
+- lib/stg/differencing.rb
+- lib/stg/help.rb
+- lib/stg/utils.rb
+- lib/stg/version.rb
 homepage: https://github.com/amrbassem218/stolen-git
 licenses:
 - MIT