compact_index 0.11.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 26a6b9d47c580c53737df7aef9c0e9619a622dfb
-  data.tar.gz: f846a31bc5833ff97687da9c6bb2aec1d865f347
+SHA256:
+  metadata.gz: 53388525df0047c065e1c9197e9021550c69e988629f624e53dc17b6128af505
+  data.tar.gz: 72e4f7887f5e43cf485f43f0e4d0d3c1789805707166afed428de0b9b63fde8a
 SHA512:
-  metadata.gz: a2ea035146ce0bcb7eb8c1d227a216dddd6279228c97c180e1f6ef211e969a46bbec6a89e920cd771e3b2fad6ea89de368fa048fdcaeea48e0fb3180986171a8
-  data.tar.gz: 86c03f712b8d4f37e84502245abd7d065299eb9f6ff5081ec4dfcdbbe434df859c491b625c2d94fd6ecd9898f00a33c02dd57bf6d9fa29c3cf21a1618e4c19f9
+  metadata.gz: 48d42cebf94bc355e676dedb986beb08c4d512d50295d00a3337ad95f3f3e9f24001311b46ebfc17a1e9043f1af1e9ad6feefd5a846d92086af9bde3d4686432
+  data.tar.gz: ffb5581d24c9089a0f06e7497369ed9b5064c7c826a99fcb0536f1d1026ccac83f6818a75774af5c4bb0e06dde7caa576bc4a3ed24f23856a693189f7fda39bb

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop-bundler.yml

@@ -2,6 +2,7 @@ inherit_from:
   - .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: 1.9
   Exclude:
     - tmp/**/*
     - lib/bundler/vendor/**/*
@@ -14,23 +15,39 @@ Lint/AssignmentInCondition:
   Enabled: false
 
 Lint/EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
+  AutoCorrect: true
 
 Lint/UnusedMethodArgument:
   Enabled: false
 
 # Style
 
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
-Style/AlignParameters:
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
-Style/MultilineOperationIndentation:
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: always
+
+Style/MultilineBlockChain:
+  Enabled: false
+
+Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
-Style/SpaceInsideBlockBraces:
+Style/PerlBackrefs:
+  Enabled: false
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Layout/SpaceInsideBlockBraces:
   SpaceBeforeBlockParameters: false
 
 Style/TrivialAccessors:
@@ -46,6 +63,18 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
+# Having these make it easier to *not* forget to add one when adding a new
+# value and you can simply copy the previous line.
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingUnderscoreVariable:
+  Enabled: false
+
+# `String.new` is preferred style with enabled frozen string literal
+Style/EmptyLiteral:
+  Enabled: false
+
 # 1.8.7 support
 
 Style/HashSyntax:
@@ -54,7 +83,7 @@ Style/HashSyntax:
 Style/Lambda:
   Enabled: false
 
-Style/DotPosition:
+Layout/DotPosition:
   EnforcedStyle: trailing
 
 Style/EachWithObject:
@@ -63,6 +92,12 @@ Style/EachWithObject:
 Style/SpecialGlobalVars:
   Enabled: false
 
+Style/TrailingCommaInArguments:
+  Enabled: false
+
+Performance/FlatMap:
+  Enabled: false
+
 # Metrics
 
 # We've chosen to use Rubocop only for style, and not for complexity or quality checks.
@@ -84,5 +119,10 @@ Metrics/AbcSize:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
+Metrics/ParameterLists:
+  Enabled: false
+
+# It will be obvious which code is complex, Rubocop should only lint simple
+# rules for us.
 Metrics/PerceivedComplexity:
   Enabled: false

data/.rubocop.yml

@@ -1,4 +1,13 @@
 inherit_from: .rubocop-bundler.yml
 
+AllCops:
+  Exclude:
+    - !ruby/regexp /(vendor|bundle|bin|db|tmp)\/.*/
+
+Metrics/BlockLength:
+  Exclude:
+    - "db/migrations/*.rb"
+    - "spec/**/*.rb"
+
 Style/FrozenStringLiteralComment:
   EnforcedStyle: always

data/.travis.yml

@@ -1,8 +1,17 @@
 language: ruby
-before_install: gem install bundler
+
+cache:
+  bundler: true
+  directories:
+    - vendor/cache
+
+bundler_args: --jobs=3 --retry=3
+
+script:
+  - bundle exec rake
+
 rvm:
-  - "2.3.0"
-  - "2.2.4"
-  - "2.1.5"
-  - "1.9.3"
-  - "1.8.7"
+  - "2.7.1"
+  - "2.6.6"
+  - "2.5.8"
+  - "2.4.10"

data/CHANGELOG.md

@@ -1,4 +1,24 @@
-## 0.10.0 (January 22, 2016)
+
+## 0.14.0 (May 25, 2020)
+
+Enhancement:
+
+  - Add timestamp arg to version file create function
+
+## 0.13.0 (May 25, 2020)
+
+Bugfix:
+
+  - Revert trimming of space from requirements. Removing space would have meant info response of all gems were going to change.
+  - Fix token used for splitting list of requirements
+
+## 0.12.0 (May 3, 2020)
+
+Bugfix:
+
+  - Update info line to join multiple ruby or rubygems requirements by ampersand (rubygems/compact_index#26)
+
+## 0.11.0 (January 22, 2016)
 
 Features:
 

data/Gemfile

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in compact_index.gemspec
 gemspec
 
 group :documentation do
-  gem "yard", "~> 0.8"
-  gem "redcarpet", "~> 2.3"
+  gem "redcarpet", "~> 3.5"
+  gem "yard", "~> 0.9"
 end
 
 group :development do
-  gem "rubocop", :install_if => lambda { RUBY_VERSION >= "1.9" }
+  gem "rubocop", "~> 0.49.0", :install_if => lambda { RUBY_VERSION >= "2.0" }
 end

data/Gemfile.lock

@@ -0,0 +1,55 @@
+PATH
+  remote: .
+  specs:
+    compact_index (0.14.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.0)
+    diff-lcs (1.3)
+    parallel (1.19.1)
+    parser (2.7.1.1)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    rainbow (2.2.2)
+      rake
+    rake (13.0.1)
+    redcarpet (3.5.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.10.1)
+    unicode-display_width (1.7.0)
+    yard (0.9.24)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  compact_index!
+  rake (~> 13.0)
+  redcarpet (~> 3.5)
+  rspec (~> 3)
+  rubocop (~> 0.49.0)
+  yard (~> 0.9)
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/bundler/compact_index.svg)](https://travis-ci.org/bundler/compact_index)
+[![Build Status](https://travis-ci.org/rubygems/compact_index.svg)](https://travis-ci.org/rubygems/compact_index)
 
 # CompactIndex
 

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "bundler/gem_tasks"
 
 begin
@@ -6,7 +7,7 @@ begin
 
   desc "Run specs"
   RSpec::Core::RakeTask.new(:spec) do |t|
-    t.rspec_opts = %w(--color)
+    t.rspec_opts = %w[--color]
   end
 
   begin

data/compact_index.gemspec

@@ -1,5 +1,6 @@
 # coding: utf-8
 # frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "compact_index/version"
@@ -7,11 +8,11 @@ require "compact_index/version"
 Gem::Specification.new do |spec|
   spec.name          = "compact_index"
   spec.version       = CompactIndex::VERSION
-  spec.authors       = ["fotanus@gmail.com"]
-  spec.email         = ["Felipe Tanus"]
+  spec.authors       = ["Felipe Tanus"]
+  spec.email         = ["fotanus@gmail.com"]
 
   spec.summary       = "Backend for compact index"
-  spec.homepage      = "https://github.com/bundler/compact_index"
+  spec.homepage      = "https://github.com/rubygems/compact_index"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
@@ -19,6 +20,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3"
 end

data/db/migrations/01_rubygems_org_schema_dump.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     create_table(:dependencies, :ignore_index_errors => true) do

data/db/migrations/02_prune.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   up do
     drop_table :linksets

data/db/migrations/03_add_ruby_and_rubygems_requirements.rb

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

data/db/migrations/04_add_deps_md5_to_rubygems.rb

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

data/db/migrations/05_create_checksums.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     create_table :checksums do

data/db/migrations/06_add_created_at_to_versions.rb

@@ -1,4 +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,4 +1,5 @@
 # frozen_string_literal: true
+
 Sequel.migration do
   change do
     alter_table :versions do

data/lib/compact_index/dependency.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module CompactIndex
   Dependency = Struct.new(:gem, :version, :platform, :checksum) do
     def version_and_platform

data/lib/compact_index/ext/date.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "date"
 
 # Ruby 1.8.7 makes Time#to_datetime private, but we need it

data/lib/compact_index/gem.rb

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

data/lib/compact_index/gem_version.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
+
 module CompactIndex
+  # rubocop:disable Metrics/BlockLength
   GemVersion = Struct.new(:number, :platform, :checksum, :info_checksum,
     :dependencies, :ruby_version, :rubygems_version) do
     def number_and_platform
@@ -22,18 +24,30 @@ module CompactIndex
 
     def to_line
       line = number_and_platform.dup << " " << deps_line << "|checksum:#{checksum}"
-      line << ",ruby:#{ruby_version}" if ruby_version && ruby_version != ">= 0"
-      line << ",rubygems:#{rubygems_version}" if rubygems_version && rubygems_version != ">= 0"
+      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], d.version_and_platform.split(", ").sort.join("&")].join(":")
+        [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,4 +1,5 @@
 # frozen_string_literal: true
+
 module CompactIndex
-  VERSION = "0.11.0".freeze
+  VERSION = "0.14.0".freeze
 end

data/lib/compact_index/versions_file.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 require "time"
 require "date"
 require "digest"
-require "compact_index"
 
 module CompactIndex
   class VersionsFile
@@ -24,11 +24,11 @@ module CompactIndex
       created_at_header(@path) || Time.at(0).to_datetime
     end
 
-    def create(gems)
+    def create(gems, ts = Time.now.iso8601)
       gems.sort!
 
       File.open(@path, "w") do |io|
-        io.write "created_at: #{Time.now.iso8601}\n---\n"
+        io.write "created_at: #{ts}\n---\n"
         io.write gem_lines(gems)
       end
     end
@@ -36,8 +36,6 @@ module CompactIndex
   private
 
     def gem_lines(gems)
-      gems.each {|g| g.versions.sort! }
-
       gems.reduce("".dup) do |lines, gem|
         version_numbers = gem.versions.map(&:number_and_platform).join(",")
         lines << gem.name <<

data/lib/compact_index.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "compact_index/gem"
 require "compact_index/gem_version"
 require "compact_index/dependency"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compact_index
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.14.0
 platform: ruby
 authors:
-- fotanus@gmail.com
+- Felipe Tanus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2021-10-03 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.2.3
 signing_key: 
 specification_version: 4
 summary: Backend for compact index