gaptool-server 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f73acc1996353bb8e20000d04b304807f18c76
-  data.tar.gz: 47a25aecf0253dc011017ac5dcea184566dd9672
+  metadata.gz: 8f4f3e9c7ea6941ecfc204af4f0e3955084d2782
+  data.tar.gz: 46cdd65cd84a180d568fa842101e4e8d10898c23
 SHA512:
-  metadata.gz: 2f1ad14a94e0e304f5677e20d3f056f12076a4dea5e7a6e756dc07c2029ff562b7c737ba4da51bfca9e0760dc01a39786de7cd7a24e0b2ff3f6590af99d14dda
-  data.tar.gz: 053d1ed3010a379feac71e36ee63dae0c2736bb6ec359b0d8cbe83e5573ad8880ab053b1c2b41488ed705bda203237ae6bf3c48053dbefb25990751ad1bef828
+  metadata.gz: 7f0acc40c76b1715f4c509cafa4af7dfa33da130fd25c15f434f2e304ead95f436bff891554836ddf91aea91c1eafcd4bb93874f23426d775acd5fcfc136490e
+  data.tar.gz: 6a22c5aa7f579de53d1cfe08d650f3b30f458320d30bcb6eb84c57bdcaab2be1fe97db5e1e1f86325c2b01ca66e69fc4804358d33319b240a17ea43b3f90e764

data/Rakefile

@@ -14,28 +14,26 @@ $stdout.sync = true
 
 def sys(cmd)
   IO.popen(cmd) do |f|
-    until f.eof?
-      puts f.gets
-    end
+    puts f.gets until f.eof?
   end
-  $?.to_i
+  $CHILD_STATUS.to_i
 end
 
-Dir.glob('tasks/*.rb').each { |r| load r}
+Dir.glob('tasks/*.rb').each { |r| load r }
 
-unless File.exists?('/.dockerenv')
-  desc "Start the shell"
+unless File.exist?('/.dockerenv')
+  desc 'Start the shell'
   task :shell do
     exec "racksh #{Shellwords.join(ARGV[1..-1])}"
   end
-  task :sh => :shell
+  task sh: :shell
 
-  desc "Start the HTTP server"
+  desc 'Start the HTTP server'
   task :server do
     exec "puma -p 3000 --preload -t 8:32 -w 3 #{Shellwords.join(ARGV[1..-1])}"
   end
 
-  desc "Bump the version"
+  desc 'Bump the version'
   task :bump do
     version = File.read('VERSION').strip
     nver = version.next
@@ -44,29 +42,29 @@ unless File.exists?('/.dockerenv')
     f.close
     puts "Bumped #{version} => #{nver}"
     exec "git commit -m 'Bump version to v#{nver}' VERSION"
-    Rake::Task["tag"].invoke
-    Rake::Task["gem:build"].invoke
+    Rake::Task['tag'].invoke
+    Rake::Task['gem:build'].invoke
   end
 
-  desc "Tag git with VERSION"
+  desc 'Tag git with VERSION'
   task :tag do
-    exec "git tag v$(cat VERSION)"
+    exec 'git tag v$(cat VERSION)'
   end
 
-  desc "Push the git tag and the gem version"
-  task :push => :tag do
-    exec "git push origin v$(cat VERSION)"
-    Rake::Task["gem:push"].invoke
+  desc 'Push the git tag and the gem version'
+  task push: :tag do
+    exec 'git push origin v$(cat VERSION)'
+    Rake::Task['gem:push'].invoke
   end
 end
 
 task :help do
-  puts "Available tasks"
-  exec "rake -T"
+  puts 'Available tasks'
+  exec 'rake -T'
 end
 
 RSpec::Core::RakeTask.new :test do |task|
   task.pattern = Dir['test/*_test.rb']
 end
 
-task :default => :help
+task default: :help

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.8.0

data/bin/gaptool-server

@@ -5,7 +5,7 @@ begin
   require 'gaptool-server'
   root = Gem.loaded_specs['gaptool-server'].full_gem_path
 rescue LoadError
-  root = File.realpath(File.join(File.dirname(__FILE__), ".."))
+  root = File.realpath(File.join(File.dirname(__FILE__), '..'))
 end
 Dir.chdir(root)
-exec "puma #{ARGV.join(" ")}"
+exec "puma #{ARGV.join(' ')}"

data/bin/gaptool-shell

@@ -5,8 +5,8 @@ begin
   require 'gaptool-server'
   root = Gem.loaded_specs['gaptool-server'].full_gem_path
 rescue LoadError
-  root = File.realpath(File.join(File.dirname(__FILE__), ".."))
+  root = File.realpath(File.join(File.dirname(__FILE__), '..'))
 end
 Dir.chdir(root)
 
-exec "racksh #{ARGV.join(" ")}"
+exec "racksh #{ARGV.join(' ')}"

data/config.ru

@@ -2,9 +2,8 @@
 
 ENV['DRYRUN'] = nil unless ENV['DRYRUN'] == 'true'
 
-libpath = File.expand_path(File.join(File.dirname(__FILE__), "lib"))
-$:.unshift(libpath)
-require "#{libpath}/helpers/redis"
+libpath = File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
+$LOAD_PATH.unshift(libpath)
 require "#{libpath}/app.rb"
 
-run GaptoolServer
+run Gaptool::Server

data/lib/app.rb

@@ -13,87 +13,97 @@ require 'logger'
 require 'versionomy'
 require_relative 'exceptions'
 
