gemirro 0.12.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8982c03b3986ec30f9cb52186836ff37b677a369
-  data.tar.gz: 4983fc83b1bf255c6b74da5a66482ac868ae66c2
+  metadata.gz: 836bd37bcd65885bdd10b4faaa752084fb15aa82
+  data.tar.gz: 672147cad4d0d681e103a9c791fc8cd807a14365
 SHA512:
-  metadata.gz: 379c27532e2525d86ee0590b9b42697672a1e44c517574d6ded98bfc52fd7699192df09cab8158c19a8edacd325a430e946f980ddc18d483b72352ebd4840252
-  data.tar.gz: 0ff72c9c524b607df1a98dd2f1662522ef8c5d2fa743a0247241ba7a65b30c3f1049915345157ad05a2ede29ff6d6d9bdad33ab29f74a8703b2e637586293fb4
+  metadata.gz: c416be87d6a284fcf752b39cfac3f203e291a0dc7022294a090a844acb5cdb1da829b18878f2decd553d545a5cba11c0defaa56f8062ba166ef18a6b554af229
+  data.tar.gz: 96a558e31033dee1f7f58f84edea8c5ffbab24ee2ad0394346624abb92eb8510b4406ad294128893ba8ffc564ad01398d45741ca4de1ddcc26b57e21ca616237

data/MANIFEST

@@ -13,6 +13,7 @@ lib/gemirro/cache.rb
 lib/gemirro/cli.rb
 lib/gemirro/cli/index.rb
 lib/gemirro/cli/init.rb
+lib/gemirro/cli/list.rb
 lib/gemirro/cli/server.rb
 lib/gemirro/cli/update.rb
 lib/gemirro/configuration.rb
@@ -26,11 +27,13 @@ lib/gemirro/mirror_directory.rb
 lib/gemirro/mirror_file.rb
 lib/gemirro/server.rb
 lib/gemirro/source.rb
+lib/gemirro/utils.rb
 lib/gemirro/version.rb
 lib/gemirro/versions_fetcher.rb
 lib/gemirro/versions_file.rb
 spec/fixtures/gems/gemirro-0.0.1.gem
 spec/fixtures/quick/gemirro-0.0.1.gemspec.rz
+spec/gemirro/cache_spec.rb
 spec/gemirro/cli_spec.rb
 spec/gemirro/configuration_spec.rb
 spec/gemirro/gem_spec.rb
@@ -64,4 +67,4 @@ template/public/gems/.gitkeep
 views/gem.erb
 views/index.erb
 views/layout.erb
-views/not_found.erb
+views/not_found.erb

data/gemirro.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test', '~>0.6'
   s.add_development_dependency 'rspec', '~>3.2'
   s.add_development_dependency 'simplecov', '~>0.9'
-  s.add_development_dependency 'rubocop', '~>0.30'
+  s.add_development_dependency 'rubocop', '~>0.35'
   s.add_development_dependency 'fakefs', '~>0.6.7'
 end

data/lib/gemirro.rb

@@ -21,6 +21,7 @@ end
 require 'gemirro/version'
 require 'gemirro/configuration'
 require 'gemirro/cache'
+require 'gemirro/utils'
 require 'gemirro/gem'
 require 'gemirro/gem_version'
 require 'gemirro/gem_version_collection'
@@ -34,7 +35,8 @@ require 'gemirro/versions_fetcher'
 require 'gemirro/gems_fetcher'
 
 require 'gemirro/cli'
-require 'gemirro/cli/init'
-require 'gemirro/cli/update'
 require 'gemirro/cli/index'
+require 'gemirro/cli/init'
+require 'gemirro/cli/list'
 require 'gemirro/cli/server'
+require 'gemirro/cli/update'

data/lib/gemirro/cli.rb

@@ -30,7 +30,8 @@ module Gemirro
     def self.load_configuration(config_file)
       config_file ||= Configuration.default_configuration_file
       config_file   = File.expand_path(config_file, Dir.pwd)
