gemirro 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d800c2fcc4025d9b6c61b262de67bd7fabaa16b
-  data.tar.gz: 83b03d07f993704b6a944435cc0736f15cb691d1
+  metadata.gz: 88720262f04cf437d78990d801473153965d7ee8
+  data.tar.gz: 5d05de8d3fdb9b9cc07c69b4483a7263e9eb8690
 SHA512:
-  metadata.gz: cc903688bd26f284ecba57a374c2bbd21121fdb0c27b2a358780b5bb6126177428416277052049e7babb987bf2737e984a99d5ea91f1775da21346a3253c54b4
-  data.tar.gz: c4cfc5462bc6739b1857a5ff411dad6922fe69e8caeeff2605123bfea093377318d0afc6e0038ed93a52a4f6b271e5db8bcb55affbf6b8fdd054339e4b5ef534
+  metadata.gz: 61fd8692d6885444ea4505c698b6d7420910a0b8ed9c7315d6e87b6c94b1ed8b3fee10358cfe6cde6c6a97d734f105aad9b9b0e5373810b7af21a69c8f0fb0e7
+  data.tar.gz: d614a2c7de6b2ef408afc0194ce48c039831edf36037c8c60b297b5b39d9fea2d75ff99d99c1fac3b9928d4ec32e75e5478eb202e8179fcbcba4a85d05daa347

data/MANIFEST

@@ -34,7 +34,6 @@ 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

data/gemirro.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'httpclient', '~>2.4'
   s.add_dependency 'confstruct', '~>0.2'
   s.add_dependency 'builder', '~>3.2'
+  s.add_dependency 'sinatra', '~>1.4'
+  s.add_dependency 'thin', '~>1.6'
 
-  s.add_development_dependency 'mime-types', '~>2.3'
   s.add_development_dependency 'rake', '~>10.0'
   s.add_development_dependency 'rspec', '~>3.0'
   s.add_development_dependency 'simplecov', '~>0.9'

data/lib/gemirro/cli/server.rb

@@ -14,6 +14,7 @@ Gemirro::CLI.options.command 'server' do
       abort
     end
 
-    Gemirro::Server.new.run
+    require 'gemirro/server'
+    Gemirro::Server.run!
   end
 end

data/lib/gemirro/server.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+require 'sinatra/base'
+require 'thin'
 
 module Gemirro
   ##
@@ -13,23 +15,17 @@ module Gemirro
   # @!attribute [r] gems_fetcher
   #  @return [Gemirro::GemsFetcher]
   #
-  class Server
-    attr_reader :server, :destination, :versions_fetcher, :gems_fetcher
-
+  class Server < Sinatra::Base
     ##
-    # Initialize Server
+    # Configure server
     #
-    def initialize
-      configuration.server_host = 'localhost' if configuration.server_host.nil?
-      configuration.server_port = '2000' if configuration.server_port.nil?
-      logger.info('Running server on ' \
-                  "#{configuration.server_host}:#{configuration.server_port}")
-      @server = TCPServer.new(
-        configuration.server_host,
-        configuration.server_port
-      )
-
-      @destination = configuration.destination
+    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
+      set :destination, config.destination.gsub(/\/$/, '')
     end
 
     ##
@@ -37,42 +33,22 @@ module Gemirro
     #
     # @return [nil]
     #
-    def run
-      while (session = server.accept)
-        request = session.gets.chomp
-        logger.info(request)
-
-        trimmedrequest = request
-          .gsub(/(HEAD|GET)\ \//, '')
-          .gsub(/\ HTTP.*/, '')
-          .chomp
-        resource = "#{@destination}/#{trimmedrequest}"
-
-        # Try to download gem if file doesn't exists
-        fetch_gem(resource) unless File.exist?(resource)
-
-        # If not found again, return a 404
-        unless File.exist?(resource)
-          logger.warn("404 - #{trimmedrequest.gsub(/^public\//, '')}")
-          session.print "HTTP/1.1 404/Object Not Found\r\n\r\n"
-          session.close
-          next
-        end
+    get('*') do |path|
+      resource = "#{settings.destination}#{path}"
 
-        begin
-          if File.directory?(resource)
-            display_directory(session, resource)
-          else
-            mime_type = MIME::Types.type_for(resource)
-            session.print "HTTP/1.1 200/OK\r\nContent-type:#{mime_type}\r\n\r\n"
-            file = open(resource, 'rb')
-            session.puts(file.read)
-          end
-        rescue Errno::ECONNRESET, Errno::EPIPE => e
-          logger.info(e.message)
-        end
+      # Try to download gem if file doesn't exists
+      fetch_gem(resource) unless File.exist?(resource)
+      # If not found again, return a 404
+      return not_found unless File.exist?(resource)
 
-        session.close
+      begin
+        if File.directory?(resource)
+          display_directory(resource)
+        else
+          send_file resource
+        end
+      rescue Errno::ECONNRESET, Errno::EPIPE => e
+        logger.info(e.message)
       end
     end
 
@@ -88,10 +64,12 @@ module Gemirro
       regexp = /^(.*)-(\d+(?:\.\d+){,4})\.gem(?:spec\.rz)?$/
       result = name.match(regexp)
       return unless result
+
       gem_name, gem_version = result.captures
       return unless gem_name && gem_version
 
       logger.info("Try to download #{gem_name} with version #{gem_version}")
+
       begin
         gems_fetcher.source.gems.clear
         gems_fetcher.source.gems.push(Gemirro::Gem.new(gem_name, gem_version))
@@ -109,7 +87,7 @@ module Gemirro
     # @return [Indexer]
     #
     def generate_index
-      indexer    = Indexer.new(configuration.destination)
+      indexer    = Indexer.new(settings.destination)
       indexer.ui = ::Gem::SilentUI.new
 
       logger.info('Generating indexes')
@@ -119,24 +97,20 @@ module Gemirro
     ##
     # Display directory on the current sesion
     #
-    # @param [TCPSocket] session
     # @param [String] resource
     # @return [Array]
     #
-    def display_directory(session, resource)
-      session.print "HTTP/1.1 200/OK\r\nContent-type:text/html\r\n\r\n"
+    def display_directory(resource)
       base_dir = Dir.new(resource)
-      base_dir.entries.sort.each do |f|
+      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(@destination, '')
-
-        session.print(
-          "<a href=\"#{resource_path}\">#{f}#{dir_sign}</a><br>"
-        ) unless ['.', '..'].include?(File.basename(resource_path))
-      end
+        resource_path = resource_path.gsub(settings.destination, '')
+        "<a href=\"#{resource_path}\">#{f}#{dir_sign}</a><br>" \
+          unless ['.', '..'].include?(File.basename(resource_path))
+      end.compact
     end
 
     ##

data/lib/gemirro/version.rb

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

data/lib/gemirro.rb

@@ -10,8 +10,6 @@ require 'zlib'
 require 'httpclient'
 require 'logger'
 require 'stringio'
-require 'socket'
-require 'mime/types'
 
 unless $LOAD_PATH.include?(File.expand_path('../', __FILE__))
   $LOAD_PATH.unshift(File.expand_path('../', __FILE__))
@@ -22,7 +20,6 @@ require 'gemirro/configuration'
 require 'gemirro/gem'
 require 'gemirro/http'
 require 'gemirro/indexer'
-require 'gemirro/server'
 require 'gemirro/source'
 require 'gemirro/mirror_directory'
 require 'gemirro/mirror_file'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemirro
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Pierre Rambaud
@@ -67,19 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
+        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: '2.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +207,6 @@ files:
 - 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

data/spec/gemirro/server_spec.rb

@@ -1,96 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'spec_helper'
-require 'gemirro/source'
-require 'gemirro/server'
-require 'gemirro/mirror_file'
-require 'socket'
-require 'mime/types'
-
-#  tests
-module Gemirro
-  describe 'Server' do
-    include FakeFS::SpecHelpers
-
-    it 'should be initialized' do
-      Gemirro.configuration.logger.should_receive(:info)
-        .once.with('Running server on localhost:2000')
-      TCPServer.should_receive(:new).with('localhost', '2000')
-      server = Server.new
-      expect(server).to be_a(Server)
-      expect(server.destination).to eq(Gemirro.configuration.destination)
-    end
-
-    it 'should be initialized with host and port' do
-      Gemirro.configuration.logger.should_receive(:info)
-        .once.with('Running server on gemirro:1337')
-      Gemirro.configuration.should_receive(:server_host)
-        .at_least(:once).and_return('gemirro')
-      Gemirro.configuration.should_receive(:server_port)
-        .at_least(:once).and_return('1337')
-      TCPServer.should_receive(:new).with('gemirro', '1337')
-      server = Server.new
-      expect(server).to be_a(Server)
-      expect(server.destination).to eq(Gemirro.configuration.destination)
-    end
-
-    it 'should return logger' do
-      TCPServer.should_receive(:new).once
-      Gemirro.configuration.logger.should_receive(:info)
-        .once.with('Running server on localhost:2000')
-      server = Server.new
-      expect(server.logger).to be(Gemirro.configuration.logger)
-    end
-
-    it 'should return configuration' do
-      TCPServer.should_receive(:new).once
-      Gemirro.configuration.logger.should_receive(:info)
-        .once.with('Running server on localhost:2000')
-      server = Server.new
-      expect(server.configuration).to be(Gemirro.configuration)
-    end
-
-    it 'should return versions fetcher' do
-      TCPServer.should_receive(:new).once
-      Gemirro.configuration.logger.should_receive(:info)
-        .once.with('Running server on localhost:2000')
-      server = Server.new
-      server.configuration.source = Source.new(
-        'rubygems', 'https://rubygems.org')
-      Struct.new('ServerVersionsFetcher', :fetch)
-
-      VersionsFetcher.should_receive(:new)
-        .once
-        .with(server.configuration.source).and_return(Struct::ServerVersionsFetcher.new(true))
-      expect(server.gems_fetcher).to be_a(GemsFetcher)
-    end
-
-    it 'should display directory informations' do
-      TCPServer.should_receive(:new).once
-      Gemirro.configuration.logger.should_receive(:info)
-        .once.with('Running server on localhost:2000')
-      server = Server.new
-      session = MockTCPSocket.new
-      FileUtils.mkdir_p('public/directory')
-      MirrorFile.new('public/directory/file').write('content')
-      expect(server.display_directory(session, 'public/directory'))
-        .to eq(['.', '..', 'file'])
-      expect(session.output)
-        .to eq("HTTP/1.1 200/OK\r\nContent-type:text/html"\
-               "\r\n\r\n<a href=\"directory/file\">file</a><br>")
-    end
-  end
-
-  ##
-  # Mock TCP Socket
-  class MockTCPSocket
-    attr_accessor :response, :output
-    def initialize
-      @responses = []
-      @output    = ''
-    end
-
-    def print(line)
-      @output << line
-    end
-  end
-end