gemirro 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTE2OTU0OTYxMmU0Y2JkZjBlZTQxMWRiZDQ4MWZkNzVlZDAyZWRlZQ==
-  data.tar.gz: !binary |-
-    NDk1ZDFlYWYxYmE1NjY1MmNiNzUxYzRjZjA0N2Q2MzI1YjNlZDEyZg==
+SHA1:
+  metadata.gz: 9237dacb278367d0711772c1aa07972bdb0298a3
+  data.tar.gz: c707b4dd8ade6d496703e5901dc228e64248345f
 SHA512:
-  metadata.gz: !binary |-
-    MTQ0MWI1ODQ4NWVhODA0ZTlmMzMzZDU3N2ViNDM4MmY0ODViN2EyZmEzNjBl
-    ZDNhNDQ4NjIwYTU5OWJlMTM4MzY4OWZmODg0MmY2NDUxOThmZTY4NGZhMzZm
-    MmZiYzBlNzI5NzcxMzIxMTdkOGIwNzA2ZmJjYmFlZWM5NjAzMzU=
-  data.tar.gz: !binary |-
-    MDhkOTcyMTk5NDIyMzI5MzA0YTM1ODAxNmIzMDliZWMzMWY2ZWY4YjdmZTQw
-    YjJhZWM4NjU2YmU3MGJhOWZlMTk4NDE2YzYwM2UyMTg1YWRmMDU5NjZjN2Iw
-    ZTQ0MWEwNjA4OTI4NjEwN2YwNTY1ZDU3OTFkMjk0ODQ1ZmMyZjY=
+  metadata.gz: 25934f8f35928f90b98a48a9ef650243694e48db0a59a6fcb8f64d3d1a5dcdec902d04bea6d658d825ff2e2bd8a61e2733fddbcc45da1f2d1cbb76dcf7219070
+  data.tar.gz: d00781c9a26a8e564368b5a80f88b7d1e8ccbc0407a0cd95831d08e3dffe8d9bf739d95861b921d6f6951a5193f36b93dac0427c544e9c4666aaf63514fa751a

data/README.md

@@ -1,8 +1,8 @@
 # Gemirro | [![Build Status](https://travis-ci.org/PierreRambaud/gemirro.svg)](https://travis-ci.org/PierreRambaud/gemirro)
 
 Gemirro is a Ruby application that makes it easy way to create your own RubyGems mirror without having to push or write all gem you wanted in a configuration file.
-It does mirroring only, it has no authentication and you can't upload Gems to it.
-More you only need to launch the server and gems will automaticly be downloaded when requests come.
+It does mirroring without any authentication and you can add your private gems in the `gems` directory.
+More, to mirroring a source, you only need to start the server, and gems will automaticly be downloaded when needed.
 
 ## Requirements
 

data/lib/gemirro/configuration.rb

@@ -5,7 +5,12 @@ module Gemirro
   # @return [Gemirro::Configuration]
   #
   def self.configuration
-    @configuration ||= Configuration.new
+    @configuration ||= Configuration.new do
+      server do
+        access_log '/tmp/gemirro.access.log'
+        error_log '/tmp/gemirro.error.log'
+      end
+    end
   end
 
   ##
@@ -13,8 +18,8 @@ module Gemirro
   # destination directory, source, ignored Gems, etc.
   #
   class Configuration < Confstruct::Configuration
-    attr_reader :logger, :mirror_directory
-    attr_accessor :source, :ignored_gems
+    attr_reader :mirror_directory
+    attr_accessor :source, :ignored_gems, :logger
 
     ##
     # Returns the logger

data/lib/gemirro/indexer.rb

@@ -38,18 +38,60 @@ module Gemirro
                      verbose: verbose, force: true)
       end
 
-      files = files.map do |path|
-        path.sub(/^#{Regexp.escape @directory}\/?/, '')
-      end
-
-      files.each do |file|
+      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)
+        # 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
-        MirrorFile.new(dst_name).write(resp.body)
+        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) do |io|
+            io.write(Marshal.dump(new_content))
+          end
+        else
+          MirrorFile.new(dst_name).write(source_content)
+        end
+
+        FileUtils.rm_rf(path)
+      end
+    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
+      ::Gem::Specification.dirs = []
+      ::Gem::Specification.add_specs(*specs)
+      files = build_marshal_gemspecs
+
+      files.each do |path|
+        file = path.sub(/^#{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
     end
   end

data/lib/gemirro/server.rb

@@ -14,16 +14,34 @@ module Gemirro
   class Server < Sinatra::Base
     attr_accessor :versions_fetcher, :gems_fetcher
 
+    access_logger = Logger.new(Gemirro.configuration.server.access_log)
+      .tap do |logger|
+      ::Logger.class_eval { alias_method :write, :'<<' }
+      logger.level = ::Logger::INFO
+    end
+
+    error_logger = ::File.new(Gemirro.configuration.server.error_log, 'a+')
+    error_logger.sync = true
+
+    before do
+      Gemirro.configuration.logger = access_logger
+      env['rack.errors'] = error_logger
+    end
+
     ##
     # Configure server
     #
     configure do
       config = Gemirro.configuration
-      config.server_host = 'localhost' if config.server_host.nil?
-      config.server_port = '2000' if config.server_port.nil?
-      set :port, config.server_port
-      set :bind, config.server_host
+      config.server.host = 'localhost' if config.server.host.nil?
+      config.server.port = '2000' if config.server.port.nil?
+      set :port, config.server.port
+      set :bind, config.server.host
       set :destination, config.destination.gsub(/\/$/, '')
+      set :environment, config.environment
+
+      enable :logging
+      use Rack::CommonLogger, access_logger
     end
 
     ##
@@ -73,20 +91,21 @@ module Gemirro
         logger.error(e.message)
       end
 
-      generate_index
+      update_gemspecs
     end
 
     ##
-    # Generate index and install indicies.
+    # Update gemspecs files
     #
     # @return [Indexer]
     #
-    def generate_index
+    def update_gemspecs
       indexer    = Indexer.new(settings.destination)
       indexer.ui = ::Gem::SilentUI.new
 
-      logger.info('Generating indexes')
-      indexer.generate_index
+      logger.info('Updating gemspecs files...')
+      indexer.update_gemspecs
+      logger.info('Done')
     end
 
     ##
@@ -108,14 +127,6 @@ module Gemirro
       end.compact
     end
 
-    ##
-    # @see Gemirro::Configuration#logger
-    # @return [Logger]
-    #
-    def logger
-      configuration.logger
-    end
-
     ##
     # @see Gemirro.configuration
     #
@@ -127,7 +138,8 @@ module Gemirro
     # @see Gemirro::VersionsFetcher.fetch
     #
     def versions_fetcher
-      @versions_fetcher ||= Gemirro::VersionsFetcher.new(configuration.source).fetch
+      @versions_fetcher ||= Gemirro::VersionsFetcher
+        .new(configuration.source).fetch
     end
 
     ##

data/lib/gemirro/version.rb

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

data/spec/gemirro/indexer_spec.rb

@@ -20,18 +20,20 @@ module Gemirro
       dir.add_directory('gem_generate_index/quick/Marshal.4.8')
       ::Gem.configuration.should_receive(:really_verbose).once.and_return(true)
 
-      @indexer = Indexer.new('./')
-      @indexer.should_receive(:say)
+      indexer = Indexer.new('./')
+      indexer.should_receive(:say)
         .once.with('Downloading index into production dir ./')
-      @indexer.quick_marshal_dir = 'gem_generate_index/quick/Marshal.4.8'
-      @indexer.dest_directory = './'
-      @indexer.directory = 'gem_generate_index'
-      @indexer.files = [
+      indexer.quick_marshal_dir = 'gem_generate_index/quick/Marshal.4.8'
+      indexer.dest_directory = './'
+      indexer.directory = 'gem_generate_index'
+      indexer.files = [
         'gem_generate_index/quick/Marshal.4.8',
         'gem_generate_index/specs.4.8.gz'
       ]
 
       FileUtils.should_receive(:mkdir_p).once.with('./quick', verbose: true)
+      FileUtils.should_receive(:rm_rf)
+        .once.with('gem_generate_index/specs.4.8.gz')
       FileUtils.should_receive(:rm_rf)
         .once.with('./quick/Marshal.4.8', verbose: true)
       FileUtils.should_receive(:mv)
@@ -45,11 +47,47 @@ module Gemirro
       Http.should_receive(:get)
         .with('https://rubygems.org/specs.4.8.gz').and_return(http_get)
 
-      files = @indexer.install_indicies
-      expect(files).to eq(['specs.4.8.gz'])
-      files.each do |f|
-        expect(MirrorFile.new(f).read).to eq('content')
-      end
+      files = indexer.install_indicies
+      expect(files).to eq(['gem_generate_index/specs.4.8.gz'])
+      expect(MirrorFile.new('specs.4.8.gz').read).to eq('content')
+    end
+
+    it 'should exit if there is no new gems' do
+      dir = MirrorDirectory.new('./')
+      dir.add_directory('gem_generate_index/gems')
+      MirrorFile.new('./specs.4.8').write('')
+
+      indexer = Indexer.new('./')
+      indexer.should_receive(:make_temp_directories).and_return(true)
+
+      expect { indexer.update_gemspecs }.to raise_error SystemExit
+    end
+
+    it 'should generate gemspecs files' do
+      dir = MirrorDirectory.new('/')
+      dir.add_directory('gems')
+      dir.add_directory('quick')
+      dir.add_directory('tmp')
+
+      indexer = Indexer.new('/')
+
+      dir.add_directory("#{indexer.directory.gsub(/^\//, '')}/gems")
+      dir.add_directory("#{indexer.directory.gsub(/^\//, '')}/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('')
+      MirrorFile.new("#{indexer.directory}/quick/gemirro-0.1.0.gemspec.rz")
+        .write('test')
+
+      indexer.should_receive(:gem_file_list)
+        .and_return(['gems/gemirro-0.1.0.gem'])
+      indexer.should_receive(:make_temp_directories).once.and_return(true)
+      indexer.should_receive(:build_marshal_gemspecs).once.and_return([
+        "#{indexer.directory}/quick/gemirro-0.1.0.gemspec.rz"])
+
+      indexer.update_gemspecs
+      expect(File.read('/quick/gemirro-0.1.0.gemspec.rz'))
+        .to eq('test')
     end
   end
 end

data/template/config.rb

@@ -3,6 +3,9 @@
 # change settings such as the location to store Gem files in and what source
 # and Gems you'd like to mirror at start.
 Gemirro.configuration.configure do
+  # Define sinatra environment
+  environment :production
+
   # The directory to store indexing information as well as the Gem files in.
   destination File.expand_path('../public', __FILE__)
 
@@ -11,10 +14,12 @@ Gemirro.configuration.configure do
   logger.level = Logger::INFO
 
   # If you want to run your server on a specific host and port, you must
-  # change the following parameter (server_host and server_port).
+  # change the following parameters (server_host and server_port).
   #
-  # server_host = 'localhost'
-  # server_port = '2000'
+  # server.host 'localhost'
+  # server.port '2000'
+  server.access_log File.expand_path('../logs/access.log', __FILE__)
+  server.error_log File.expand_path('../logs/error.log', __FILE__)
 
   # You must define a source wich where gems will be downloaded.
   # All gem in the block will be downloaded with the update command.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemirro
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Pierre Rambaud
@@ -14,168 +14,168 @@ dependencies:
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: confstruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.25'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 description: Create your own gem mirror with a simple TCPServer.
@@ -185,9 +185,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - MANIFEST
@@ -240,17 +240,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: Gem for easily creating your own RubyGems mirror.