absgit 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e791e4bf577e3a1e58ac8f959f0227ed4933a595
-  data.tar.gz: f762c30f32481f37064411d076ce2bcaebd3ca0f
+  metadata.gz: 3e5b421181caae16aa6117e6b3a69da27869d11e
+  data.tar.gz: 6018b58723501e31f4d410d56035467a314f0cba
 SHA512:
-  metadata.gz: 7bd814e27cf3029fa9c3b168b8edb0e938f419daf82c16226110d3cb5bd086d4526a2189bbb2a3094745db17cdb0cd3667ec409525d7f324ccfef0d8215d6833
-  data.tar.gz: 7d46df305375c76723f9a6f1eee238fdab6eea57a900aba16bb4784d954f13e95a3f2f09c975c9a4b3843b9aec8ea6e4a95109e42dcd5ec2c73bcdfc49b24843
+  metadata.gz: e018de14b4a7f2267a7d7a9f62cd821ba9d9c9eabaa841595b168f8d681d6898ed4a4409f04d6ff430021fa57767e7d1284f723684463fd1058ab785bc6d783b
+  data.tar.gz: d78ac731320c1f902af6d320858344766b5ae90cd033acf45156760cf00e3ef9e531514132982f5bb17a552b0bc82c8147092466bde300df03f9171e018b2624

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in absgit.gemspec
-gemspec
+gem 'methadone', '~> 1.3.0'
+gem 'minitest', '~> 4.7.3'
+gem 'minitest-reporters', '~> 0.14.17'
+gem 'rake', '~> 10.0.4'

data/Gemfile.lock

@@ -1,16 +1,9 @@
-PATH
-  remote: .
-  specs:
-    absgit (0.1.0)
-      methadone (~> 1.2.6)
-
 GEM
-  remote: https://rubygems.org/
   specs:
     ansi (1.4.3)
     builder (3.0.4)
     hashie (2.0.4)
-    methadone (1.2.6)
+    methadone (1.3.0)
       bundler
     minitest (4.7.3)
     minitest-reporters (0.14.17)
@@ -27,8 +20,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  absgit!
-  bundler (~> 1.3)
-  minitest (~> 4.0)
+  methadone (~> 1.3.0)
+  minitest (~> 4.7.3)
   minitest-reporters (~> 0.14.17)
-  rake
+  rake (~> 10.0.4)

data/README.md

@@ -7,7 +7,7 @@ called `absgit`.
 It provides a program of the same name
 which
 allows one to manipulate files in a Git repository,
-regardless of whether one is inside it.
+even if one's working directory is outside it.
 
 ## Installation
 

data/Rakefile

@@ -1,7 +1,19 @@
 require 'bundler/gem_tasks'
 
+desc 'Run absgit'
+task :run, [:absgit_args] do |dummy, args|
+  system(
+    *with_bundler(
+      'ruby', '-I', 'lib', 'bin/absgit', *args.absgit_args.split
+    )
+  )
+end
+
 desc 'Run the test suite'
 task :test do
+  cmd = 'minitest4', 'test'
+  cmd = 'minitest4', '-p', 'test', '--', '-v'
+
   #> we need to set RUBYLIB, because the test suite
   # invokes the application as a separate process
 
@@ -9,11 +21,11 @@ task :test do
     {
       'RUBYLIB' =>
         (
-          ENV.fetch('RUBYLIB', '').split(':') +
-          [File.join(__dir__, 'lib')]
+          [File.join(__dir__, 'lib')] +
+          ENV.fetch('RUBYLIB', '').split(':')
         ).join(':')
     },
-    FileUtils::RUBY, 'test/absgit_test.rb'
+    *with_bundler(*cmd)
   )
 end
 

data/absgit.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
 
   spec.description       = %q{
     This gem contains a program which allows one to
-    manipulate files in a Git repository,
-    regardless of whether one is inside it.
+    manipulate files in a Git repository
+    from any location in the filesystem.
   }.split.join(' ')
 
   spec.homepage      = "https://github.com/ruafozy/absgit"

data/doc/absgit.md

@@ -23,25 +23,25 @@ For example:
 
     absgit commit --message blah /some/absolute/path
 
-Its logic is very simple.
+Its logic is simple.
 It skips over the Git subcommand and iterates
 over the remaining arguments, looking
 for the first argument which contains a slash and
 names a path inside a Git repository.
