absgit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f26cd5efa247302f66c97d4ef3f6118d2b6a576
-  data.tar.gz: 2af40a800b06f4085875b6ae54935dfb0c97e53d
+  metadata.gz: e791e4bf577e3a1e58ac8f959f0227ed4933a595
+  data.tar.gz: f762c30f32481f37064411d076ce2bcaebd3ca0f
 SHA512:
-  metadata.gz: 114ada2e52cdde5bfea375e52b75721a092a71f299089a2b6bb2350b618c4a1d1a19024b796d04dd73e741924fd9e44d139f5f6a2d92220e2bc4f52d066d3ba3
-  data.tar.gz: 9e86941d8c7a81a97746faca2cbccb2bf0b52569a523d886bf241394a4abc4e66323ba76f2fc6dc7a9e326670cfa544f21486acfae18e26c91b957cc9a694a20
+  metadata.gz: 7bd814e27cf3029fa9c3b168b8edb0e938f419daf82c16226110d3cb5bd086d4526a2189bbb2a3094745db17cdb0cd3667ec409525d7f324ccfef0d8215d6833
+  data.tar.gz: 7d46df305375c76723f9a6f1eee238fdab6eea57a900aba16bb4784d954f13e95a3f2f09c975c9a4b3843b9aec8ea6e4a95109e42dcd5ec2c73bcdfc49b24843

data/lib/absgit/version.rb

@@ -1,3 +1,3 @@
 class Absgit
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/absgit.rb

@@ -15,12 +15,12 @@ class Absgit
   end
 
   def self.get_repo_path(file_name)
-    path = Pathname.new(file_name)
-
-    if path.exist?
-      path.realpath.ascend do |path2|
-        if (path2 + '.git').exist?
-          return path2
+    Pathname.new(file_name).ascend do |path|
+      if path.exist?
+        path.realpath.ascend do |path2|
+          if (path2 + '.git').exist?
+            return path2
+          end
         end
       end
     end
@@ -68,7 +68,8 @@ class Absgit
       puts option_parser
     else
       repo_path =
-        @args[1..-1].grep(%r{/}).each_with_object(nil) { |arg|
+        @args[1..-1].find_all { |arg| repo_object_candidate?(arg) }.
+        each_with_object(nil) { |arg|
           repo = self.class.get_repo_path(arg)
           break repo if !repo.nil?
         }
@@ -94,6 +95,15 @@ class Absgit
       system(env, *command)
     end
   end
+
+  private
+
+  def repo_object_candidate?(arg)
+    !!if arg.include?('/')
+      path = Pathname.new(arg)
+      path.exist? || path.dirname.exist?
+    end
+  end
 end
 
 # vim: set syntax=ruby:

data/test/absgit_test.rb

@@ -20,42 +20,34 @@ class AbsgitTest < MiniTest::Unit::TestCase
   APP_PATH_ESC = Shellwords.escape(APP_PATH)
 
   def setup
+    @saved_dir = Dir.pwd
+
     @temp_dir = Dir.mktmpdir
 
-    # puts "dir: #@temp_dir"
+    Dir.chdir(@temp_dir)
   end
 
   def teardown
+    Dir.chdir(@saved_dir)
+
     FileUtils.rm_r(@temp_dir, secure: true)
   end
 
-  def test_symlinks_resolved
-    Dir.chdir(@temp_dir) do
-      # Given
-
-      repo = 'a1/a2/a3/repo'
-      repo_abs = File.absolute_path(repo)
-
-      repo_file = File.join(repo, 'b1/b2/b3/file')
-      repo_file_abs = File.absolute_path(repo_file)
-
-      symlink = 'd/symlink'
-
-      FileUtils.makedirs(File.dirname(repo_file))
-      FileUtils.touch(repo_file)
-
-      Dir.mkdir(File.dirname(symlink))
-      File.symlink(repo_file_abs, symlink)
+  def test_help_message_is_output
+    assert_match(/--help\b/, `#{APP_PATH_ESC} --help`)
+  end
 
-      system 'git', 'init', '--quiet', repo
+  def test_options_for_git_are_left_alone
+    refute_match(
+      /--help\b/,
 
-      # When & Then
+      #> any program that consumes its input will do
+      # instead of "wc"
 
-      assert_equal(repo_abs, Absgit.get_repo_path(symlink).to_s)
-      assert_equal(
-        repo_abs, Absgit.get_repo_path(File.absolute_path(symlink)).to_s
-      )
-    end
+      %x{
+        PAGER=wc #{APP_PATH_ESC} log --help
+      }
+    )
   end
 
   def test_file_not_in_repo
@@ -68,49 +60,117 @@ class AbsgitTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_symlinks_resolved
+    # Given
+
+    repo = 'a1/a2/a3/repo'
+    repo_abs = File.absolute_path(repo)
+
+    repo_file = File.join(repo, 'b1/b2/b3/file')
+    repo_file_abs = File.absolute_path(repo_file)
+
+    symlink = 'd/symlink'
+
+    FileUtils.makedirs(File.dirname(repo_file))
+    FileUtils.touch(repo_file)
+
+    Dir.mkdir(File.dirname(symlink))
+    File.symlink(repo_file_abs, symlink)
+
+    system 'git', 'init', '--quiet', repo
+
+    # When & Then
+
+    assert_equal(repo_abs, Absgit.get_repo_path(symlink).to_s)
+    assert_equal(
+      repo_abs, Absgit.get_repo_path(File.absolute_path(symlink)).to_s
+    )
+  end
+
   def test_commit_does_not_require_chdir_to_repo
-    Dir.chdir(@temp_dir) do
-      # Given
+    # Given
 
-      repo = 'repo'
-      repo_file = File.join(repo, 'file')
-      repo_file_abs = File.absolute_path(repo_file)
+    repo = 'repo'
+    repo_file = File.join(repo, 'file')
+    repo_file_abs = File.absolute_path(repo_file)
 
-      Dir.mkdir(repo)
-      system 'git', 'init', '--quiet', repo
-      IO.write(repo_file, "blah\n")
+    Dir.mkdir(repo)
+    system 'git', 'init', '--quiet', repo
+    IO.write(repo_file, "blah\n")
 
-      # When
+    # When
 
-      system(
-        "#{APP_PATH_ESC} add #{repo_file_abs.shellescape}"
-      )
+    system(
+      "#{APP_PATH_ESC} add #{repo_file_abs.shellescape}"
+    )
 
-      system(
-        "#{APP_PATH_ESC} commit --quiet --message blah " +
-          repo_file_abs.shellescape
-      )
+    system(
+      "#{APP_PATH_ESC} commit --quiet --message blah " +
+        repo_file_abs.shellescape
+    )
 
-      # Then
+    # Then
 
-      Dir.chdir(repo) do
-        assert_equal("1\n", `git rev-list --count HEAD`)
-      end
-    end
+    assert_equal(1, num_commits(repo))
   end
 
-  def test_help_message_is_output
-    assert_match(/--help\b/, `#{APP_PATH_ESC} --help`)
+  def test_commit_works_for_removed_file
+    # Given
+
+    repo = 'repo'
+    repo_file = File.join(repo, 'file')
+    repo_file_abs = File.absolute_path(repo_file)
+
+    Dir.mkdir(repo)
+    system 'git', 'init', '--quiet', repo
+
+    IO.write(repo_file, "blah\n")
+    system(
+      "#{APP_PATH_ESC} add #{repo_file_abs.shellescape}"
+    )
+    system(
+      "#{APP_PATH_ESC} commit --quiet --message blah " +
+        repo_file_abs.shellescape
+    )
+
+    num_commits_before = num_commits(repo)
+
+    # When
+
+    system(
+      "#{APP_PATH_ESC} rm --quiet " +
+        repo_file_abs.shellescape
+    )
+    system(
+      "#{APP_PATH_ESC} commit --quiet --message blah " +
+        repo_file_abs.shellescape
+    )
+
+    # Then
+
+    assert_equal(num_commits_before + 1, num_commits(repo))
   end
 
-  def test_options_for_git_are_left_alone
-    refute_match(
-      /--help\b/,
-      %x{
-        #> any program that consumes its input will do
-        # instead of "wc"
-        PAGER=wc #{APP_PATH_ESC} log --help
+  private
+
+  def num_commits(repo_dir)
+    Dir.chdir(repo_dir) {
+      `git rev-list --count HEAD`.match(/\A\d+\n\z/) { |m|
+        m[0].to_i
       }
-    )
+    }
+  end
+end
+
+if false
+  module Kernel
+    alias old_system system
+
+    def system(*a)
+      puts "\ndebug: about to call #{__method__} with " +
+        "these parameters: #{a.inspect}"
+      old_system(*a)
+      puts "\ndebug: call to #{__method__} completed"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: absgit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ruafozy