nit 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f516d5091e63c8591e12facb8e6971d19116c8bc
-  data.tar.gz: c76c5d753527a5568bce39965197aa5c1ddf34cc
+SHA256:
+  metadata.gz: ed0ddde57650f01656e5feb9d67a49d9b2e4e4d50889d40a2b16ed3291031800
+  data.tar.gz: 7cc40e90614681a5d7abe8b94d1b95b8d4ad0c77d49f7ca2fdc79cbf1a5cb0c2
 SHA512:
-  metadata.gz: 1f3392cec82272850b8dd83bf405deb84c85e3c00746fc744e4d2b371675f91f782a32f7f75c094d1ceb51e918f5b132f45fdafff002768047de43a3e9e65c5a
-  data.tar.gz: afd638bc8f316a9982ae688137edaec506807d7a42935e69689eed73e0e0a58a272333ce054aa191a2b1b5014976b8f6d92a2480d60ef969a448317fd66bf994
+  metadata.gz: ffe6c0c65bc72cf07e08086becc781f7f659c78cda187eb7006a7766b69ad799f982fac9db2f57420f18460d010f71c25f9b40c2f42706ea1115a6243b25391e
+  data.tar.gz: 3bf54fe3597da8495056f7296947cbc33a1a63e7dd3e1f935e2e3ed8364e224a13256020072e7bd4822b22a0437d02fe8aaddc68f7486cda73221ff56e05af29

data/CHANGES.md

@@ -1,6 +1,11 @@
-## 0.0.5
+## 0.0.6
+
+* Allow Ruby 3.4.
 
 
+## 0.0.5
+
+* Make nit compatible with a git upgrade where the status command doesn't prepend lines with a hash (#) anymore (as seen in git 1.8.5.2).
 
 ## 0.0.4
 
@@ -10,4 +15,4 @@
 ## 0.0.3
 
 * Some bug fixes.
-* Allow passing arbitrary git arguments to all nit commands, like `nit commit -m "awesome work" abc"
+* Allow passing arbitrary git arguments to all nit commands, like `nit commit -m "awesome work" abc"

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in nit.gemspec
 gemspec
+gem "minitest-line"

data/bin/nit-client

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo $* | netcat -U demo.socket

data/bin/nit-server

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+# client:
+# echo "bla and more" | netcat -U demo.socket
+
+require "nit/app"
+def run!(input)
+  foo = StringIO.new
+  $stdout = foo
+
+  Nit::App.start
+
+  $stdout.string
+end
+
+
+
+require 'socket'
+
+socket_file_name = './demo.socket'
+
+File.unlink socket_file_name
+server = UNIXServer.new socket_file_name
+
+loop do
+  client = server.accept
+  input = client.gets
+
+  argv = input.split(" ") # FIXME: this does not include +1 spaces.
+  ARGV = argv # FIXME: this sucks, it's the only interface for Thor. make input injectable for Nit::App
+  # FIXME: make App::run/start return outpub.
+
+  output = run!(input)
+
+  client.puts output
+  client.close
+end
+

data/lib/nit/command/commit.rb

@@ -2,6 +2,7 @@ class Nit::Command
   class Commit < Status
     def process(state, indexes, args)
       handle_m!(args)
+      pp state.files
       system "git add #{state.files.list(indexes)} && git commit #{args.join(" ")}"
     end
 
@@ -12,4 +13,4 @@ class Nit::Command
       args[i+1] = "\"#{args[i+1]}\""
     end
   end
-end
+end

data/lib/nit/command/status.rb

@@ -40,6 +40,9 @@ module Nit
             process_modified(i, file, ln)
           elsif ln.match(screen.file_patterns[:new])
             process_new(i, file, ln)
+          # elsif ln.match(screen.file_patterns[:deleted])
+          #   raise
+          #   process_deleted(i, file, ln)
           end
         end
 
@@ -87,4 +90,4 @@ module Nit
       end
     end
   end
-end
+end

data/lib/nit/lines.rb

@@ -31,8 +31,9 @@ module Nit
   #private
     def file_patterns
       {
-        modified: /#\tmodified:(.+)/,
-        new: /#\t((?!modified:).+)/
+        modified: /#?\tmodified:(.+)/,
+        new: /#?\t((?!modified:).+)/,
+        deleted: /#?\tdeleted:(.+)/,
       }
     end
   end
@@ -60,4 +61,4 @@ module Nit
       path.to_s
     end
   end
-end
+end

data/lib/nit/version.rb

@@ -1,3 +1,3 @@
 module Nit
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/nit.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'nit/version'
@@ -10,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["apotonick@gmail.com"]
   spec.description   = %q{Improving your Git workflow since 2013.}
   spec.summary       = %q{Nit improves your git workflows.}
-  spec.homepage      = "http://github.com/apotonick/nit"
+  spec.homepage      = "https://github.com/apotonick/nit"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,9 +17,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor", "~> 0.18.1"
+  spec.add_dependency "thor", '>= 0.18.1'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  # FIXME: this is for nit-server:
+  spec.add_dependency "mkfifo"
+  spec.add_dependency "ruby-fifo"
+
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "5.2.0"
+  spec.add_development_dependency "minitest", ">= 5.4.0"
 end

data/test/commands_test.rb

@@ -28,7 +28,6 @@ class CommandsTest < MiniTest::Spec
 
   describe "commit" do
     let (:klass) { "Commit" }
-    let (:screen) { output }
 
     it "also ignores files when commiting" do
       config.ignored_files = ["new.rb", "brandnew.rb", "staged.rb"] # TODO: make this more generic.
@@ -41,6 +40,20 @@ class CommandsTest < MiniTest::Spec
     it { cmd.call(["-m", "awesome work", "b"], output).must_equal "git add ../lib/new.rb && git commit -m \"awesome work\"" }
 
     # TODO: test nit commit -a
+
+    it "allow co with a deleted file, so it gets {git rm}" do
+      output = <<-EOF
+On branch master
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+  \tmodified:   CHANGES.md
+  \tdeleted:    bin/nit-client
+  \tmodified:   bin/nit-server
+EOF
+
+      assert_equal cmd.call(["ac"], output),%(git add CHANGES.md && git rm bin/nit-client && git commit )
+    end
   end
 end
 
@@ -52,4 +65,4 @@ class ArgsProcessorTest < MiniTest::Spec
   it { subject.call(["-a"]).must_equal [[], ["-a"]] }
   it { subject.call(["-a", "-m", '"message"', "abc"]).must_equal [["abc"], ["-a", "-m", '"message"']] }
   it { subject.call(["-m", '"message"', "a", "b"]).must_equal [["a", "b"], ["-m", '"message"']] }
-end
+end

data/test/lines_test.rb

@@ -12,8 +12,8 @@ class LinesTest < StatusTest
   end
 
   describe "#to_s" do
-    let (:output) { "1\n2" }
-    it { Nit::Lines.new(output).to_s.must_equal(output) }
+    let (:out) { "1\n2" }
+    it { Nit::Lines.new(out).to_s.must_equal(out) }
   end
 
   describe "Line" do
@@ -24,4 +24,4 @@ class LinesTest < StatusTest
     it { subject.delete
          lines.to_s.must_equal "rocks"}
   end
-end
+end

data/test/nit_test.rb

@@ -25,6 +25,8 @@ class NitTest < MiniTest::Spec
       `mkdir stage`
       `cp -R git stage/.git`
       `cp files/* stage/`
+
+      yield if block_given?
     end
 
     Dir.chdir "test/dummies/stage" do
@@ -42,14 +44,16 @@ end
 class DynamicCommandTest < NitTest
   it "evaluates indexes and invokes git command with it" do
     # how to capture STDERR: https://www.ruby-forum.com/topic/1103519#982117
