httpme 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6016f8e2721f79749d9432b1bd9489de9307df9f5ff2651e8e12e30cf7633a7
-  data.tar.gz: 7c6c427e893051b9f67ebcfb203f5400ee776fdf4c0b5e65319e47f8e5e41a96
+  metadata.gz: fca9b62ba6b59c8f59e9bc8ea35935bdbcd9ab750657dd8d0512d491dd968121
+  data.tar.gz: 9783fff85113d96544534a65fe9f3f27d364417161b98c3da68871d4a000d12b
 SHA512:
-  metadata.gz: 4979cb2101027aade89204a4b1814be815ff2b2dbbf37c32aedfbafe181095af671f3b6b47d6d4cb0adb10254ca2d33cf95dee14aaca125ef7bdc60983384081
-  data.tar.gz: 466bc485b93d89984873fde23180255b8ca82b65ae2410aefe0ec419c6f923bb08ddffa43e0cb8411ed3df162caf4f718645d63a20a7482c225ea3279ae6cc1d
+  metadata.gz: d78fd7e148046922b7e4b16256b5bce7216b8b9e504be6836c289170baa76cba1d868e4d276f8da20371c661691e206dab7534f4ec48bb5ec7b5916faadcd61a
+  data.tar.gz: 23ab313ec7dadec1f0a684214cf54bcefd63147b78317a956ba6c080bf0963fc2ce4f5f36a4211a61cc357c4b8ba17e890f104c51124c88fbdcd4d23cf13c502

data/bin/httpme

@@ -9,6 +9,6 @@ begin
   exit router.run ARGV
 rescue => e
   puts e.backtrace.reverse if ENV['DEBUG']
-  say! "!txtred!#{e.class}: #{e.message}"
+  say! "r`#{e.class}: #{e.message}`"
   exit 1
-end
+end

data/lib/httpme/command.rb

@@ -7,26 +7,26 @@ module HTTPMe
     include Colsole
 
     version HTTPMe::VERSION
-    summary "httpme - static web server with basic authentication"
+    summary 'httpme - static web server with basic authentication'
 
-    help "Options can be set using command line arguments or environment variables"
+    help 'Options can be set using command line arguments or environment variables'
 
-    usage "httpme [PATH] [--port PORT --host HOST --auth AUTH]"
-    usage "httpme (-h|--help|--version)"
+    usage 'httpme [PATH] [--port PORT --host HOST --auth AUTH]'
+    usage 'httpme (-h|--help|--version)'
 
-    param "PATH", "Path to the directory you want to serve [default: .]"
-    option "-p --port PORT", "Server port (default: 3000)"
-    option "-o --host HOST", "Server host (default: 0.0.0.0)"
-    option "-a --auth AUTH", "Specify user:password to enable basic authentication"
+    param 'PATH', 'Path to the directory you want to serve [default: .]'
+    option '-p --port PORT', 'Server port (default: 3000)'
+    option '-o --host HOST', 'Server host (default: 0.0.0.0)'
+    option '-a --auth AUTH', 'Specify user:password to enable basic authentication'
 
-    environment 'HTTPME_PATH', "Same as the PATH argument"
-    environment 'HTTPME_AUTH', "Same as the --auth option"
-    environment 'HTTPME_PORT', "Same as the --port option"
-    environment 'HTTPME_HOST', "Same as the --host option"
+    environment 'HTTPME_PATH', 'Same as the PATH argument'
+    environment 'HTTPME_AUTH', 'Same as the --auth option'
+    environment 'HTTPME_PORT', 'Same as the --port option'
+    environment 'HTTPME_HOST', 'Same as the --host option'
 
-    example "httpme -p 4000"
-    example "httpme docs --auth admin:s3cr3t"
-    example "HTTPME_AUTH=admin:s3cr3t httpme docs  # same result as above"
+    example 'httpme -p 4000'
+    example 'httpme docs --auth admin:s3cr3t'
+    example 'HTTPME_AUTH=admin:s3cr3t httpme docs  # same result as above'
 
     def run
       path = args['PATH'] || ENV['HTTPME_PATH'] || '.'
@@ -36,8 +36,8 @@ module HTTPMe
 
       raise ArgumentError, "Path not found [#{path}]" unless Dir.exist? path
 
-      server = Server.new path: path, host: host, port: port, auth: auth
-      server.run
+      Server.setup path: path, host: host, port: port, auth: auth
+      Server.run!
     end
   end
 end

data/lib/httpme/server.rb

@@ -1,51 +1,31 @@
-require 'rack'
-require 'rack/handler/puma'
-require 'httpme/index_redirector'
+require 'rack/contrib/try_static'
+require 'sinatra/base'
 
 module HTTPMe
-  class Server
-    attr_reader :options
+  class Server < Sinatra::Application
+    class << self
+      def setup(port: 3000, host: '0.0.0.0', path: '.', zone: 'Restricted Area', auth: nil)
+        reset!
 
-    def initialize(options = {})
-      @options = options
-    end
-
-    def run
-      Rack::Handler::Puma.run(app, **rack_options) do |server|
-        # :nocov: - FIXME: Can we test this?
-        [:INT, :TERM].each do |sig|
-          trap(sig) { server.stop }
-        end
-        # :nocov:
-      end
-    end
-
-    def app
-      path = options[:path] || '.'
-      auth = options[:auth]
-      zone = options[:zone] || 'Restricted Area'
+        set :bind, host
+        set :port, port
+        set :server, %w[puma webrick]
 
-      Rack::Builder.new do
         if auth
           use Rack::Auth::Basic, zone do |username, password|
             auth.split(':') == [username, password]
           end
         end
 
-        use Rack::Static, urls: ["/"], root: path, cascade: true, index: 'index.html'
-        use IndexRedirector, root: path
-        run Rack::Directory.new(path)
-      end
-    end
+        not_found do
+          content_type :text
+          '404 Not Found'
+        end
 
-  private
+        use Rack::TryStatic, root: path, urls: %w[/], try: %w[.html index.html /index.html]
 
-    def rack_options
-      {
-        Port: (options[:port] || '3000'),
-        Host: (options[:host] || '0.0.0.0'),
-      }
+        self
+      end
     end
-
   end
 end

data/lib/httpme/version.rb

@@ -1,3 +1,3 @@
 module HTTPMe
-  VERSION = "0.1.6"
-end
+  VERSION = '0.2.1'
+end

data/lib/httpme.rb

@@ -1,2 +1,6 @@
 require 'httpme/server'
-require 'byebug' if ENV['BYEBUG']
+
+if ENV['BYEBUG']
+  require 'byebug'
+  require 'lp'
+end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: httpme
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-15 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colsole
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: mister_bin
   requirement: !ruby/object:Gem::Requirement
@@ -25,47 +45,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: colsole
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '5.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '5.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '3.0'
 description: Command line utility for running a web server for static files with basic
   authentication support
 email: db@dannyben.com
@@ -79,13 +105,13 @@ files:
 - lib/httpme.rb
 - lib/httpme/cli.rb
 - lib/httpme/command.rb
-- lib/httpme/index_redirector.rb
 - lib/httpme/server.rb
 - lib/httpme/version.rb
 homepage: https://github.com/dannyben/httpme
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -94,14 +120,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.5
 signing_key: 
 specification_version: 4
 summary: Static files web server with basic authentication

data/lib/httpme/index_redirector.rb

@@ -1,19 +0,0 @@
-module HTTPMe
-  class IndexRedirector
-    def initialize(app, root: '.')
-      @app = app
-      @root = root
-    end
-
-    def call(env)
-      path_info = Rack::Utils.unescape env['PATH_INFO']
-      path = File.join @root, path_info
-
-      if File.directory?(path) and !path_info.end_with? '/'
-        return [302, { 'Location' => "#{env['PATH_INFO']}/" }, []]
-      end
-
-      @app.call env
-    end
-  end
-end