file_sv 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6fe6c5fff5f5d93506024349027d89d5ae0331b22f1dc15c94aaf72b18d1c8a
-  data.tar.gz: b8c7f47b3602949beb64b5b7e9fa7f859b2fc3020f5c1a3d91fa9a6309a1ad8a
+  metadata.gz: 43425956ba3f1325aa81876eea311cabd364f35ae2735adf79f4cb2daed69dd4
+  data.tar.gz: 629f16289572cb0407ae010a5322f96b07ab6261e591b55dd080f3c9d5e5b58c
 SHA512:
-  metadata.gz: 3b6521770efbd56f4b790650de3801668e80b4c197e995d3cdd1a97326013c58e241d265caf1735eeeae020050aa775ad44d7acb29b0c651aa3401b109bd7be0
-  data.tar.gz: ac3d6a6d948161f2b96f38090a148e3605927a9a43a690a05933b3a942905903f1c95b9e84ead1a204441b7edd66ef179be8aac3e30d6ddb2946a0330314d195
+  metadata.gz: ec1ca5bffdfcbcc83f94cde7838bc1cdccf844c6c58f45a768203f8d72f2c77e0ce49f706ba7878cb9ba414a58863fb7438e056d76c341a16b258e6de31d3125
+  data.tar.gz: c8e605801443bbd947769ce32bfd376daad28c98bf05dcbca4e1cbbf81a09d1b6a50b9a5f6d0dc1aab29d494f6796bf400bbda023e95ddb8e57c3e241bf16692

data/lib/file_sv/global_settings.rb

@@ -18,7 +18,7 @@ class GlobalSettings
     attr_accessor :empty_body_status
     # @return [Array] Expression representing files to ignore
     attr_accessor :ignore_files
-    # @return [Boolean] Whether to serve https using self signed certificate
+    # @return [Boolean] Whether to serve https using self signed certificate. Deprecated now
     attr_accessor :https
     # @return [String] Path to HTTPS cert
     attr_accessor :cert

data/lib/file_sv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FileSv
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/file_sv/virtual_server.rb

@@ -1,53 +1,18 @@
 # frozen_string_literal: true
 
-require "webrick"
+require "puma"
 require "sinatra"
 require "docdsl"
-require "webrick/https"
 require "openssl"
 
 # Virtual server hosting virtual service defined through files
 class VirtualServer < Sinatra::Base
-  set :server, "webrick"
+  set :server, :puma
+  enable :logging if ENV['debug'] == "true"
   set :bind, "0.0.0.0"
 
   register Sinatra::DocDsl
 
-  if GlobalSettings.https
-    def self.own_certs(webrick_options)
-      puts "Using cert from #{GlobalSettings.cert}"
-      cert = OpenSSL::X509::Certificate.new File.read GlobalSettings.cert
-      pkey = OpenSSL::PKey::RSA.new File.read GlobalSettings.key
-      webrick_options[:SSLCertificate] = cert
-      webrick_options[:SSLPrivateKey] = pkey
-      webrick_options
-    end
-
-    def self.determine_certs(webrick_options)
-      if GlobalSettings.key && GlobalSettings.cert
-        webrick_options = own_certs webrick_options
-      else
-        puts "Using self signed cert"
-        webrick_options[:ServerName] = "localhost"
-        webrick_options[:SSLCertName] = "/CN=localhost"
-      end
-      webrick_options
-    end
-
-    # Run as https with self signed cert
-    def self.run!
-      logger = WEBrick::Log.new(nil, WEBrick::BasicLog::WARN)
-      webrick_options = { Port: port, SSLEnable: true, Logger: logger }
-      webrick_options = determine_certs webrick_options
-      # TODO: Following run does not work on Ruby 3
-      Rack::Handler::WEBrick.run(self, webrick_options) do |server|
-        %i[INT TERM].each { |sig| trap(sig) { server.stop } }
-        server.threaded = settings.threaded if server.respond_to? :threaded=
-        set :running, true
-      end
-    end
-  end
-
   page do
     title "File SV"
     header "Service virtualization created from #{Dir.pwd}"
@@ -69,11 +34,13 @@ for more details'
 
   # Log endpoint. Return content and status code defined by endpoint
   # @param [PlannedEndpoint] endpoint Planned endpoint to serve
-  def serve(endpoint, id = nil)
-    message = "Using endpoint based on file #{endpoint.serving_file_name}."
+  def serve(endpoint, id = nil)    
     @id = id
-    message += " Using param '#{@id}'" if id
-    puts message
+    if ENV['debug'] == "true"
+      message = "Using endpoint based on file #{endpoint.serving_file_name}."
+      message += " Using param '#{@id}'" if id
+      puts message
+    end
     [endpoint.status_code, output_for(endpoint, binding)]
   end
 
@@ -86,11 +53,15 @@ for more details'
       if endpoint_base.path.include? "#{File::Separator}:"
         send(endpoint_base.method, endpoint_base.path) do |id|
           endpoint = endpoints.sample
+          @params = params
+          puts "#{endpoint_base.method} #{endpoint_base.path} ?#{@params}"
           serve endpoint, id
         end
       else
         send(endpoint_base.method, endpoint_base.path) do
           endpoint = endpoints.sample
+          @params = params
+          puts "#{endpoint_base.method} #{endpoint_base.path} ?#{@params}" unless ENV['ignore_path'] && ("/#{ENV['ignore_path']}" == endpoint_base.path)
           serve endpoint
         end
       end

data/lib/file_sv/yaml_processor.rb

@@ -6,8 +6,8 @@ class YamlProcessor
     # Process YAML file
     def process(filename)
       if filename == "/file_sv.yaml"
-        puts "Overriding default config based on #{File.join(Dir.pwd, filename[1..-1])}"
-        load_default_config filename[1..-1]
+        puts "Overriding default config based on #{File.join(Dir.pwd, filename[1..])}"
+        load_default_config filename[1..]
       else
         puts "Skipping #{filename}"
       end

data/lib/file_sv.rb

@@ -52,7 +52,7 @@ end
 # Set global params based on ENV vars
 def set_based_on_env_vars
   GlobalSettings.instance_variables.each do |setting|
-    setting_name = setting.to_s[1..-1]
+    setting_name = setting.to_s[1..]
     if ENV[setting_name]
       puts "Setting #{setting_name} to #{ENV[setting_name]}"
       GlobalSettings.send("#{setting_name}=", ENV[setting_name])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_sv
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webrick
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
 description: |-
   Create a virtual REST service through file structure. Customize it more
   through ERB and special file names