servel 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce6f55af17def653868138167feedca557e981ff15f3010585ece287e5f0e8d
-  data.tar.gz: 8c1e5087a5f219b6523eb3e65daca81d91c149d50cfbe1607cc5bae3a8024dad
+  metadata.gz: b9764905c7e72d90eecf301bf30c25c5542602d70df065803e18c03ab8353322
+  data.tar.gz: cf989ead1073528b04fc5c2c86d2f57ce37beace6c110fe40955c802390e4d58
 SHA512:
-  metadata.gz: 609b927a7d22c511a93b024cdb736a6553da2f6bd26301fa4ef716862a2ab9543f795d0fde3ad768c7bb8501a4fc3590045b0218abdba091e619471127014fc4
-  data.tar.gz: 549e6337e9871ba4db2d851702a246a2ebf9174e3a76e08a9155ec0707a32208fd4514bcbf965b1de0cb54127415ba41b9bcbc49f2a04aa14ee72c13a93f8690
+  metadata.gz: ed18495a7e3c37f25fd22655f7eebd8e78e712782d3970f15a46b205cc9c5e92da2ddb884277cae0558043b66754dac9936fd8dfcbd9dd9333c324caed2931b3
+  data.tar.gz: fadfa698ea51f4c95deee988c4ecfbd8edfff80776cf406fb780b5551f0d0207826110d8058ec150af763422d16901bb2a17431d2111cce855bd0346dd30933a

data/bin/servel

@@ -2,4 +2,4 @@
 
 require "servel"
 
-Servel::CLI.new(ARGV).start
+Servel::CLI.new.start

data/lib/servel.rb

@@ -3,6 +3,7 @@ require 'rack/handler/puma'
 require 'hamlit'
 require 'active_support/all'
 require 'lru_redux'
+require 'tty-config'
 
 require 'thread'
 require 'pathname'
@@ -15,6 +16,10 @@ module Servel
 
     Rack::URLMap.new(url_map)
   end
+
+  def self.config
+    @config ||= Servel::ConfigParser.new.config
+  end
 end
 
 require "servel/version"
@@ -25,4 +30,5 @@ require "servel/haml_context"
 require "servel/index"
 require "servel/app"
 require "servel/home_app"
+require "servel/config_parser"
 require "servel/cli"

data/lib/servel/cli.rb

@@ -1,18 +1,14 @@
-class Servel::CLI
-  def initialize(argv)
-    @argv = argv
-  end
-
-  def start
-    Rack::Handler::Puma.run(Servel.build_app(path_map))
-  end
-
-  def path_map
-    @argv.map do |arg|
-      root, url_root = arg.split(":" , 2)
-      root = Pathname.new(root).realpath
-
-      [root, url_root || "/"]
-    end.to_h
-  end
-end
+class Servel::CLI
+  def start
+    Rack::Handler::Puma.run(Servel.build_app(path_map))
+  end
+
+  def path_map
+    Servel.config.fetch(:listings).map do |listing|
+      listing = { listing => nil } if listing.is_a?(String)
+
+      root, url_root = listing.keys.first, listing.values.first || "/"
+      [Pathname.new(root).realpath, url_root]
+    end.to_h
+  end
+end

data/lib/servel/config_parser.rb

@@ -0,0 +1,23 @@
+class Servel::ConfigParser
+  attr_reader :config
+
+  def initialize
+    @config = TTY::Config.new
+    @config.filename = "servel"
+    @config.append_path(Dir.pwd)
+    @config.append_path((Pathname.new(Dir.home) + ".servel").to_s)
+    @config.append_path(Dir.home)
+    @config.env_prefix = "servel"
+    @config.autoload_env
+    @config.read if @config.exist?
+
+    @config.append(*parse_argv, to: :listings)
+  end
+
+  def parse_argv
+    ARGV.map do |arg|
+      root, url_root = arg.split(":" , 2)
+      { root => url_root }
+    end
+  end
+end

data/lib/servel/version.rb

@@ -1,3 +1,3 @@
 module Servel
-  VERSION = "0.30.0"
+  VERSION = "0.31.0"
 end

data/servel.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hamlit"
   spec.add_dependency "activesupport"
   spec.add_dependency "lru_redux"
+  spec.add_dependency "tty-config"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Serves files and directories over HTTP.
 email:
 - i@bloople.net
@@ -143,6 +157,7 @@ files:
 - lib/servel.rb
 - lib/servel/app.rb
 - lib/servel/cli.rb
+- lib/servel/config_parser.rb
 - lib/servel/entry.rb
 - lib/servel/entry_factory.rb
 - lib/servel/haml_context.rb