reapack-index 1.0beta3 → 1.0beta4

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

@@ -7,6 +7,8 @@ class ReaPack::Index::CLI
   ].freeze
 
   DEFAULTS = {
+    check: false,
+    scan: [],
     verbose: false,
     warnings: true,
     progress: true,
@@ -41,28 +43,37 @@ class ReaPack::Index::CLI
     OptionParser.new do |op|
       op.program_name = PROGRAM_NAME
       op.version = ReaPack::Index::VERSION
-      op.banner = "Package indexer for ReaPack-based repositories\n" +
+      op.banner = "Package indexer for git-based ReaPack 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.separator 'Modes:'
 
       op.on '-c', '--check', 'Test every package including uncommited changes and exit' do
         opts[:check] = true
       end
 
+      op.on '-s', '--scan [COMMIT]', 'Scan new commits (default) or specific commits' do |commit|
+        opts[:check] = false
+        opts[:scan] ||= []
+
+        if commit
+          opts[:scan] << commit.strip
+        else
+          opts[:scan].clear
+        end
+      end
+
+      op.separator 'Indexer options:'
+
+      op.on '-a', '--[no-]amend', 'Reindex existing versions' do |bool|
+        opts[:amend] = bool
+      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
@@ -73,6 +84,12 @@ class ReaPack::Index::CLI
         opts[:output] = file.strip
       end
 
+      op.separator 'Repository metadata:'
+
+      op.on '-n', '--name NAME', 'Set the name shown in ReaPack for this repository' do |name|
+        opts[:name] = name.strip
+      end
+
       op.on '-l', '--link LINK', 'Add or remove a website link' do |link|
         opts[:links] ||= Array.new
         opts[:links] << [:website, link.strip]
@@ -99,6 +116,8 @@ class ReaPack::Index::CLI
         opts[:dump_about] = true
       end
 
+      op.separator 'Misc options:'
+
       op.on '--[no-]progress', 'Enable or disable progress information' do |bool|
         opts[:progress] = bool
       end

data/lib/reapack/index/gem_version.rb

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

data/lib/reapack/index/git.rb

@@ -0,0 +1,189 @@
+class ReaPack::Index
+  class Git
+    def initialize(path)
+      @repo = Rugged::Repository.discover path
+    end
+
+    def empty?
+      @repo.empty?
+    end
+
+    def path
+      File.expand_path @repo.workdir
+    end
+
+    def commits_since(sha)
+      return [] if empty?
+
+      walker = Rugged::Walker.new @repo
+      walker.sorting Rugged::SORT_TOPO | Rugged::SORT_REVERSE
+      walker.push @repo.head.target_id
+
+      walker.hide sha if fetch_commit sha
+
+      walker.map {|c| Commit.new c, @repo }
+    end
+
+    def get_commit(sha)
+      c = fetch_commit sha
+      Commit.new c, @repo if c
+    end
+
+    def last_commit
+      c = @repo.last_commit
+      Commit.new c, @repo if c
+    end
+
+    def guess_url_template
+      remote = @repo.remotes['origin']
+      return unless remote
+
+      uri = Gitable::URI.parse remote.url
+      return unless uri.path =~ /\A\/?(?<user>[^\/]+)\/(?<repo>[^\/]+)\.git\Z/
+
+      tpl = uri.to_web_uri
+      tpl.path += '/raw/$commit/$path'
+
+      tpl.to_s
+    end
+
+    def relative_path(path)
+      root = Pathname.new @repo.workdir
+      file = Pathname.new path
+
+      file.relative_path_from(root).to_s
+    end
+
+    def create_commit(message, files)
+      old_index = @repo.index
+      target = empty? ? nil : @repo.head.target
+
+      if target
+        old_index.read_tree target.tree
+      else
+        old_index.clear
+      end
+
+      new_index = @repo.index
+      files.each {|f|
+        if File.exist? f
+          new_index.add relative_path(f)
+        else
+          new_index.remove relative_path(f)
+        end
+      }
+
+      c = Rugged::Commit.create @repo, \
+        tree: new_index.write_tree(@repo),
+        message: message,
+        parents: [target].compact,
+        update_ref: 'HEAD'
+
+      old_index.write
+
+      # force-reload the repository
+      @repo = Rugged::Repository.discover path
+
+      get_commit c
+    end
+
+  private
+    def fetch_commit(sha)
+      if sha && sha.size.between?(7, 40) && @repo.include?(sha)
+        object = @repo.lookup sha
+        object if object.is_a? Rugged::Commit
+      end
+    rescue Rugged::InvalidError
+      nil
+    end
+  end
+
+  class Git::Commit
+    def initialize(commit, repo)
+      @commit, @repo = commit, repo
+      @parent = commit.parents.first
+    end
+
+    def each_diff
+      return enum_for :each_diff unless block_given?
+
+      if @parent
+        diff = @parent.diff id
+      else
+        diff = @commit.diff
+      end
+
+      diff.each_delta {|delta| yield Git::Diff.new(delta, @parent.nil?, @repo) }
+    end
+
+    def id
+      @commit.oid
+    end
+
+    def short_id
+      id[0...7]
+    end
+
+    def message
+      @commit.message
+    end
+
+    def summary
+      message.lines.first.chomp
+    end
+
+    def time
+      @commit.time
+    end
+
+    def filelist
+      lsfiles @commit.tree
+    end
+
+    def ==(o)
+      id == o.id
+    end
+
+  private
+    def lsfiles(tree, base = String.new)
+      files = []
+
+      tree.each {|obj|
+        fullname = base.empty? ? obj[:name] : File.join(base, obj[:name])
+        case obj[:type]
+        when :blob
+          files << fullname
+        when :tree
+          files.concat lsfiles(@repo.lookup(obj[:oid]), fullname)
+        end
+      }
+
+      files
+    end
+  end
+
+  class Git::Diff
+    def initialize(delta, is_initial, repo)
+      @delta, @repo = delta, repo
+
+      if is_initial
+        @status = :added
+        @file = delta.old_file
+      else
+        @status = delta.status.to_sym
+        @file = delta.new_file
+      end
+    end
+
+    attr_reader :status
+
+    def file
+      @file[:path].force_encoding(Encoding::UTF_8)
+    end
+    
+    def new_content
+      return if status == :deleted
+      @repo.lookup(@file[:oid]).content.force_encoding(Encoding::UTF_8)
+    end
+  end
+end

data/lib/reapack/index/metadata.rb

@@ -24,7 +24,7 @@ class ReaPack::Index
           raise Addressable::URI::InvalidURIError
         end
       rescue Addressable::URI::InvalidURIError
-        raise Error, "invalid link: #{url}"
+        raise Error, "invalid link '#{url}'"
       end
 
       make_root
@@ -60,7 +60,7 @@ class ReaPack::Index
     def remove_link(type, search)
       node = Link.find type, search, @root
 
-      raise Error, "no such #{type} link: #{search}" unless node
+      raise Error, "no such #{type} link '#{search}'" unless node
 
       node.remove
       auto_remove

data/lib/reapack/index/named_node.rb

@@ -7,7 +7,7 @@ class ReaPack::Index
       @tag
     end
 
-    def self.find_in(parent, name)
+    def self.find_one(name, parent)
       node = parent.element_children.find {|node|
         node.name == tag && node[NAME_ATTR] == name
       }
@@ -21,27 +21,32 @@ class ReaPack::Index
         .map {|node| self.new node }
     end
 
-    def self.get(name, parent, create)
+    def self.fetch(name, parent, create)
       return unless parent
 
-      node = self.find_in parent, name
+      instance = find_one name, parent
 
       if create
-        node ||= self.new name, parent
+        instance ||= self.create name, parent
       end
 
-      node
+      instance
     end
 
-    def initialize(node, parent = nil)
-      return @node = node if parent.nil?
+    def self.create(name, parent)
+      node = Nokogiri::XML::Node.new tag, parent.document
+      node[NAME_ATTR] = name
+      node.parent = parent
 
-      @is_new = true
-      @dirty = true
+      instance = new node
+      instance.instance_variable_set :@is_new, true
+      instance.instance_variable_set :@dirty, true
 
-      @node = Nokogiri::XML::Node.new self.class.tag, parent.document
-      @node[NAME_ATTR] = node
-      @node.parent = parent
+      instance
+    end
+
+    def initialize(node)
+      @node = node
     end
 
     attr_reader :node

data/lib/reapack/index/package.rb

@@ -6,13 +6,10 @@ class ReaPack::Index
   class Package < NamedNode
     @tag = 'reapack'.freeze
 
-    TYPE = 'type'.freeze
+    TYPE_ATTR = 'type'.freeze
 
-    def initialize(node, parent = nil)
+    def initialize(node)
       super
-
-      @versions = {}
-
       read_versions
     end
 
@@ -20,16 +17,24 @@ class ReaPack::Index
       super || @versions.values.any? {|ver| ver.modified? }
     end
 
+    def category
+      @node.parent[NAME_ATTR]
+    end
+
+    def path
+      @path ||= File.join category, name if category && name
+    end
+
     def type
-      @node[TYPE].to_s
+      @node[TYPE_ATTR]&.to_sym
     end
 
     def type=(new_type)
-      new_type ||= String.new
+      new_type = new_type.to_sym
 
       return if type == new_type
 
-      @node[TYPE] = new_type
+      @node[TYPE_ATTR] = new_type
       @dirty = true
     end
 
@@ -45,7 +50,7 @@ class ReaPack::Index
       if has_version? name
         ver = @versions[name]
       else
-        ver = @versions[name] = Version.new name, @node
+        ver = @versions[name] = Version.create name, @node
       end
 
       if block_given?
@@ -57,6 +62,8 @@ class ReaPack::Index
 
   private
     def read_versions
+      @versions ||= {}
+
       Version.find_all(@node).each {|ver|
         @versions[ver.name] = ver
       }

data/lib/reapack/index/provides.rb

@@ -0,0 +1,46 @@
+class ReaPack::Index
+  Provides = Struct.new :file_pattern, :url_template, :platform, :type do
+    PROVIDES_REGEX = /
+      \A
+      ( \[ \s* (?<options> .+? ) \s* \] )?
+      \s*
+      (?<file> .+?)
+      ( \s+ (?<url> (?:file|https?):\/\/.+ ) )?
+      \z
+    /x.freeze
+
+    class << self
+      def parse_each(input)
+        if block_given?
+          input.to_s.lines.map {|line| yield parse(line) }
+        else
+          enum_for :parse_each, input
+        end
+      end
+
+      def parse(line)
+        m = line.strip.match PROVIDES_REGEX
+        options, pattern, url_tpl = m[:options], m[:file], m[:url]
+
+        instance = self.new pattern, url_tpl
+
+        options and options.split(',').each {|user_opt|
+          user_opt.strip!
+          next if user_opt.empty?
+
+          opt = user_opt.downcase.to_sym
+
+          if Source.is_platform? opt
+            instance.platform = opt
+          elsif type = ReaPack::Index.resolve_type(opt)
+            instance.type = type
+          else
+            raise Error, "unknown option (platform or type) '#{user_opt}'"
+          end
+        }
+
+        instance
+      end
+    end
+  end
+end