compact_index 0.9.4 → 0.13.0

data/db/migrations/05_create_checksums.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Sequel.migration do
   change do
     create_table :checksums do
@@ -5,7 +7,7 @@ Sequel.migration do
       String :name
       String :md5
 
-      index [:name], name: :index_checksums_on_name, unqiue: true
+      index [:name], :name => :index_checksums_on_name, :unqiue => true
     end
   end
 end

data/db/migrations/06_add_created_at_to_versions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table :versions do

data/db/migrations/07_add_checksum_to_versions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table :versions do

data/lib/compact_index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "compact_index/gem"
 require "compact_index/gem_version"
 require "compact_index/dependency"
@@ -17,7 +19,7 @@ module CompactIndex
   #   other-gem
   #   ```
   def self.names(gem_names)
-    "---\n" << gem_names.join("\n") << "\n"
+    String.new("---\n") << gem_names.join("\n") << "\n"
   end
 
   # Returns the versions file content argumented with some extra gems
@@ -48,7 +50,6 @@ module CompactIndex
     versions_file.contents(gems, args)
   end
 
-
   # Formats the versions information of a gem, to be display in the `/info/gemname` endpoint.
   #
   # @param versions_file [CompactIndex::VersionsFile] which will be used as a base response
@@ -69,40 +70,9 @@ module CompactIndex
   #   1.0.1 requirement:<2.0&>1.0|checksum:abc1
   #   1.0.2 requirement:<2.0&>1.0,requirement2:=1.1|checksum:abc2,ruby:>1.0,rubygems:>2.0
   #   ```
-  def self.info(params)
-    output = "---\n"
-    params.each do |version|
-      output << version_line(version) << "\n"
+  def self.info(versions)
+    versions.inject("---\n".dup) do |output, version|
+      output << version.to_line << "\n"
     end
-    output
-  end
-
-
-  private
-
-
-  def self.version_line(version)
-    if version[:dependencies]
-      version[:dependencies]
-      deps = version[:dependencies].map do |d|
-        [
-           d[:gem],
-           d.version_and_platform.split(', ').sort.join("&")
-        ].join(':')
-      end
-    else
-      deps = []
-    end
-
-    line = version.number_and_platform
-    line << " "
-    line << deps.join(",")
-    line << "|"
-
-    line << "checksum:#{version[:checksum]}"
-    line << ",ruby:#{version[:ruby_version]}" if version[:ruby_version]
-    line << ",rubygems:#{version[:rubygems_version]}" if version[:rubygems_version]
-
-    line
   end
 end

data/lib/compact_index/dependency.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module CompactIndex
   Dependency = Struct.new(:gem, :version, :platform, :checksum) do
     def version_and_platform
-      if platform.nil? || platform == 'ruby'
+      if platform.nil? || platform == "ruby"
         version.dup
       else
         "#{version}-#{platform}"

data/lib/compact_index/ext/date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "date"
 
 # Ruby 1.8.7 makes Time#to_datetime private, but we need it
@@ -5,4 +7,4 @@ unless Time.public_instance_methods.include? :to_datetime
   class Time
     public :to_datetime
   end
-end
+end

data/lib/compact_index/gem.rb

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
 module CompactIndex
-  Gem = Struct.new(:name, :versions)
+  Gem = Struct.new(:name, :versions) do
+    def <=>(other)
+      name <=> other.name
+    end
+  end
 end

data/lib/compact_index/gem_version.rb

@@ -1,12 +1,53 @@
+# frozen_string_literal: true
+
 module CompactIndex
+  # rubocop:disable Metrics/BlockLength
   GemVersion = Struct.new(:number, :platform, :checksum, :info_checksum,
-                          :dependencies, :ruby_version, :rubygems_version) do
+    :dependencies, :ruby_version, :rubygems_version) do
     def number_and_platform
-      if platform.nil? || platform == 'ruby'
+      if platform.nil? || platform == "ruby"
         number.dup
       else
         "#{number}-#{platform}"
       end
     end
+
+    def <=>(other)
+      number_comp = number <=> other.number
+
+      if number_comp.zero?
+        [number, platform].compact <=> [other.number, other.platform].compact
+      else
+        number_comp
+      end
+    end
+
+    def to_line
+      line = number_and_platform.dup << " " << deps_line << "|checksum:#{checksum}"
+      line << ",ruby:#{ruby_version_line}" if ruby_version && ruby_version != ">= 0"
+      line << ",rubygems:#{rubygems_version_line}" if rubygems_version && rubygems_version != ">= 0"
+      line
+    end
+
+  private
+
+    def ruby_version_line
+      join_multiple(ruby_version)
+    end
+
+    def rubygems_version_line
+      join_multiple(rubygems_version)
+    end
+
+    def deps_line
+      return "" if dependencies.nil?
+      dependencies.map do |d|
+        [d[:gem], join_multiple(d.version_and_platform)].join(":")
+      end.join(",")
+    end
+
+    def join_multiple(requirements)
+      requirements.split(", ").sort.join("&")
+    end
   end
 end

data/lib/compact_index/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CompactIndex
-  VERSION = "0.9.4"
+  VERSION = "0.13.0".freeze
 end

data/lib/compact_index/versions_file.rb

@@ -1,116 +1,68 @@
-require 'time'
-require 'date'
-require 'digest'
-require 'compact_index'
+# frozen_string_literal: true
 
-class CompactIndex::VersionsFile
-  def initialize(file = nil)
-    @path = file || "/versions.list"
-  end
+require "time"
+require "date"
+require "digest"
 
-  def contents(gems = nil, args = {})
-    if args[:calculate_checksums]
-      gems = calculate_checksums(gems)
+module CompactIndex
+  class VersionsFile
+    def initialize(file = nil)
+      @path = file || "/versions.list"
     end
 
-    out = File.read(@path)
-    out << parse_gems(gems) if gems
-    out
-  end
-
-  def updated_at
-    created_at_header(@path) || Time.at(0).to_datetime
-  end
-
-  def update_with(gems)
-    if File.exists?(@path) && !File.zero?(@path)
-      update(gems)
-    else
-      create(gems)
-    end
-  end
+    def contents(gems = nil, args = {})
+      gems = calculate_info_checksums(gems) if args.delete(:calculate_info_checksums) { false }
 
+      raise ArgumentError, "Unknown options: #{args.keys.join(", ")}" unless args.empty?
 
-  private
-
-
-  def create(gems)
-    content = "created_at: #{Time.now.iso8601}"
-    content << "\n---\n"
-    content << parse_gems_for_create(gems)
-
-    File.open(@path, 'w') do |io|
-      io.write content
+      File.read(@path).tap do |out|
+        out << gem_lines(gems) if gems
+      end
     end
-  end
 
-  def update(gems)
-    File.open(@path, 'a') do |io|
-      io.write parse_gems(gems)
+    def updated_at
+      created_at_header(@path) || Time.at(0).to_datetime
     end
-  end
 
-  def parse_gems_for_create(gems)
-    # Join all versions for each gem in one hash
-    gems_hash = {}
-    gems.each do |entry|
-      gems_hash[entry[:name]] ||= []
-      gems_hash[entry[:name]] += entry[:versions]
-    end
+    def create(gems)
+      gems.sort!
 
-    # Transform hash in a list of line informations to be printed
-    gems = gems_hash.map do |gem, versions|
-      { :name => gem, :versions => versions, :checksum => versions.first[:checksum] }
-    end
-
-    # Sort gems by name and versions by number
-    gems.sort! { |a,b| a[:name] <=> b[:name] }
-    gems.each do |entry|
-      entry[:versions].sort! do |a,b|
-        Gem::Version.create(a[:number]) <=> Gem::Version.create(b[:number])
+      File.open(@path, "w") do |io|
+        io.write "created_at: #{Time.now.iso8601}\n---\n"
+        io.write gem_lines(gems)
       end
     end
 
-    gem_lines(gems)
-  end
-
-  def parse_gems(gems)
-    gem_lines = gems.map do |entry|
-      {
-        :name => entry[:name],
-        :versions => entry[:versions],
-        :checksum => entry[:versions].first[:checksum]
-      }
-    end
-    gem_lines(gem_lines)
-  end
+  private
 
-  def gem_lines(gems)
-    gems.reduce("") do |concat, entry|
-      versions = entry[:versions]
-      concat << "#{entry[:name]} #{versions.map(&:number_and_platform).join(',')} #{entry[:checksum]}\n"
+    def gem_lines(gems)
+      gems.reduce("".dup) do |lines, gem|
+        version_numbers = gem.versions.map(&:number_and_platform).join(",")
+        lines << gem.name <<
+          " ".freeze << version_numbers <<
+          " #{gem.versions.last.info_checksum}\n"
+      end
     end
-  end
 
-  def calculate_checksums(gems)
-    gems.each do |gem|
-      info_checksum = Digest::MD5.hexdigest(CompactIndex.info(gem[:versions]))
-      gem[:versions].first[:checksum] = info_checksum
+    def calculate_info_checksums(gems)
+      gems.each do |gem|
+        info_checksum = Digest::MD5.hexdigest(CompactIndex.info(gem[:versions]))
+        gem[:versions].last[:info_checksum] = info_checksum
+      end
     end
-  end
 
-  def created_at_header(path)
-    return unless File.exists? path
+    def created_at_header(path)
+      return unless File.exist? path
 
-    File.open(path) do |file|
-      file.each_line do |line|
-        line.match(/created_at: (.*)\n|---\n/) do |match|
-          return match[1] && DateTime.parse(match[1])
+      File.open(path) do |file|
+        file.each_line do |line|
+          line.match(/created_at: (.*)\n|---\n/) do |match|
+            return match[1] && DateTime.parse(match[1])
+          end
         end
       end
-    end
 
-    nil
+      nil
+    end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compact_index
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.13.0
 platform: ruby
 authors:
-- fotanus@gmail.com
+- Felipe Tanus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: '3'
 description: 
 email:
-- Felipe Tanus
+- fotanus@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -55,6 +55,7 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -75,7 +76,7 @@ files:
 - lib/compact_index/gem_version.rb
 - lib/compact_index/version.rb
 - lib/compact_index/versions_file.rb
-homepage: https://github.com/bundler/compact_index
+homepage: https://github.com/rubygems/compact_index
 licenses:
 - MIT
 metadata: {}
@@ -94,8 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Backend for compact index