commit 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 525332be2b7dd147395cdc951b849ea9bd41c96824c3140264de5bb7f531d0c0
-  data.tar.gz: '019c86addf56a91823cb337bc3438c9c6e8a002d453ed2383a429fcc77432df1'
+  metadata.gz: b6138776dedeea471b341c2527dcaedeeee7c19439a86caf860b5149c04e5906
+  data.tar.gz: 3dae4a041ea54fe55a0ca7b28b66f143933452cf8784cd9bbf9bf623d1ff9798
 SHA512:
-  metadata.gz: 8b1e74b61b336af2aa2793fd0749062f2ccdc434841dd2022ad78c6311527062f48a82f2ae16e2e238670dd18194ff01e84702c38ab0c5c66948fcf1515ad594
-  data.tar.gz: 857d5edf90f4022dd4a71e66dcdfdabee3607edfe811e520b5a94f7fd8bbe3db5dd4bdd4f8e5993d0e1443f352d9908f6f5d86f9b5e452eea07fd0c8b7ba9ddd
+  metadata.gz: 2a89c5efac58799f9cedd29610cdad9b3d66d193e96174e495dea13efa1422cdd5fb1ac39cd634172250ecc7861eba88db1f4e620f0db63dd3c3050acf11e2c6
+  data.tar.gz: 8dcac30b3732564994a60553059fe75fbcfaec2e0d4fb9cad288fff9b1cc59832b7b86eaecb266d3633e8933c4fc3da5e950f5e1427f968d41c2c6944895ed5a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.7.1 / 2025-0-30
+
+* Now processes deleted files properly
+* Using enums for verbosity
+
+
 ## 0.7.0 / 2025-06-14
 
 * Options are processed once again; this broke in v0.6.0.

data/exe/commit

@@ -2,4 +2,9 @@
 
 require_relative '../lib/commit'
 
+trap "SIGINT" do
+  puts "Exiting"
+  exit 130
+end
+
 Commit.main

data/lib/commit/git_commit.rb

@@ -36,11 +36,12 @@ class GitCommit
     msg = @options[:commit_message] if @options[:commit_message]
     discover_branch
 
-    puts "Committing with message '#{msg}'".green unless @options[:verbosity].zero?
-    run("git commit -m '#{msg}' 2>&1 | sed -e '/^X11/d' -e '/^Warning:/d'", verbose: @options[:verbosity] >= 2)
+    puts "Committing with message '#{msg}'".green unless @options[:verbosity] == QUIET
+    run "git commit -m '#{msg}' 2>&1 | sed -e '/^X11/d' -e '/^Warning:/d'", verbose: @options[:verbosity] >= VERBOSE
     # @repo.push 'origin', ['refs/heads/master'] # Needs a callback to handle authentication
-    puts "Pushing to origin #{@branch}".green unless @options[:verbosity].zero?
-    run("git push origin #{@branch} --tags 3>&1 1>&2 2>&3 | sed -e '/^X11/d' -e '/^Warning:/d'", verbose: @options[:verbosity] >= 2)
+    puts "Pushing to origin #{@branch}".green unless @options[:verbosity] == QUIET
+    run "git push origin #{@branch} --tags 3>&1 1>&2 2>&3 | sed -e '/^X11/d' -e '/^Warning:/d'",
+        verbose: @options[:verbosity] >= VERBOSE
     @change_count = 0
     @commit_size = 0
   end
@@ -62,7 +63,7 @@ class GitCommit
   def large_files
     large = []
     @repo.status do |path, flags|
-      puts "#{path} #{flags}" if @options[:verbosity].positive?
+      puts "#{path} #{flags}" if @options[:verbosity] >= NORMAL
       if File(path).dir?
         scan_dir path
       elsif large_file?(filename)
@@ -91,8 +92,8 @@ class GitCommit
     tag = @options[:tag]
     return unless tag
 
-    run("git tag -a #{tag} -m 'v#{tag}'", verbose: @options[:verbosity] >= 2)
-    run('git push origin --tags', verbose: @options[:verbosity] >= 2)
+    run "git tag -a #{tag} -m 'v#{tag}'", verbose: @options[:verbosity] >= VERBOSE
+    run 'git push origin --tags', verbose: @options[:verbosity] >= VERBOSE
     exit
   end
 

data/lib/commit/helper.rb

@@ -1,4 +1,11 @@
 class GitCommit
+  QUIET = 0
+  NORMAL = 1
+  VERBOSE = 2
+  ANNOYING = 3
+  STFU = 4
+
+
   # Needs absolute path or the path relative to the current directory, not just the name of the directory
   def add_recursively(name)
     Dir.entries(name).each do |entry|
@@ -28,7 +35,7 @@ class GitCommit
         however the file is #{@nh.to_human file_size}.
         The file will be added to .gitignore.
       MESSAGE
-      puts msg.yellow unless @options[:verbosity].zero?
+      puts msg.yellow unless @options[:verbosity] == QUIET
 
       newline = needs_newline('.gitignore') ? "\n" : ''
       File.write('.gitignore', "#{newline}#{filename}\n", mode: 'a')
@@ -36,9 +43,12 @@ class GitCommit
     elsif filename == '.gitignore'
       @gitignore_dirty = true
     else
-      commit_push('A portion of the files to be committed is being pushed now because they are large.') if @commit_size + file_size >= MAX_SIZE / 2.0
-      puts "Adding '#{escape filename}'".green unless @options[:verbosity].zero?
-      run ['git', 'add', escape(filename)], verbose: @options[:verbosity] >= 2
+      if @commit_size + file_size >= MAX_SIZE / 2.0
+        # Defeat formatter
+        commit_push 'A portion of the files to be committed is being pushed now because they are large.'
+      end
+      puts "Adding '#{escape filename}'".green unless @options[:verbosity] == QUIET
+      run ['git', 'add', escape(filename)], verbose: @options[:verbosity] >= VERBOSE
     end
     @change_count += 1
     @commit_size += file_size
@@ -66,6 +76,7 @@ class GitCommit
   #  - +:worktree_deleted+: the file has been deleted from the working directory
   def recursive_add
     @change_count = 0
+    run ['git', 'add', '--all'], verbose: @options[:verbosity] >= VERBOSE
     @repo.status do |path, flags|
       next if flags.include? :ignored
 
@@ -76,13 +87,13 @@ class GitCommit
       end
     end
     if @gitignore_dirty
-      puts 'Changing .gitignore'.green unless @options[:verbosity].zero?
+      puts 'Changing .gitignore'.green unless @options[:verbosity] == QUIET
       run 'git add .gitignore', verbose: @options[:verbosity] >= 2
       @change_count += 1
     end
     return unless @change_count.zero?
 
-    puts 'No changes were detected to this git repository.'.green if @options[:verbosity].positive?
+    puts 'No changes were detected to this git repository.'.green if @options[:verbosity] >= VERBOSE
     exit
   end
 

data/lib/commit/version.rb

@@ -1,3 +1,3 @@
 module Commit
-  VERSION = '0.7.0'.freeze unless defined? VERSION
+  VERSION = '0.7.1'.freeze unless defined? VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Mike Slinn