compact_index 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1910b8bcbe07ae4b1503386a945c527e9dae0c82
-  data.tar.gz: eaccc11cf9d9d8e329b66278c1b6a4913225f882
+  metadata.gz: 9b3856147725f1163a8a30cbdaf87a50ec11569d
+  data.tar.gz: 29d0a42db611e97e05e27e1f6539285769465039
 SHA512:
-  metadata.gz: f4c4d5386521b6e29028a09165f16af8cb5da09cd19fed220d003fdfc30e0b86ffeafd602e612830184d3a474090c0ac65d4b03a8f5f403a9d1a74a870e56af2
-  data.tar.gz: 222bf16b5c83f0927cd5770d7e63497ef410b3db62c280c10d5badf546e8e475f6437f5f87547ec161e6811dca8f3312cc434a56bd287650a01e13753855a1a3
+  metadata.gz: bd16103ee70d0a4ee203fc94748c723494fa3da2c2c5d61ec8d610d8c7174ec8e9a943b0ff1e3618002137f75e5c4eeda159e45eb59b452499c49677443f4999
+  data.tar.gz: 80d01b2cb95206fb8c781f3c8ad118d050a9ce030e2bf42f2a6533121a477d2d639c18903ec285136081b29aed6e7f1640a45843d018dbdd2668b3153fefb721

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
-rvm: 2.1.5
+rvm:
+  - "2.2.3"
+  - "2.1.5"
+  - "1.9.3"
+  - "1.8.7"
 script: bundle exec rspec
 

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.9.3 (August 25, 2015)
+
+Features:
+
+  - Support for ruby 1.8
+
+## 0.9.2 (August 22, 2015)
+
+Features:
+
+  - Parameters from versions are now optional
+
 ## 0.9.1 (August 19, 2015)
 
 Features:

data/README.md

@@ -41,39 +41,16 @@ from_date = @versions_file.updated_at
 
 # Query the extra gems using the from date. Format should be as follows
 extra_gems = [
-  {
-    name: "gem1",
-    versions: [
-      {
-        number: "0.9.8"
-        platform: "ruby"
-        checksum:  "abc123" #sha256 checksum available on rubygems.org
-      },
-      {
-        number: "0.9.9"
-        platform: "java"
-        checksum:  "abc123"
-      }
-    ]
-  },
-  {
-    name: "gem2",
-    versions: [
-      {
-        number: "0.9.8"
-        platform: "ruby"
-        checksum:  "abc123" #sha256 checksum available on rubygems.org
-      },
-      {
-        number: "0.9.9"
-        platform: "java"
-        checksum:  "abc123"
-      }
-    ]
-  }
+  CompactIndex::Gem.new("gem1", [
+    CompactIndex::GemVersion.new("0.9.8", "ruby", "abc123"),
+    CompactIndex::GemVersion.new("0.9.9", "jruby", "abc123"),
+  ]),
+  CompactIndex::Gem.new("gem2", [
+    CompactIndex::GemVersion.new("0.9.8", "ruby", "abc123"),
+    CompactIndex::GemVersion.new("0.9.9", "jruby", "abc123"),
+  ])
 ]
 
-
 # Render the body for the versions response
 CompactIndex.versions(@versions_file, extra_gems)
 ```
@@ -87,17 +64,10 @@ gem 'compact_index'
 
 # Expected versions format
 versions = [
-  {
-    number: '1.0.1',
-    checksum: "abc123",
-    dependencies: [
-      {
-        gem: 'foo',
-        version: '=1.0.1',
-        checksum: 'abc123'
-      }
-    ]
-  }
+  CompactIndex::GemVersion.new("1.0.1", "ruby", "abc123", "info123", [
+    CompactIndex::Dependency.new("foo", "=1.0.1", "abc123"),
+    CompactIndex::Dependency.new("bar", ">1.0, <2.0", "abc123"),
+  ])
 ]
 CompactIndex.info(versions)
 ```

data/lib/compact_index.rb

@@ -1,3 +1,7 @@
+require "compact_index/gem"
+require "compact_index/gem_version"
+require "compact_index/dependency"
+
 require "compact_index/version"
 require "compact_index/versions_file"
 
@@ -6,7 +10,7 @@ module CompactIndex
     "---\n" << gem_names.join("\n") << "\n"
   end
 
-  def self.versions(versions_file, gems, args)
+  def self.versions(versions_file, gems = nil, args = {})
     versions_file.contents(gems, args)
   end
 
@@ -25,14 +29,14 @@ module CompactIndex
         deps = version[:dependencies].map do |d|
           [
              d[:gem],
-             number_and_platform(d[:version],d[:platform]).gsub(/, /, "&")
+             d.version_and_platform.gsub(/, /, "&")
           ].join(':')
         end
       else
         deps = []
       end
 
-      line = number_and_platform(version[:number], version[:platform])
+      line = version.number_and_platform
       line << " "
       line << deps.join(",")
       line << "|"
@@ -43,12 +47,4 @@ module CompactIndex
 
       line
     end
-
-    def self.number_and_platform(number, platform)
-      if platform.nil? || platform == 'ruby'
-        number.dup
-      else
-        "#{number}-#{platform}"
-      end
-    end
 end

data/lib/compact_index/dependency.rb

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

data/lib/compact_index/gem.rb

@@ -0,0 +1,3 @@
+module CompactIndex
+  Gem = Struct.new(:name, :versions)
+end

data/lib/compact_index/gem_version.rb

@@ -0,0 +1,11 @@
+module CompactIndex
+  GemVersion = Struct.new(:number, :platform, :checksum, :info_checksum, :dependencies, :ruby_version, :rubygems_version) do
+    def number_and_platform
+      if platform.nil? || platform == 'ruby'
+        number.dup
+      else
+        "#{number}-#{platform}"
+      end
+    end
+  end
+end

data/lib/compact_index/version.rb

@@ -1,3 +1,3 @@
 module CompactIndex
-  VERSION = "0.9.1"
+  VERSION = "0.9.3"
 end

data/lib/compact_index/versions_file.rb

@@ -1,3 +1,5 @@
+require 'time'
+require 'date'
 require 'compact_index'
 
 class CompactIndex::VersionsFile
@@ -5,7 +7,7 @@ class CompactIndex::VersionsFile
     @path = file || "/versions.list"
   end
 
-  def contents(gems=nil, args = {})
+  def contents(gems = nil, args = {})
     if args[:calculate_checksums]
       gems = calculate_checksums(gems)
     end
@@ -61,13 +63,15 @@ class CompactIndex::VersionsFile
 
       # 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] }
+        { :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_by! { |v| Gem::Version.create(v[:number]) }
+        entry[:versions].sort! do |a,b|
+          Gem::Version.create(a[:number]) <=> Gem::Version.create(b[:number])
+        end
       end
 
       gem_lines(gems)
@@ -76,9 +80,9 @@ class CompactIndex::VersionsFile
     def parse_gems(gems)
       gem_lines = gems.map do |entry|
         {
-          name: entry[:name],
-          versions: entry[:versions],
-          checksum: entry[:versions].first[:checksum]
+          :name => entry[:name],
+          :versions => entry[:versions],
+          :checksum => entry[:versions].first[:checksum]
         }
       end
       gem_lines(gem_lines)
@@ -87,16 +91,7 @@ class CompactIndex::VersionsFile
     def gem_lines(gems)
       gems.reduce("") do |concat, entry|
         versions = entry[:versions]
-        number_and_plat = versions.map { |version| number_and_platform(version[:number], version[:platform]) }
-        concat << "#{entry[:name]} #{number_and_plat.join(',')} #{entry[:checksum]}\n"
-      end
-    end
-
-    def number_and_platform(number, platform)
-      if platform.nil? || platform == 'ruby'
-        number.dup
-      else
-        "#{number}-#{platform}"
+        concat << "#{entry[:name]} #{versions.map(&:number_and_platform).join(',')} #{entry[:checksum]}\n"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compact_index
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - fotanus@gmail.com
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -65,6 +65,9 @@ files:
 - db/migrations/06_add_created_at_to_versions.rb
 - db/migrations/07_add_checksum_to_versions.rb
 - lib/compact_index.rb
+- lib/compact_index/dependency.rb
+- lib/compact_index/gem.rb
+- lib/compact_index/gem_version.rb
 - lib/compact_index/version.rb
 - lib/compact_index/versions_file.rb
 homepage: https://github.com/bundler/compact_index