absgit 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e5b421181caae16aa6117e6b3a69da27869d11e
-  data.tar.gz: 6018b58723501e31f4d410d56035467a314f0cba
+  metadata.gz: cd29facc8a9fc8d0fd30f4c06f532780ce7e16be
+  data.tar.gz: f3cf9946f25f02229d4d345a0d2daea7b3ffcf37
 SHA512:
-  metadata.gz: e018de14b4a7f2267a7d7a9f62cd821ba9d9c9eabaa841595b168f8d681d6898ed4a4409f04d6ff430021fa57767e7d1284f723684463fd1058ab785bc6d783b
-  data.tar.gz: d78ac731320c1f902af6d320858344766b5ae90cd033acf45156760cf00e3ef9e531514132982f5bb17a552b0bc82c8147092466bde300df03f9171e018b2624
+  metadata.gz: 1ce175e288ab5067c4103d08c4fa88c15fd84a30d81a6520e80e0396e0d343426a09bf849c3a258c63b575fcbfa89c4783868abad9fa2821860946fd20d9e287
+  data.tar.gz: af63a1d19436a28ca56ca8d4a24c9054db1759d99fb73f6caa984a88b21aeb467df7b667fb5ed1300a52e0063f22c3c2ce0dea3f93db1b622cce9c634c88b857

data/Rakefile

@@ -9,11 +9,14 @@ task :run, [:absgit_args] do |dummy, args|
   )
 end
 
