reapack-index 1.1rc4 → 1.1rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 055dade2288572ca9c5ba6b088830910e4c02ba4
-  data.tar.gz: c0a47135f969d857dd62758411e24c3c55ee11b6
+  metadata.gz: 521e9cf95253116fdbdae336d5e103e412800a63
+  data.tar.gz: 0ba6258b623ec7dc4daefc2055ba8cd9e5a147a8
 SHA512:
-  metadata.gz: b36c261cb78483239b8c7130f60ed1140e82b439ed3d7b63b37a70f829575cab3c4811384bfac35f6420e9102f27b620aba1baf512ad396d9c90675c59d11434
-  data.tar.gz: 76444bacda5d294b627caf9f53167675dd6980f1edb5ff4771f73db4c1438d51ed7ccaa906b9d90ce96ef09af2746ac7bd553678aada64190c9b375165944c91
+  metadata.gz: 0cbe24ed175822879c0dc9fff484b6311c7d3a53d4000d8ee7036d885184e85b448f8f953fb5ca5f50b872556cc826e2b521845166fca18637867d98f9dc5624
+  data.tar.gz: a747dc392326879db9980f449ac483d13b92d8a6d0de0e003f2b6242957cf23e718f24ea8cc4b9af68b6d5f55f20ffdc2e48770b95a504ae3543120e300adcc3

data/README.md