-      config_file += '/config.rb' unless config_file.end_with?('config.rb')
+      config_file += '/config.rb' unless config_file.end_with?('.rb') ||
+                                         !File.directory?(config_file)
 
       unless File.file?(config_file)
         abort "The configuration file #{config_file} does not exist"

data/lib/gemirro/cli/init.rb

@@ -3,14 +3,24 @@ 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|
+  run do |opts, args|
     directory = File.expand_path(args[0] || Dir.pwd)
     template  = Gemirro::Configuration.template_directory
 
     Dir.mkdir(directory) unless File.directory?(directory)
 
-    FileUtils.cp_r(File.join(template, '.'), directory)
+    if opts[:force]
+      FileUtils.cp_r(File.join(template, '.'), directory)
+    else
+      Dir.glob("#{template}/**/*", File::FNM_DOTMATCH).each do |file|
+        next if ['.', '..'].include?(File.basename(file))
+        dest = File.join(directory, file.gsub(/^#{template}/, ''))
+        next if File.exist?(dest)
+        FileUtils.cp_r(file, dest)
+      end
+    end
 
     puts "Initialized empty mirror in #{directory}"
   end

data/lib/gemirro/cli/list.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+Gemirro::CLI.options.command 'list' do
+  banner 'Usage: gemirro list [OPTIONS]'
+  description 'List available gems.'
+  separator "\nOptions:\n"
+
+  on :c=, :config=, 'Path to the configuration file'
+
+  run do |opts, _args|
+    Gemirro::CLI.load_configuration(opts[:c])
+    config = Gemirro.configuration
+
+    unless File.directory?(config.destination)
+      config.logger.error("The directory #{config.destination} does not exist")
+      abort
+    end
+
+    gems = Gemirro::Utils.gems_collection.group_by(&:name).sort
+    gems.each do |name, versions|
+      puts "#{name}: (#{versions.map(&:number).join(', ')})"
+    end
+  end
+end

data/lib/gemirro/cli/server.rb

@@ -110,7 +110,7 @@ Gemirro::CLI.options.command 'server' do
   end
 
   def running?(process_id)
-    Process.getpgid(process_id) != -1
+    Process.getpgid(process_id.to_i) != -1
   rescue Errno::ESRCH
     false
   end

data/lib/gemirro/gem.rb

@@ -15,6 +15,7 @@ module Gemirro
   class Gem
     attr_reader :name, :requirement, :platform, :version
     attr_accessor :gemspec
+    ONLY_LATEST = [:latest, :newest]
 
     ##
     # Returns a `Gem::Version` instance based on the specified requirement.
@@ -60,6 +61,20 @@ module Gemirro
       version && !version.segments.reject { |s| s == 0 }.empty?
     end
 
+    ##
+    # Define if version exists
+    #
+    # @return [TrueClass|FalseClass]
+    #
+    def only_latest?
+      @requirement.is_a?(Symbol) && ONLY_LATEST.include?(@requirement)
+    end
+
+    ##
+    # Is gemspec
+    #
+    # @return [TrueClass|FalseClass]
+    #
     def gemspec?
       @gemspec == true
     end

data/lib/gemirro/gems_fetcher.rb

@@ -29,11 +29,11 @@ module Gemirro
         versions_for(gem).each do |version|
           if gem.gemspec?
             gemfile = fetch_gemspec(gem, version)
-            configuration.mirror_gemspecs_directory
+            Utils.configuration.mirror_gemspecs_directory
               .add_file(gem.gemspec_filename(version), gemfile) if gemfile
           else
             gemfile = fetch_gem(gem, version)
-            configuration.mirror_gems_directory
+            Utils.configuration.mirror_gems_directory
               .add_file(gem.filename(version), gemfile) if gemfile
           end
         end
@@ -49,6 +49,8 @@ module Gemirro
     #
     def versions_for(gem)
       available = @versions_file.versions_for(gem.name)
+      return [available.last] if gem.only_latest?
+
       versions = available.select do |v|
         gem.requirement.satisfied_by?(v)
       end
@@ -67,14 +69,18 @@ module Gemirro
     #
     def fetch_gemspec(gem, version)
       filename  = gem.gemspec_filename(version)
-      satisfied = gem.requirement.satisfied_by?(version)
+      satisfied = if gem.only_latest?
+                    true
+                  else
+                    gem.requirement.satisfied_by?(version)
+                  end
 
       if gemspec_exists?(filename) || !satisfied
-        logger.debug("Skipping #{filename}")
+        Utils.logger.debug("Skipping #{filename}")
         return
       end
 
-      logger.info("Fetching #{filename}")
+      Utils.logger.info("Fetching #{filename}")
       fetch_from_source(gem, version, true)
     end
 
@@ -87,16 +93,20 @@ module Gemirro
     #
     def fetch_gem(gem, version)
       filename = gem.filename(version)
-      satisfied = gem.requirement.satisfied_by?(version)
+      satisfied = if gem.only_latest?
+                    true
+                  else
+                    gem.requirement.satisfied_by?(version)
+                  end
       name = gem.name
 
       if gem_exists?(filename) || ignore_gem?(name, version) || !satisfied
-        logger.debug("Skipping #{filename}")
+        Utils.logger.debug("Skipping #{filename}")
         return
       end
 
-      configuration.ignore_gem(gem.name, version)
-      logger.info("Fetching #{filename}")
+      Utils.configuration.ignore_gem(gem.name, version)
+      Utils.logger.info("Fetching #{filename}")
 
       fetch_from_source(gem, version)
     end
@@ -115,30 +125,15 @@ module Gemirro
         data = @source.fetch_gemspec(gem.name, version) if gemspec
       rescue => e
         filename = gem.filename(version)
-        logger.error("Failed to retrieve #{filename}: #{e.message}")
-        logger.debug("Adding #{filename} to the list of ignored Gems")
+        Utils.logger.error("Failed to retrieve #{filename}: #{e.message}")
+        Utils.logger.debug("Adding #{filename} to the list of ignored Gems")
 
-        configuration.ignore_gem(gem.name, version)
+        Utils.configuration.ignore_gem(gem.name, version)
       end
 
       data
     end
 
-    ##
-    # @see Gemirro::Configuration#logger
-    # @return [Logger]
-    #
-    def logger
-      configuration.logger
-    end
-
-    ##
-    # @see Gemirro.configuration
-    #
-    def configuration
-      Gemirro.configuration
-    end
-
     ##
     # Checks if a given Gem has already been downloaded.
     #
@@ -146,7 +141,7 @@ module Gemirro
     # @return [TrueClass|FalseClass]
     #
     def gem_exists?(filename)
-      configuration.mirror_gems_directory.file_exists?(filename)
+      Utils.configuration.mirror_gems_directory.file_exists?(filename)
     end
 
     ##
@@ -156,14 +151,14 @@ module Gemirro
     # @return [TrueClass|FalseClass]
     #
     def gemspec_exists?(filename)
-      configuration.mirror_gemspecs_directory.file_exists?(filename)
+      Utils.configuration.mirror_gemspecs_directory.file_exists?(filename)
     end
 
     ##
     # @see Gemirro::Configuration#ignore_gem?
     #
     def ignore_gem?(*args)
-      configuration.ignore_gem?(*args)
+      Utils.configuration.ignore_gem?(*args)
     end
   end
 end

data/lib/gemirro/indexer.rb

@@ -25,7 +25,6 @@ module Gemirro
                   :dest_directory,
                   :only_origin,
                   :updated_gems)
-    attr_reader :cache
 
     ##
     # Create an indexer that will index the gems in +directory+.
@@ -86,7 +85,7 @@ module Gemirro
     # @return [Array]
     #
     def install_indicies
-      logger
+      Utils.logger
         .debug("Downloading index into production dir #{@dest_directory}")
 
       files = @files
@@ -129,7 +128,7 @@ module Gemirro
     #
     def download_from_source(file)
       source_host = Gemirro.configuration.source.host
-      logger.info("Download from source: #{file}")
+      Utils.logger.info("Download from source: #{file}")
       resp = Http.get("#{source_host}/#{File.basename(file)}")
       return unless resp.code == 200
       resp.body
@@ -161,11 +160,11 @@ module Gemirro
     def map_gems_to_specs(gems)
       gems.map.with_index do |gemfile, index|
         # rubocop:disable Metrics/LineLength
-        logger.info("[#{index + 1}/#{gems.size}]: Processing #{gemfile.split('/')[-1]}")
+        Utils.logger.info("[#{index + 1}/#{gems.size}]: Processing #{gemfile.split('/')[-1]}")
         # rubocop:enable Metrics/LineLength
 
         if File.size(gemfile) == 0
-          logger.warn("Skipping zero-length gem: #{gemfile}")
+          Utils.logger.warn("Skipping zero-length gem: #{gemfile}")
           next
         end
 
@@ -179,7 +178,7 @@ module Gemirro
             exp << " (#{spec.original_name})" if
               spec.original_name != spec.full_name
             msg = "Skipping misnamed gem: #{gemfile} should be named #{exp}"
-            logger.warn(msg)
+            Utils.logger.warn(msg)
             next
           end
 
@@ -189,13 +188,13 @@ module Gemirro
           spec
         rescue SignalException
           msg = 'Received signal, exiting'
-          logger.error(msg)
+          Utils.logger.error(msg)
           raise
         rescue StandardError => e
           msg = ["Unable to process #{gemfile}",
                  "#{e.message} (#{e.class})",
                  "\t#{e.backtrace.join "\n\t"}"].join("\n")
-          logger.debug(msg)
+          Utils.logger.debug(msg)
         end
       end.compact
     end
@@ -213,7 +212,7 @@ module Gemirro
       end
 
       if @updated_gems.empty?
-        logger.info('No new gems')
+        Utils.logger.info('No new gems')
         terminate_interaction(0)
       end
 
@@ -236,7 +235,7 @@ module Gemirro
 
       compress_indicies
 
-      logger.info("Updating production dir #{@dest_directory}") if verbose
+      Utils.logger.info("Updating production dir #{@dest_directory}") if verbose
       files << @specs_index
       files << "#{@specs_index}.gz"
       files << @latest_specs_index
@@ -296,25 +295,11 @@ module Gemirro
                    dst_name,
                    verbose: verbose,
                    force: true)
-      cache.flush_key(File.basename(dst_name))
-    end
-
-    ##
-    # Cache class to store marshal and data into files
-    #
-    # @return [Gemirro::Cache]
-    #
-    def cache
-      @cache ||= Gemirro::Cache
-                 .new(File.join(Gemirro.configuration.destination, '.cache'))
+      Utils.cache.flush_key(File.basename(dst_name))
     end
 
     def verbose
       @verbose ||= ::Gem.configuration.really_verbose
     end
-
-    def logger
-      Gemirro.configuration.logger
-    end
   end
 end

data/lib/gemirro/server.rb

@@ -19,9 +19,7 @@ module Gemirro
     # rubocop:enable Metrics/LineLength
 
     attr_accessor :versions_fetcher, :gems_fetcher
-    attr_reader(:gems_orig_collection,
-                :gems_source_collection,
-                :stored_gems,
+    attr_reader(:stored_gems,
                 :cache)
 
     # rubocop:disable Metrics/LineLength
@@ -75,7 +73,7 @@ module Gemirro
     # @return [nil]
     #
     get('/gem/:gemname') do
-      gems = gems_collection
+      gems = Utils.gems_collection
       @gem = gems.find_by_name(params[:gemname])
       return not_found if @gem.nil?
 
@@ -89,7 +87,7 @@ module Gemirro
     # @return [nil]
     #
     get('/') do
-      @gems = gems_collection
+      @gems = Utils.gems_collection
       erb(:index)
     end
 
@@ -130,16 +128,6 @@ module Gemirro
       send_file(resource)
     end
 
-    ##
-    # Cache class to store marshal and data into files
-    #
-    # @return [Gemirro::Cache]
-    #
-    def cache
-      @cache ||= Gemirro::Cache
-                 .new(File.join(configuration.destination, '.cache'))
-    end
-
     ##
     # Try to fetch gem and download its if it's possible, and
     # build and install indicies.
@@ -164,14 +152,15 @@ module Gemirro
         return if gems_fetcher.gemspec_exists?(gem.gemspec_filename(gem_version)) && gem_type == GEMSPEC_TYPE
         # rubocop:enable Metrics/LineLength
 
-        logger.info("Try to download #{gem_name} with version #{gem_version}")
+        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
 
         update_indexes if configuration.update_on_fetch
       rescue StandardError => e
-        logger.error(e)
+        Utils.logger.error(e)
       end
     end
 
@@ -185,13 +174,13 @@ module Gemirro
       indexer.only_origin = true
       indexer.ui = ::Gem::SilentUI.new
 
-      configuration.logger.info('Generating indexes')
+      Utils.logger.info('Generating indexes')
       indexer.update_index
       indexer.updated_gems.peach do |gem|
-        cache.flush_key(gem.name)
+        Utils.cache.flush_key(gem.name)
       end
     rescue SystemExit => e
-      configuration.logger.info(e.message)
+      Utils.logger.info(e.message)
     end
 
     ##
@@ -226,50 +215,17 @@ module Gemirro
       params[:gems].to_s.split(',')
     end
 
-    ##
-    # @see Gemirro::Configuration#logger
-    # @return [Logger]
-    #
-    def logger
-      configuration.logger
-    end
-
-    ##
-    # Generate Gems collection from Marshal dump
-    #
-    # @param [TrueClass|FalseClass] orig Fetch orig files
-    # @return [Gemirro::GemVersionCollection]
-    #
-    def 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|
-        cache.cache(File.basename(specs_file_path)) do
-          # rubocop:disable Metrics/LineLength
-          gems.concat(Marshal.load(Zlib::GzipReader.open(specs_file_path).read)) if File.exist?(specs_file_path)
-          # rubocop:enable Metrics/LineLength
-        end
-      end
-
-      collection = GemVersionCollection.new(gems)
-      @gems_source_collection = collection unless orig
-      @gems_orig_collection = collection if orig
-
-      collection
-    end
-
     ##
     # Return gems list from query params
     #
     # @return [Array]
     #
     def query_gems_list
-      gems_collection(false) # load collection
+      Utils.gems_collection(false) # load collection
       gems = query_gems.pmap do |query_gem|
         gem_dependencies(query_gem)
       end
+
       gems.flatten!
       gems = gems.select do |g|
         !g.empty?
@@ -284,8 +240,8 @@ module Gemirro
     # @return [Array]
     #
     def gem_dependencies(gem_name)
-      cache.cache(gem_name) do
-        gems = gems_collection(false)
+      Utils.cache.cache(gem_name) do
+        gems = Utils.gems_collection(false)
         gem_collection = gems.find_by_name(gem_name)
 
         return '' if gem_collection.nil?
@@ -316,32 +272,6 @@ module Gemirro
       end
     end
 
-    ##
-    # Return specs fils paths
-    #
-    # @param [TrueClass|FalseClass] orig Fetch orig files
-    # @return [Array]
-    #
-    def specs_files_paths(orig = true)
-      marshal_version = Gemirro::Configuration.marshal_version
-      specs_file_types.pmap do |specs_file_type|
-        File.join(settings.public_folder,
-                  [specs_file_type,
-                   marshal_version,
-                   'gz' + (orig ? '.orig' : '')
-                  ].join('.'))
-      end
-    end
-
-    ##
-    # Return specs fils types
-    #
-    # @return [Array]
-    #
-    def specs_file_types
-      [:specs, :prerelease_specs]
-    end
-
     ##
     # Try to cache gem classes
     #

data/lib/gemirro/source.rb

@@ -25,21 +25,13 @@ module Gemirro
       @gems = gems
     end
 
-    ##
-    # @see Gemirro::Configuration#logger
-    # @return [Logger]
-    #
-    def logger
-      Gemirro.configuration.logger
-    end
-
     ##
     # Fetches a list of all the available Gems and their versions.
     #
     # @return [String]
     #
     def fetch_versions
-      logger.info(
+      Utils.logger.info(
         "Fetching #{Configuration.versions_file} on #{@name} (#{@host})"
       )
 
@@ -52,7 +44,7 @@ module Gemirro
     # @return [String]
     #
     def fetch_prerelease_versions
-      logger.info(
+      Utils.logger.info(
         "Fetching #{Configuration.prerelease_versions_file}" \
         " on #{@name} (#{@host})"
       )
@@ -67,7 +59,7 @@ module Gemirro
     # @return [String]
     #
     def fetch_gem(name, version)
-      logger.info(
+      Utils.logger.info(
         "Fetching gem #{name}, #{version} on #{@name} (#{@host})"
       )
       Http.get(host + "/gems/#{name}-#{version}.gem").body
@@ -81,7 +73,7 @@ module Gemirro
     # @return [String]
     #
     def fetch_gemspec(name, version)
-      logger.info(
+      Utils.logger.info(
         "Fetching gemspec #{name}, #{version} on #{@name} (#{@host})"
       )
       marshal = Gemirro::Configuration.marshal_identifier

data/lib/gemirro/utils.rb

@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+
+module Gemirro
+  ##
+  # The Utils class is responsible for executing specific traitments
+  # that are located at least on two other files
+  #
+  # @!attribute [r] client
+  #  @return [HTTPClient]
+  #
+  class Utils
+    attr_reader :cache
+
+    ##
+    # Cache class to store marshal and data into files
+    #
+    # @return [Gemirro::Cache]
+    #
+    def self.cache
+      @cache ||= Gemirro::Cache
+                 .new(File.join(configuration.destination, '.cache'))
+    end
+
+    ##
+    # Generate Gems collection from Marshal dump
+    #
+    # @param [TrueClass|FalseClass] orig Fetch orig files
+    # @return [Gemirro::GemVersionCollection]
+    #
+    def self.gems_collection(orig = true)
+      gems = []
+      specs_files_paths(orig).pmap do |specs_file_path|
+        next unless File.exist?(specs_file_path)
+        spec_gems = cache.cache(File.basename(specs_file_path)) do
+          Marshal.load(Zlib::GzipReader.open(specs_file_path).read)
+        end
+        gems.concat(spec_gems)
+      end
+
+      collection = GemVersionCollection.new(gems)
+      collection
+    end
+
+    ##
+    # Return specs fils paths
+    #
+    # @param [TrueClass|FalseClass] orig Fetch orig files
+    # @return [Array]
+    #
+    def self.specs_files_paths(orig = true)
+      marshal_version = Gemirro::Configuration.marshal_version
+      specs_file_types.pmap do |specs_file_type|
+        File.join(configuration.destination,
+                  [specs_file_type,
+                   marshal_version,
+                   'gz' + (orig ? '.orig' : '')
+                  ].join('.'))
+      end
+    end
+
+    ##
+    # Return specs fils types
+    #
+    # @return [Array]
+    #
+    def self.specs_file_types
+      [:specs, :prerelease_specs]
+    end
+
+    ##
+    # @see Gemirro::Configuration#logger
+    # @return [Logger]
+    #
+    def self.logger
+      configuration.logger
+    end
+
+    ##
+    # @see Gemirro.configuration
+    #
+    def self.configuration
+      Gemirro.configuration
+    end
+  end
+end

data/lib/gemirro/version.rb

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

data/spec/gemirro/cache_spec.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require 'gemirro/mirror_directory'
+require 'gemirro/cache'
+
+# Gem tests
+module Gemirro
+  describe 'Cache' do
+    include FakeFS::SpecHelpers
+    before(:each) do
+      MirrorDirectory.new('/tmp')
+      @cache = Cache.new('/tmp')
+    end
+
+    it 'should play with flush key' do
+      @cache.cache('foo') do
+        'something'
+      end
+      expect(@cache.cache('foo')).to eq('something')
+      @cache.flush_key('foo')
+      expect(@cache.cache('foo')).to be_nil
+    end
+
+    it 'should play with flush' do
+      @cache.cache('foo') do
+        'something'
+      end
+      expect(@cache.cache('foo')).to eq('something')
+      @cache.flush
+      expect(@cache.cache('foo')).to be_nil
+    end
+  end
+end

data/spec/gemirro/gems_fetcher_spec.rb

@@ -23,16 +23,8 @@ module Gemirro
       expect(@fetcher.versions_file).to be(@versions_file)
     end
 
-    it 'should return configuration' do
-      expect(@fetcher.configuration).to be(Gemirro.configuration)
-    end
-
-    it 'should return logger' do
-      expect(@fetcher.logger).to be(Gemirro.configuration.logger)
-    end
-
     it 'should test if gem exists' do
-      @fetcher.configuration.destination = './'
+      Utils.configuration.destination = './'
       expect(@fetcher.gem_exists?('test')).to be_falsy
       MirrorDirectory.new('./').add_directory('gems')
       MirrorDirectory.new('./').add_directory('quick/Marshal.4.8')
@@ -41,24 +33,24 @@ module Gemirro
     end
 
     it 'should ignore gem' do
-      allow(@fetcher.logger).to receive(:info)
+      allow(Utils.logger).to receive(:info)
         .once.with('Fetching gemirro-0.0.1.gem')
       expect(@fetcher.ignore_gem?('gemirro', '0.0.1')).to be_falsy
-      @fetcher.configuration.ignore_gem('gemirro', '0.0.1')
+      Utils.configuration.ignore_gem('gemirro', '0.0.1')
       expect(@fetcher.ignore_gem?('gemirro', '0.0.1')).to be_truthy
     end
 
     it 'should log error when fetch gem failed' do
-      allow(@fetcher.logger).to receive(:info)
+      allow(Utils.logger).to receive(:info)
         .once.with('Fetching gemirro-0.0.1.gem')
       gem = Gem.new('gemirro')
       version = ::Gem::Version.new('0.0.1')
-      @fetcher.configuration.ignore_gem('gemirro', '0.0.1')
+      Utils.configuration.ignore_gem('gemirro', '0.0.1')
       allow(@source).to receive(:fetch_gem)
         .once.with('gemirro', version).and_raise(ArgumentError)
-      allow(@fetcher.logger).to receive(:error)
+      allow(Utils.logger).to receive(:error)
         .once.with(/Failed to retrieve/)
-      allow(@fetcher.logger).to receive(:debug)
+      allow(Utils.logger).to receive(:debug)
         .once.with(/Adding (.*) to the list of ignored Gems/)
 
       expect(@fetcher.fetch_gem(gem, version)).to be_nil
@@ -66,7 +58,7 @@ module Gemirro
     end
 
     it 'should fetch gem' do
-      allow(@fetcher.logger).to receive(:info)
+      allow(Utils.logger).to receive(:info)
         .once.with('Fetching gemirro-0.0.1.gem')
       MirrorDirectory.new('./').add_directory('gems')
       gem = Gem.new('gemirro')
@@ -78,7 +70,7 @@ module Gemirro
     end
 
     it 'should fetch gemspec' do
-      allow(@fetcher.logger).to receive(:info)
+      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')
@@ -91,12 +83,12 @@ module Gemirro
     end
 
     it 'should not fetch gemspec if file exists' do
-      allow(@fetcher.logger).to receive(:info)
+      allow(Utils.logger).to receive(:info)
         .once.with('Fetching gemirro-0.0.1.gemspec.rz')
       allow(@fetcher).to receive(:gemspec_exists?)
         .once.with('gemirro-0.0.1.gemspec.rz')
         .and_return(true)
-      allow(@fetcher.logger).to receive(:debug)
+      allow(Utils.logger).to receive(:debug)
         .once.with('Skipping gemirro-0.0.1.gemspec.rz')
 
       gem = Gem.new('gemirro')
@@ -120,7 +112,7 @@ module Gemirro
       allow(gem.requirement).to receive(:satisfied_by?)
         .once.with(nil).and_return(false)
       @fetcher.source.gems << gem
-      allow(@fetcher.logger).to receive(:debug)
+      allow(Utils.logger).to receive(:debug)
         .once.with('Skipping gemirro-0.0.1.gem')
       expect(@fetcher.fetch).to eq([gem])
     end
@@ -137,9 +129,9 @@ module Gemirro
       allow(@fetcher).to receive(:fetch_gem)
         .once.with(gem, nil).and_return('gemfile')
 
-      allow(@fetcher.configuration.mirror_gems_directory).to receive(:add_file)
+      allow(Utils.configuration.mirror_gems_directory).to receive(:add_file)
         .once.with('gemirro-0.0.2.gem', 'gemfile')
-      allow(@fetcher.configuration.mirror_gemspecs_directory)
+      allow(Utils.configuration.mirror_gemspecs_directory)
         .to receive(:add_file)
         .once.with('gemirro-0.0.1.gemspec.rz', 'gemfile')
       expect(@fetcher.fetch).to eq([gem, gemspec])

data/spec/gemirro/server_spec.rb

@@ -3,6 +3,7 @@ require 'rack/test'
 require 'json'
 require 'pmap'
 require 'gemirro/cache'
+require 'gemirro/utils'
 require 'gemirro/mirror_directory'
 require 'gemirro/mirror_file'
 require 'gemirro/gem_version_collection'
@@ -33,6 +34,7 @@ module Gemirro
       MirrorDirectory.new('/').add_directory('tmp')
       MirrorFile.new('/var/www/gemirro/test').write('content')
       Gemirro.configuration.destination = '/var/www/gemirro'
+      Utils.instance_eval('@cache = nil')
       FakeFS::FileSystem.clone(Gemirro::Configuration.views_directory)
     end
 
@@ -255,11 +257,12 @@ module Gemirro
 
         gem = Gemirro::GemVersion.new('volay', '0.1.0', 'ruby')
         collection = Gemirro::GemVersionCollection.new([gem])
-        allow_any_instance_of(Gemirro::Server).to receive(:gems_collection)
+        allow(Utils).to receive(:gems_collection)
           .and_return(collection)
         get '/api/v1/dependencies.json?gems=volay'
         expect(last_response.headers['Content-Type'])
           .to eq('application/json')
+
         expect(last_response.body).to match(/"name":"volay"/)
         expect(last_response).to be_ok
       end

data/spec/gemirro/source_spec.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 require 'gemirro/http'
+require 'gemirro/utils'
 require 'gemirro/source'
 
 # Source tests
@@ -8,7 +9,7 @@ module Gemirro
   describe 'Source' do
     before(:each) do
       @source = Source.new('RubyGems', 'https://rubygems.org')
-      allow(@source.logger).to receive(:info)
+      allow(Utils.logger).to receive(:info)
     end
 
     it 'should be initialized' do

data/task/rspec.rake

@@ -2,5 +2,5 @@ require 'rspec/core/rake_task'
 
 desc 'Run Rspec tests'
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '--color --format documentation'
+  t.rspec_opts = '--color --format documentation --backtrace'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemirro
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Pierre Rambaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.35'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.35'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -214,6 +214,7 @@ files:
 - lib/gemirro/cli.rb
 - lib/gemirro/cli/index.rb
 - lib/gemirro/cli/init.rb
+- lib/gemirro/cli/list.rb
 - lib/gemirro/cli/server.rb
 - lib/gemirro/cli/update.rb
 - lib/gemirro/configuration.rb
@@ -227,11 +228,13 @@ files:
 - lib/gemirro/mirror_file.rb
 - lib/gemirro/server.rb
 - lib/gemirro/source.rb
+- lib/gemirro/utils.rb
 - lib/gemirro/version.rb
 - lib/gemirro/versions_fetcher.rb
 - lib/gemirro/versions_file.rb
 - spec/fixtures/gems/gemirro-0.0.1.gem
 - spec/fixtures/quick/gemirro-0.0.1.gemspec.rz
+- spec/gemirro/cache_spec.rb
 - spec/gemirro/cli_spec.rb
 - spec/gemirro/configuration_spec.rb
 - spec/gemirro/gem_spec.rb
@@ -291,4 +294,3 @@ signing_key:
 specification_version: 4
 summary: Gem for easily creating your own gems mirror.
 test_files: []
-has_rdoc: