gemirro 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 88720262f04cf437d78990d801473153965d7ee8
-  data.tar.gz: 5d05de8d3fdb9b9cc07c69b4483a7263e9eb8690
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTE2OTU0OTYxMmU0Y2JkZjBlZTQxMWRiZDQ4MWZkNzVlZDAyZWRlZQ==
+  data.tar.gz: !binary |-
+    NDk1ZDFlYWYxYmE1NjY1MmNiNzUxYzRjZjA0N2Q2MzI1YjNlZDEyZg==
 SHA512:
-  metadata.gz: 61fd8692d6885444ea4505c698b6d7420910a0b8ed9c7315d6e87b6c94b1ed8b3fee10358cfe6cde6c6a97d734f105aad9b9b0e5373810b7af21a69c8f0fb0e7
-  data.tar.gz: d614a2c7de6b2ef408afc0194ce48c039831edf36037c8c60b297b5b39d9fea2d75ff99d99c1fac3b9928d4ec32e75e5478eb202e8179fcbcba4a85d05daa347
+  metadata.gz: !binary |-
+    MTQ0MWI1ODQ4NWVhODA0ZTlmMzMzZDU3N2ViNDM4MmY0ODViN2EyZmEzNjBl
+    ZDNhNDQ4NjIwYTU5OWJlMTM4MzY4OWZmODg0MmY2NDUxOThmZTY4NGZhMzZm
+    MmZiYzBlNzI5NzcxMzIxMTdkOGIwNzA2ZmJjYmFlZWM5NjAzMzU=
+  data.tar.gz: !binary |-
+    MDhkOTcyMTk5NDIyMzI5MzA0YTM1ODAxNmIzMDliZWMzMWY2ZWY4YjdmZTQw
+    YjJhZWM4NjU2YmU3MGJhOWZlMTk4NDE2YzYwM2UyMTg1YWRmMDU5NjZjN2Iw
+    ZTQ0MWEwNjA4OTI4NjEwN2YwNTY1ZDU3OTFkMjk0ODQ1ZmMyZjY=

data/README.md

@@ -43,11 +43,14 @@ Once all the Gems have been downloaded you'll need to generate an index of all t
 $ gemirro index
 ```
 
-
-Last, launch the `TCPServer`, and all requests will check if gems are detected, and download them if necessary and generate index immediately.
+Last, launch the server, and all requests will check if gems are detected, and download them if necessary and generate index immediately.
 
 ```bash
-$ gemirro server
+$ gemirro server --start
+$ gemirro server --status
+$ gemirro server --restart
+$ gemirro server --stop
+
 ```
 
 If you want to use a custom configuration file not located in the current directory, use the `-c` or `--config` option.

data/gemirro.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'thin', '~>1.6'
 
   s.add_development_dependency 'rake', '~>10.0'
+  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'

data/lib/gemirro/cli/server.rb

@@ -1,12 +1,26 @@
 # -*- coding: utf-8 -*-
+
 Gemirro::CLI.options.command 'server' do
   banner 'Usage: gemirro server [OPTIONS]'
-  description 'Run web server'
+  description 'Manage web server'
   separator "\nOptions:\n"
 
+  on :start, 'Run web server'
+  on :stop, 'Stop web server'
+  on :restart, 'Restart web server'
+  on :status, 'Status of web server'
   on :c=, :config=, 'Path to the configuration file'
+  @pid_file = nil
 
   run do |opts, _args|
+    load_configuration(opts)
+    start if opts[:start]
+    stop if opts[:stop]
+    restart if opts[:restart]
+    status if opts[:status]
+  end
+
+  def load_configuration(opts)
     Gemirro::CLI.load_configuration(opts[:c])
     config = Gemirro.configuration
     unless File.directory?(config.destination)
@@ -14,7 +28,87 @@ Gemirro::CLI.options.command 'server' do
       abort
     end
 
+    @pid_file = File.join(config.destination, '..', 'gemirro.pid')
     require 'gemirro/server'
+  end
+
+  # Copy stdout because we'll need to reopen it later on
+  @orig_stdout = STDOUT.clone
+  $PROGRAM_NAME = 'gemirro'
+
+  def create_pid
+    File.open(@pid_file, 'w') do |f|
+      f.write("#{Process.pid}")
+    end
+  rescue Errno::EACCES
+    STDOUT.reopen @orig_stdout
+    puts "Error: Can't write to #{@pid_file} - Permission denied"
+    exit!
+  end
+
+  def destroy_pid
+    File.delete(@pid_file) if File.exist?(@pid_file) && pid == Process.pid
+  end
+
+  def pid
+    File.open(@pid_file, 'r') do |f|
+      return f.gets.to_i
+    end
+  rescue Errno::ENOENT
+    puts "Error: PID File not found #{@pid_file}"
+    exit!
+  end
+
+  def start
+    puts 'Starting...'
+    if File.exist?(@pid_file)
+      if running?(pid)
+        puts "Error: #{$PROGRAM_NAME} already running"
+        abort
+      end
+    end
+
+    Process.daemon
+    create_pid
+    STDOUT.reopen @orig_stdout
+    puts "done! (PID is #{pid})\n"
     Gemirro::Server.run!
+    destroy_pid
+    STDOUT.reopen '/dev/null', 'a'
+  end
+
+  def stop
+    process_pid = pid
+    begin
+      Process.kill('TERM', process_pid)
+      Timeout.timeout(30) { sleep 0.1 while running?(process_pid) }
+    rescue Errno::ESRCH
+      puts "Error: Couldn't find process with PID #{process_pid}"
+      exit!
+    rescue Timeout::Error
+      puts 'timeout while sending TERM signal, sending KILL signal now... '
+      Process.kill('KILL', process_pid)
+      destroy_pid
+    end
+    puts 'done!'
+  end
+
+  def restart
+    stop
+    start
+  end
+
+  def status
+    if running?(pid)
+      puts "#{$PROGRAM_NAME} is running"
+    else
+      puts "#{$PROGRAM_NAME} is not running"
+    end
+  end
+
+  def running?(process_id)
+    Process.getpgid(process_id) != -1
+  rescue Errno::ESRCH
+    false
   end
 end

data/lib/gemirro/server.rb

@@ -4,18 +4,16 @@ require 'thin'
 
 module Gemirro
   ##
-  # Launch TCPServer to easily download gems.
+  # Launch Sinatra server to easily download gems.
   #
-  # @!attribute [r] server
-  #  @return [TCPServer]
-  # @!attribute [r] destination
-  #  @return [String]
   # @!attribute [r] versions_fetcher
   #  @return [VersionsFetcher]
   # @!attribute [r] gems_fetcher
   #  @return [Gemirro::GemsFetcher]
   #
   class Server < Sinatra::Base
+    attr_accessor :versions_fetcher, :gems_fetcher
+
     ##
     # Configure server
     #
@@ -29,7 +27,8 @@ module Gemirro
     end
 
     ##
-    # Run the server and accept all connection
+    # Try to get all request and download files
+    # if files aren't found.
     #
     # @return [nil]
     #
@@ -41,14 +40,10 @@ module Gemirro
       # If not found again, return a 404
       return not_found unless File.exist?(resource)
 
-      begin
-        if File.directory?(resource)
-          display_directory(resource)
-        else
-          send_file resource
-        end
-      rescue Errno::ECONNRESET, Errno::EPIPE => e
-        logger.info(e.message)
+      if File.directory?(resource)
+        display_directory(resource)
+      else
+        send_file resource
       end
     end
 
@@ -139,7 +134,7 @@ module Gemirro
     # @return [Gemirro::GemsFetcher]
     #
     def gems_fetcher
-      @gems_fetcher = Gemirro::GemsFetcher.new(
+      @gems_fetcher ||= Gemirro::GemsFetcher.new(
         configuration.source, versions_fetcher)
     end
   end

data/lib/gemirro/version.rb

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

data/spec/gemirro/cli_spec.rb

@@ -25,7 +25,7 @@ module Gemirro
         version = options.fetch_option(:v)
         expect(version.short).to eq('v')
         expect(version.long).to eq('version')
-        expect(version.call).to be_nil
+        expect { version.call }.to output(/gemirro v.* on ruby/).to_stdout
       end
 
       it 'should retrieve version information' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemirro
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pierre Rambaud
@@ -108,6 +108,20 @@ dependencies:
     - - ~>
       - !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
@@ -231,12 +245,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Gem for easily creating your own RubyGems mirror.