@@ -29,7 +29,7 @@ reapack-index [options] [path-to-your-repository]
 ```
 Modes:
     -c, --check                      Test every package including uncommited changes and exit
-    -s, --scan [FILE|COMMIT]         Scan new commits (default), a file or a commit
+    -s, --scan [PATH|COMMIT]         Scan new commits (default), a path or a specific commit
         --no-scan                    Do not scan for new commits
         --rebuild                    Clear the index and rescan the whole git history
 Indexer options:

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

@@ -56,7 +56,7 @@ class ReaPack::Index::CLI
         opts[:check] = true
       end
 
-      op.on '-s', '--scan [FILE|COMMIT]', 'Scan new commits (default), a file or a commit' do |commit|
+      op.on '-s', '--scan [PATH|COMMIT]', 'Scan new commits (default), a path or a specific commit' do |commit|
         opts[:check] = opts[:rebuild] = false
         opts[:scan] ||= []
 

data/lib/reapack/index/cli.rb

@@ -78,16 +78,23 @@ private
     else
       @index.auto_bump_commit = false
 
+      # call process_commit only once per commit instead of once per --scan argument
+      commits = Hash.new
       @opts[:scan].map {|hash|
-        if c = @git.last_commit_for(@git.relative_path hash)
-          [c, hash]
+        files = @git.last_commits_for @git.relative_path(hash)
+        if !files.empty?
+          files.each {|commit, files|
+            commits[commit] = Array.new unless commits.has_key? commit # keep nil
+            commits[commit].concat files unless commits[commit].nil?
+          }
         elsif c = @git.get_commit(hash)
-          c
+          commits[c] = nil
         else
           $stderr.puts "--scan: bad file or revision: '%s'" % hash
           throw :stop, false
         end
-      }.compact
+      }
+      commits.to_a
     end
 
     unless commits.empty?
@@ -97,7 +104,7 @@ private
     end
   end
 
-  def process_commit(commit, file = nil)
+  def process_commit(commit, files = nil)
     if @opts[:verbose]
       log 'processing %s: %s' % [commit.short_id, commit.summary]
     end
@@ -108,9 +115,9 @@ private
 
     commit.each_diff
       .select {|diff|
-        (file.nil? || diff.file == file) &&
+        (files.nil? || files.include?(diff.file)) &&
           (not ignored? expand_path(diff.file)) &&
-          ReaPack::Index.type_of(diff.file)
+          ReaPack::Index.is_package?(diff.file)
       }
       .sort_by {|diff|
         diff.status == :deleted || diff.new_header[:noindex] ? 0 : 1

data/lib/reapack/index/gem_version.rb

@@ -1,5 +1,6 @@
 module ReaPack
   class Index
-    VERSION = '1.1rc4'
+    # bump in setup/reapack-index.nsi too
+    VERSION = '1.1rc5'
   end
 end

data/lib/reapack/index/git.rb

@@ -50,6 +50,20 @@ class ReaPack::Index
       }
     end
 
+    def last_commits_for(pattern)
+      dir = pattern.empty? ? '' : pattern + '/'
+      out = Hash.new
+      last_commit.filelist.each {|file|
+        path = File.split(file).first + '/'
+        next unless path.start_with?(dir) || file == pattern
+
+        commit = last_commit_for(file)
+        out[commit] ||= Array.new
+        out[commit] << file
+      }
+      out
+    end
+
     def guess_url_template
       remote = @repo.remotes['origin']
       return unless remote
@@ -67,7 +81,8 @@ class ReaPack::Index
       root = Pathname.new self.path
       file = Pathname.new File.expand_path(path)
 
-      file.relative_path_from(root).to_s
+      rel = file.relative_path_from(root).to_s
+      rel == '.' ? '' : rel
     end
 
     def create_commit(message, files)
@@ -163,6 +178,12 @@ class ReaPack::Index
       o && id == o.id
     end
 
+    alias :eql? :==
+
+    def hash
+      id.hash
+    end
+
     def inspect
       "#<#{self.class} #{id} #{summary}>"
     end

data/lib/reapack/index/provides.rb

@@ -1,11 +1,15 @@
 class ReaPack::Index
-  Provides = Struct.new :file_pattern, :url_template, :platform, :type, :main do
+  Provides = Struct.new :file_pattern, :url_template, :target, :platform, :type, :main do
     PROVIDES_REGEX = /
       \A
-      ( \[ \s* (?<options> .+? ) \s* \] )?
+      (?: \[ \s* (?<options> .+? ) \s* \] )?
       \s*
-      (?<file> .+?)
-      ( \s+ (?<url> (?:file|https?):\/\/.+ ) )?
+      (?<pattern>.+?)
+      (?:
+        \s*>\s*(?<target>.+?)
+      |
+        \s+ (?<url_tpl>(?:file|https?):\/\/.+)
+      )?
       \z
     /x.freeze
 
@@ -24,11 +28,9 @@ class ReaPack::Index
         m = line.strip.match PROVIDES_REGEX
         return unless m
 
-        options, pattern, url_tpl = m[:options], m[:file], m[:url]
+        instance = self.new m[:pattern], m[:url_tpl], m[:target]
 
-        instance = self.new pattern, url_tpl
-
-        options and options.split("\x20").each {|user_opt|
+        m[:options]&.split("\x20")&.each {|user_opt|
           user_opt.strip!
           next if user_opt.empty?
 

data/lib/reapack/index/scanner.rb

@@ -37,7 +37,7 @@ class ReaPack::Index
 
     HEADER_ALIASES = {
       [:reascript_name, :jsfx_name, :theme_name,
-        :extension_name, :desc] => :description,
+        :extension_name, :desc, :name] => :description,
       [:links, :website] => :link,
       :screenshots => :screenshot,
     }.freeze
@@ -47,6 +47,7 @@ class ReaPack::Index
     def initialize(cat, pkg, mh, index)
       @cat, @pkg, @mh, @index = cat, pkg, mh, index
       @cselector = @index.cdetector[pkg.path]
+      @self_overriden = false
     end
 
     def run
@@ -76,7 +77,7 @@ class ReaPack::Index
           @cselector.clear
           sources = parse_provides @mh[:provides]
 
-          if !metapackage? && sources.none? {|src| src.file.nil? }
+          unless metapackage? || @self_overriden
             # add the package itself as a main source
             src = Source.new make_url(@pkg.path)
             src.detect_sections @pkg
@@ -142,6 +143,13 @@ class ReaPack::Index
         end
 
         files.map {|file|
+          if line.target
+            target = line.target
+            expanded = ReaPack::Index.expand line.target, @pkg.category
+          else
+            target = file
+          end
+
           src = Source.new make_url(file, line.url_template)
           src.platform = line.platform
           src.type = line.type
@@ -154,7 +162,7 @@ class ReaPack::Index
           end
 
           @cselector.push src.type || @pkg.type, src.platform,
-            line.url_template ? expanded : file
+            line.url_template || line.target ? expanded : target
 
           if file == @pkg.path
             if metapackage?
@@ -164,9 +172,14 @@ class ReaPack::Index
               # not a metapackage? then the current file is registered by default
               src.detect_sections @pkg
             end
+
+            src.file = target if line.target
+            @self_overriden = true
           else
             if line.url_template
               src.file = file
+            elsif line.target
+              src.file = target
             else
               src.file = Pathname.new(file).relative_path_from(pathdir).to_s
             end

data/lib/reapack/index.rb

@@ -37,6 +37,7 @@ class ReaPack::Index
     effect: %w{jsfx},
     data: %w{data},
     theme: %w{theme},
+    langpack: %w{ReaperLangPack},
   }.freeze
 
   FS_ROOT = File.expand_path('/').freeze

data/setup/reapack-index.nsi

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

data/test/cli/test_scan.rb

@@ -318,8 +318,6 @@ processing [a-f0-9]{7}: third commit
   end
 
   def test_scan_file
-    options = [ '--scan', 'cat/test1.lua']
-
     setup = proc {
       Dir.chdir @git.path
 
@@ -329,19 +327,123 @@ processing [a-f0-9]{7}: third commit
       @git.create_commit 'second commit', [
         mkfile('cat/test1.lua', '@version 2'),
         mkfile('cat/test2.lua', '@version 2.2'),
+        mkfile('cat/test3.lua', '@version 3'),
       ]
 
       @git.create_commit 'third commit',
-        [mkfile('cat/test3.lua', '@version 3')]
+        [mkfile('cat/test4.lua', '@version 4')]
+    }
+
+    wrapper ['--progress', '--scan', 'cat/test1.lua', '--scan', 'cat/test2.lua'],
+        setup: setup do
+      stdin, stderr = capture_io { @cli.run }
+
+      contents = read_index
+      refute_match 'version name="1"', contents, 'The initial commit was scanned'
+      assert_match 'version name="2"', contents
+      assert_match 'test2.lua', contents, 'test2.lua was indexed'
+      refute_match 'test3.lua', contents, 'The third commit was scanned'
+
+      assert_match /Indexing commit \d+ of 1/, stderr # not 3 commits!
+    end
+  end
+
+  def test_scan_directory
+    setup = proc {
+      Dir.chdir @git.path
+
+      mkfile('dir1/uncommited.lua')
+
+      @git.create_commit 'initial commit',
+        [mkfile('dir1/test1.lua', '@version 1')]
+
+      @git.create_commit 'second commit', [
+        mkfile('dir1/test2.lua', '@version 2'),
+        mkfile('dir1/sub/test3.lua', '@version 3'),
+        mkfile('dir2/test4.lua', '@version 4'),
+      ]
+    }
+
+    wrapper ['--progress', '--scan', 'dir1'], setup: setup do
+      stdout, stderr = capture_io { @cli.run }
+
+      contents = read_index
+      assert_match 'test1.lua', contents
+      assert_match 'test2.lua', contents
+      assert_match 'test3.lua', contents
+      refute_match 'test4.lua', contents, 'test4.lua was indexed'
+
+      assert_match /Indexing commit \d+ of 2/, stderr # not 3 commits!
+    end
+  end
+
+  def test_scan_directory_uncommited
+    setup = proc {
+      Dir.chdir @git.path
+
+      mkfile('dir/uncommited.lua')
+    }
+
+    wrapper ['--scan', 'dir'], setup: setup do
+      @git.create_commit 'initial commit', [mkfile('README.md')]
+
+      assert_output nil, /--scan: bad file or revision: 'dir'/i do
+        assert_throws(:stop, false) { @cli.run }
+      end
+    end
+  end
+
+  def test_scan_directory_absolute
+    options = ['--scan', nil]
+
+    setup = proc {
+      @git.create_commit 'initial commit',
+        [mkfile('dir/test.lua', '@version 1')]
+      options[1] = mkpath('dir')
     }
 
     wrapper options, setup: setup do
       capture_io { @cli.run }
 
-      refute_match 'version name="1"', read_index, 'The initial commit was scanned'
-      assert_match 'version name="2"', read_index
-      refute_match 'test2.lua', read_index, 'test2.lua was indexed'
-      refute_match 'test3.lua', read_index, 'The third commit was scanned'
+      assert_match 'test.lua', read_index
+    end
+  end
+
+  def test_scan_directory_root
+    setup = proc {
+      Dir.chdir @git.path
+
+      @git.create_commit 'initial commit',
+        [mkfile('dir1/test1.lua', '@version 1'),
+         mkfile('dir2/test2.lua', '@version 2')]
+    }
+
+    wrapper ['--scan', '.'], setup: setup do
+      capture_io { @cli.run }
+
+      contents = read_index
+      assert_match 'test1.lua', contents
+      assert_match 'test2.lua', contents
+    end
+  end
+
+  def test_scan_stick_to_full_commit
+    options = ['--scan', nil, '--scan', 'cat/test1.lua']
+
+    setup = proc {
+      Dir.chdir @git.path
+
+      @git.create_commit 'initial commit',
+        [mkfile('cat/test1.lua', '@version 1'),
+         mkfile('cat/test2.lua', '@version 2')]
+
+      options[1] = @git.last_commit.id
+    }
+
+    wrapper options, setup: setup do
+      capture_io { @cli.run }
+
+      assert_match 'test2.lua', read_index
     end
   end
 

data/test/index/test_provides.rb

@@ -360,4 +360,47 @@ class TestIndex::Provides < MiniTest::Test
     refute_match 'main="main"', contents
     assert_match '<source>http://host/Category/script.lua</source>', contents
   end
+
+  def test_rename_target
+    index = ReaPack::Index.new @dummy_path
+    index.files = ['Category/source.lua', 'Category/source.png']
+    index.url_template = 'http://host/$path'
+
+    index.scan index.files.first, <<-IN
+      @version 1.0
+      @provides
+        source.lua > target.lua
+        source.png > target.png
+    IN
+
+    index.write!
+
+    xml = File.read index.path
+
+    assert_match 'file="target.lua"', xml
+    assert_match 'file="target.png"', xml
+    refute_match 'file="source.png"', xml
+
+    assert_equal 1,
+      xml.scan(/#{Regexp.quote('http://host/Category/source.lua')}/).count
+    assert_match 'http://host/Category/source.png', xml
+  end
+
+  def test_rename_target_no_wrong_conflict
+    index = ReaPack::Index.new @dummy_path
+
+    # target.lua is not in the same directory
+    index.files = ['Category/s1.lua', 'target.lua', 'Category/s2.lua']
+    index.url_template = 'http://host/$path'
+
+    index.scan index.files.first, <<-IN
+      @version 1.0
+      @provides . > target.lua
+    IN
+
+    index.scan index.files.last, <<-IN
+      @version 1.0
+      @provides ../target.lua
+    IN
+  end
 end

data/test/index/test_scan.rb

@@ -226,4 +226,30 @@ class TestIndex::Scan < MiniTest::Test
     index.write!
     assert_equal expected, File.read(index.path)
   end
+
+  def test_langpack
+    index = ReaPack::Index.new @dummy_path
+    index.url_template = 'http://host/$path'
+    index.files = ['Translations/French.ReaperLangPack']
+
+    index.scan index.files.first, <<-IN
+    @version 1.0
+    IN
+
+    expected = <<-XML
+<?xml version="1.0" encoding="utf-8"?>
+<index version="1">
+  <category name="Translations">
+    <reapack name="French.ReaperLangPack" type="langpack">
+      <version name="1.0">
+        <source>http://host/Translations/French.ReaperLangPack</source>
+      </version>
+    </reapack>
+  </category>
+</index>
+    XML
+
+    index.write!
+    assert_equal expected, File.read(index.path)
+  end
 end

data/test/test_git.rb

@@ -19,6 +19,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')
+    assert_equal '', @git.relative_path(File.join(@git.path, '.'))
   end
 
   def test_guess_url_template
@@ -140,6 +141,26 @@ class TestGit < MiniTest::Test
     assert_nil @git.last_commit_for('foo/bar')
   end
 
+  def test_last_commits_for_directory
+    c1 = @git.create_commit 'first commit', [mkfile('hello/world')]
+    c2 = @git.create_commit 'second commit', [mkfile('hello/world', 'modified')]
+    c3 = @git.create_commit 'third commit', [mkfile('chunky/bacon')]
+    c4 = @git.create_commit 'fourth commit', [mkfile('hello/sub/world')]
+    c5 = @git.create_commit 'fifth commit',
+      [mkfile('helloworld/a'), mkfile('hello-world')]
+
+    assert_equal({c2 => ['hello/world'], c4 => ['hello/sub/world']},
+      @git.last_commits_for('hello'))
+    assert_equal({c3 => ['chunky/bacon']}, @git.last_commits_for('chunky'))
+    assert_equal({c4 => ['hello/sub/world']}, @git.last_commits_for('hello/sub'))
+    assert_empty @git.last_commits_for('foobar')
+
+    assert_equal({c2 => ['hello/world']}, @git.last_commits_for('hello/world'))
+    assert_equal({c3 => ['chunky/bacon'], c5 => ['hello-world', 'helloworld/a'],
+                  c4 => ['hello/sub/world'], c2 => ['hello/world']},
+      @git.last_commits_for(''))
+  end
+
   def test_multibyte_filename
     filename = "\342\200\224.lua"
 

data/test/test_index.rb

@@ -20,6 +20,7 @@ class TestIndex < MiniTest::Test
       'Cat/test.jsfx'  => :effect,
       'Cat/test.data'  => :data,
       'Cat/test.theme' => :theme,
+      'Cat/test.ReaperLangPack' => :langpack,
     }.each {|fn, type|
       actual = ReaPack::Index.type_of fn
       assert_equal type, actual,
@@ -41,6 +42,7 @@ class TestIndex < MiniTest::Test
       'ext'       => :extension,
       'data'      => :data,
       'theme'     => :theme,
+      'langpack'  => :langpack,
     }.each {|input, type|
       actual = ReaPack::Index.resolve_type input
       assert_equal type, actual,

data/test/test_provides.rb

@@ -66,6 +66,18 @@ class TestProvides < MiniTest::Test
       ].map {|l| ReaPack::Index::Provides.parse(l).main? }
   end
 
+  def test_target
+    l1 = ReaPack::Index::Provides.parse 'src.txt > dst.txt'
+    assert_equal 'src.txt', l1.file_pattern
+    assert_equal 'dst.txt', l1.target
+    assert_nil l1.url_template
+
+    l2 = ReaPack::Index::Provides.parse 'src.txt>dst.txt http://test.com'
+    assert_equal 'src.txt', l2.file_pattern
+    assert_equal 'dst.txt http://test.com', l2.target
+    assert_nil l2.url_template
+  end
+
   def test_invalid_options
     assert_equal ["unknown option 'HeLlO'", "unknown option 'Test'"],
       [

metadata

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