reapack-index 1.1rc1 → 1.1rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55a64059d22c205bb18d8854f3603fc8e89110e6
-  data.tar.gz: 849a34318b8679e8d34d4f10c99a7101b22c2fd7
+  metadata.gz: 45a5d393aea0b960659f4bb459bf40adfb0abc0c
+  data.tar.gz: 5f3955b073c091771b71383f1ce9fcb679593950
 SHA512:
-  metadata.gz: bf8ba5d83856c37efc94d269d09cab08b98e31d0197711f73511710c44854211ff535600d7ae89527d5239856bc4769e030a1ac2107f20ece264323c9a78ce11
-  data.tar.gz: 5e4d1f32904bdbd1a01d201de7c37d02e2e7b919956e6cd6e0dd16f9a0542fbbe2c10fccd450c94aa59a4c1e0b5474b1804d25270cff3c9d7a1b16a25d3badee
+  metadata.gz: 34198f4f8e78724ae0036a4c7c1b421530c88f10446a0d60f6cc057fca43e12c80713874b95e57010e24b1a850c3f0bd7da0a2ccc504ca7d8ebf7aea90c97e12
+  data.tar.gz: a68176f901401b24fab087eae9e0507fc9fd9dccf8eebb479d2c482503a7621c15c7443c58ed5cc8ab5b3b6daad9fab2f3342d283308ce54b7c57a200ffda181

data/lib/reapack/index/cli.rb

@@ -7,12 +7,17 @@ class ReaPack::Index::CLI
     @git = ReaPack::Index::Git.new argv.first || Dir.pwd
     log "found git repository in #{@git.path}"
 
-    @opts = parse_options(read_config).merge @opts unless @opts[:noconfig]
+    read_config unless @opts[:noconfig]
+
+    unless @opts[:output]
+      @opts[:output] = expand_path DEFAULTS[:output], relative: true
+    end
+
     @opts = DEFAULTS.merge @opts
 
     log Hash[@opts.sort].inspect
 
-    @index = ReaPack::Index.new expand_path(@opts[:output])
+    @index = ReaPack::Index.new File.expand_path(@opts[:output])
     @index.amend = @opts[:amend]
     @index.strict = @opts[:strict]
     set_url_template
@@ -74,7 +79,7 @@ private
       @index.auto_bump_commit = false
 
       @opts[:scan].map {|hash|
-        if c = @git.last_commit_for(hash)
+        if c = @git.last_commit_for(@git.relative_path hash)
           [c, hash]
         elsif c = @git.get_commit(hash)
           c
@@ -316,10 +321,19 @@ private
     false
   end
 
-  def expand_path(path)
+  def expand_path(path, **options)
     # expand from the repository root or from the current directory if
     # the repository is not yet initialized
-    File.expand_path path, @git ? @git.path : Dir.pwd
+    path = File.expand_path path, options[:base] || (@git ? @git.path : Dir.pwd)
+
+    if options[:relative]
+      root = Pathname.new Dir.pwd
+      file = Pathname.new path
+
+      file.relative_path_from(root).to_s
+    else
+      path
+    end
   end
 
   def indent(input)

data/lib/reapack/index/cli/options.rb

@@ -11,7 +11,7 @@ class ReaPack::Index::CLI
     commit: nil,
     message: 'index: $changelog',
     ignore: [],
-    output: './index.xml',
+    output: 'index.xml',
     progress: true,
     quiet: false,
     rebuild: false,
@@ -23,7 +23,7 @@ class ReaPack::Index::CLI
   }.freeze
 
   def read_config
-    CONFIG_SEARCH.map {|dir|
+    CONFIG_SEARCH.each {|dir|
       dir = expand_path dir
       path = File.expand_path '.reapack-index.conf', dir
 
@@ -34,13 +34,14 @@ class ReaPack::Index::CLI
         next
       end
 
-      Shellwords.split File.read(path)
-    }.flatten.compact
+      opts = Shellwords.split File.read(path)
+      @opts = parse_options(opts, dir).merge @opts
+    }
   rescue ArgumentError => e
     raise ReaPack::Index::Error, e.message
   end
 
-  def parse_options(args)
+  def parse_options(args, basepath = nil)
     opts = Hash.new
 
     OptionParser.new do |op|
@@ -60,7 +61,7 @@ class ReaPack::Index::CLI
         opts[:scan] ||= []
 
         if commit
-          opts[:scan] << commit.strip
+          opts[:scan] << expand_path(commit.strip, base: basepath, relative: true)
         else
           opts[:scan].clear
         end
@@ -83,12 +84,12 @@ class ReaPack::Index::CLI
 
       op.on '-i', '--ignore PATH', "Don't check or index any file starting with PATH" do |path|
         opts[:ignore] ||= []
-        opts[:ignore] << expand_path(path)
+        opts[:ignore] << expand_path(path, base: basepath)
       end
 
       op.on '-o', "--output FILE=#{DEFAULTS[:output]}",
           'Set the output filename and path for the index' do |file|
-        opts[:output] = file.strip
+        opts[:output] = expand_path(file.strip, base: basepath, relative: true)
       end
 
       op.on '--[no-]strict', 'Enable strict validation mode' do |bool|
@@ -126,7 +127,7 @@ class ReaPack::Index::CLI
       end
 
       op.on '-A', '--about=FILE', 'Set the about content from a file' do |file|
-        opts[:about] = file.strip
+        opts[:about] = expand_path file.strip, base: basepath, relative: true
       end
 
       op.on '--remove-about', 'Remove the about content from the index' do

data/lib/reapack/index/gem_version.rb

@@ -1,5 +1,5 @@
 module ReaPack
   class Index
-    VERSION = '1.1rc1'
+    VERSION = '1.1rc2'
   end
 end

data/lib/reapack/index/git.rb

@@ -65,7 +65,7 @@ class ReaPack::Index
 
     def relative_path(path)
       root = Pathname.new self.path
-      file = Pathname.new path
+      file = Pathname.new File.expand_path(path)
 
       file.relative_path_from(root).to_s
     end

data/setup/reapack-index.nsi

@@ -4,7 +4,7 @@ Unicode true
 !include Sections.nsh
 !include StrRep.nsh
 
-!define VERSION "1.1rc1"
+!define VERSION "1.1rc2"
 !define NAME "reapack-index ${VERSION}"
 !define LONG_VERSION "0.1.0.0"
 

data/test/cli/test_metadata.rb

@@ -100,6 +100,24 @@ class TestCLI::Metadata < MiniTest::Test
     end
   end
 
+  def test_about_relative_config
+    setup = proc {
+      mkfile '.reapack-index.conf', '--about=README.md'
+      mkfile 'README.md', '# Hello World'
+
+      dir = mkpath 'test'
+      FileUtils.mkdir dir
+      Dir.chdir dir
+    }
+
+    wrapper [], setup: setup do
+      _, stderr = capture_io { @cli.run }
+
+      refute_match /no such file or directory/i, stderr
+      assert_match 'Hello World', read_index
+    end
+  end
+
   def test_about_pandoc_not_found
     old_path = ENV['PATH']
 

data/test/cli/test_scan.rb

@@ -321,6 +321,8 @@ processing [a-f0-9]{7}: third commit
     options = [ '--scan', 'cat/test1.lua']
 
     setup = proc {
+      Dir.chdir @git.path
+
       @git.create_commit 'initial commit',
         [mkfile('cat/test1.lua', '@version 1')]
 
@@ -390,7 +392,9 @@ processing [a-f0-9]{7}: third commit
   end
 
   def test_report_right_invalid_hash
-    wrapper ['--scan', 'README.md', '--scan', INVALID_HASHES.first] do
+    setup = proc { Dir.chdir @git.path }
+
+    wrapper ['--scan', 'README.md', '--scan', INVALID_HASHES.first], setup: setup do
       @git.create_commit 'initial commit', [mkfile('README.md')]
 
       _, stderr = capture_io do

data/test/test_cli.rb

@@ -42,7 +42,8 @@ class TestCLI < MiniTest::Test
   end
 
   def test_output
-    wrapper ['-o output.xml'] do
+    setup = proc { Dir.chdir @git.path }
+    wrapper ['-o output.xml'], setup: setup do
       assert_equal mkpath('output.xml'), @cli.index.path
     end
   end

data/test/test_git.rb

@@ -18,6 +18,7 @@ class TestGit < MiniTest::Test
 
   def test_relative_path
     assert_equal 'test', @git.relative_path(File.join(@git.path, 'test'))
+    assert_match 'test', @git.relative_path('test')
   end
 
   def test_guess_url_template

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapack-index
 version: !ruby/object:Gem::Version
-  version: 1.1rc1
+  version: 1.1rc2
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler