gemirro 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a27216c3e7f57ead579ec183d3f266b06a67450c
+  data.tar.gz: 0c90923f014ab3d15d75ccc8e6e6c48320ffddc4
+SHA512:
+  metadata.gz: 216bf415b374c5fa3a95b3fc3dc7e15c7ad03a59de69fb83eb3f16ea3e61633b21d01b71370bd580d1e826cbf6b429cd4b8a8c9ca8bd3f7776e11a268ea7c22e
+  data.tar.gz: fcebca52be22d67439c6b4897959667e9afaf9890765d2cd06b19cdfca4e8d1d113744c2267835f8ec15afda413bbbafcad64375525ce2a0d78d4e78e8e55c33

data/Gemfile

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 source 'https://rubygems.org/'
 
 gemspec

data/MANIFEST

@@ -16,6 +16,8 @@ lib/gemirro/cli/server.rb
 lib/gemirro/cli/update.rb
 lib/gemirro/configuration.rb
 lib/gemirro/gem.rb
+lib/gemirro/gem_version.rb
+lib/gemirro/gem_version_collection.rb
 lib/gemirro/gems_fetcher.rb
 lib/gemirro/http.rb
 lib/gemirro/indexer.rb
@@ -29,11 +31,14 @@ lib/gemirro/versions_file.rb
 spec/gemirro/cli_spec.rb
 spec/gemirro/configuration_spec.rb
 spec/gemirro/gem_spec.rb
+spec/gemirro/gem_version_collection_spec.rb
+spec/gemirro/gem_version_spec.rb
 spec/gemirro/gems_fetcher_spec.rb
 spec/gemirro/http_spec.rb
 spec/gemirro/indexer_spec.rb
 spec/gemirro/mirror_directory_spec.rb
 spec/gemirro/mirror_file_spec.rb
+spec/gemirro/server_spec.rb
 spec/gemirro/source_spec.rb
 spec/gemirro/versions_fetcher_spec.rb
 spec/gemirro/versions_file_spec.rb
@@ -42,4 +47,18 @@ task/manifest.rake
 task/rspec.rake
 task/rubocop.rake
 template/config.rb
-template/public/gems/.gitkeep
+template/logs/.gitkeep
+template/public/dist/css/bootstrap.min.css
+template/public/dist/css/gemirro.css
+template/public/dist/fonts/glyphicons-halflings-regular.eot
+template/public/dist/fonts/glyphicons-halflings-regular.svg
+template/public/dist/fonts/glyphicons-halflings-regular.ttf
+template/public/dist/fonts/glyphicons-halflings-regular.woff
+template/public/dist/fonts/glyphicons-halflings-regular.woff2
+template/public/dist/js/bootstrap.min.js
+template/public/dist/js/jquery.min.js
+template/public/gems/.gitkeep
+views/gem.erb
+views/index.erb
+views/layout.erb
+views/not_found.erb

data/Rakefile

@@ -7,4 +7,4 @@ Dir['./task/*.rake'].each do |task|
   import(task)
 end
 
-task default: [:rubocop, :spec]
+task default: [:spec, :rubocop]

data/gemirro.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test', '~>0.6'
   s.add_development_dependency 'rspec', '~>3.0'
   s.add_development_dependency 'simplecov', '~>0.9'
-  s.add_development_dependency 'rubocop', '~>0.25'
-  s.add_development_dependency 'fakefs', '~>0.5'
+  s.add_development_dependency 'rubocop', '~>0.28'
+  s.add_development_dependency 'fakefs', '~>0.6.4'
 end

data/lib/gemirro/configuration.rb

@@ -39,6 +39,15 @@ module Gemirro
       File.expand_path('../../../template', __FILE__)
     end
 
+    ##
+    # Returns the views path to render templates
+    #
+    # @return [String]
+    #
+    def self.views_directory
+      File.expand_path('../../../views', __FILE__)
+    end
+
     ##
     # Returns default configuration file path
     #

data/lib/gemirro/gem_version.rb

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+module Gemirro
+  ##
+  # The Gem class contains data about a Gem such as the name, requirement as
+  # well as providing some methods to more easily extract the specific version
+  # number.
+  #
+  # @!attribute [r] name
+  #  @return [String]
+  # @!attribute [r] number
+  #  @return [Integer]
+  # @!attribute [r] platform
+  #  @return [String]
+  #
+  class GemVersion
+    include Comparable
+    attr_reader :name, :number, :platform
+
+    ##
+    # @param [String] name
+    # @param [String] number
+    # @param [String] platform
+    #
+    def initialize(name, number, platform)
+      @name     = name
+      @number   = number
+      @platform = platform
+    end
+
+    ##
+    # Is for ruby
+    #
+    # @return [Boolean]
+    #
+    def ruby?
+      !(@platform =~ /^ruby$/i).nil?
+    end
+
+    ##
+    # Retrieve gem version
+    #
+    # @return [Gem::Version]
+    #
+    def version
+      ::Gem::Version.create(number)
+    end
+
+    ##
+    # Compare gem to another
+    #
+    # @return [Integer]
+    #
+    def <=>(other)
+      sort = other.name <=> @name
+      sort = version <=> other.version if sort.zero?
+      sort = (other.ruby? && !ruby?) ? 1 : -1 if sort.zero? &&
+                                                 ruby? != other.ruby?
+      sort = other.platform <=> @platform if sort.zero?
+
+      sort
+    end
+
+    ##
+    # Gemfile name
+    #
+    # @return [String]
+    #
+    def gemfile_name
+      platform = ruby? ? nil : @platform
+      [@name, @number, platform].compact.join('-')
+    end
+  end
+end

data/lib/gemirro/gem_version_collection.rb

@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+module Gemirro
+  ##
+  # The VersionCollection class contains a collection of ::Gem::Version
+  #
+  # @!attribute [r] gems
+  #  @return [Array]
+  # @!attribute [r] grouped
+  #  @return [Array]
+  #
+  class GemVersionCollection
+    include Enumerable
+
+    attr_reader :gems
+    attr_reader :grouped
+
+    ##
+    # @param [Array] gems
+    #
+    def initialize(gems = [])
+      @gems = gems.map do |object|
+        if object.is_a?(GemVersion)
+          object
+        else
+          GemVersion.new(*object)
+        end
+      end
+    end
+
+    ##
+    # Return oldest version of a gem
+    #
+    # @return [GemVersion]
+    #
+    def oldest
+      @gems.first
+    end
+
+    ##
+    # Return newest version of a gem
+    #
+    # @return [GemVersion]
+    #
+    def newest
+      @gems.last
+    end
+
+    ##
+    # Return size of a gem
+    #
+    # @return [Integer]
+    #
+    def size
+      @gems.size
+    end
+
+    ##
+    # Each method
+    #
+    def each(&block)
+      @gems.each(&block)
+    end
+
+    ##
+    # Group gems by name
+    #
+    # @param [Proc] block
+    # @return [Array]
+    #
+    def by_name(&block)
+      if @grouped.nil?
+        @grouped = @gems.group_by(&:name).map do |name, collection|
+          [name, GemVersionCollection.new(collection)]
+        end
+        @grouped.sort_by! do |name, _collection|
+          name.downcase
+        end
+      end
+
+      if block_given?
+        @grouped.each(&block)
+      else
+        @grouped
+      end
+    end
+
+    ##
+    # Find gem by name
+    #
+    # @param [String] gemname
+    # @return [Array]
+    #
+    def find_by_name(gemname)
+      gem = by_name.select do |name, _collection|
+        name == gemname
+      end
+
+      gem.first.last if gem.any?
+    end
+  end
+end

data/lib/gemirro/indexer.rb

@@ -13,9 +13,15 @@ module Gemirro
   #  @return [String]
   # @!attribute [r] dest_directory
   #  @return [String]
+  # @!attribute [r] only_origin
+  #  @return [Boolean]
   #
   class Indexer < ::Gem::Indexer
-    attr_accessor :files, :quick_marshal_dir, :directory, :dest_directory
+    attr_accessor(:files,
+                  :quick_marshal_dir,
+                  :directory,
+                  :dest_directory,
+                  :only_origin)
 
     ##
     # Generate indicies on the destination directory
@@ -41,25 +47,31 @@ module Gemirro
       files.each do |path|
         file = path.sub(/^#{Regexp.escape @directory}\/?/, '')
         dst_name = File.join @dest_directory, file
-        # next if File.exist?(dst_name) &&
-        #   (File.mtime(dst_name) >= Time.now - 360)
-
-        resp = Http.get("#{Gemirro.configuration.source.host}/#{file}")
-        next unless resp.code == 200
-        source_content = resp.body
 
         if ["#{@specs_index}.gz",
             "#{@latest_specs_index}.gz",
             "#{@prerelease_specs_index}.gz"].include?(path)
-          source_content = Marshal.load(
-            Zlib::GzipReader.new(StringIO.new(source_content)).read)
+
           content = Marshal.load(Zlib::GzipReader.open(path).read)
-          new_content = source_content.concat(content).uniq
+          Zlib::GzipWriter.open("#{dst_name}.orig") do |io|
+            io.write(Marshal.dump(content))
+          end
 
-          Zlib::GzipWriter.open(dst_name) do |io|
-            io.write(Marshal.dump(new_content))
+          unless @only_origin
+            source_content = download_from_source(file)
+            next if source_content.nil?
+            source_content = Marshal.load(Zlib::GzipReader
+                                            .new(StringIO
+                                                   .new(source_content)).read)
+            new_content = source_content.concat(content).uniq
+
+            Zlib::GzipWriter.open(dst_name) do |io|
+              io.write(Marshal.dump(new_content))
+            end
           end
         else
+          source_content = download_from_source(file)
+          next if source_content.nil?
           MirrorFile.new(dst_name).write(source_content)
         end
 
@@ -67,6 +79,13 @@ module Gemirro
       end
     end
 
+    def download_from_source(file)
+      source_host = Gemirro.configuration.source.host
+      resp = Http.get("#{source_host}/#{File.basename(file)}")
+      return unless resp.code == 200
+      resp.body
+    end
+
     def update_gemspecs
       make_temp_directories
 

data/lib/gemirro/server.rb

@@ -35,15 +35,52 @@ module Gemirro
       config = Gemirro.configuration
       config.server.host = 'localhost' if config.server.host.nil?
       config.server.port = '2000' if config.server.port.nil?
+
+      set :views, Gemirro::Configuration.views_directory
       set :port, config.server.port
       set :bind, config.server.host
-      set :destination, config.destination.gsub(/\/$/, '')
+      set :public_folder, config.destination.gsub(/\/$/, '')
       set :environment, config.environment
+      set :dump_errors, true
+      set :raise_errors, true
 
       enable :logging
       use Rack::CommonLogger, access_logger
     end
 
+    ##
+    # Set template for not found action
+    #
+    # @return [nil]
+    #
+    not_found do
+      erb(:not_found)
+    end
+
+    ##
+    # Display information about one gem
+    #
+    # @return [nil]
+    #
+    get('/gem/:gemname') do
+      gems = gems_collection
+      @gem = gems.find_by_name(params[:gemname])
+      return not_found if @gem.nil?
+
+      erb(:gem)
+    end
+
+    ##
+    # Display home page containing the list of gems already
+    # downloaded on the server
+    #
+    # @return [nil]
+    #
+    get('/') do
+      @gems = gems_collection
+      erb(:index)
+    end
+
     ##
     # Try to get all request and download files
     # if files aren't found.
@@ -51,18 +88,14 @@ module Gemirro
     # @return [nil]
     #
     get('*') do |path|
-      resource = "#{settings.destination}#{path}"
+      resource = "#{settings.public_folder}#{path}"
 
-      # Try to download gem if file doesn't exists
-      fetch_gem(resource) unless File.exist?(resource)
+      # Try to download gem
+      fetch_gem(resource)
       # If not found again, return a 404
       return not_found unless File.exist?(resource)
 
-      if File.directory?(resource)
-        display_directory(resource)
-      else
-        send_file resource
-      end
+      send_file(resource)
     end
 
     ##
@@ -91,40 +124,23 @@ module Gemirro
         logger.error(e.message)
       end
 
-      update_gemspecs
+      update_indexes
     end
 
     ##
-    # Update gemspecs files
+    # Update indexes files
     #
     # @return [Indexer]
     #
-    def update_gemspecs
-      indexer    = Indexer.new(settings.destination)
+    def update_indexes
+      indexer    = Gemirro::Indexer.new(configuration.destination)
+      indexer.only_origin = true
       indexer.ui = ::Gem::SilentUI.new
 
-      logger.info('Updating gemspecs files...')
-      indexer.update_gemspecs
-      logger.info('Done')
-    end
-
-    ##
-    # Display directory on the current sesion
-    #
-    # @param [String] resource
-    # @return [Array]
-    #
-    def display_directory(resource)
-      base_dir = Dir.new(resource)
-      base_dir.entries.sort.map do |f|
-        dir_sign = ''
-        resource_path = resource.gsub(/\/$/, '') + '/' + f
-        dir_sign = '/' if File.directory?(resource_path)
-        resource_path = resource_path.gsub(/^public\//, '')
-        resource_path = resource_path.gsub(settings.destination, '')
-        "<a href=\"#{resource_path}\">#{f}#{dir_sign}</a><br>" \
-          unless ['.', '..'].include?(File.basename(resource_path))
-      end.compact
+      configuration.logger.info('Generating indexes')
+      indexer.generate_index
+    rescue SystemExit => e
+      configuration.logger.info(e.message)
     end
 
     ##
@@ -157,5 +173,67 @@ module Gemirro
     def logger
       configuration.logger
     end
+
+    ##
+    # Generate Gems collection from Marshal dump
+    #
+    # @return [Gemirro::GemVersionCollection]
+    #
+    def gems_collection
+      gems = specs_files_paths.map do |specs_file_path|
+        if File.exist?(specs_file_path)
+          Marshal.load(Zlib::GzipReader.open(specs_file_path).read)
+        else
+          []
+        end
+      end.inject(:|)
+
+      GemVersionCollection.new(gems)
+    end
+
+    ##
+    # Return specs fils paths
+    #
+    # @return [Array]
+    #
+    def specs_files_paths
+      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('.'))
+      end
+    end
+
+    ##
+    # Return specs fils types
+    #
+    # @return [Array]
+    #
+    def specs_file_types
+      [:specs, :prerelease_specs]
+    end
+
+    helpers do
+      ##
+      # Return gem specification from gemname and version
+      #
+      # @param [String] gemname
+      # @param [String] version
+      # @return [::Gem::Specification]
+      #
+      def spec_for(gemname, version, platform = 'ruby')
+        filename = [gemname, version]
+        filename.push(platform) if platform != 'ruby'
+        spec_file = File.join(settings.public_folder,
+                              'quick',
+                              Gemirro::Configuration.marshal_identifier,
+                              "#{filename.join('-')}.gemspec.rz")
+
+        File.open(spec_file, 'r') do |uz_file|
+          uz_file.binmode
+          Marshal.load(::Gem.inflate(uz_file.read))
+        end if File.exist?(spec_file)
+      end
+    end
   end
 end

data/lib/gemirro/version.rb

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

data/lib/gemirro.rb

@@ -18,6 +18,8 @@ end
 require 'gemirro/version'
 require 'gemirro/configuration'
 require 'gemirro/gem'
+require 'gemirro/gem_version'
+require 'gemirro/gem_version_collection'
 require 'gemirro/http'
 require 'gemirro/indexer'
 require 'gemirro/source'

data/spec/gemirro/cli_spec.rb

@@ -35,7 +35,7 @@ module Gemirro
       end
 
       it 'should raise SystemExit if file does not exists' do
-        CLI.should_receive(:abort)
+        allow(CLI).to receive(:abort)
           .with('The configuration file /config.rb does not exist')
           .and_raise SystemExit
         expect { CLI.load_configuration('config.rb') }.to raise_error SystemExit

data/spec/gemirro/configuration_spec.rb

@@ -57,13 +57,13 @@ module Gemirro
     end
 
     it 'return mirror directory' do
-      @config.should_receive(:gems_directory).once.and_return('/tmp')
+      allow(@config).to receive(:gems_directory).once.and_return('/tmp')
       expect(@config.mirror_directory).to be_a(MirrorDirectory)
       expect(@config.mirror_directory.path).to eq('/tmp')
     end
 
     it 'should return gems directory' do
-      @config.should_receive(:destination).once.and_return('/tmp')
+      allow(@config).to receive(:destination).once.and_return('/tmp')
       expect(@config.gems_directory).to eq('/tmp/gems')
     end
 

data/spec/gemirro/gem_version_collection_spec.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require 'gemirro/gem_version_collection'
+require 'gemirro/gem_version'
+
+# Gem tests
+module Gemirro
+  describe 'GemVersionCollection' do
+    it 'should be initialized' do
+      collection = GemVersionCollection.new([['subzero',
+                                              '0.0.1',
+                                              'ruby'],
+                                             GemVersion.new('alumina',
+                                                            '0.0.1',
+                                                            'ruby')])
+      expect(collection.gems.first).to be_a(GemVersion)
+      expect(collection.gems.last).to be_a(GemVersion)
+      expect(collection.oldest).to be(collection.gems.first)
+      expect(collection.newest).to be(collection.gems.last)
+      expect(collection.size).to eq(2)
+    end
+
+    it 'should group and sort gems' do
+      collection = GemVersionCollection.new([['subzero',
+                                              '0.0.1',
+                                              'ruby'],
+                                             GemVersion.new('alumina',
+                                                            '0.0.1',
+                                                            'ruby')])
+      expect(collection.by_name.first[0]).to eq('alumina')
+      values = %w(alumina subzero)
+      collection.by_name do |name, _version|
+        expect(name).to eq(values.shift)
+      end
+    end
+
+    it 'should find gem by name' do
+      collection = GemVersionCollection.new([['subzero',
+                                              '0.0.1',
+                                              'ruby'],
+                                             GemVersion.new('alumina',
+                                                            '0.0.1',
+                                                            'ruby'),
+                                             GemVersion.new('alumina',
+                                                            '0.0.2',
+                                                            'ruby')])
+      expect(collection.find_by_name('something')).to be_nil
+      expect(collection.find_by_name('alumina').newest.name)
+        .to eq('alumina')
+      expect(collection.find_by_name('alumina').newest.version.to_s)
+        .to eq('0.0.2')
+    end
+  end
+end

data/spec/gemirro/gem_version_spec.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require 'gemirro/gem_version'
+
+# Gem tests
+module Gemirro
+  describe 'GemVersion' do
+    it 'should be initialized' do
+      gem = GemVersion.new('gemirro',
+                           '0.0.1',
+                           'ruby')
+      expect(gem.name).to eq('gemirro')
+      expect(gem.number).to eq('0.0.1')
+      expect(gem.platform).to eq('ruby')
+      expect(gem.ruby?).to be_truthy
+      expect(gem.version).to be_a(::Gem::Version)
+      expect(gem.gemfile_name).to eq('gemirro-0.0.1')
+    end
+
+    it 'should be initialized with other platform' do
+      gem = GemVersion.new('gemirro',
+                           '0.0.1',
+                           'jruby')
+      expect(gem.name).to eq('gemirro')
+      expect(gem.number).to eq('0.0.1')
+      expect(gem.platform).to eq('jruby')
+      expect(gem.ruby?).to be_falsy
+      expect(gem.version).to be_a(::Gem::Version)
+      expect(gem.gemfile_name).to eq('gemirro-0.0.1-jruby')
+    end
+
+    it 'should compare with an other gem' do
+      first_gem = GemVersion.new('gemirro',
+                                 '0.0.1',
+                                 'ruby')
+      second_gem = GemVersion.new('gemirro',
+                                  '0.0.2',
+                                  'ruby')
+      third_gem = GemVersion.new('gemirro',
+                                 '0.0.1',
+                                 'ruby')
+      expect(first_gem < second_gem).to eq(true)
+      expect(second_gem < first_gem).to eq(false)
+      expect(first_gem == third_gem).to eq(true)
+      expect(first_gem != second_gem).to eq(true)
+    end
+  end
+end