httpme 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e27183a0829fe35cd8336810fdcbe9a862a1df0a0e0c663aae71ee1bb9d0a78a
-  data.tar.gz: b7e7403de4fda13bb29a344114910d9bd394566a4dceda51699a564288d7c4f9
+  metadata.gz: 99af7b72919ce9067c213da74800f672b83bc32c4ed9aaa138b3b054c5e27d87
+  data.tar.gz: 9aab9343681890a51d0a3fa903fa52724866fc6c8829119047b4af62900b204f
 SHA512:
-  metadata.gz: 61e63755fc6d3e2982aadd6ca339dbdd9db73ce219f36698612fef9beb14cf8e146601f79f173c8444933cba60b97a891ee775efec5dd7438ec84fc90dcba39e
-  data.tar.gz: e2e142ddf8ba2ad4a132b85bf76a10164ff75a6e033fc4d96e31758f9770c2ee8028c80f3827792901225b92332faad234343124f01d79cb672eebe18820cfe9
+  metadata.gz: a6d80f36f71b0dbc774b15f4d066b3dc55a31ae38e9c10d91796ade658927731cc61f64a1eda16a4fdbc17065b6dc898a1bd1c827ae8af4157d53346500e36c1
+  data.tar.gz: 8b5891bf859b15221a9507c8642d1c065a18f5572c6b5f097f260e60c0fb6cd5c562464d88028906f76e5074d02e769f2f6ca96bc5d368118a0fd83deadd7803

data/bin/httpme

@@ -11,4 +11,4 @@ rescue => e
   puts e.backtrace.reverse if ENV['DEBUG']
   say! "!txtred!#{e.class}: #{e.message}"
   exit 1
-end
+end

data/lib/httpme/command.rb

@@ -1,31 +1,32 @@
 require 'mister_bin'
 require 'colsole'
+require 'httpme/version'
 
 module HTTPMe
   class Command < MisterBin::Command
     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'] || '.'
@@ -35,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.5"
-end
+  VERSION = '0.2.0'
+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,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: httpme
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-15 00:00:00.000000000 Z
+date: 2022-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mister_bin
+  name: colsole
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: colsole
+  name: mister_bin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -39,33 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: rack-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  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 +93,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 +108,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.3.26
 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