gemirro 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1e7618920b0a5b976e92686dc4b496b161b396b
-  data.tar.gz: bd1b7e2db932406d147684758349d353767a3783
+  metadata.gz: 174665ea51d2dab7ee0f62ed7fea8ab858696e3c
+  data.tar.gz: c595859875f3131b7b8c1700c6523f3cc6ddabaf
 SHA512:
-  metadata.gz: c463bfa2094dd80b74e00ef7901740144759b0bc6aa3552f5270d4e985d5515c0ebf07d614d2b1995add24c5b1c07006f2a8a9c7f0f36485b707cc43627de59e
-  data.tar.gz: b89a870107a5cd6676f3069b318e020436fa00b43a0394bb952de3713c63b34089c68dd9ba4812612ae81b97e8a9e78cba95994b66d20ff055bb4db098d0cbef
+  metadata.gz: 5b92c93ca0bf860e7fb16b72582ea1f1bc241b8b1410c10575b21b5127831be8f15787d8956ac4f5a02735d1d92de2e79d38a3de19cc6fe46d4b583eac6e5c73
+  data.tar.gz: 3dcdfbeed2cc2e2cca94eff1eef3de5c4e1b1271806b6d73a08497958998cb93bfb567fdc89ac56eff9b1844abf3b746ed47ddd49267e72eced9715349e75f6f

data/lib/gemirro/server.rb

@@ -89,9 +89,7 @@ module Gemirro
     #
     get '/api/v1/dependencies' do
       content_type 'application/octet-stream'
-      return 200 unless query_gems.any?
-      return Marshal.dump(query_gems_list) if query_gems_list.any?
-      404
+      query_gems.any? ? Marshal.dump(query_gems_list) : 200
     end
 
     ##
@@ -101,9 +99,7 @@ module Gemirro
     #
     get '/api/v1/dependencies.json' do
       content_type 'application/json'
-      return {} unless query_gems.any?
-      return JSON.dump(query_gems_list) if query_gems_list.any?
-      404
+      query_gems.any? ? JSON.dump(query_gems_list) : {}
     end
 
     ##
@@ -116,7 +112,7 @@ module Gemirro
       resource = "#{settings.public_folder}#{path}"
 
       # Try to download gem
-      fetch_gem(resource)
+      fetch_gem(resource) unless File.exist?(resource)
       # If not found again, return a 404
       return not_found unless File.exist?(resource)
 
@@ -211,10 +207,11 @@ module Gemirro
     ##
     # Generate Gems collection from Marshal dump
     #
+    # @param [TrueClass|FalseClass] orig Fetch orig files
     # @return [Gemirro::GemVersionCollection]
     #
-    def gems_collection
-      gems = specs_files_paths.map do |specs_file_path|
+    def gems_collection(orig = true)
+      gems = specs_files_paths(orig).map do |specs_file_path|
         if File.exist?(specs_file_path)
           Marshal.load(Zlib::GzipReader.open(specs_file_path).read)
         else
@@ -247,7 +244,7 @@ module Gemirro
     # @return [Array]
     #
     def gem_dependencies(gem_name)
-      gems = gems_collection
+      gems = gems_collection(false)
       gem_collection = gems.find_by_name(gem_name)
       return '' if gem_collection.nil?
 
@@ -280,13 +277,17 @@ module Gemirro
     ##
     # Return specs fils paths
     #
+    # @param [TrueClass|FalseClass] orig Fetch orig files
     # @return [Array]
     #
-    def specs_files_paths
+    def specs_files_paths(orig = true)
       marshal_version = Gemirro::Configuration.marshal_version
       specs_file_types.map do |specs_file_type|
         File.join(settings.public_folder,
-                  [specs_file_type, marshal_version, 'gz.orig'].join('.'))
+                  [specs_file_type,
+                   marshal_version,
+                   'gz' + (orig ? '.orig' : '')
+                  ].join('.'))
       end
     end
 
@@ -310,11 +311,13 @@ module Gemirro
       def spec_for(gemname, version, platform = 'ruby')
         filename = [gemname, version]
         filename.push(platform) if platform != 'ruby'
+        gemspec_path = File.join('quick',
+                                 Gemirro::Configuration.marshal_identifier,
+                                 "#{filename.join('-')}.gemspec.rz")
         spec_file = File.join(settings.public_folder,
-                              'quick',
-                              Gemirro::Configuration.marshal_identifier,
-                              "#{filename.join('-')}.gemspec.rz")
+                              gemspec_path)
 
+        fetch_gem(gemspec_path) unless File.exist?(spec_file)
         File.open(spec_file, 'r') do |uz_file|
           uz_file.binmode
           Marshal.load(::Gem.inflate(uz_file.read))

data/lib/gemirro/version.rb

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

data/spec/gemirro/server_spec.rb

@@ -57,20 +57,53 @@ module Gemirro
       end
 
       it 'should display gem specifications' do
-        marshal_dump = Marshal.dump([['groove-dl',
+        marshal_dump = Marshal.dump([['volay',
                                       ::Gem::Version.create('0.1.0'),
                                       'ruby']])
 
         MirrorFile.new('/var/www/gemirro/specs.4.8.gz.orig').write(marshal_dump)
         Struct.new('SuccessGzipReader', :read)
         gzip_reader = Struct::SuccessGzipReader.new(marshal_dump)
+        MirrorDirectory.new('/var/www/gemirro')
+          .add_directory('quick/Marshal.4.8')
+        MirrorFile.new('/var/www/gemirro/quick/Marshal.4.8/' \
+                       'volay-0.1.0.gemspec.rz')
+          .write("x\x9C\x8D\x94]\x8F\xD2@\x14\x86\x89Y\xBB\xB4|\xEC\x12\xD7h" \
+                 "\xD4h\xD3K\x13J\x01\x97\xC84n\x9A\xA8\xBBi\xE2\xC5\x06\xBB" \
+                 "{\xC3\x85)\xE5\x00\x13f:u:E\xD1\xC4\xDF\xE6\xB5\xBF\xCAiK" \
+                 "\x11\xE3GK\xEF\x98\xF7\xBC\xCFy\xCF\xC9\xCCQ=A\x0F\xAE\x80" \
+                 "\"\xF4>\x82\x00/p\xE0\v\xCC\xC2;\xC1\xDD\xA3\xFA\xF4\xA1k4" \
+                 "\x06\xA6e\xF6_(Hy\xEBa\xD55\xB4\r#\xFEV\xB1k\xDE\r\xEAdu" \
+                 "\xB7\xC0cY1U\xE4\xA1\x95\x8A\xD3C7A\xAA\x87)\xB4\x9C\x1FO" \
+                 "\xBE\xD7\xE4OA\xEA\x17\x16\x82k\xD4o\xBC\xD7\x99\xC2x\xEC" \
+                 "\xAD@\xBFe$\xA1\xA0\xC7\xDBX\x00\xD5\x05/\xBC\xEFg\xDE\x13" \
+                 "\xF8\x98`\x0E\x14B1U\xE4w\xEC\x1A\xC7\x17\xAF2\x85\xADd\xC4" \
+                 "\xBE96\x87\xF9\x1F\xEA\xDF%\x8A\x95\xE3T\x9E\xCC2\xF3i\x9B" \
+                 "\xA1\xB3\xCC\xFE\rD\x10\xCE!\f\xB6\x1A\xD2\x9C\xD0\xA7\xB2" \
+                 "\xBF\x13\x8A?\x13<\xEB\x06\x04\xA7b\xD4q\xF8\xAF&\x0E!\xDF" \
+                 ".~\xEF\xE3\xDC\xCC@\xD2Hl\#@M\x9E\x84BN\x00\x9D:\x11\a\x0E" \
+                 "\x04\xFC\x18.\xD1#g\x93\xCF\xEB\xC3\x81m\\\xC1\x97\xD9" \
+                 "\x9Af7\\\xE3l\xD7_\xBC\x02BX\"\xD23\xBB\xF9o\x83A\xB1\x12" \
+                 "\xBBe\xB7\xED\x93K\xFB\xB4\x82\xB6\x80\xA9K\xB1\x1E\x96" \
+                 "\x10\xEA\x03sP\xCD\xBFP\x16\xEE\x8D\x85\xBF\x86E\\\x96" \
+                 "\xC02G\xF9\b\xEC\x16:\x9D\xC3\x06\b\x8B\xD2\xA9\x95\x84" \
+                 "\xD9\x97\xED\xC3p\x89+\x81\xA9}\xAB`\xD9\x9D\xFF\x03\xF6" \
+                 "\xD2\xC2\xBF\xCD\xFD`\xDD\x15\x10\x97\xED\xA4.[\xAB\xC6(" \
+                 "\x94\x05B\xE3\xB1\xBC\xA5e\xF6\xC3\xAA\x11\n\xE5>A\x8CiD " \
+                 "`\x9B\xF2\x04\xE3\xCA\t\xC6\x87\by-f,`Q\xD9\x1E,sp^q\x0F" \
+                 "\x85\xD4r\x8Dg\x11\x06\xCE\xC1\xE4>\x9D\xF9\xC9\xFC\xE5" \
+                 "\xC8YR\x1F\x133`4\xBB\xF9R~\xEF:\x93\xE8\x93\\\x92\xBF\r" \
+                 "\xA3\t\xF8\x84l\xF5<\xBF\xBE\xF9\xE3Q\xD2?q,\x04\x84:\x0E" \
+                 "\xF5\xF4\x1D1\xF3\xBA\xE7+!\"\xD4\xEB-\xB1X%\xB3\x14\xD3" \
+                 "\xCB\xEDw\xEE\xBD\xFDk\xE99OSz\xF3\xEA\xFA]w7\xF5\xAF\xB5" \
+                 "\x9F+\xFEG\x96")
 
         allow(Zlib::GzipReader).to receive(:open)
           .once
           .with('/var/www/gemirro/specs.4.8.gz.orig')
           .and_return(gzip_reader)
 
-        get '/gem/groove-dl'
+        get '/gem/volay'
         expect(last_response.status).to eq(200)
         expect(last_response).to be_ok
       end
@@ -177,11 +210,12 @@ module Gemirro
       it 'should retrieve empty json when gem was not found' do
         get '/api/v1/dependencies.json?gems=gemirro'
         expect(last_response.headers['Content-Type'])
-          .to eq('text/html;charset=utf-8')
-        expect(last_response).to_not be_ok
+          .to eq('application/json')
+        expect(last_response.body).to eq('[]')
+        expect(last_response).to be_ok
       end
 
-      it 'should retrieve empty json when gem was not found' do
+      it 'should retrieve json when gem was found' do
         MirrorDirectory.new('/var/www/gemirro')
           .add_directory('quick/Marshal.4.8')
         MirrorFile.new('/var/www/gemirro/quick/Marshal.4.8/' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemirro
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Pierre Rambaud