reapack-index 1.1beta1 → 1.1beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74ff4d70819b98251948bbe5a7e7767e7b9e3b0c
-  data.tar.gz: 1887659545c7d20019c17e740a1aaa48f078ae6f
+  metadata.gz: 8fe0c0ad52b4938c414bacfff63b2981614c2df2
+  data.tar.gz: 4c799d2fd3f4d7823bad7ac142cc08146c029c60
 SHA512:
-  metadata.gz: 1f47b75ad09e4f08962a52b6ea2ac13e94778086fd7107d9fe550d48516e19553417ddbf281796143c83d64a78c5afa198375abba74419fd30ecf749b638c341
-  data.tar.gz: 11f2b3596583affdc178428867a03a8bf094ae2701c84f2db4cca1d96d6bad479dda5adc6a368df7d1e31b8841efced68cfa16fa420524616951e89bcdea5e82
+  metadata.gz: 8c0f24e952b9c836e5db6172928bcd5366f60dba50388fee7d54bd6159b9b3afcbf8c954af8613235a99b463a339a7d561fca7928930dbcab2d7b8649eb7eb53
+  data.tar.gz: 84acc8f432d45f95d51053c05e2a0233ea4b961e933c2c849cdb471e11f8b93c60d68ebbc86b0624d80547beefaccc85a34941cdddb0e52964c7ea24a63d1afa

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 [COMMIT]              Scan new commits (default) or specific commits
+    -s, --scan [FILE|COMMIT]         Scan new commits (default), a file or a commit
         --rebuild                    Clear the index and rescan the whole git history
 Indexer options:
     -a, --[no-]amend                 Reindex existing versions

data/lib/reapack/index.rb

@@ -43,6 +43,7 @@ class ReaPack::Index
 
   attr_reader :path, :url_template, :cdetector
   attr_accessor :amend, :commit, :files, :time, :strict
+  attr_accessor :auto_bump_commit
 
   class << self
     def is_type?(input)
@@ -73,6 +74,7 @@ class ReaPack::Index
     @changed_nodes = []
     @files = []
     @path = path
+    @auto_bump_commit = true
 
     @cdetector = ConflictDetector.new
 
@@ -146,7 +148,7 @@ class ReaPack::Index
       end
     }
 
-    bump_commit
+    bump_commit if @auto_bump_commit
   end
 
   def remove(path)
@@ -158,7 +160,7 @@ class ReaPack::Index
     pkg.remove
     cat.remove if cat.empty?
 
-    bump_commit
+    bump_commit if @auto_bump_commit
     log_change 'removed package'
   end
 

data/lib/reapack/index/cli.rb

@@ -84,9 +84,15 @@ private
     elsif @opts[:scan].empty?
       @git.commits_since @index.last_commit
     else
+      @index.auto_bump_commit = false
+
       @opts[:scan].map {|hash|
-        @git.get_commit hash or begin
-          $stderr.puts '--scan: bad revision: %s' % @opts[:scan]
+        if c = @git.last_commit_for(hash)
+          [c, hash]
+        elsif c = @git.get_commit(hash)
+          c
+        else
+          $stderr.puts "--scan: bad file or revision: '%s'" % @opts[:scan]
           @exit = false
           nil
         end
@@ -95,12 +101,12 @@ private
 
     unless commits.empty?
       progress_wrapper commits.size do
-        commits.each {|commit| process_commit commit }
+        commits.each {|args| process_commit *args }
       end
     end
   end
 
-  def process_commit(commit)
+  def process_commit(commit, file = nil)
     if @opts[:verbose]
       log 'processing %s: %s' % [commit.short_id, commit.summary]
     end
@@ -111,7 +117,8 @@ private
 
     commit.each_diff
       .select {|diff|
-        (not ignored? expand_path(diff.file)) &&
+        (file.nil? || diff.file == file) &&
+          (not ignored? expand_path(diff.file)) &&
           ReaPack::Index.type_of(diff.file)
       }
       .sort_by {|diff|

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

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

data/lib/reapack/index/gem_version.rb

@@ -1,5 +1,5 @@
 module ReaPack
   class Index
-    VERSION = '1.1beta1'
+    VERSION = '1.1beta3'
   end
 end

data/lib/reapack/index/git.rb

@@ -13,7 +13,7 @@ class ReaPack::Index
     end
 
     def commits
-      commits_since nil
+      @commits ||= commits_since nil
     end
 
     def commits_since(sha)
@@ -38,6 +38,12 @@ class ReaPack::Index
       Commit.new c, @repo if c
     end
 
+    def last_commit_for(file)
+      commits.reverse_each.find {|c|
+        c.each_diff.any? {|d| d.file == file }
+      }
+    end
+
     def guess_url_template
       remote = @repo.remotes['origin']
       return unless remote
@@ -77,7 +83,7 @@ class ReaPack::Index
         end
       }
 
-      c = Rugged::Commit.create @repo, \
+      hash = Rugged::Commit.create @repo, \
         tree: new_index.write_tree(@repo),
         message: message,
         parents: [target].compact,
@@ -88,7 +94,9 @@ class ReaPack::Index
       # force-reload the repository
       @repo = Rugged::Repository.discover path
 
-      get_commit c
+      commit = get_commit hash
+      @commits << commit if @commits
+      commit
     end
 
   private
@@ -108,8 +116,8 @@ class ReaPack::Index
       @parent = commit.parents.first
     end
 
-    def each_diff
-      return enum_for :each_diff unless block_given?
+    def each_diff(&block)
+      return @diffs.each &block if @diffs
 
       if @parent
         diff = @parent.diff id
@@ -117,7 +125,8 @@ class ReaPack::Index
         diff = @commit.diff
       end
 
-      diff.each_delta {|delta| yield Git::Diff.new(delta, @parent.nil?, @repo) }
+      @diffs ||= diff.each_delta.map {|delta| Git::Diff.new(delta, @parent.nil?, @repo) }
+      @diffs.each &block
     end
 
     def id
@@ -145,7 +154,11 @@ class ReaPack::Index
     end
 
     def ==(o)
-      id == o.id
+      o && id == o.id
+    end
+
+    def inspect
+      "#<#{self.class} #{id} #{message}>"
     end
 
   private

data/lib/reapack/index/metadata.rb

@@ -165,7 +165,7 @@ class ReaPack::Index
     # the first type will be the default one
     VALID_TYPES = [:website, :screenshot, :donation].freeze
 
-    LINK_REGEX = /\A(.+?)(?:\s|=)(\w+?:\/\/.+)\Z/.freeze
+    LINK_REGEX = /\A(.+?)(?:\s+|=)(\w+?:\/\/.+)\Z/.freeze
 
     def self.split(input)
       if input =~ LINK_REGEX

data/lib/reapack/index/package.rb

@@ -73,6 +73,17 @@ class ReaPack::Index
       if has_version? name
         ver = @versions[name]
       else
+        @versions.each_key {|other|
+          normalized = [other.dup, name.dup].each {|ver|
+            ver.gsub! /(?<![\d\w])0+/, ''
+            ver.gsub! /[^\d\w]+/, '.'
+          }
+
+          if normalized.uniq.size < 2
+            raise Error, "version #{name} is a duplicate of version #{other}"
+          end
+        }
+
         ver = @versions[name] = Version.create name, @node
       end
 

data/lib/reapack/index/parsers.rb

@@ -8,6 +8,7 @@ class WordpressChangelog < MetaHeader::Parser
   VERSION = /\A[\s\*]*v([\d\.]+)(?:\s+(.+))?\Z/.freeze
 
   def parse(input)
+    input = input.read
     input.encode! Encoding::UTF_8, invalid: :replace
 
     ver, changes = header[:version], header[:changelog]

data/lib/reapack/index/provides.rb

@@ -14,7 +14,7 @@ class ReaPack::Index
     class << self
       def parse_each(input)
         if block_given?
-          input.to_s.lines.map {|line| yield parse(line) }
+          input.to_s.lines.map {|line| i = parse(line) and yield i }
         else
           enum_for :parse_each, input
         end
@@ -22,6 +22,8 @@ class ReaPack::Index
 
       def parse(line)
         m = line.strip.match PROVIDES_REGEX
+        return unless m
+
         options, pattern, url_tpl = m[:options], m[:file], m[:url]
 
         instance = self.new pattern, url_tpl

data/lib/reapack/index/scanner.rb

@@ -21,22 +21,25 @@ class ReaPack::Index
           'segment overflow (%d > %d)' % [s, VERSION_SEGMENT_MAX] if s
         }
       ],
-      description: SIMPLE_TAG,
       about: MetaHeader::VALUE,
-      website: MetaHeader::VALUE,
-      screenshot: MetaHeader::VALUE,
+      description: SIMPLE_TAG,
       donation: MetaHeader::VALUE,
+      link: MetaHeader::VALUE,
+      noindex: MetaHeader::BOOLEAN,
+      screenshot: MetaHeader::VALUE,
 
       # version-specific tags
       author: SIMPLE_TAG,
       changelog: MetaHeader::VALUE,
-      provides: [MetaHeader::VALUE, PROVIDES_VALIDATOR],
-      noindex: MetaHeader::BOOLEAN,
       metapackage: MetaHeader::BOOLEAN,
+      provides: [MetaHeader::VALUE, PROVIDES_VALIDATOR],
     }.freeze
 
     HEADER_ALIASES = {
-      [:reascript_name, :desc] => :description,
+      [:reascript_name, :jsfx_name, :theme_name,
+        :extension_name, :desc] => :description,
+      :links => :link,
+      :screenshots => :screenshot,
     }.freeze
 
     META_TYPES = [:extension, :data, :theme].freeze
@@ -56,7 +59,7 @@ class ReaPack::Index
       @pkg.description = @mh[:description]
       @pkg.metadata.about = @mh[:about]
 
-      eval_links :website
+      eval_links :website, tag: :link
       eval_links :screenshot
       eval_links :donation
 
@@ -152,11 +155,13 @@ class ReaPack::Index
       }.flatten
     end
 
-    def eval_links(type)
+    def eval_links(type, tag: nil)
+      tag ||= type
+
       @pkg.metadata.replace_links type do