-    nit(" checkout e 2>&1").must_match "error: pathspec 'new.rb' did not match any file(s) known to git."
+    assert_equal nit(" checkout e 2>&1"), "error: pathspec 'new.rb' did not match any file(s) known to git
+
+"
   end
 end
 
 class ArbitraryGitCommandsTest < NitTest
   it { nit(" diff b").must_match "a\/staged.rb" }
 
-  it { nit(" diff --raw b").must_equal ":100644 100644 e69de29... 0000000... M\tstaged.rb\n" }
+  it { nit(" diff --raw b").must_equal ":100644 100644 e69de29 0000000 M\tstaged.rb\n" }
 
   # commit:
   it "allows strings after -m" do # TODO: implement that for all commands?
@@ -58,6 +62,19 @@ class ArbitraryGitCommandsTest < NitTest
     output.must_match "1 file changed" # TODO: check if correct file was commited.
   end
 
+  # FIXME: with one changed, one new file!!!
+  it "what" do
+    output = nit(' ') do
+      `touch stage/new_file`
+      `cd stage && git add stage/new_file`
+    end
+    puts output
+    assert_equal output, "] fixing it\n"
+  end
+
+
+
+
   # it "allows -m after file indices" do
   #   output = nit(' co ab -m add something 4 u')
   #   puts output
@@ -72,4 +89,4 @@ class NitWithCharIndexerTest < NitTest
     out.must_match "a\/staged.rb"
     out.must_match "a\/on_stage.rb"
   end
-end
+end

data/test/status_test.rb

@@ -20,6 +20,15 @@ class StatusTest < MiniTest::Spec
       console.must_match "[3] new.rb"
       console.must_match "[5] db/migrate/"
     end
+
+    it "processes `git status` without #" do
+      console = subject.call([], output)
+      console.must_match "modified: [0]    on_stage.rb"
+      console.must_match "modified: [1]    staged.rb"
+      console.must_match "[2] brandnew.rb"
+      console.must_match "[3] new.rb"
+      console.must_match "[5] db/migrate/"
+    end
   end
 
   describe "char indexing" do

data/test/test_helper.rb

@@ -21,4 +21,28 @@ MiniTest::Spec.class_eval do
     no changes added to commit (use "git add" and/or "git commit -a")
     EOF
   end
-end
+
+  let (:hashless_output) do <<-EOF
+    On branch master
+    Changes not staged for commit:
+      (use "git add <file>..." to update what will be committed)
+      (use "git checkout -- <file>..." to discard changes in working directory)
+
+    \tmodified:   on_stage.rb
+    \tmodified:   staged.rb
+
+    Untracked files:
+      (use "git add <file>..." to include in what will be committed)
+
+    \tbrandnew.rb
+    \tnew.rb
+    \t../lib/new.rb
+    \tdb/migrate/
+    no changes added to commit (use "git add" and/or "git commit -a")
+    EOF
+  end
+
+  def assert_equal(expected, asserted)
+    super(asserted, expected)
+  end
+end

metadata

@@ -1,43 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: nit
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: mkfifo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-fifo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +84,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.4.0
 description: Improving your Git workflow since 2013.
 email:
 - apotonick@gmail.com
@@ -82,6 +110,8 @@ files:
 - Rakefile
 - Thorfile
 - bin/nit
+- bin/nit-client
+- bin/nit-server
 - lib/nit.rb
 - lib/nit/CHANGES.mk
 - lib/nit/app.rb
@@ -132,7 +162,7 @@ files:
 - test/nit_test.rb
 - test/status_test.rb
 - test/test_helper.rb
-homepage: http://github.com/apotonick/nit
+homepage: https://github.com/apotonick/nit
 licenses:
 - MIT
 metadata: {}
@@ -151,8 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Nit improves your git workflows.