webspicy 0.20.24 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 358d398af31550346d16e0b0aea1fbdbbdb6d9b6097adc0f53642faf73605447
-  data.tar.gz: 73bbb61d76edb81151a2d201b51a8e509d79728145a524f04a33bb80696ced46
+  metadata.gz: f4ed553ffebc5521719b8ae05848942894671b9fc5599af596697bb774d3503d
+  data.tar.gz: 40c18bb7c4f4e6549a81d9cff8f671d5dc239bca5bf44a7f205c08cde901af09
 SHA512:
-  metadata.gz: 641ccd34d62b106ac983ed192fb54f313dfd03a1a068a95018e84fdb840a0e54dfa3d410617a2fb357519eebd344e3f179e7cdac0cc7ae61b43b51a770f32284
-  data.tar.gz: f9ed1ae27dbaae00369437622f04610391225ce39c19636e430cb5e10f1606a52b50582aa01a83a611aee61aab673a4eb67f94d340f21906924409020713f886
+  metadata.gz: 0f5ca666ad6d74f5a070671bf7ec97e9f40922322b24fdbfb20767afe08b2bbd31db7801b2c5d580d6e9a5adcbc44040a5431f23943941a9828c9cea04c40b4b
+  data.tar.gz: cbf46a595dc6365e65b38442097f617c5f845a7daea54c18aeac2a374dec46949061b5a534577a57ba68ea19bfe627abae2e6f2b9b0fa59f1ffa35ac5494316d

data/README.md

@@ -1,4 +1,4 @@
-[![Test](https://github.com/enspirit/webspicy/actions/workflows/integration.yml/badge.svg?branch=master)](https://github.com/enspirit/webspicy/actions/workflows/integration.yml)
+[![Test](https://github.com/enspirit/webspicy/actions/workflows/integration.yml/badge.svg)](https://github.com/enspirit/webspicy/actions/workflows/integration.yml/badge.svg)
 # Webspicy
 
 A specification and test framework for web services seen as black-box software

data/bin/webspicy

@@ -21,6 +21,7 @@
 #/ - TAG=...                      execute only tests matching the given tag
 #/ - FAILFAST=yes|no              stop executing tests on first failure
 #/ - INSECURE=yes|no              allow insecure server connections when using SSL
+#/ - WATCH=FOLDER,FOLDER,...      run in watch mode (run tests when files change)
 #/
 require 'webspicy'
 require 'webspicy/tester'
@@ -42,6 +43,9 @@ ARGV.options do |opts|
   opts.on('-k', '--insecure') {
     ENV['INSECURE'] = 'yes'
   }
+  opts.on('-w', '--watch') {
+    ENV['WATCH'] = '.'
+  }
   opts.on("--debug") {
     ENV['LOG_LEVEL'] = 'DEBUG'
     Webspicy::LOGGER.level = Logger.const_get(ENV['LOG_LEVEL'])

data/lib/webspicy/configuration.rb

@@ -43,6 +43,7 @@ module Webspicy
       @scope_factory = ->(config){ Scope.new(config) }
       @client = Web::HttpClient
       @reporter = default_reporter
+      @watch_list = default_watchlist
       Path.require_tree(@folder/'support') if (@folder/'support').exists?
       @world = Support::World.new(folder/'world', self)
       yield(self) if block_given?
@@ -451,6 +452,13 @@ module Webspicy
     end
     attr_accessor :reporter
 
+    def default_watchlist
+      return nil unless list = ENV['WATCH']
+
+      list.split(',').map{|x| Path.pwd/x }
+    end
+    attr_accessor :watch_list
+
     # Returns the Data system to use for parsing schemas
     #
     # The data system associated with a configuration is build when the

data/lib/webspicy/tester/file_checker.rb

@@ -10,7 +10,7 @@ module Webspicy
         @reporter << Reporter::SuccessOrNot.new
       end
 
-      def run_scope
+      def run_scope(all = true)
         scope.each_specification_file do |spec_file|
           @specification = load_specification(spec_file)
           reporter.spec_file_done

data/lib/webspicy/tester/reporter/exceptions.rb

@@ -6,8 +6,7 @@ module Webspicy
 
         def initialize(*args, &bl)
           super
-          @spec_file_errors = []
-          @failed_results = []
+          clear
         end
         attr_reader :failed_results, :spec_file_errors
 
@@ -24,6 +23,11 @@ module Webspicy
           report_failed_results
         end
 
+        def clear
+          @spec_file_errors = []
+          @failed_results = []
+        end
+
       private
 
         def report_spec_file_errors

data/lib/webspicy/tester/reporter/file_summary.rb

@@ -5,8 +5,7 @@ module Webspicy
 
         def initialize(*args, &bl)
           super
-          @spec_files_count = 0
-          @errors_count = 0
+          clear
         end
         attr_reader :spec_files_count, :errors_count
 
@@ -31,6 +30,11 @@ module Webspicy
           io.flush
         end
 
+        def clear
+          @spec_files_count = 0
+          @errors_count = 0
+        end
+
       private
 
         def success?

data/lib/webspicy/tester/reporter/summary.rb

@@ -5,14 +5,7 @@ module Webspicy
 
         def initialize(*args, &bl)
           super
-          @spec_files_count = 0
-          @examples_count = 0
-          @counterexamples_count = 0
-          @assertions_count = 0
-          #
-          @spec_file_errors_count = 0
-          @errors_count = 0
-          @failures_count = 0
+          clear
         end
         attr_reader :spec_files_count, :examples_count, :counterexamples_count
         attr_reader :assertions_count
@@ -54,6 +47,17 @@ module Webspicy
           io.flush
         end
 
+        def clear
+          @spec_files_count = 0
+          @examples_count = 0
+          @counterexamples_count = 0
+          @assertions_count = 0
+          #
+          @spec_file_errors_count = 0
+          @errors_count = 0
+          @failures_count = 0
+        end
+
         def total_error_count
           @spec_file_errors_count + @errors_count + @failures_count
         end

data/lib/webspicy/tester/reporter.rb

@@ -58,7 +58,8 @@ module Webspicy
         :after_each_done,
         :after_all,
         :after_all_done,
-        :report
+        :report,
+        :clear
       ]
 
       HOOKS.each do |meth|

data/lib/webspicy/tester.rb

@@ -32,9 +32,23 @@ module Webspicy
     end
 
     def call
+      res = call_once(true)
+      if folders = config.watch_list
+        require 'listen'
+        listener = Listen.to(*folders) do
+          reporter.clear
+          res = call_once(false)
+        end
+        listener.start
+        sleep
+      end
+      res
+    end
+
+    def call_once(all = true)
       reporter.init(self)
       begin
-        run_config
+        run_config(all)
       rescue FailFast
       end
       reporter.report
@@ -64,19 +78,21 @@ module Webspicy
 
   protected
 
-    def run_config
+    def run_config(all = true)
       config.each_scope do |scope|
         @scope = scope
         @hooks = Support::Hooks.for(scope.config)
         @client = scope.get_client
-        run_scope
+        run_scope(all)
       end
     end
 
-    def run_scope
-      reporter.before_all
-      hooks.fire_before_all(self)
-      reporter.before_all_done
+    def run_scope(all = true)
+      if all
+        reporter.before_all
+        hooks.fire_before_all(self)
+        reporter.before_all_done
+      end
       reporter.before_scope
       scope.each_specification_file do |spec_file|
         @specification = load_specification(spec_file)
@@ -90,9 +106,11 @@ module Webspicy
         end
       end
       reporter.scope_done
-      reporter.after_all
-      hooks.fire_after_all(self)
-      reporter.after_all_done
+      if all
+        reporter.after_all
+        hooks.fire_after_all(self)
+        reporter.after_all_done
+      end
     end
 
     def load_specification(spec_file)

data/lib/webspicy/version.rb

@@ -1,8 +1,8 @@
 module Webspicy
   module Version
     MAJOR = 0
-    MINOR = 20
-    TINY  = 24
+    MINOR = 21
+    TINY  = 2
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/lib/webspicy/web/client/http_client.rb

@@ -55,8 +55,8 @@ module Webspicy
         def options(url, params = {}, headers = nil, body = nil)
           info_request("OPTIONS", url, params, headers, body)
 
-          params = querystring_params(params)
-          http_opts = http_options(params: params)
+          url = url + "?" + Rack::Utils.build_query(params) if !params.empty?
+          http_opts = http_options
           @last_response = HTTP[headers || {}].options(url, http_opts)
 
           debug_response(@last_response)
@@ -67,8 +67,8 @@ module Webspicy
         def get(url, params = {}, headers = nil, body = nil)
           info_request("GET", url, params, headers, body)
 
-          params = querystring_params(params)
-          http_opts = http_options(params: params)
+          url = url + "?" + Rack::Utils.build_query(params) if !params.empty?
+          http_opts = http_options
           @last_response = HTTP[headers || {}].get(url, http_opts)
 
           debug_response(@last_response)
@@ -111,6 +111,7 @@ module Webspicy
         def patch(url, params = {}, headers = nil, body = nil)
           info_request("PATCH", url, params, headers, body)
 
+          url = url + "?" + Rack::Utils.build_query(params) if body && !params.empty?
           headers ||= {}
           headers['Content-Type'] ||= 'application/json'
           http_opts = http_options(body: params.to_json)
@@ -124,6 +125,7 @@ module Webspicy
         def put(url, params = {}, headers = nil, body = nil)
           info_request("PUT", url, params, headers, body)
 
+          url = url + "?" + Rack::Utils.build_query(params) if body && !params.empty?
           headers ||= {}
           headers['Content-Type'] ||= 'application/json'
           http_opts = http_options(body: params.to_json)
@@ -137,6 +139,7 @@ module Webspicy
         def post_form(url, params = {}, headers = nil, body = nil)
           info_request("POST", url, params, headers, body)
 
+          url = url + "?" + Rack::Utils.build_query(params) if body && !params.empty?
           http_opts = http_options(form: params)
           @last_response = HTTP[headers || {}].post(url, http_opts)
 
@@ -148,6 +151,7 @@ module Webspicy
         def delete(url, params = {}, headers = nil, body = nil)
           info_request("DELETE", url, params, headers, body)
 
+          url = url + "?" + Rack::Utils.build_query(params) if body && !params.empty?
           http_opts = http_options(body: params.to_json)
           @last_response = HTTP[headers || {}].delete(url, http_opts)
 
@@ -156,7 +160,7 @@ module Webspicy
           @last_response
         end
 
-        def http_options(extra)
+        def http_options(extra = {})
           if config.insecure
             ctx = OpenSSL::SSL::SSLContext.new
             ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE

data/lib/webspicy/web/specification/file_upload.rb

@@ -18,7 +18,8 @@ module Webspicy
         def locate(specification)
           FileUpload.new({
             path: specification.locate(path),
-            content_type: content_type
+            content_type: content_type,
+            param_name: param_name
           })
         end
 

data/spec/unit/test_configuration.rb

@@ -184,6 +184,35 @@ module Webspicy
       end
     end
 
+    describe 'watch_list' do
+
+      it 'is nil by default' do
+        config = Configuration.new
+        expect(config.watch_list).to be_nil
+      end
+
+      it 'supports a single relative folder on WATCH env variable' do
+        ENV['WATCH'] = 'a_folder'
+        config = Configuration.new
+        expect(config.watch_list).to eql([Path.pwd/"a_folder"])
+        ENV.delete('WATCH')
+      end
+
+      it 'supports a commalist on WATCH env variable' do
+        ENV['WATCH'] = 'a_folder,another'
+        config = Configuration.new
+        expect(config.watch_list).to eql([Path.pwd/"a_folder", Path.pwd/'another'])
+        ENV.delete('WATCH')
+      end
+
+      it 'supports absolute folders too' do
+        ENV['WATCH'] = 'a_folder,/tmp'
+        config = Configuration.new
+        expect(config.watch_list).to eql([Path.pwd/"a_folder", Path('/tmp')])
+        ENV.delete('WATCH')
+      end
+    end
+
     describe 'insecure' do
 
       it 'is false by default' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.20.24
+  version: 0.21.2
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -246,6 +246,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 description: Webspicy helps testing web services as software operation black boxes
 email: blambeau@gmail.com
 executables:
@@ -394,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Webspicy helps testing web services as software operation black boxes!