-desc 'Run the test suite'
-task :test do
-  cmd = 'minitest4', 'test'
+desc %q{Run the test suite (`pat' is used with "-n")}
+task :test, [:pat] do |dummy, args|
   cmd = 'minitest4', '-p', 'test', '--', '-v'
 
+  if args.pat
+    cmd += ['-n', args.pat]
+  end
+
   #> we need to set RUBYLIB, because the test suite
   # invokes the application as a separate process
 
@@ -21,7 +24,10 @@ task :test do
     {
       'RUBYLIB' =>
         (
-          [File.join(__dir__, 'lib')] +
+          [
+            File.join(__dir__, 'lib'),
+            File.join(__dir__, 'test', 'lib'),
+          ] +
           ENV.fetch('RUBYLIB', '').split(':')
         ).join(':')
     },

data/doc/absgit.md

@@ -39,8 +39,8 @@ variables in its environment.
 
 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.
+a path inside the repository is turned into a
+canonicalised absolute pathname before being passed to Git.
 This enables relative paths and symlinks to work.
 
 ## Options

data/lib/absgit.rb

@@ -41,6 +41,12 @@ class Absgit
         @options[:help] = true
       end
 
+      parser.on(
+        '-p', '--path PATH', 'Use PATH to determine Git repository'
+      ) do |path|
+        @options[:path] = path
+      end
+
       parser.on('--version', 'Show program name and version') do
         @options[:version] = true
       end
@@ -49,7 +55,7 @@ class Absgit
 
   def run
     begin
-      option_parser.order!
+      option_parser.order!(@args)
     rescue OptionParser::ParseError
       $stderr.puts 'Error: incorrect usage'
       $stderr.puts ''
@@ -69,12 +75,23 @@ class Absgit
     elsif @options[:help]
       puts option_parser
     else
-      repo_path =
-        @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?
-        }
+      if @options[:path]
+        repo_path = self.class.get_repo_path(@options[:path])
+
+        if repo_path.nil?
+          $stderr.puts \
+            "Fatal error: cannot " +
+            "map path to Git repository: #{@options[:path]}"
+          exit(1)
+        end
+      else
+        repo_path =
+          @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?
+          }
+      end
 
       if repo_path.nil?
         env = {}

data/lib/absgit/version.rb

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

data/test/{absgit_test.rb → absgit_above_repo_test.rb}

@@ -1,44 +1,21 @@
 require 'absgit'
+require 'absgit_common'
 require 'fileutils'
 require 'shellwords'
 require 'tmpdir'
 require 'minitest/unit'
 
-class AbsgitTest < MiniTest::Unit::TestCase
-  APP_PATH = File.expand_path(
-    "../../bin/#{Absgit::PROGRAM_NAME}",
-    __FILE__
-  )
-  APP_PATH_ESC = Shellwords.escape(APP_PATH)
-
-  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
+class AbsgitAboveRepoTest < MiniTest::Unit::TestCase
+  include AbsgitCommon
 
   def test_help_message_is_output
     assert_match(/--help\b/, `#{APP_PATH_ESC} --help`)
   end
 
   def test_options_for_git_are_left_alone
-    refute_match(
-      /--help\b/,
-
-      #> any program that consumes its input will do
-      # instead of "wc"
-
-      %x{
-        PAGER=wc #{APP_PATH_ESC} log --help
-      }
+    refute_equal(
+      `#{APP_PATH_ESC} --help`,
+      `#{APP_PATH_ESC} log --help`
     )
   end
 
@@ -183,68 +160,52 @@ 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_path_option_works_for_symlink
+    # Given
 
-    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
+    repo = get_repo
 
-  private
+    tracked_file = File.join(repo, 'tracked_file')
+    FileUtils.touch(tracked_file)
 
-  def files_in_index(repo)
-    Dir.chdir(repo) do
-      %x{git ls-files}.split("\n")
-    end
-  end
+    symlink = './symlink'
+    File.symlink(tracked_file, symlink)
 
-  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
+    # When
 
-  def get_repo
-    dir = Dir.mktmpdir(nil, '.')
-    system('git', 'init', '--quiet', dir)
-    dir
+    system(APP_PATH, '--path', symlink, 'add', symlink)
+
+    # Then
+
+    assert_equal(1, files_in_index(repo).size)
   end
-end
 
-0.times do
-  module Kernel
-    alias old_system system
+  def test_path_option_works_for_real_path
+    # Given
+
+    repo = get_repo
+
+    tracked_file = File.join(repo, 'tracked_file')
+    FileUtils.touch(tracked_file)
+
+    real_path = File.realpath(tracked_file)
 
-    def system(*a)
-      puts "\ndebug: about to call #{__method__} with " +
-        "these parameters: #{a.inspect}"
-      old_system(*a)
-      puts "\ndebug: call to #{__method__} completed"
+    # When
+
+    system(APP_PATH, '--path', real_path, 'add', real_path)
+
+    # Then
+
+    assert_equal(1, files_in_index(repo).size)
+  end
+
+  def test_error_behaviour_for_path_option
+    output, err_msg = capture_subprocess_io do
+      system(APP_PATH, '--path', '/', 'log')
     end
+
+    refute $?.success?
+    assert_equal('', output)
+    assert_match(/./, err_msg)
   end
 end

data/test/absgit_within_repo_test.rb

@@ -0,0 +1,35 @@
+require 'absgit'
+require 'absgit_common'
+require 'minitest/unit'
+
+class AbsgitWithinRepoTest < MiniTest::Unit::TestCase
+  include AbsgitCommon
+
+  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

data/test/lib/absgit_common.rb

@@ -0,0 +1,60 @@
+require 'fileutils'
+require 'shellwords'
+require 'tmpdir'
+
+module AbsgitCommon
+  APP_PATH = File.expand_path(
+    "../../../bin/#{Absgit::PROGRAM_NAME}",
+    __FILE__
+  )
+  APP_PATH_ESC = Shellwords.escape(APP_PATH)
+
+  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
+
+  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|
+        m[0].to_i
+      }
+    }
+  end
+
+  def get_repo
+    dir = Dir.mktmpdir(nil, '.')
+    system('git', 'init', '--quiet', dir)
+    dir
+  end
+end
+
+0.times do
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: absgit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ruafozy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -101,7 +101,9 @@ files:
 - lib/absgit/version.rb
 - lib/utils.rb
 - rakelib/utils.rake
-- test/absgit_test.rb
+- test/absgit_above_repo_test.rb
+- test/absgit_within_repo_test.rb
+- test/lib/absgit_common.rb
 - test/utils_test.rb
 homepage: https://github.com/ruafozy/absgit
 licenses:
@@ -128,3 +130,4 @@ signing_key:
 specification_version: 4
 summary: Allow manipulating Git repository files outside a repository
 test_files: []
+has_rdoc: false