-If it finds such an argument,
+If it finds no such argument, it simply delegates to
+Git.
+
+On the other hand, if it *does*
+find such an argument,
 it infers `GIT_DIR` and `GIT_WORK_TREE`,
 then invokes `git` with these
 variables in its environment.
 
-If it finds no such argument,
-then it simply invokes `git` with an
-unchanged environment.
-For example, the following
-two commands are essentially equivalent:
-
-    absgit log -3
-
-    git log -3
+Also,
+any argument which contains a slash and denotes
+a path inside the repository is turned into an
+absolute path before being passed to Git.
+This enables relative paths and symlinks to work.
 
 ## Options
 
@@ -49,7 +49,6 @@ two commands are essentially equivalent:
 
 ## Origin of name
 
-The software is commonly used in conjunction with
-absolute pathnames,
-so the prefix "abs" was chosen,
-as a short version of "absolute".
+‘abs’ is from ‘absolute’;
+the software is commonly used with
+absolute pathnames.

data/lib/absgit.rb

@@ -2,15 +2,17 @@ require 'absgit/version'
 require 'methadone'
 require 'optparse'
 require 'pathname'
+require 'utils'
 
 class Absgit
   include Methadone::CLILogging
+  include Utils
 
   GIT_DIR_BASE = '.git'
   PROGRAM_NAME = 'absgit'
 
   def initialize(args)
-    @args = args
+    @args = args.dup
     @options = {}
   end
 
@@ -74,25 +76,34 @@ class Absgit
           break repo if !repo.nil?
         }
 
-      env =
-        if repo_path.nil?
-          {}
-        else
-          {
-            'GIT_DIR' => (repo_path + GIT_DIR_BASE).to_s,
-            'GIT_WORK_TREE' => repo_path.to_s,
-          }
-        end
+      if repo_path.nil?
+        env = {}
+
+        git_args = @args
+      else
+        env = {
+          'GIT_DIR' => (repo_path + GIT_DIR_BASE).to_s,
+          'GIT_WORK_TREE' => repo_path.to_s,
+        }
+
+        git_args = @args.map { |arg|
+          make_tracked_files_relative_to_repo(repo_path, arg)
+        }
+      end
+
+      command = ['git'] + git_args
 
+      debug(command.inspect)
+      debug(env.inspect)
+
+      system(env, *command)
+      #
       #< it seems better to use environment variables
       # rather than "--git-dir" and "--work-tree", because
       # environment variables will be inherited by processes
       # spawned by git aliases.
 
-      command = ['git'] + @args
-      debug(command.inspect)
-      debug(env.inspect)
-      system(env, *command)
+      exit($?.exited? ? $?.exitstatus: 1)
     end
   end
 

data/lib/absgit/version.rb

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

data/lib/utils.rb

@@ -0,0 +1,30 @@
+module Utils
+  private
+
+  def make_tracked_files_relative_to_repo(repo_dir, x)
+    repo_dir_real = Pathname.new(repo_dir).realpath.to_s
+
+    catch(:finished) do
+      if x.include?('/')
+        discards = []
+
+        Pathname.new(x).ascend do |path|
+          if path.exist?
+            real = path.realpath.to_s
+
+            if real == repo_dir_real ||
+              real.start_with?(repo_dir_real + '/')
+            then
+              x = File.join(real, *discards)
+              throw :finished
+            end
+          else
+            discards.unshift(path.basename)
+          end
+        end
+      end
+    end
+
+    x
+  end
+end

data/rakelib/utils.rake

@@ -0,0 +1,7 @@
+def with_bundler(*command)
+  command.tap do |cmd|
+    if !ENV.has_key?('BUNDLE_BIN_PATH')
+      cmd.unshift('bundle', 'exec') 
+    end
+  end
+end

data/test/absgit_test.rb

@@ -1,16 +1,8 @@
-require 'rubygems'
-gem 'minitest', '~> 4.0'
-
-require 'minitest/unit'
-MiniTest::Unit.autorun
-
-require "minitest/reporters"
-MiniTest::Reporters.use!
-
 require 'absgit'
 require 'fileutils'
 require 'shellwords'
 require 'tmpdir'
+require 'minitest/unit'
 
 class AbsgitTest < MiniTest::Unit::TestCase
   APP_PATH = File.expand_path(
@@ -87,6 +79,46 @@ class AbsgitTest < MiniTest::Unit::TestCase
     )
   end
 
+  def test_rel_path_works
+    # Given
+
+    repo = 'repo'
+    Dir.mkdir(repo)
+    system(*%W{git init --quiet #{repo}})
+    filename = 'f'
+    rel_path = File.join(repo, filename)
+    FileUtils.touch(rel_path)
+
+    # When
+
+    system(APP_PATH, 'add', rel_path)
+
+    # Then
+
+    assert_equal(1, files_in_index(repo).size)
+  end
+
+  def test_symlink_works
+    # Given
+
+    repo = 'repo'
+    Dir.mkdir(repo)
+    system(*%W{git init --quiet #{repo}})
+    filename = 'f'
+    rel_path = File.join(repo, filename)
+    FileUtils.touch(rel_path)
+    symlink = './symlink'
+    File.symlink(rel_path, symlink)
+
+    # When
+
+    system(APP_PATH, 'add', symlink)
+
+    # Then
+
+    assert_equal(1, files_in_index(repo).size)
+  end
+
   def test_commit_does_not_require_chdir_to_repo
     # Given
 
@@ -151,8 +183,44 @@ class AbsgitTest < MiniTest::Unit::TestCase
     assert_equal(num_commits_before + 1, num_commits(repo))
   end
 
+  class InRepo < self
+    def setup
+      super
+      Dir.chdir(get_repo)
+    end
+
+    def test_exit_status_preserved
+      [
+        %w{ls-files},
+        %w{ls-files --non-existent-option},
+        %w{add non-existent-file},
+      ].each do |args|
+        # Given & When
+
+        opts = {
+          err: '/dev/null',
+          out: '/dev/null',
+        }
+        system(*(%w{git} + args), opts)
+        git_exit_status = $?.exitstatus
+        system(*([APP_PATH] + args), opts)
+        absgit_exit_status = $?.exitstatus
+
+        # Then
+
+        assert_equal(git_exit_status, absgit_exit_status)
+      end
+    end
+  end
+
   private
 
+  def files_in_index(repo)
+    Dir.chdir(repo) do
+      %x{git ls-files}.split("\n")
+    end
+  end
+
   def num_commits(repo_dir)
     Dir.chdir(repo_dir) {
       `git rev-list --count HEAD`.match(/\A\d+\n\z/) { |m|
@@ -160,9 +228,15 @@ class AbsgitTest < MiniTest::Unit::TestCase
       }
     }
   end
+
+  def get_repo
+    dir = Dir.mktmpdir(nil, '.')
+    system('git', 'init', '--quiet', dir)
+    dir
+  end
 end
 
-if false
+0.times do
   module Kernel
     alias old_system system
 

data/test/utils_test.rb

@@ -0,0 +1,42 @@
+require 'fileutils'
+require 'minitest/unit'
+require 'tmpdir'
+require 'utils'
+
+class UtilsTest < MiniTest::Unit::TestCase
+  include Utils
+
+  def setup
+    @saved_dir = Dir.pwd
+    @temp_dir = Dir.mktmpdir
+    Dir.chdir(@temp_dir)
+  end
+
+  def teardown
+    Dir.chdir(@saved_dir)
+    FileUtils.rm_r(@temp_dir, secure: true)
+  end
+
+  def test_make_tracked_files_relative_to_repo
+    # Given
+
+    name1 = 'a/b/c/d'
+    FileUtils.makedirs(name1)
+
+    symlink = 'a/b/c/symlink'
+    File.symlink('d', symlink)
+
+    name2 = "#{symlink}/e/f/g/h"
+
+    # When
+
+    result = make_tracked_files_relative_to_repo(name1, name2)
+
+    # Then
+
+    assert_equal(
+      File.join(File.realpath(name1), 'e/f/g/h'),
+      result
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: absgit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Ruafozy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem contains a program which allows one to manipulate files in a
-  Git repository, regardless of whether one is inside it.
+  Git repository from any location in the filesystem.
 email: 
 executables:
 - absgit
@@ -99,7 +99,10 @@ files:
 - doc/absgit.md
 - lib/absgit.rb
 - lib/absgit/version.rb
+- lib/utils.rb
+- rakelib/utils.rake
 - test/absgit_test.rb
+- test/utils_test.rb
 homepage: https://github.com/ruafozy/absgit
 licenses:
 - MIT