stg 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a24fa114435be573b5b125dc7631052ba02e9b87c071d900aef8be5dd3c771e3
-  data.tar.gz: ae2e3189797eb7f737bf2e6f44502458dbf0567d69c8659a1adf18c5a7619a0b
+  metadata.gz: 1eb93a1f37a9ec874a195189c9047b322ef7eb823f2c4af4219dad4aba1bdcb0
+  data.tar.gz: 7795502739c3503dcc0fa241cecc65093c711eed608d633ef32813c96c0f4d80
 SHA512:
-  metadata.gz: e9b91105669be9f1b50129e3c347af9c7b9dc6adfd1d476d7c015005db0990927848956587961f16f6e3cd8a134edfc4cf4707ea720bd78423110d807e197e7e
-  data.tar.gz: c19cea532598c24f46e8743f6f5af524d087780730b19e1081cc0318dea0ec2a68757effdd440429384e17107abf714161f302f4d9daf90f861a7e0206029fd8
+  metadata.gz: 60c435caaec0c696b269a1cd014a96539fa646eb6c204a9b53d67cb55dda4f2de16813202e3e1c6e5a3a12d774acf1c43cb26eb418c1817b03cca7d242b2aded
+  data.tar.gz: e1b69a714e519862c46d4264648504f3699b94fc7046f9900dbe780e36f3db8fa255cc9dfe40323b201bcb6f18ea7a8a0f01409b23724eedda67d7fa665e8d5e

data/README.md

@@ -12,17 +12,22 @@ Stolen git is well... you get it. I'm building a mini git clone to learn version
 
 ## Usage
 
-| Command | description                                                       | Flags                                   |
-| ------- | ----------------------------------------------------------------- | --------------------------------------- |
-| init    | Initialize the project                                            | N/A                                     |
-| stage   | add a file or directory to be tracked                             | N/A                                     |
-| commit  | Save the current tracked state                                    | `-n [--name]` <br> `-d [--description]` |
-| diff    | get the difference between working directory and the last commit  | N/A                                     |
-| log     | print out commit history (limit print by a number `log <number>`) | N/A                                     |
-
-| reset | Reset to the last commit | N/A |
-| checkout | check a commit or a branch without loss in data | `-c [--commit] <commit_id>` to check out a commit instaed of a branch wihout changing HEAD pointer |
-| branch | List all branches. (or creating a branch by `branch <name>`) | N/A |
+Run `stg init` once in a project before using the other commands. Stolen Git stores its data in `.stolen-git/` and tracks files through its own index.
+
+| Command                   | Description                                                                                                            | Options                                                |
+| ------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------ |
+| `init`                    | Initialize `.stolen-git/` in the current directory.                                                                    | N/A                                                    |
+| `stage <file...>`         | Add files or directories to the Stolen Git index. Directories are staged recursively.                                  | N/A                                                    |
+| `commit`                  | Save the current indexed state as a commit.                                                                            | `-n, --name NAME` <br> `-d, --description DESCRIPTION` |
+| `diff`                    | Show differences between the working directory and the last commit.                                                    | N/A                                                    |
+| `log [limit]`             | Print commit history. Pass a limit to show only the latest entries.                                                    | N/A                                                    |
+| `reset [commit_id]`       | With no id, restore working files from the index. With an id, restore that commit and move the current branch pointer. | N/A                                                    |
+| `checkout <name>`         | Check out a branch by name.                                                                                            | N/A                                                    |
+| `checkout -c <commit_id>` | Check out a commit without moving the current branch pointer.                                                          | `-c, --commit`                                         |
+| `branch [name]`           | List all branches, or create a branch when a name is provided.                                                         | N/A                                                    |
+| `help`                    | Print the command list.                                                                                                | N/A                                                    |
+
+For more detail on staging, committing, and reset behavior, see [COMMANDS.md](COMMANDS.md).
 
 ## Installation
 
@@ -39,6 +44,9 @@ Stolen git is well... you get it. I'm building a mini git clone to learn version
 
    ```
    gem install stg
+
+   # you may need administrative permission, in this case
+   sudo gem install stg
    ```
 
 Run `stg` to verify your installation
@@ -48,47 +56,51 @@ Run `stg` to verify your installation
 > [!NOTE]
 > You have to initialize with `stg init` for any of the other commands to work
 
-- Initialization
-
-  ```
-  stg init
-  ```
+### Start a new project
 
-- Staging
-
-  ```
-  stg stage src/page.ts
-  ```
+```sh
+stg init
+stg stage .
+stg commit -n "Initial commit"
+```
 
-- Committing
+### Save a file change
 
-  ```
-  stg commit -n "Adding main page"
-  ```
+```sh
+stg stage lib/stg/actions.rb
+stg commit -n "Improve reset validation"
+```
 
-- Logging all commits
+### Inspect history
 
-  ```
-  stg log
-  ```
+```sh
+stg log # Show 5 logs and waits for user confirmation to continue
+stg log 3 # Shows last 3 commits in the branch and closes
+```
 
-  Logging last 5 commits
+### Discard unstaged working changes
 
-  ```
-  stg log 5
-  ```
+```sh
+stg stage README.md
+# edit README.md again
+stg reset
+```
 
-- Help
+`README.md` is restored to the version stored in the index (a.k.a last version of the file you staged).
 
-  ```
-  stg
-  or
-  stg help
-  ```
+### Reset to a previous commit
 
-- Hard reset
+> [!WARNING]
+> `stg reset <commit_id>` is destructive. It moves the branch pointer back and can make later Stolen Git commits unreachable. Use `stg checkout -c <commit_id>` if you only want to inspect an older commit.
 
+```sh
+stg log # shows all commits with commit_id next to the word commit in green
+stg reset <commit_id>
 ```
 
+### Help
+
+```sh
 stg
+stg help
 ```

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,52 @@ 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'))
+    index = read_json('.stolen-git/index.json')
+    ignore = read_json('.stg-ignore')
+    index.reject! { |key, _value| ignored_path?(key, ignore) }
+
+    path_in_directory = lambda do |path, dir_path|
+      dir_path == '.' || path == dir_path || path.start_with?("#{dir_path}/")
+    end
+
+    stage_deleted = lambda do |path|
+      path = clean_path(path)
+
+      index.keys.each do |indexed_path|
+        next unless indexed_path == path || path_in_directory.call(indexed_path, path)
+        next if File.exist?(indexed_path)
+
+        index.delete(indexed_path)
+      end
+    end
 
     stage_file = lambda do |file_path|
+      file_path = clean_path(file_path)
+      return if ignored_path?(file_path, ignore)
+
       file_hash = get_file_hash(file_path)
       file_content = File.read(file_path)
 
@@ -79,7 +132,14 @@ module Actions
     end
 
     stage_directory = lambda do |dir_path|
+      dir_path = clean_path(dir_path)
+      return if ignored_path?(dir_path, ignore)
+
+      stage_deleted.call(dir_path)
+
       Dir.children(dir_path).each do |entry|
+        next if entry == '.stolen-git'
+
         path = File.join(dir_path, entry)
         if File.file?(path)
           stage_file.call(path)
@@ -90,8 +150,13 @@ module Actions
     end
 
     inp.each do |inp_path|
+      inp_path = clean_path(inp_path)
       unless File.exist? inp_path
-        puts "#{inp_path} doesn't exist"
+        if index.key?(inp_path) || index.keys.any? { |key| path_in_directory.call(key, inp_path) }
+          stage_deleted.call(inp_path)
+        else
+          puts "#{inp_path} doesn't exist"
+        end
         next
       end
 
@@ -111,22 +176,41 @@ 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?
 
     # Get the index
     index = JSON.parse(File.read('.stolen-git/index.json'))
+    ignore = read_json('.stg-ignore')
+    original_index_size = index.length
+    index.reject! { |key, _value| ignored_path?(key, ignore) }
+    File.write('.stolen-git/index.json', JSON.pretty_generate(index)) if index.length != original_index_size
+
     tree_content = {
       entries: []
     }
@@ -139,35 +223,59 @@ 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
+                     .reject { |entry| ignored_path?(entry['path'], ignore) }
+                     .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
@@ -193,6 +301,7 @@ module Actions
 
     # Making the tree
     index.each do |key, value|
+      key = clean_path(key)
       tree_content[:entries].push({
                                     path: key,
                                     type: 'blob',
@@ -243,23 +352,46 @@ module Actions
   end
 
   def reset
+    reset_usage = lambda do
+      puts 'Usage: stg reset <commit_id>'
+      puts "You can find commit_id by running 'stg log'"
+    end
+
+    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
+      reset_usage.call
+      puts '  -h, --help    Show this help'
+      exit 1
+    end
+
+    if ARGV.length > 1
+      reset_usage.call
+      return
+    end
+
     commit_id = ARGV.first
     commit_history = read_json('.stolen-git/commits.json')
     pointer = read_json('.stolen-git/pointer.json')
     branch_id = pointer['point_to']
     branch_content = read_json(".stolen-git/branches/#{branch_id}.json")
-    current_commit_hash = branch_content['commit_pointer']
-
-    new_commit = if !commit_id || commit_id.empty?
-                   current_commit_hash
-                 else
-                   commit_history['commits'].find do |x|
-                     x['id'] == commit_id
-                   end['hash']
-                 end
-
-    if new_commit.empty?
-      puts "This commit doesn't exit"
+    if commit_id.nil? || commit_id.empty?
+      revert_to_index
+      return
+    end
+
+    commit = commit_history['commits'].find { |x| x['id'] == commit_id }
+    new_commit = commit && commit['hash']
+    if new_commit.nil? || new_commit.empty?
+      reset_usage.call
       return
     end
 
@@ -272,13 +404,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'
@@ -287,7 +433,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|
@@ -302,28 +448,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}")
@@ -338,8 +503,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?
@@ -357,25 +539,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,13 @@ 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}

@@ -5,14 +5,14 @@ module Help
   Commands:\n"
     commands_docs = {
       init: 'Initialize the project',
-      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>`) ',
-      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>`) '
-
+      stage: 'Add files or directories to the index',
+      commit: 'Save the current indexed state',
+      diff: 'Show differences between the working directory and the last commit',
+      log: 'Print commit history',
+      reset: 'Restore from the index, or restore a commit when an id is provided',
+      checkout: 'Check out a branch, or a commit with -c',
+      branch: 'List branches, or create a branch when a name is provided',
+      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)
@@ -47,17 +50,58 @@ module Utils
   def revert_to_commit(commit_hash)
     commit_content = read_json(".stolen-git/commits/#{commit_hash}.json")
     commit_tree = read_json(".stolen-git/storage/trees/#{commit_content['tree_hash']}.json")
+    current_index = read_json('.stolen-git/index.json') || {}
     index = {}
+
     commit_tree['entries'].each do |entry|
       blob = File.read(".stolen-git/storage/blobs/#{entry['hash']}")
       # TODO: Figure out what to do when path changes
+      dir = File.dirname(entry['path'])
+      FileUtils.mkdir_p(dir) unless dir == '.'
       File.write(entry['path'], blob)
       index[entry['path']] ||= {}
       index[entry['path']]['hash'] = entry['hash']
     end
 
+    (current_index.keys - index.keys).each do |path|
+      FileUtils.rm_f(path)
+    end
+
     File.write('.stolen-git/index.json', JSON.pretty_generate(index))
   end
+
+  def revert_to_index
+    index = read_json('.stolen-git/index.json') || {}
+
+    index.each do |path, entry|
+      blob = File.read(".stolen-git/storage/blobs/#{entry['hash']}")
+      File.write(path, blob)
+    end
+  end
+
+  def clean_path(path)
+    Pathname.new(path).cleanpath.to_s
+  end
+
+  def ignored_path?(path, ignore_patterns)
+    path = clean_path(path)
+    return false if path == '.'
+
+    path_as_dir = path.end_with?('/') ? path : "#{path}/"
+
+    ignore_patterns&.any? do |pattern|
+      File.fnmatch(pattern, path) ||
+        File.fnmatch(pattern, path_as_dir) ||
+        (pattern.end_with?('/') && File.fnmatch("#{pattern}**", path))
+    end
+  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.6'
+end

data/lib/stg.rb

@@ -1,5 +1,7 @@
-require_relative 'help'
-require_relative 'actions'
+require 'optparse'
+require_relative 'stg/help'
+require_relative 'stg/actions'
+require_relative 'stg/version'
 
 module Stg
   class CLI
@@ -7,10 +9,36 @@ module Stg
     extend Help
 
     def self.start
+      begin
+        OptionParser.new do |opts|
+          opts.banner = 'Usage: stg <command> [options]'
+
+          opts.on('-v', '--version', 'Show version') do
+            puts "stg version #{VERSION}"
+            exit
+          end
+
+          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
+
       command = ARGV.shift
-      case command
-      when 'init'
+      if !command || command.empty?
+        puts print_usage
+        return
+      elsif command == 'init'
         p_initialize
+        return
+      else
+        return unless check_program_exists
+      end
+
+      case command
       when 'commit'
         commit
       when 'diff'
@@ -42,3 +70,5 @@ module Stg
     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.3
+  version: 0.1.6
 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