compact_index 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e482659a6122776eafafea998d383a1a252c1247
-  data.tar.gz: f7d608614cf0e5352b802b62c1b49639233b2cba
+  metadata.gz: 26a6b9d47c580c53737df7aef9c0e9619a622dfb
+  data.tar.gz: f846a31bc5833ff97687da9c6bb2aec1d865f347
 SHA512:
-  metadata.gz: 34ca690508948503066eb677d520b367ac8bde9fa08102a692d0921d20afd85ed5e7182f692475c8a197cd03ac0c2d9a5d317c213017c21c58287a66d71192be
-  data.tar.gz: 61a3ef799c846ceef782d1ca645a9ecc6eb10293456491bd3b1b753e3087356a54507dcc47b6fc080a6a9e0ad410564e931d1d9cdbdbb87c4b78317c877b8dda
+  metadata.gz: a2ea035146ce0bcb7eb8c1d227a216dddd6279228c97c180e1f6ef211e969a46bbec6a89e920cd771e3b2fad6ea89de368fa048fdcaeea48e0fb3180986171a8
+  data.tar.gz: 86c03f712b8d4f37e84502245abd7d065299eb9f6ff5081ec4dfcdbbe434df859c491b625c2d94fd6ecd9898f00a33c02dd57bf6d9fa29c3cf21a1618e4c19f9

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## 0.10.0 (January 22, 2016)
 
+Features:
+
+  - Refactoring big part of the code
+  - Change behavior of VersionsFile#create to avoid adding multiple versions per line
+
+## 0.10.0 (January 22, 2016)
+
 Features:
 
   - Frozen string literal support

data/README.md

@@ -20,7 +20,7 @@ And then execute:
 
 ### `/names`
 
-To render the body for this call, all you have to do is generate a list of gems available in alfabetical order and use call `CompactIndex.names`.
+To render the body for this call, all you have to do is generate a list of gems available in alphabetical order and use call `CompactIndex.names`.
 
 ```ruby
 gem 'compact_index'
@@ -37,7 +37,7 @@ gem 'compact_index'
 versions_file = CompactIndex::VersionsFile.new("/path/to/versions/file")
 
 # Get last updated date. This is used to discover what gems aren't  in the file yet
-from_date = @versions_file.updated_at
+from_date = versions_file.updated_at
 
 # Query the extra gems using the from date. Format should be as follows
 extra_gems = [
@@ -52,7 +52,7 @@ extra_gems = [
 ]
 
 # Render the body for the versions response
-CompactIndex.versions(@versions_file, extra_gems)
+CompactIndex.versions(versions_file, extra_gems)
 ```
 
 ### `/info/gem_name`

data/lib/compact_index.rb

@@ -69,38 +69,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 = String.new("---\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.dup
-    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/gem.rb

@@ -1,4 +1,8 @@
 # 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

@@ -9,5 +9,31 @@ module CompactIndex
         "#{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}" if ruby_version && ruby_version != ">= 0"
+      line << ",rubygems:#{rubygems_version}" if rubygems_version && rubygems_version != ">= 0"
+      line
+    end
+
+  private
+
+    def deps_line
+      return "" if dependencies.nil?
+      dependencies.map do |d|
+        [d[:gem], d.version_and_platform.split(", ").sort.join("&")].join(":")
+      end.join(",")
+    end
   end
 end

data/lib/compact_index/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module CompactIndex
-  VERSION = "0.10.0".freeze
+  VERSION = "0.11.0".freeze
 end

data/lib/compact_index/versions_file.rb

@@ -15,80 +15,34 @@ module CompactIndex
 
       raise ArgumentError, "Unknown options: #{args.keys.join(", ")}" unless args.empty?
 
-      out = File.read(@path)
-      out << parse_gems(gems) if gems
-      out
+      File.read(@path).tap do |out|
+        out << gem_lines(gems) if gems
+      end
     end
 
     def updated_at
       created_at_header(@path) || Time.at(0).to_datetime
     end
 
-    def update_with(gems)
-      if File.exist?(@path) && !File.zero?(@path)
-        update(gems)
-      else
-        create(gems)
-      end
-    end
-
-  private
-
     def create(gems)
-      content = "created_at: #{Time.now.iso8601}".dup
-      content << "\n---\n"
-      content << parse_gems_for_create(gems)
+      gems.sort!
 
       File.open(@path, "w") do |io|
-        io.write content
-      end
-    end
-
-    def update(gems)
-      File.open(@path, "a") do |io|
-        io.write parse_gems(gems)
-      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
-
-      # Transform hash in a list of line informations to be printed
-      gems = gems_hash.map do |gem, versions|
-        { :name => gem, :versions => versions, :info_checksum => versions.last[:info_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])
-        end
+        io.write "created_at: #{Time.now.iso8601}\n---\n"
+        io.write gem_lines(gems)
       end
-
-      gem_lines(gems)
     end
 
-    def parse_gems(gems)
-      gem_lines = gems.map do |entry|
-        {
-          :name => entry[:name],
-          :versions => entry[:versions],
-          :info_checksum => entry[:versions].last[:info_checksum]
-        }
-      end
-      gem_lines(gem_lines)
-    end
+  private
 
     def gem_lines(gems)
-      gems.reduce("".dup) do |concat, entry|
-        versions = entry[:versions]
-        concat << "#{entry[:name]} #{versions.map(&:number_and_platform).join(",")} #{entry[:info_checksum]}\n"
+      gems.each {|g| g.versions.sort! }
+
+      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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compact_index
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - fotanus@gmail.com
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -95,9 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Backend for compact index
 test_files: []
-has_rdoc: