gemirro 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 777922859275d6f968d483067b6c468d6796436c
-  data.tar.gz: c28f06747d86a8040b0003a0a92693fe3b37cd08
+  metadata.gz: 82b43d4fb674a2d477ca6e36892ce24cb75dc27e
+  data.tar.gz: 6722f23ee14197f2eed5fdb3089b0bfaddb3321b
 SHA512:
-  metadata.gz: 2282a5753a197ade52486dd5921e5983d603076c9e3f4cd27a88329f2f2f98e0032ad4a485833a1b7da16d4a1ceb1436094972e000e87b49c113642a8635c21e
-  data.tar.gz: acd234a81d16c6aff952f253855e8217ff42c6d2b52dd4be5c529672e35434e9d58ec841c0e1164c2a826892770626e82a9fc27bf99d42695f34820fc4222536
+  metadata.gz: 72c637dddc14a1a6f6f9649df99fd6e04dbbcfce0926b99c44ef084a8bda8d148507616ac80497df4e7ed609c37b3a7112fa310d1d64319995699ea88c6df388
+  data.tar.gz: 0318c861a49c17318dec009db0284022459e839a6fdd2b74f26c5be1b4a784540b0d120ef09085bf95d932fe1e485f1434ad9734255e44194cc86c978894fbce

data/README.md

@@ -57,6 +57,26 @@ $ gemirro server --stop
 
 If you want to use a custom configuration file not located in the current directory, use the `-c` or `--config` option.
 
+### Available commands
+
+```
+Usage: gemirro [COMMAND] [OPTIONS]
+
+Options:
+
+    -v, --version      Shows the current version
+    -h, --help         Display this help message.
+
+Available commands:
+
+  index    Retrieve specs list from source.
+  init     Sets up a new mirror
+  list     List available gems.
+  server   Manage web server
+  update   Updates the list of Gems
+
+See `<command> --help` for more information on a specific command.
+```
 
 ## Apache configuration
 

data/lib/gemirro/cli/index.rb

@@ -5,11 +5,13 @@ Gemirro::CLI.options.command 'index' do
   separator "\nOptions:\n"
 
   on :c=, :config=, 'Path to the configuration file'
+  on :l=, :log_level=, 'Set logger level'
   on :u, :update, 'Update only'
 
   run do |opts, _args|
     Gemirro::CLI.load_configuration(opts[:c])
     config = Gemirro.configuration
+    config.logger_level = opts[:l] if opts[:l]
 
     unless File.directory?(config.destination)
       config.logger.error("The directory #{config.destination} does not exist")

data/lib/gemirro/cli/init.rb

@@ -3,6 +3,7 @@ Gemirro::CLI.options.command 'init' do
   banner 'Usage: gemirro init [DIRECTORY] [OPTIONS]'
   description 'Sets up a new mirror'
   separator "\nOptions:\n"
+
   on :force, 'Force overwrite'
 
   run do |opts, args|

data/lib/gemirro/cli/list.rb

@@ -5,10 +5,12 @@ Gemirro::CLI.options.command 'list' do
   separator "\nOptions:\n"
 
   on :c=, :config=, 'Path to the configuration file'
+  on :l=, :log_level=, 'Set logger level'
 
   run do |opts, _args|
     Gemirro::CLI.load_configuration(opts[:c])
     config = Gemirro.configuration
+    config.logger_level = opts[:l] if opts[:l]
 
     unless File.directory?(config.destination)
       config.logger.error("The directory #{config.destination} does not exist")

data/lib/gemirro/cli/server.rb

@@ -10,6 +10,8 @@ Gemirro::CLI.options.command 'server' do
   on :restart, 'Restart web server'
   on :status, 'Status of web server'
   on :c=, :config=, 'Path to the configuration file'
+  on :l=, :log_level=, 'Set logger level'
+
   @pid_file = nil
 
   run do |opts, _args|
@@ -23,6 +25,7 @@ Gemirro::CLI.options.command 'server' do
   def load_configuration(opts)
     Gemirro::CLI.load_configuration(opts[:c])
     config = Gemirro.configuration
+    config.logger_level = opts[:l] if opts[:l]
     unless File.directory?(config.destination)
       config.logger.error("The directory #{config.destination} does not exist")
       abort

data/lib/gemirro/cli/update.rb

@@ -5,9 +5,11 @@ Gemirro::CLI.options.command 'update' do
   separator "\nOptions:\n"
 
   on :c=, :config=, 'Path to the configuration file'
+  on :l=, :log_level=, 'Set logger level'
 
   run do |opts, _args|
     Gemirro::CLI.load_configuration(opts[:c])
+    config.logger_level = opts[:l] if opts[:l]
 
     source = Gemirro.configuration.source
     versions = Gemirro::VersionsFetcher.new(source).fetch

data/lib/gemirro/configuration.rb

@@ -24,6 +24,15 @@ module Gemirro
     attr_reader :mirror_gems_directory, :mirror_gemspecs_directory
     attr_accessor :source, :ignored_gems, :logger
 
+    LOGGER_LEVEL = {
+      'debug' =>  Logger::DEBUG,
+      'warning' => Logger::WARN,
+      'info' => Logger::INFO,
+      'unknown' => Logger::UNKNOWN,
+      'error' => Logger::ERROR,
+      'fatal' => Logger::FATAL
+    }
+
     ##
     # Returns the logger
     #
@@ -33,6 +42,18 @@ module Gemirro
       @logger ||= Logger.new(STDOUT)
     end
 
+    ##
+    # Set log level
+    #
+    # @param [string]
+    #
+    # @return [Logger]
+    #
+    def logger_level=(level)
+      logger.level = LOGGER_LEVEL[level] if LOGGER_LEVEL.key?(level)
+      logger
+    end
+
     ##
     # Returns the template path to init directory
     #

data/lib/gemirro/indexer.rb

@@ -203,8 +203,13 @@ module Gemirro
             next
           end
 
-          abbreviate spec
-          sanitize spec
+          if ::Gem::VERSION >= '2.5.0'
+            spec.abbreviate
+            spec.sanitize
+          else
+            abbreviate spec
+            sanitize spec
+          end
 
           spec
         rescue SignalException

data/lib/gemirro/server.rb

@@ -6,45 +6,36 @@ module Gemirro
   ##
   # Launch Sinatra server to easily download gems.
   #
-  # @!attribute [r] versions_fetcher
-  #  @return [VersionsFetcher]
-  # @!attribute [r] gems_fetcher
-  #  @return [Gemirro::GemsFetcher]
-  #
   class Server < Sinatra::Base
     # rubocop:disable Metrics/LineLength
     URI_REGEXP = /^(.*)-(\d+(?:\.\d+){1,4}.*?)(?:-x86-(?:(?:mswin|mingw)(?:32|64)).*?)?\.(gem(?:spec\.rz)?)$/
     GEMSPEC_TYPE = 'gemspec.rz'
     GEM_TYPE = 'gem'
-    # rubocop:enable Metrics/LineLength
-
-    attr_accessor :versions_fetcher, :gems_fetcher
-    attr_reader(:stored_gems,
-                :cache)
 
-    # rubocop:disable Metrics/LineLength
-    access_logger = Logger.new(Gemirro.configuration.server.access_log).tap do |logger|
+    access_logger = Logger.new(Utils.configuration.server.access_log).tap do |logger|
       ::Logger.class_eval { alias_method :write, :'<<' }
       logger.level = ::Logger::INFO
     end
     # rubocop:enable Metrics/LineLength
 
-    error_logger = File.new(Gemirro.configuration.server.error_log, 'a+')
+    error_logger = File.new(Utils.configuration.server.error_log, 'a+')
     error_logger.sync = true
 
     before do
       env['rack.errors'] = error_logger
-      Gemirro.configuration.logger = access_logger
+      Utils.configuration.logger = access_logger
     end
 
     ##
     # Configure server
     #
     configure do
-      config = Gemirro.configuration
+      config = Utils.configuration
       config.server.host = 'localhost' if config.server.host.nil?
       config.server.port = '2000' if config.server.port.nil?
 
+      set :static, true
+
       set :views, Gemirro::Configuration.views_directory
       set :port, config.server.port
       set :bind, config.server.host
@@ -74,10 +65,10 @@ module Gemirro
     #
     get('/gem/:gemname') do
       gems = Utils.gems_collection
-      @gem = gems.find_by_name(params[:gemname])
-      return not_found if @gem.nil?
+      gem = gems.find_by_name(params[:gemname])
+      return not_found if gem.nil?
 
-      erb(:gem)
+      erb(:gem, {}, gem: gem)
     end
 
     ##
@@ -87,8 +78,7 @@ module Gemirro
     # @return [nil]
     #
     get('/') do
-      @gems = Utils.gems_collection
-      erb(:index)
+      erb(:index, {}, gems: Utils.gems_collection)
     end
 
     ##
@@ -144,21 +134,21 @@ module Gemirro
       return unless gem_name && gem_version
 
       begin
-        gem = stored_gem(gem_name, gem_version)
+        gem = Utils.stored_gem(gem_name, gem_version)
         gem.gemspec = true if gem_type == GEMSPEC_TYPE
 
         # rubocop:disable Metrics/LineLength