-        @mh[type].to_s.lines {|l|
-          l.chomp!
-          @pkg.metadata.push_link type, *Link.split(l)
+        @mh[tag].to_s.lines {|line|
+          line.strip!
+          @pkg.metadata.push_link type, *Link.split(line) unless line.empty?
         }
       end
     end

data/reapack-index.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'addressable', '~> 2.4'
   spec.add_runtime_dependency 'colorize', '~> 0.7'
   spec.add_runtime_dependency 'gitable', '~> 0.3'
-  spec.add_runtime_dependency 'metaheader', '~> 1.3beta1'
+  spec.add_runtime_dependency 'metaheader', '~> 1.3beta2'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6.8'
   spec.add_runtime_dependency 'pandoc-ruby', '~> 2.0'
   spec.add_runtime_dependency 'rugged', '~> 0.24'

data/setup/reapack-index.nsi

@@ -2,11 +2,11 @@
 !include Sections.nsh
 !include StrRep.nsh
 
-!define VERSION "1.1beta1"
+!define VERSION "1.1beta3"
 !define NAME "ReaPack Index ${VERSION}"
 !define LONG_VERSION "0.1.0.0"
 
-!define RUBY_VERSION "2.3.0"
+!define RUBY_VERSION "2.3.1"
 !define RUBYINSTALLER_FILE "rubyinstaller-${RUBY_VERSION}.exe"
 !define RUBYINSTALLER_URL \
   "http://dl.bintray.com/oneclick/rubyinstaller/${RUBYINSTALLER_FILE}"

data/test/cli/test_scan.rb

@@ -316,6 +316,50 @@ processing [a-f0-9]{7}: third commit
       refute_match 'test1.lua', read_index, 'The initial commit was scanned'
       assert_match 'test2.lua', read_index
       assert_match 'test3.lua', read_index
+      assert_match @git.last_commit.id, read_index
+    end
+  end
+
+  def test_manual_disable_commit_bump
+    options = ['--scan', nil]
+
+    setup = proc {
+      @git.create_commit 'initial commit',
+        [mkfile('cat/test1.lua', '@version 2.0')]
+      options[1] = @git.last_commit.id
+    }
+
+    wrapper options, setup: setup do
+      capture_io { assert_equal true, @cli.run }
+
+      assert_equal false, @cli.index.auto_bump_commit
+      refute_match %Q[commit="#{options[1]}"], read_index
+    end
+  end
+
+  def test_scan_file
+    options = [ '--scan', 'cat/test1.lua']
+
+    setup = proc {
+      @git.create_commit 'initial commit',
+        [mkfile('cat/test1.lua', '@version 1')]
+
+      @git.create_commit 'second commit', [
+        mkfile('cat/test1.lua', '@version 2'),
+        mkfile('cat/test2.lua', '@version 2.2'),
+      ]
+
+      @git.create_commit 'third commit',
+        [mkfile('cat/test3.lua', '@version 3')]
+    }
+
+    wrapper options, setup: setup do
+      capture_io { assert_equal true, @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'
     end
   end
 
@@ -358,7 +402,7 @@ processing [a-f0-9]{7}: third commit
       wrapper ['--scan', hash] do
         @git.create_commit 'initial commit', [mkfile('README.md')]
 
-        assert_output nil, /--scan: bad revision: #{Regexp.escape hash}/i do
+        assert_output nil, /--scan: bad file or revision: '#{Regexp.escape hash}'/i do
           assert_equal false, @cli.run
         end
       end

data/test/index/test_scan.rb

@@ -92,6 +92,26 @@ class TestIndex::Scan < MiniTest::Test
     refute_match '<category', contents
   end
 
+  def test_auto_bump_commit_enabled
+    index = ReaPack::Index.new @real_path
+    index.commit = @commit
+
+    assert_equal true, index.auto_bump_commit
+    refute_equal @commit, index.last_commit
+
+    index.scan 'Category Name/Hello World.lua', '@version 1.0'
+    assert_equal @commit, index.last_commit
+  end
+
+  def test_auto_bump_commit_disabled
+    index = ReaPack::Index.new @real_path
+    index.commit = @commit
+    index.auto_bump_commit = false
+
+    index.scan 'Category Name/Hello World.lua', '@version 1.0'
+    refute_equal @commit, index.last_commit
+  end
+
   def test_strict_mode
     index = ReaPack::Index.new @dummy_path
     index.strict = true

data/test/scanner/test_validation.rb

@@ -112,6 +112,12 @@ class TestScanner::TestValidation < MiniTest::Test
     assert_equal "missing value for tag 'about'", error.message
   end
 
+  def test_links
+    @mh[:links] = true
+    error = assert_raises(ReaPack::Index::Error) { @scanner.run }
+    assert_equal "missing value for tag 'links'", error.message
+  end
+
   def test_screenshot
     @mh[:screenshot] = true
     error = assert_raises(ReaPack::Index::Error) { @scanner.run }

data/test/test_git.rb

@@ -129,6 +129,16 @@ class TestGit < MiniTest::Test
     }
   end
 
+  def test_last_commit_for_file
+    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')]
+
+    assert_equal c2, @git.last_commit_for('hello/world')
+    assert_equal c3, @git.last_commit_for('chunky/bacon')
+    assert_nil @git.last_commit_for('foo/bar')
+  end
+
   def test_multibyte_filename
     filename = "\342\200\224.lua"
 
@@ -152,4 +162,11 @@ class TestGit < MiniTest::Test
     git = ReaPack::Index::Git.new path # should not throw
     assert_equal @git.path, git.path
   end
+
+  def test_inspect_commit
+    c = @git.create_commit 'message', []
+    assert_match c.class.name, c.inspect
+    assert_match c.id, c.inspect
+    assert_match c.message, c.inspect
+  end
 end

data/test/test_index.rb

@@ -175,6 +175,7 @@ class TestIndex < MiniTest::Test
     index.write @dummy_path
     contents = File.read @dummy_path
 
+    assert_equal @commit, index.last_commit
     assert_match @commit, contents
     refute_match '<category', contents
   end

data/test/test_metadata.rb

@@ -157,6 +157,9 @@ class TestMetadata < MiniTest::Test
 
     assert_equal ['Hello World', 'http://perdu.com/a=b'],
       ReaPack::Index::Link.split('Hello World http://perdu.com/a=b')
+
+    assert_equal ['Hello World', 'http://perdu.com/a=b'],
+      ReaPack::Index::Link.split('Hello World   http://perdu.com/a=b')
   end
 
   def test_invalid_link

data/test/test_package.rb

@@ -95,7 +95,7 @@ class TestPackage < MiniTest::Test
     assert_equal '1.0', versions.first.name
   end
 
-  def test_get_or_create_version
+  def test_new_version
     before = make_node <<-XML
     <reapack name="pkg" type="script">
       <version name="1.0" />
@@ -120,6 +120,23 @@ class TestPackage < MiniTest::Test
     assert pkg.has_version?('1.1'), 'version 1.1 not found'
   end
 
+  def test_new_version_similar
+    before = make_node '<reapack name="pkg" type="script"/>'
+
+    pkg = ReaPack::Index::Package.new before
+    pkg.version '1.01'
+
+    error = assert_raises ReaPack::Index::Error do
+      pkg.version '1.1'
+    end
+    assert_equal 'version 1.1 is a duplicate of version 1.01', error.message
+
+    error = assert_raises ReaPack::Index::Error do
+      pkg.version '1//1'
+    end
+    assert_equal 'version 1//1 is a duplicate of version 1.01', error.message
+  end
+
   def test_category_and_path
     pkg1 = ReaPack::Index::Package.new make_node('<reapack/>')
     assert_nil pkg1.category

data/test/test_parsers.rb

@@ -23,13 +23,34 @@ class TestParsers < MiniTest::Test
  Test\x97
     IN
 
-    changelog = <<-LOG
-+ Line 3
-+ Line 4
-    LOG
+    assert_equal '1.1', mh[:version]
+    assert_equal "+ Line 3\n+ Line 4", mh[:changelog]
+  end
+
+  def test_wordpress_no_date
+    mh = MetaHeader.new <<-IN
+/**
+ * Version: 1.1
+ */
+
+/**
+ * Changelog:
+ * v1.2
+\t+ Line 1
+\t+ Line 2
+ * v1.1
+\t+ Line 3
+\t+ Line 4
+ * v1.0
+\t+ Line 5
+\t+ Line 6
+ */
+
+ Test\x97
+    IN
 
     assert_equal '1.1', mh[:version]
-    assert_equal changelog.chomp, mh[:changelog]
+    assert_equal "+ Line 3\n+ Line 4", mh[:changelog]
   end
 
   def test_wordpress_noprefix
@@ -55,12 +76,7 @@ v1.0 (2012-01-01)
  Test\x97
     IN
 
-    changelog = <<-LOG
-+ Line 3
-+ Line 4
-    LOG
-
     assert_equal '1.1', mh[:version]
-    assert_equal changelog.chomp, mh[:changelog]
+    assert_equal "+ Line 3\n+ Line 4", mh[:changelog]
   end
 end

data/test/test_provides.rb

@@ -76,4 +76,9 @@ class TestProvides < MiniTest::Test
         end.message
       }
   end
+
+  def test_empty_line
+    assert_nil ReaPack::Index::Provides.parse(String.new)
+    assert_equal 2, ReaPack::Index::Provides.parse_each("a\n\nb").to_a.size
+  end
 end

data/test/test_scanner.rb

@@ -124,7 +124,7 @@ class TestScanner < MiniTest::Test
   end
 
   def test_website_links
-    @mh[:website] = [
+    @mh[:links] = [
       'http://cfillion.tk',
       'Label http://cfillion.tk',
     ].join "\n"
@@ -140,6 +140,7 @@ class TestScanner < MiniTest::Test
   def test_screenshot_links
     @mh[:screenshot] = [
       'http://i.imgur.com/1.png',
+      '',
       'Label http://i.imgur.com/2.png',
     ].join "\n"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapack-index
 version: !ruby/object:Gem::Version
-  version: 1.1beta1
+  version: 1.1beta3
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3beta1
+        version: 1.3beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3beta1
+        version: 1.3beta2
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -296,4 +296,3 @@ test_files:
 - test/test_scanner.rb
 - test/test_source.rb
 - test/test_version.rb
-has_rdoc: