reapack-index 1.1beta4 → 1.1rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68a03118ab26b00e4fd7969dc54c9b2b350f517a
-  data.tar.gz: 2bc39e1d5de9c718b69f8f8efbcd4c10fcc3e496
+  metadata.gz: 55a64059d22c205bb18d8854f3603fc8e89110e6
+  data.tar.gz: 849a34318b8679e8d34d4f10c99a7101b22c2fd7
 SHA512:
-  metadata.gz: 88efa5f4a1116dd6ad47cb3fe2bf3418eac5621a6c2e5031e7d33284b66a5540977bc11a1e89ba4e9f60cbeccc91409841a6b64c0a227dbdd75945950baa1395
-  data.tar.gz: 8fd0bcb5dba3dcc5f20dd5eccc0e82f21f4ec4017bd1ca2cf6e85fb7e6b9ffe23cb1b69c9d3b23c5045c27efcdb149a546c640c3280cfc24b8588ca5c9d8ad2f
+  metadata.gz: bf8ba5d83856c37efc94d269d09cab08b98e31d0197711f73511710c44854211ff535600d7ae89527d5239856bc4769e030a1ac2107f20ece264323c9a78ce11
+  data.tar.gz: 5e4d1f32904bdbd1a01d201de7c37d02e2e7b919956e6cd6e0dd16f9a0542fbbe2c10fccd450c94aa59a4c1e0b5474b1804d25270cff3c9d7a1b16a25d3badee

data/README.md

@@ -30,6 +30,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
+        --no-scan                    Do not scan for new commits
         --rebuild                    Clear the index and rescan the whole git history
 Indexer options:
     -a, --[no-]amend                 Update existing versions
@@ -51,6 +52,7 @@ Misc options:
     -V, --[no-]verbose               Activate diagnosis messages
     -C, --[no-]commit                Select whether to commit the modified index
         --prompt-commit              Ask at runtime whether to commit the index
+    -m, --commit-template MESSAGE    Customize the commit message. Supported placeholder: $changelog
     -W, --warnings                   Enable warnings
     -w, --no-warnings                Turn off warnings
     -q, --[no-]quiet                 Disable almost all output

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

@@ -9,6 +9,7 @@ class ReaPack::Index::CLI
   DEFAULTS = {
     check: false,
     commit: nil,
+    message: 'index: $changelog',
     ignore: [],
     output: './index.xml',
     progress: true,
@@ -33,10 +34,10 @@ class ReaPack::Index::CLI
         next
       end
 
-      opts = Array.new
-      File.foreach(path) {|line| opts << Shellwords.split(line) }
-      opts
+      Shellwords.split File.read(path)
     }.flatten.compact
+  rescue ArgumentError => e
+    raise ReaPack::Index::Error, e.message
   end
 
   def parse_options(args)
@@ -65,6 +66,10 @@ class ReaPack::Index::CLI
         end
       end
 
+      op.on '--no-scan', 'Do not scan for new commits' do
+        opts[:scan] = false
+      end
+
       op.on '--rebuild', 'Clear the index and rescan the whole git history' do
         opts[:check] = false
         opts[:rebuild] = true
@@ -150,6 +155,11 @@ class ReaPack::Index::CLI
         opts[:commit] = nil
       end
 
+      op.on '-m', "--commit-template MESSAGE",
+        'Customize the commit message. Supported placeholder: $changelog' do |msg|
+        opts[:message] = msg
+      end
+
       op.on '-W', '--warnings', 'Enable warnings' do
         opts[:warnings] = true
       end

data/lib/reapack/index/cli.rb

@@ -40,7 +40,7 @@ class ReaPack::Index::CLI
 
     unless @index.modified?
       $stderr.puts 'Nothing to do!' unless @opts[:quiet]
-      return
+      return true
     end
 
     # changelog will be cleared by Index#write!
@@ -63,14 +63,11 @@ private
   end
 
   def do_scan
-    if @git.empty?
-      warn 'The current branch does not contains any commit.'
-      return
-    end
-
     commits = if @opts[:rebuild]
       @index.clear
       @git.commits
+    elsif @opts[:scan] == false
+      []
     elsif @opts[:scan].empty?
       @git.commits_since @index.last_commit
     else
@@ -256,7 +253,8 @@ private
       prompt 'Commit the new index?'
     end
 
-    @git.create_commit "index: #{changelog}", [@index.path]
+    message = @opts[:message].gsub '$changelog', changelog
+    @git.create_commit message, [@index.path]
     $stderr.puts 'commit created'
   end
 

data/lib/reapack/index/gem_version.rb

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

data/lib/reapack/index/git.rb

@@ -2,14 +2,20 @@ class ReaPack::Index
   class Git
     def initialize(path)
       @repo = Rugged::Repository.discover path.encode(Encoding::UTF_8)
+
+      if @repo.bare?
+        raise ReaPack::Index::Error,
+          'reapack-index cannot be run in a repository without a work tree'
+      end
     end
 
     def empty?
-      @repo.empty?
+      # head_unborn = orphan branch – FIXME: add test for this case
+      @repo.empty? || @repo.head_unborn?
     end
 
     def path
-      File.expand_path @repo.workdir
+      @path ||= File.expand_path @repo.workdir
     end
 
     def commits
@@ -58,7 +64,7 @@ class ReaPack::Index
     end
 
     def relative_path(path)
-      root = Pathname.new @repo.workdir
+      root = Pathname.new self.path
       file = Pathname.new path
 
       file.relative_path_from(root).to_s

data/setup/reapack-index.nsi

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

data/test/cli/test_scan.rb

@@ -42,14 +42,6 @@ class TestCLI::Scan < MiniTest::Test
     end
   end
 
-  def test_empty_branch
-    wrapper do
-      assert_output nil, /the current branch does not contains any commit/i do
-        @cli.run
-      end
-    end
-  end
-
   def test_workingdir_is_subdirectory
     wrapper do
       @git.create_commit 'initial commit',
@@ -464,6 +456,21 @@ processing [a-f0-9]{7}: third commit
     end
   end
 
+  def test_no_scan
+    options = ['--no-scan']
+
+    setup = proc {
+      @git.create_commit 'initial commit',
+        [mkfile('cat/test1.lua', '@version 1.0')]
+    }
+
+    wrapper options, setup: setup do
+      capture_io { @cli.run }
+
+      refute_match 'test1.lua', read_index, 'The initial commit was scanned'
+    end
+  end
+
   def test_no_arguments
     wrapper ['--scan'] do; end
   end

data/test/test_cli.rb

@@ -89,9 +89,19 @@ class TestCLI < MiniTest::Test
     end
   end
 
+  def test_custom_commit_message
+    wrapper ['--commit', '--commit-template', 'a $changelog b $changelog c'] do
+      assert_output("empty index\n", /commit created\n/) { @cli.run }
+
+      commit = @git.last_commit
+      assert_equal 'a empty index b empty index c', commit.message
+      assert_equal ['index.xml'], commit.each_diff.map {|d| d.file }
+    end
+  end
+
   def test_config
-    catch :stop do
-      assert_output /--help/, '' do
+    assert_output /--help/, '' do
+      catch :stop do
         wrapper [], setup: proc {
           mkfile '.reapack-index.conf', '--help'
         }
@@ -141,6 +151,24 @@ class TestCLI < MiniTest::Test
     end
   end
 
+  def test_config_unmatched_quote
+    assert_output '', /unmatched double quote/i do
+      catch :stop do
+        wrapper [], setup: proc {
+          mkfile '.reapack-index.conf', '--output "'
+        }
+      end
+    end
+  end
+
+  def test_config_line_break
+    assert_output '', '' do
+      wrapper [], setup: proc {
+        mkfile '.reapack-index.conf', %Q{--commit-template="hello\nworld"}
+      }
+    end
+  end
+
   def test_working_directory_with_options
     wrapper do
       @git.create_commit 'initial commit',
@@ -207,7 +235,7 @@ class TestCLI < MiniTest::Test
 
     wrapper ['--progress'], setup: setup do
       assert_output '', /nothing to do/i do
-        @cli.run
+        assert_equal true, @cli.run
       end
     end
   end

data/test/test_git.rb

@@ -170,4 +170,11 @@ class TestGit < MiniTest::Test
     assert_match c.summary, c.inspect
     refute_match c.message, c.inspect
   end
+
+  def test_bare_repo
+    path = Dir.mktmpdir 'test-repository'
+
+    repo = Rugged::Repository.init_at path, true
+    assert_raises(ReaPack::Index::Error) { ReaPack::Index::Git.new path }
+  end
 end

metadata

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