-        return if gems_fetcher.gem_exists?(gem.filename(gem_version)) && gem_type == GEM_TYPE
-        return if gems_fetcher.gemspec_exists?(gem.gemspec_filename(gem_version)) && gem_type == GEMSPEC_TYPE
+        return if Utils.gems_fetcher.gem_exists?(gem.filename(gem_version)) && gem_type == GEM_TYPE
+        return if Utils.gems_fetcher.gemspec_exists?(gem.gemspec_filename(gem_version)) && gem_type == GEMSPEC_TYPE
         # rubocop:enable Metrics/LineLength
 
         Utils.logger
           .info("Try to download #{gem_name} with version #{gem_version}")
-        gems_fetcher.source.gems.clear
-        gems_fetcher.source.gems.push(gem)
-        gems_fetcher.fetch
+        Utils.gems_fetcher.source.gems.clear
+        Utils.gems_fetcher.source.gems.push(gem)
+        Utils.gems_fetcher.fetch
 
-        update_indexes if configuration.update_on_fetch
+        update_indexes if Utils.configuration.update_on_fetch
       rescue StandardError => e
         Utils.logger.error(e)
       end
@@ -170,7 +160,7 @@ module Gemirro
     # @return [Indexer]
     #
     def update_indexes
-      indexer = Gemirro::Indexer.new(configuration.destination)
+      indexer = Gemirro::Indexer.new(Utils.configuration.destination)
       indexer.only_origin = true
       indexer.ui = ::Gem::SilentUI.new
 
@@ -183,29 +173,6 @@ module Gemirro
       Utils.logger.info(e.message)
     end
 
-    ##
-    # @see Gemirro.configuration
-    #
-    def configuration
-      Gemirro.configuration
-    end
-
-    ##
-    # @see Gemirro::VersionsFetcher.fetch
-    #
-    def versions_fetcher
-      @versions_fetcher ||= Gemirro::VersionsFetcher
-                            .new(configuration.source).fetch
-    end
-
-    ##
-    # @return [Gemirro::GemsFetcher]
-    #
-    def gems_fetcher
-      @gems_fetcher ||= Gemirro::GemsFetcher.new(
-        configuration.source, versions_fetcher)
-    end
-
     ##
     # Return all gems pass to query
     #
@@ -272,23 +239,6 @@ module Gemirro
       end
     end
 
-    ##
-    # Try to cache gem classes
-    #
-    # @param [String] gem_name Gem name
-    # @return [Gem]
-    #
-    def stored_gem(gem_name, gem_version, platform = 'ruby')
-      @stored_gems ||= {}
-      # rubocop:disable Metrics/LineLength
-      @stored_gems[gem_name] = {} unless @stored_gems.key?(gem_name)
-      @stored_gems[gem_name][gem_version] = {} unless @stored_gems[gem_name].key?(gem_version)
-      @stored_gems[gem_name][gem_version][platform] ||= Gem.new(gem_name, gem_version, platform) unless @stored_gems[gem_name][gem_version].key?(platform)
-      # rubocop:enable Metrics/LineLength
-
-      @stored_gems[gem_name][gem_version][platform]
-    end
-
     helpers do
       ##
       # Return gem specification from gemname and version
@@ -298,7 +248,7 @@ module Gemirro
       # @return [::Gem::Specification]
       #
       def spec_for(gemname, version, platform = 'ruby')
-        gem = stored_gem(gemname, version.to_s, platform)
+        gem = Utils.stored_gem(gemname, version.to_s, platform)
         gemspec_path = File.join('quick',
                                  Gemirro::Configuration.marshal_identifier,
                                  gem.gemspec_filename)

data/lib/gemirro/utils.rb

@@ -7,10 +7,18 @@ module Gemirro
   #
   # @!attribute [r] client
   #  @return [HTTPClient]
+  # @!attribute [r] versions_fetcher
+  #  @return [VersionsFetcher]
+  # @!attribute [r] gems_fetcher
+  #  @return [Gemirro::GemsFetcher]
   #
   class Utils
-    attr_reader :cache
-
+    attr_reader(:cache,
+                :versions_fetcher,
+                :gems_fetcher,
+                :gems_orig_collection,
+                :gems_source_collection,
+                :stored_gems)
     ##
     # Cache class to store marshal and data into files
     #
@@ -28,6 +36,9 @@ module Gemirro
     # @return [Gemirro::GemVersionCollection]
     #
     def self.gems_collection(orig = true)
+      return @gems_orig_collection if orig && !@gems_orig_collection.nil?
+      return @gems_source_collection if !orig && !@gems_source_collection.nil?
+
       gems = []
       specs_files_paths(orig).pmap do |specs_file_path|
         next unless File.exist?(specs_file_path)
@@ -38,6 +49,9 @@ module Gemirro
       end
 
       collection = GemVersionCollection.new(gems)
+      @gems_source_collection = collection unless orig
+      @gems_orig_collection = collection if orig
+
       collection
     end
 
@@ -81,5 +95,38 @@ module Gemirro
     def self.configuration
       Gemirro.configuration
     end
+
+    ##
+    # @see Gemirro::VersionsFetcher.fetch
+    #
+    def self.versions_fetcher
+      @versions_fetcher ||= Gemirro::VersionsFetcher
+                            .new(configuration.source).fetch
+    end
+
+    ##
+    # @return [Gemirro::GemsFetcher]
+    #
+    def self.gems_fetcher
+      @gems_fetcher ||= Gemirro::GemsFetcher.new(
+        configuration.source, versions_fetcher)
+    end
+
+    ##
+    # Try to cache gem classes
+    #
+    # @param [String] gem_name Gem name
+    # @return [Gem]
+    #
+    def self.stored_gem(gem_name, gem_version, platform = 'ruby')
+      @stored_gems ||= {}
+      # rubocop:disable Metrics/LineLength
+      @stored_gems[gem_name] = {} unless @stored_gems.key?(gem_name)
+      @stored_gems[gem_name][gem_version] = {} unless @stored_gems[gem_name].key?(gem_version)
+      @stored_gems[gem_name][gem_version][platform] ||= Gem.new(gem_name, gem_version, platform) unless @stored_gems[gem_name][gem_version].key?(platform)
+      # rubocop:enable Metrics/LineLength
+
+      @stored_gems[gem_name][gem_version][platform]
+    end
   end
 end

data/lib/gemirro/version.rb

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

data/spec/gemirro/gems_fetcher_spec.rb

@@ -64,7 +64,19 @@ module Gemirro
       gem = Gem.new('gemirro')
       version = ::Gem::Version.new('0.0.1')
       allow(@source).to receive(:fetch_gem)
-        .once.with('gemirro', version).and_return('gemirro')
+        .with('gemirro', version).and_return('gemirro')
+
+      expect(@fetcher.fetch_gem(gem, version)).to eq('gemirro')
+    end
+
+    it 'should fetch latest gem' do
+      allow(Utils.logger).to receive(:info)
+        .once.with('Fetching gemirro-0.0.1.gem')
+      MirrorDirectory.new('./').add_directory('gems')
+      gem = Gem.new('gemirro', :latest)
+      version = ::Gem::Version.new('0.0.1')
+      allow(@source).to receive(:fetch_gem)
+        .with('gemirro', version).and_return('gemirro')
 
       expect(@fetcher.fetch_gem(gem, version)).to eq('gemirro')
     end
@@ -82,6 +94,19 @@ module Gemirro
       expect(@fetcher.fetch_gemspec(gem, version)).to eq('gemirro')
     end
 
+    it 'should fetch latest gemspec' do
+      allow(Utils.logger).to receive(:info)
+        .once.with('Fetching gemirro-0.0.1.gemspec.rz')
+      MirrorDirectory.new('./').add_directory('quick/Marshal.4.8')
+      gem = Gem.new('gemirro', :latest)
+      gem.gemspec = true
+      version = ::Gem::Version.new('0.0.1')
+      allow(@source).to receive(:fetch_gemspec)
+        .once.with('gemirro', version).and_return('gemirro')
+
+      expect(@fetcher.fetch_gemspec(gem, version)).to eq('gemirro')
+    end
+
     it 'should not fetch gemspec if file exists' do
       allow(Utils.logger).to receive(:info)
         .once.with('Fetching gemirro-0.0.1.gemspec.rz')

data/spec/gemirro/server_spec.rb

@@ -35,6 +35,8 @@ module Gemirro
       MirrorFile.new('/var/www/gemirro/test').write('content')
       Gemirro.configuration.destination = '/var/www/gemirro'
       Utils.instance_eval('@cache = nil')
+      Utils.instance_eval('@gems_orig_collection = nil')
+      Utils.instance_eval('@gems_source_collection = nil')
       FakeFS::FileSystem.clone(Gemirro::Configuration.views_directory)
     end
 

data/views/gem.erb

@@ -5,7 +5,7 @@
 </div>
 
 <div class="col-lg-12">
-  <% @gem.by_name do |name, versions| %>
+  <% gem.by_name do |name, versions| %>
     <div class="col-lg-6 center-block pull-none">
       <div class="panel panel-info">
         <div class="panel-heading">

data/views/index.erb

@@ -6,9 +6,9 @@
 </div>
 
 <div class="col-lg-12">
-  <% if @gems.any? %>
+  <% if gems.any? %>
     <div class="col-lg-6 center-block pull-none">
-      <% @gems.by_name do |name, versions| %>
+      <% gems.by_name do |name, versions| %>
         <div class="panel panel-info">
           <div class="panel-heading">
             <a href="<%= url("gem/#{name}") %>">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemirro
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Pierre Rambaud
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Gem for easily creating your own gems mirror.