-class GaptoolServer < Sinatra::Application
-  helpers Sinatra::JSON
-  use Airbrake::Sinatra
+module Gaptool
+  class Server < Sinatra::Application
+    @versions = {}
+    class << self
+      attr_reader :versions
+    end
 
-  def error_response msg=''
-    message = env['sinatra_error'].nil? ? "" : " #{env['sinatra.error'].message}"
-    message = "#{msg}#{message}" unless msg.empty?
-    json result: 'error', message: message
-  end
+    def versions
+      self.class.versions
+    end
 
-  error JSON::ParserError do
-    status 400
-    error_response "Invalid data."
-  end
+    helpers Sinatra::JSON
+    use Airbrake::Sinatra
 
-  error HTTPError do
-    status env['sinatra.error'].code
-    error_response
-  end
+    def error_response(msg = '')
+      message = env['sinatra_error'].nil? ? '' : " #{env['sinatra.error'].message}"
+      message = "#{msg}#{message}" unless msg.empty?
+      json result: 'error', message: message
+    end
 
-  def unauthenticated
-    halt(401, error_response("Unauthenticated"))
-  end
+    error JSON::ParserError do
+      status 400
+      error_response 'Invalid data.'
+    end
 
-  def check_version(server, client)
-    @@client_versions ||= {}
-    cl_v = @@client_versions[client]
-    if cl_v.nil?
-      begin
-        @@client_versions[client] = Versionomy.parse(client)
-        cl_v = @@client_versions[client]
-      rescue
-        return false
-      end
+    error HTTPError do
+      status env['sinatra.error'].code
+      error_response
     end
-    cl_v.major == server.major && cl_v.minor == server.minor
-  end
 
-  def invalid_version(server, client)
-    halt(400, error_response("Invalid version #{client} (server: #{server})"))
-  end
+    def unauthenticated
+      halt(401, error_response('Unauthenticated'))
+    end
 
-  error do
-    status 500
-    error_response
-  end
+    def client_version
+      client = env['HTTP_X_GAPTOOL_VERSION']
+      versions[client] ||= Versionomy.parse(client)
+    rescue
+      nil
+    end
+
+    def check_version
+      server = settings.version_parsed
+      client_version.major >= server.major && \
+        client_version.minor >= server.minor
+    rescue
+      false
+    end
+
+    def invalid_version
+      halt(400, error_response("Invalid version #{client_version} (server: #{settings.version})"))
+    end
 
-  configure do
-    unless ENV['AIRBRAKE_API_KEY'].nil?
-      Airbrake.configure do |cfg|
-        cfg.api_key = ENV['AIRBRAKE_API_KEY']
-        cfg.logger = Logger.new(STDOUT)
+    error do
+      status 500
+      error_response
+    end
+
+    configure do
+      unless ENV['AIRBRAKE_API_KEY'].nil?
+        Airbrake.configure do |cfg|
+          cfg.api_key = ENV['AIRBRAKE_API_KEY']
+          cfg.logger = Logger.new(STDOUT)
+        end
       end
+      disable :sessions
+      enable :dump_errors
+      disable :show_exceptions
+      version = File.read(File.realpath(
+                            File.join(File.dirname(__FILE__), '..', 'VERSION')
+      )).strip
+      set(:version, version)
+      set(:version_parsed, Versionomy.parse(version))
     end
-    disable :sessions
-    enable  :dump_errors
-    disable :show_exceptions
-    version = File.read(File.realpath(
-      File.join(File.dirname(__FILE__), "..", 'VERSION')
-    )).strip
-    set(:version, version)
-    set(:version_parsed, Versionomy.parse(version))
-  end
 
-  before do
-    if request.path_info != '/ping' && ENV['GAPTOOL_DISABLE_AUTH'].nil?
-      user = Gaptool::Data.user(env['HTTP_X_GAPTOOL_USER'])
-      return unauthenticated if user.nil?
-      return unauthenticated unless user[:key] == env['HTTP_X_GAPTOOL_KEY']
-      if !ENV['GAPTOOL_CHECK_CLIENT_VERSION'].nil? && !check_version(settings.version_parsed, env['HTTP_X_GAPTOOL_VERSION'])
-        return invalid_version(settings.version, env['HTTP_X_GAPTOOL_VERSION'])
+    before do
+      if request.path_info != '/ping' && ENV['GAPTOOL_DISABLE_AUTH'].nil?
+        user = Gaptool::Data.user(env['HTTP_X_GAPTOOL_USER'])
+        return unauthenticated if user.nil?
+        return unauthenticated unless user[:key] == env['HTTP_X_GAPTOOL_KEY']
+        return invalid_version if !ENV['GAPTOOL_CHECK_CLIENT_VERSION'].nil? && !check_version
       end
     end
-  end
 
-  after do
-    # Fix for old versions of gaptool-api
-    if request.preferred_type.to_str == "application/json"
-      content_type "application/json"
-    else
-      content_type 'text/html'
+    after do
+      # Fix for old versions of gaptool-api
+      if request.preferred_type.to_str == 'application/json'
+        content_type 'application/json'
+      else
+        content_type 'text/html'
+      end
     end
   end
 end

data/lib/exceptions.rb

@@ -1,13 +1,13 @@
 class HTTPError < StandardError
   @code = 500
 
-  def self.code
-    @code
+  class << self
+    attr_reader :code
   end
 
- def code
+  def code
     self.class.code
- end
+  end
 end
 
 class ClientError < HTTPError