reapack-index 1.0beta2 → 1.0beta3

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

@@ -0,0 +1,157 @@
+class ReaPack::Index::CLI
+  PROGRAM_NAME = 'reapack-index'.freeze
+
+  CONFIG_SEARCH = [
+    '~',
+    '.',
+  ].freeze
+
+  DEFAULTS = {
+    verbose: false,
+    warnings: true,
+    progress: true,
+    quiet: false,
+    commit: nil,
+    output: './index.xml',
+    ignore: [],
+    url_template: 'auto',
+  }.freeze
+
+  def read_config
+    CONFIG_SEARCH.map {|dir|
+      dir = expand_path dir
+      path = File.expand_path '.reapack-index.conf', dir
+
+      log 'reading configuration from %s' % path
+
+      unless File.readable? path
+        log 'configuration file is unreadable, skipping'
+        next
+      end
+
+      opts = Array.new
+      File.foreach(path) {|line| opts << Shellwords.split(line) }
+      opts
+    }.flatten.compact
+  end
+
+  def parse_options(args)
+    opts = Hash.new
+
+    OptionParser.new do |op|
+      op.program_name = PROGRAM_NAME
+      op.version = ReaPack::Index::VERSION
+      op.banner = "Package indexer for ReaPack-based repositories\n" +
+        "Usage: #{PROGRAM_NAME} [options] [directory]"
+
+      op.separator 'Options:'
+
+      op.on '-a', '--[no-]amend', 'Reindex existing versions' do |bool|
+        opts[:amend] = bool
+      end
+
+      op.on '-c', '--check', 'Test every package including uncommited changes and exit' do
+        opts[:check] = true
+      end
+
+      op.on '-i', '--ignore PATH', "Don't check or index any file starting with PATH" do |path|
+        opts[:ignore] ||= []
+        opts[:ignore] << expand_path(path)
+      end
+
+      op.on '-n', '--name NAME', 'Set the name shown in ReaPack for this repository' do |name|
+        opts[:name] = name.strip
+      end
+
+      op.on '-U', "--url-template TEMPLATE=#{DEFAULTS[:url_template]}",
+          'Set the template for implicit download links' do |tpl|
+        opts[:url_template] = tpl.strip
+      end
+
+      op.on '-o', "--output FILE=#{DEFAULTS[:output]}",
+          'Set the output filename and path for the index' do |file|
+        opts[:output] = file.strip
+      end
+
+      op.on '-l', '--link LINK', 'Add or remove a website link' do |link|
+        opts[:links] ||= Array.new
+        opts[:links] << [:website, link.strip]
+      end
+
+      op.on '--donation-link LINK', 'Add or remove a donation link' do |link|
+        opts[:links] ||= Array.new
+        opts[:links] << [:donation, link.strip]
+      end
+
+      op.on '--ls-links', 'Display the link list then exit' do
+        opts[:lslinks] = true
+      end
+
+      op.on '-A', '--about=FILE', 'Set the about content from a file' do |file|
+        opts[:about] = file.strip
+      end
+
+      op.on '--remove-about', 'Remove the about content from the index' do
+        opts[:rmabout] = true
+      end
+
+      op.on '--dump-about', 'Dump the raw about content in RTF and exit' do
+        opts[:dump_about] = true
+      end
+
+      op.on '--[no-]progress', 'Enable or disable progress information' do |bool|
+        opts[:progress] = bool
+      end
+
+      op.on '-V', '--[no-]verbose', 'Activate diagnosis messages' do |bool|
+        opts[:verbose] = bool
+      end
+
+      op.on '-C', '--[no-]commit', 'Select whether to commit the modified index' do |bool|
+        opts[:commit] = bool
+      end
+
+      op.on '--prompt-commit', 'Ask at runtime whether to commit the index' do
+        opts[:commit] = nil
+      end
+
+      op.on '-W', '--warnings', 'Enable warnings' do
+        opts[:warnings] = true
+      end
+
+      op.on '-w', '--no-warnings', 'Turn off warnings' do
+        opts[:warnings] = false
+      end
+
+      op.on '-q', '--[no-]quiet', 'Disable almost all output' do
+        opts[:warnings] = false
+        opts[:progress] = false
+        opts[:verbose] = false
+        opts[:quiet] = true
+      end
+
+      op.on '--no-config', 'Bypass the configuration files' do
+        opts[:noconfig] = true
+      end
+
+      op.on_tail '-v', '--version', 'Display version information' do
+        puts op.ver
+        @exit = true
+        return opts
+      end
+
+      op.on_tail '-h', '--help', 'Prints this help' do
+        puts op
+        @exit = true
+        return opts
+      end
+    end.parse! args
+
+    opts
+  rescue OptionParser::ParseError => e
+    $stderr.puts "#{PROGRAM_NAME}: #{e.message}"
+    $stderr.puts "Try '#{PROGRAM_NAME} --help' for more information."
+    @exit = false
+    opts
+  end
+end

data/lib/reapack/index/gem_version.rb

@@ -1,5 +1,5 @@
 module ReaPack
   class Index
-    VERSION = '1.0beta2'
+    VERSION = '1.0beta3'
   end
 end

data/lib/reapack/index/metadata.rb

@@ -17,8 +17,14 @@ class ReaPack::Index
     def push_link(type, name = nil, url)
       Link.check_type type
 
-      unless url =~ /\A#{URI::regexp(['http', 'https'])}\z/
-        raise Error, "invalid URL: #{url}"
+      begin
+        uri = Addressable::URI.parse url
+
+        unless ['http', 'https'].include? uri.scheme
+          raise Addressable::URI::InvalidURIError
+        end
+      rescue Addressable::URI::InvalidURIError
+        raise Error, "invalid link: #{url}"
       end
 
       make_root

data/lib/reapack/index/parsers.rb

@@ -5,7 +5,7 @@ class WordpressChangelog < MetaHeader::Parser
     ((?:--)?\]\]|\*\/)
   /xm.freeze
 
-  VERSION = /\A[\s\*]+v([\d\.]+)(?:\s+(.+))?\Z/.freeze
+  VERSION = /\A[\s\*]*v([\d\.]+)(?:\s+(.+))?\Z/.freeze
 
   def parse(input)
     input.encode! Encoding::UTF_8, invalid: :replace
@@ -13,23 +13,20 @@ class WordpressChangelog < MetaHeader::Parser
     ver, changes = header[:version], header[:changelog]
     return if ver.nil? || changes || CHANGELOG.match(input).nil?
 
-    $1.lines {|line| read line.lstrip }
+    $1.lines.each {|line| read line.lstrip }
   end
 
   def read(line)
     if line =~ VERSION
       @current = $1 == header[:version]
-      line = $2.to_s
+    elsif @current
+      if header[:changelog]
+        header[:changelog] += "\n"
+      else
+        header[:changelog] = String.new
+      end
+
+      header[:changelog] += line.chomp
     end
-
-    return unless @current
-
-    if header[:changelog]
-      header[:changelog] += "\n"
-    else
-      header[:changelog] = String.new
-    end
-
-    header[:changelog] += line.chomp
   end
 end

data/lib/reapack/index/version.rb

@@ -125,7 +125,7 @@ class ReaPack::Index
       @node.parent = parent
       @node[PLATFORM] = @platform
       @node[FILE] = @file if @file
-      @node.content = URI.escape @url
+      @node.content = Addressable::URI.encode @url
     end
   end
 

data/reapack-index.gemspec

@@ -5,13 +5,13 @@ $LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
 require 'reapack/index/gem_version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "reapack-index"
+  spec.name          = 'reapack-index'
   spec.version       = ReaPack::Index::VERSION
-  spec.authors       = ["cfillion"]
-  spec.email         = ["reapack-index@cfillion.tk"]
-  spec.summary       = %q{Package indexer for ReaPack-based repositories}
-  spec.homepage      = "https://github.com/cfillion/reapack-indexer"
-  spec.license       = "LGPL-3.0+"
+  spec.authors       = ['cfillion']
+  spec.email         = ['reapack-index@cfillion.tk']
+  spec.summary       = 'Package indexer for ReaPack-based repositories'
+  spec.homepage      = 'https://github.com/cfillion/reapack-index'
+  spec.license       = "GPL-3.0+"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -20,14 +20,16 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'coveralls', '~> 0.8'
-  spec.add_development_dependency 'git', '~> 1.2'
+  spec.add_development_dependency 'git', '~> 1.3'
   spec.add_development_dependency 'minitest', '~> 5.8'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'simplecov', '~> 0.11'
 
+  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.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
-  spec.add_runtime_dependency 'pandoc-ruby', '~> 1.0'
-  spec.add_runtime_dependency 'rugged', '~> 0.24.0b12'
+  spec.add_runtime_dependency 'pandoc-ruby', '~> 2.0'
+  spec.add_runtime_dependency 'rugged', '~> 0.24'
 end

data/setup/StrRep.nsh

@@ -0,0 +1,59 @@
+; Source: http://nsis.sourceforge.net/StrRep
+
+!macro StrRep output string old new
+    Push `${string}`
+    Push `${old}`
+    Push `${new}`
+    Call StrRep
+    Pop ${output}
+!macroend
+
+Function StrRep
+    Exch $R2 ;new
+    Exch 1
+    Exch $R1 ;old
+    Exch 2
+    Exch $R0 ;string
+    Push $R3
+    Push $R4
+    Push $R5
+    Push $R6
+    Push $R7
+    Push $R8
+    Push $R9
+ 
+    StrCpy $R3 0
+    StrLen $R4 $R1
+    StrLen $R6 $R0
+    StrLen $R9 $R2
+    loop:
+        StrCpy $R5 $R0 $R4 $R3
+        StrCmp $R5 $R1 found
+        StrCmp $R3 $R6 done
+        IntOp $R3 $R3 + 1 ;move offset by 1 to check the next character
+        Goto loop
+    found:
+        StrCpy $R5 $R0 $R3
+        IntOp $R8 $R3 + $R4
+        StrCpy $R7 $R0 "" $R8
+        StrCpy $R0 $R5$R2$R7
+        StrLen $R6 $R0
+        IntOp $R3 $R3 + $R9 ;move offset by length of the replacement string
+        Goto loop
+    done:
+ 
+    Pop $R9
+    Pop $R8
+    Pop $R7
+    Pop $R6
+    Pop $R5
+    Pop $R4
+    Pop $R3
+    Push $R0
+    Push $R1
+    Pop $R0
+    Pop $R1
+    Pop $R0
+    Pop $R2
+    Exch $R1
+FunctionEnd

data/setup/reapack-index.nsi

@@ -1,7 +1,8 @@
 !include MUI2.nsh
 !include Sections.nsh
+!include StrRep.nsh
 
-!define VERSION "1.0beta2"
+!define VERSION "1.0beta3"
 !define NAME "ReaPack Index ${VERSION}"
 !define LONG_VERSION "0.1.0.0"
 
@@ -10,11 +11,13 @@
 !define RUBYINSTALLER_URL \
   "http://dl.bintray.com/oneclick/rubyinstaller/${RUBYINSTALLER_FILE}"
 
-!define PANDOC_FILE "pandoc-1.16.0.2-windows.msi"
+!define PANDOC_VERSION "1.17.0.2"
+!define PANDOC_FILE "pandoc-${PANDOC_VERSION}-windows.msi"
 !define PANDOC_URL \
-  "https://github.com/jgm/pandoc/releases/download/1.16.0.2/${PANDOC_FILE}"
+  "https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/${PANDOC_FILE}"
 
-!define RUGGED_FILE "rugged-0.24.0b12-x86-mingw32.gem"
+!define RUGGED_VERSION "0.24.0"
+!define RUGGED_FILE "rugged-${RUGGED_VERSION}-%PLATFORM%.gem"
 !define RUGGED_URL \
   "https://github.com/cfillion/reapack-index/releases/download/v${VERSION}/${RUGGED_FILE}"
 
@@ -42,11 +45,11 @@ VIAddVersionKey "LegalCopyright" "Copyright (C) 2015-2016  Christian Fillion"
 !insertmacro MUI_LANGUAGE "English"
 
 !macro DOWNLOAD url file
-  NSISdl::download /TIMEOUT=30000 "${url}" "${file}"
-  Pop $R0
-  StrCmp $R0 "success" +4
-    DetailPrint "Error while downloading ${url}:"
-    DetailPrint "  $R0"
+  inetc::get /CONNECTTIMEOUT=30000 "${url}" "${file}" /END
+  Pop $0
+  StrCmp $0 "OK" +4
+    DetailPrint "Error while downloading ${url} to ${file}:"
+    DetailPrint "  $0"
     Abort "${ABORT_MSG}"
 !macroend
 
@@ -68,69 +71,89 @@ VIAddVersionKey "LegalCopyright" "Copyright (C) 2015-2016  Christian Fillion"
     Abort "${ABORT_MSG}"
 !macroend
 
+!macro RELOAD_PATH
+  ; reload the path to use the one freshly set by the ruby installer
+  ReadRegStr $R1 HKCU "Environment" "Path"
+  System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("Path", R1).r2'
+!macroend
+
 Section /o "Ruby for Windows" InstallRuby
   InitPluginsDir
-  StrCpy $0 "$PLUGINSDIR\${RUBYINSTALLER_FILE}"
-  !insertmacro DOWNLOAD "${RUBYINSTALLER_URL}" $0
+  StrCpy $R0 "$PLUGINSDIR\${RUBYINSTALLER_FILE}"
+  !insertmacro DOWNLOAD "${RUBYINSTALLER_URL}" $R0
 
   DetailPrint "Installing Ruby ${RUBY_VERSION}..."
-  !insertmacro EXEC_GUI '"$0" /VERYSILENT /TASKS=MODPATH' ${RUBYINSTALLER_FILE}
+  !insertmacro EXEC_GUI '"$R0" /VERYSILENT /TASKS=MODPATH' ${RUBYINSTALLER_FILE}
 
-  ; reload the path to use the one freshly set by the ruby installer
-  ReadRegStr $R0 HKCU "Environment" "Path"
-  System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("Path", R0).r2'
+  !insertmacro RELOAD_PATH
 SectionEnd
 
 Section /o "Rugged (libgit2)" InstallRugged
+  nsExec::ExecToStack '"ruby" -e "print Gem::Platform.local"'
+  Pop $0
+  Pop $1
+  !insertmacro StrRep $R2 "${RUGGED_FILE}" "%PLATFORM%" $1
+  !insertmacro StrRep $R3 "${RUGGED_URL}" "%PLATFORM%" $1
+
   InitPluginsDir
-  StrCpy $0 "$PLUGINSDIR\${RUGGED_FILE}"
-  !insertmacro DOWNLOAD "${RUGGED_URL}" $0
+  StrCpy $R0 "$PLUGINSDIR\$R2"
+  !insertmacro DOWNLOAD "$R3" $R0
 
   DetailPrint "Installing rugged/libgit2 with pre-built C extensions..."
-  !insertmacro EXEC_CLI '"cmd" /C gem install $0' "gem install ${RUGGED_FILE}"
+  !insertmacro EXEC_CLI '"cmd" /C gem install $R0' "gem install $R2"
 SectionEnd
 
 Section /o "Pandoc" InstallPandoc
   InitPluginsDir
-  StrCpy $0 "$PLUGINSDIR\${PANDOC_FILE}"
-  !insertmacro DOWNLOAD "${PANDOC_URL}" $0
+  StrCpy $R0 "$PLUGINSDIR\${PANDOC_FILE}"
+  !insertmacro DOWNLOAD "${PANDOC_URL}" $R0
 
   DetailPrint "Installing Pandoc..."
-  !insertmacro EXEC_GUI '"msiexec" /i $0 /passive' ${PANDOC_FILE}
+  !insertmacro EXEC_GUI '"msiexec" /i $R0 /passive' ${PANDOC_FILE}
 SectionEnd
 
-Section "ReaPack-Index" InstallMain
+Section "ReaPack Index" InstallMain
   SectionIn RO
 
   DetailPrint "Installing reapack-index... (this can take a while)"
 
-  !insertmacro EXEC_CLI \
-    '"cmd" /C gem install reapack-index --version=${VERSION}' \
-    "gem install reapack-index"
+  StrCpy $R0 "gem install reapack-index --version=${VERSION}"
+  !insertmacro EXEC_CLI '"cmd" /C $R0' "$R0"
 SectionEnd
 
 Function .onInit
-  nsExec::ExecToStack '"ruby" -e "require \"rugged\"'
+  !insertmacro RELOAD_PATH
+  nsExec::ExecToStack '"ruby" -e " \
+    spec = Gem::Specification.find_all_by_name(\"rugged\").first; \
+    req = Gem::Requirement.new(\"~> ${RUGGED_VERSION}\"); \
+    raise unless spec && req =~ spec.version'
   Pop $0
 
-  StrCmp $0 "error" 0 +5 ; failed to launch ruby
+  StrCmp $0 "error" 0 +6 ; failed to launch ruby
     SectionGetFlags ${InstallRuby} $1
     IntOp $1 $1 | ${SF_SELECTED}
+    IntOp $1 $1 | ${SF_RO}
     SectionSetFlags ${InstallRuby} $1
     Goto +2 ; also install rugged
 
-  StrCmp $0 "1" 0 +4 ; rugged is not installed
+  StrCmp $0 "1" 0 +5 ; rugged is not installed
     SectionGetFlags ${InstallRugged} $1
     IntOp $1 $1 | ${SF_SELECTED}
+    IntOp $1 $1 | ${SF_RO}
     SectionSetFlags ${InstallRugged} $1
 
   nsExec::ExecToStack '"pandoc" --version'
   Pop $0
 
-  StrCmp $0 "error" 0 +4 ; failed to launch pandoc
+  StrCmp $0 "error" 0 +5 ; failed to launch pandoc
     SectionGetFlags ${InstallPandoc} $1
     IntOp $1 $1 | ${SF_SELECTED}
+    IntOp $1 $1 | ${SF_RO}
     SectionSetFlags ${InstallPandoc} $1
+
+  SectionGetFlags ${InstallMain} $1
+    IntOp $1 $1 | ${SF_PSELECTED}
+    SectionSetFlags ${InstallMain} $1
 FunctionEnd
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN