gemirro 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a17ffcad594827a8af375247a4b6b470cb042768
-  data.tar.gz: c8edea98454503d5268eb2dfea42d60b83703cc5
+  metadata.gz: 4546e4ecf735f60e1aad1d47afddbe9a2538355b
+  data.tar.gz: b5f0b6f5bb9e017c251a9843faa6492b8f510505
 SHA512:
-  metadata.gz: 2965d1f853352b9260c5f527717451670e6275f468aadd9da8fdbe8ec0f1ab821f86e55d2ea395b78da183ff15871ec8e91f2088cd4bf19c5511003e5bc3dd9f
-  data.tar.gz: f1406d3162f48966520ca16dabcb4d355a45e0fcf40b163f3a304a05d82015782d5dc45558098ea32d0b7fb72261b046ce7aded3d072f6fa8fa9435300055445
+  metadata.gz: 3fc2c772a2f5e4ac9c75106503d646ad1225855fd0547bbae0515a6b507f0603f323674715c5a02c6634fc1111cc3c6afe83801ee6c8089edb7e3a68f337f129
+  data.tar.gz: 8ce9b6f65744607f5f4b704283e790a8966f4de2ce9c2a2728c95bb6ab5ed634dabbd9d7a6ab008556f43777d65d50747ef333d293ca58289eb457651c1695e5

data/lib/gemirro/indexer.rb

@@ -83,7 +83,8 @@ module Gemirro
     #
     def install_indicies
       verbose = ::Gem.configuration.really_verbose
-      say "Downloading index into production dir #{@dest_directory}" if verbose
+      Gemirro.configuration.logger
+        .debug("Downloading index into production dir #{@dest_directory}")
 
       files = @files
       files.delete @quick_marshal_dir if files.include? @quick_dir
@@ -139,32 +140,14 @@ module Gemirro
       resp.body
     end
 
-    def update_gemspecs
-      make_temp_directories
-
-      specs_mtime = File.stat(@dest_specs_index).mtime
-      newest_mtime = Time.at 0
-
-      updated_gems = gem_file_list.select do |gem|
-        gem_mtime = File.stat(gem).mtime
-        newest_mtime = gem_mtime if gem_mtime > newest_mtime
-        gem_mtime >= specs_mtime
-      end
-
-      terminate_interaction(0) if updated_gems.empty?
-
-      specs = map_gems_to_specs updated_gems
+    def build_indicies
       ::Gem::Specification.dirs = []
-      ::Gem::Specification.add_specs(*specs)
-      files = build_marshal_gemspecs
+      ::Gem::Specification.all = *map_gems_to_specs(gem_file_list)
 
-      files.each do |path|
-        file = path.sub(%r{^#{Regexp.escape @directory}/?}, '')
-        src_name = File.join @directory, file
-        dst_name = File.join @dest_directory, file
-        FileUtils.mv(src_name, dst_name)
-        File.utime newest_mtime, newest_mtime, dst_name
-      end
+      build_marshal_gemspecs
+      build_modern_indicies if @build_modern
+
+      compress_indicies
     end
   end
 end

data/lib/gemirro/server.rb

@@ -128,7 +128,9 @@ module Gemirro
     #
     def fetch_gem(resource)
       name = File.basename(resource)
-      regexp = /^(.*)-(\d+(?:\.\d+){,4})\.gem(?:spec\.rz)?$/
+      # rubocop:disable Metrics/LineLength
+      regexp = /^(.*)-(\d+(?:\.\d+){,4})(-x86-((mswin|mingw)(32|64))*)\.gem(?:spec\.rz)?$/
+      # rubocop:enable Metrics/LineLength
       result = name.match(regexp)
       return unless result
 

data/lib/gemirro/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Gemirro Version
 module Gemirro
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'
 end

data/spec/gemirro/indexer_spec.rb

@@ -19,8 +19,6 @@ module Gemirro
         .once.and_return(true)
 
       indexer = Indexer.new('/tmp/test')
-      allow(indexer).to receive(:say)
-        .once.with('Downloading index into production dir /tmp/test')
       indexer.quick_marshal_dir = '/tmp/gem_generate_index/quick/Marshal.4.8'
       indexer.dest_directory = '/tmp/test'
       indexer.directory = '/tmp/gem_generate_index'
@@ -85,20 +83,17 @@ module Gemirro
 
       indexer = Indexer.new('./')
       allow(indexer).to receive(:make_temp_directories).and_return(true)
-
-      expect { indexer.update_gemspecs }.to raise_error SystemExit
     end
 
-    it 'should update gemspecs files' do
+    it 'should build indicies' do
+      indexer = Indexer.new('/')
       dir = MirrorDirectory.new('/')
       dir.add_directory('gems')
       dir.add_directory('quick')
       dir.add_directory('tmp')
-
-      indexer = Indexer.new('/')
-
       dir.add_directory("#{indexer.directory.gsub(%r{^/}, '')}/gems")
       dir.add_directory("#{indexer.directory.gsub(%r{^/}, '')}/quick")
+
       MirrorFile.new('/specs.4.8').write('')
       MirrorFile.new("#{indexer.directory}/gems/gemirro-0.1.0.gem").write('')
       MirrorFile.new('gems/gemirro-0.1.0.gem').write('')
@@ -107,13 +102,11 @@ module Gemirro
 
       allow(indexer).to receive(:gem_file_list)
         .and_return(['gems/gemirro-0.1.0.gem'])
-      allow(indexer).to receive(:make_temp_directories).once.and_return(true)
       allow(indexer).to receive(:build_marshal_gemspecs).once.and_return([
         "#{indexer.directory}/quick/gemirro-0.1.0.gemspec.rz"])
+      allow(indexer).to receive(:compress_indicies).once.and_return(true)
 
-      indexer.update_gemspecs
-      expect(File.read('/quick/gemirro-0.1.0.gemspec.rz'))
-        .to eq('test')
+      indexer.build_indicies
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemirro
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Pierre Rambaud
@@ -269,8 +269,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Gem for easily creating your own RubyGems mirror.
 test_files: []
+has_rdoc: