kanrisuru 0.16.16 → 0.16.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c72c91f337408d0a7dee545cabeb07ba9fac668baf8d3c3dbb65d0e04a27e347
-  data.tar.gz: 28d8387d8081783dfd32031c202ffc5ec66e4a7fea3306e8cb35d117f2193c10
+  metadata.gz: e31b687d1a4fbd77c62a502ffe4e3ec6e7c314c9e8335fc1964e8fcaca75f554
+  data.tar.gz: e36de3bb37966123d08c25aa6023be77f932705e49d005590f63a45d6a8c2d1b
 SHA512:
-  metadata.gz: 8a0d66db59619c3cb9e69567ef0ed08e564c53ca3171dccc7acd31410288dfa06ebfc5a5daa2ff09aa14cbbacf433175352928b8a6e837f2ba43217de5fb70ac
-  data.tar.gz: 8bfc4a39d3bb5ab4c9f180dd4e5682057a7c1fe5c5bd93e25a6d88280a6e12c79831e0c5d9cb05b2b3211b91e3c6161d585fcc20c2d851da100037393dd17752
+  metadata.gz: fb5549794cf62990bd0026c315b5c9828884b814f28ea82a7e04f944d12d2d52a77131d72b64e1d2c3d9d9c525f3bd468d020d69f0539304818f78b8b070b5ef
+  data.tar.gz: dd58f2d707f62615d4a7cc997dea5f27ca0a1678e6d60478f5548c4953685b469f61f8928c879b4965a56c51de4ec8ddb722980bd14cb9f1793355b001f60678

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Kanrisuru 0.16.17 (January 10, 2022) ##
+*  Add additional options to `wget` command.
+*  Rename some options to better reflect options from wget program.
+
 ## Kanrisuru 0.16.16 (January 08, 2022) ##
 *  Fix issue with `download` command when downloading directories from remote server.
 

data/lib/kanrisuru/core/transfer/commands/wget.rb

@@ -105,7 +105,12 @@ module Kanrisuru
         end
 
         command.append_arg('--post-file', opts[:post_file])
+        command.append_arg('--method', opts[:method])
+
         command.append_flag('--content-disposition', opts[:content_disposition])
+        command.append_flag('--content-on-error', opts[:content_on_error])
+        command.append_flag('--trust-server-names', opts[:trust_server_names])
+        command.append_flag('--retry-on-host-error', opts[:retry_on_host_error])
 
         ## SSL / TLS
         if Kanrisuru::Util.present?(opts[:secure_protocol])
@@ -123,18 +128,24 @@ module Kanrisuru
         command.append_arg('--ca-directory', opts[:ca_directory])
         command.append_arg('--random-file', opts[:random_file])
         command.append_arg('--egd-file', opts[:egd_file])
+        command.append_flag('--https-only', opts[:https_only])
 
-        ## FTP
+        ## FTP / FTPS
         command.append_arg('--ftp-user', opts[:ftp_user])
         command.append_arg('--ftp-password', opts[:ftp_password])
         command.append_flag('--no-remove-listing', opts[:no_remove_listing])
         command.append_flag('--no-glob', opts[:no_glob])
         command.append_flag('--no-passive-ftp', opts[:no_passive_ftp])
         command.append_flag('--retr-symlinks', opts[:retr_symlinks])
+        command.append_flag('--preserve-permissions', opts[:preserve_permissions])
+        command.append_flag('--ftps-implicit', opts[:ftps_implicit])
+        command.append_flag('--no-ftps-resume-ssl', opts[:no_ftps_resume_ssl])
+        command.append_flag('--ftps-clear-data-connection', opts[:ftps_clear_data_connection])
+        command.append_flag('--ftps-fallback-to-ftp', opts[:ftps_fallback_to_ftp])
 
         ## Recursive Retrieval
         command.append_flag('--recursive', opts[:recursive])
-        command.append_arg('--level', opts[:depth])
+        command.append_arg('--level', opts[:level])
         command.append_flag('--delete-after', opts[:delete_after])
         command.append_flag('--convert-links', opts[:convert_links])
         command.append_flag('--backup-converted', opts[:backup_converted])
@@ -143,10 +154,13 @@ module Kanrisuru
         command.append_flag('--strict-comments', opts[:strict_comments])
 
         ## Recursive Accept/Reject
-        command.append_arg('--accept', Kanrisuru::Util.array_join_string(opts[:accept_list]))
-        command.append_arg('--reject', Kanrisuru::Util.array_join_string(opts[:reject_list]))
-        command.append_arg('--domains', Kanrisuru::Util.array_join_string(opts[:domain_list]))
-        command.append_arg('--exclude-domains', Kanrisuru::Util.array_join_string(opts[:exclude_domain_list]))
+        command.append_arg('--accept', Kanrisuru::Util.array_join_string(opts[:accept]))
+        command.append_arg('--reject', Kanrisuru::Util.array_join_string(opts[:reject]))
+        command.append_arg('--accept-regex', opts[:accept_regex])
+        command.append_arg('--reject-regex', opts[:reject_regex])
+        command.append_arg('--regex_type', opts[:regex_type])
+        command.append_arg('--domains', Kanrisuru::Util.array_join_string(opts[:domains]))
+        command.append_arg('--exclude-domains', Kanrisuru::Util.array_join_string(opts[:exclude_domains]))
         command.append_arg('--follow-tags', Kanrisuru::Util.array_join_string(opts[:follow_tags]))
         command.append_arg('--ignore-tags', Kanrisuru::Util.array_join_string(opts[:ignore_tags]))
         command.append_arg('--include-directories', Kanrisuru::Util.array_join_string(opts[:include_directories]))

data/lib/kanrisuru/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanrisuru
-  VERSION = '0.16.16'
+  VERSION = '0.16.17'
 end

data/spec/functional/core/transfer_spec.rb

@@ -97,8 +97,11 @@ RSpec.describe Kanrisuru::Core::Stat do
                              },
                              content_disposition: true,
                              secure_protocol: 'SSLv3',
+                             content_on_error: true,
+                             trust_server_names: true,
+                             retry_on_host_error: true,
                              no_check_certificate: true),
-                   "wget --post-data url=https%3A%2F%2Fexample.com%3Fparam%3D123 --content-disposition --secure-protocol SSLv3 --no-check-certificate #{url}")
+                   "wget --post-data url=https%3A%2F%2Fexample.com%3Fparam%3D123 --content-disposition --content-on-error --trust-server-names --retry-on-host-error --secure-protocol SSLv3 --no-check-certificate #{url}")
 
     expect do
       host.wget(url, secure_protocol: 'SSL')
@@ -115,27 +118,37 @@ RSpec.describe Kanrisuru::Core::Stat do
 
     expect_command(host.wget(url,
                              certificate: '~/cert.pem',
+                             https_only: true,
                              certificate_type: 'PEM',
                              private_key: '~/key.pem',
                              private_key_type: 'PEM',
                              ca_certificate: '~/ca.pem',
                              random_file: '~/random'),
-                   "wget --certificate ~/cert.pem --certificate-type PEM --private-key ~/key.pem --private-key-type PEM --ca-certificate ~/ca.pem --random-file ~/random #{url}")
+                   "wget --certificate ~/cert.pem --certificate-type PEM --private-key ~/key.pem --private-key-type PEM --ca-certificate ~/ca.pem --random-file ~/random --https-only #{url}")
 
     ## FTP
-    expect_command(host.wget(url,
+    expect_command(host.wget("ftp.example.com",
                              ftp_user: 'admin',
                              ftp_password: '12345678',
                              no_remove_listing: true,
                              no_glob: true,
                              no_passive_ftp: true,
-                             retr_symlinks: true),
-                   "wget --ftp-user admin --ftp-password 12345678 --no-remove-listing --no-glob --no-passive-ftp --retr-symlinks #{url}")
+                             retr_symlinks: true,
+                             preserve_permissions: true),
+                   "wget --ftp-user admin --ftp-password 12345678 --no-remove-listing --no-glob --no-passive-ftp --retr-symlinks --preserve-permissions ftp.example.com")
+
+    expect_command(host.wget("ftps.example.com",
+                             ftp_user: 'admin',
+                             ftp_password: '12345678',
+                             ftps_implicit: true,
+                             no_ftps_resume_ssl: true,
+                             ftps_fallback_to_ftp: true,
+                             ftps_clear_data_connection: true), "wget --ftp-user admin --ftp-password 12345678 --ftps-implicit --no-ftps-resume-ssl --ftps-clear-data-connection --ftps-fallback-to-ftp ftps.example.com")
 
     ## Recursive Retrieval
     expect_command(host.wget(url,
                              recursive: true,
-                             depth: 10,
+                             level: 10,
                              delete_after: true,
                              convert_links: true,
                              backup_converted: true,
@@ -146,10 +159,13 @@ RSpec.describe Kanrisuru::Core::Stat do
 
     ## Recursive Accept/Reject
     expect_command(host.wget(url,
-                             accept_list: ['.txt', '.html'],
-                             reject_list: ['.csv'],
-                             domain_list: ['example.com'],
-                             exclude_domain_list: ['hackernews.com'],
+                             accept: ['.txt', '.html'],
+                             reject: ['.csv'],
+                             accept_regex: 'https://*',
+                             regect_regex: 'ftp*',
+                             regex_type: 'posix',
+                             domains: ['example.com'],
+                             exclude_domains: ['hackernews.com'],
                              follow_tags: %w[a div span],
                              ignore_tags: %w[area link],
                              include_directories: ['/gems'],
@@ -159,6 +175,6 @@ RSpec.describe Kanrisuru::Core::Stat do
                              span_hosts: true,
                              relative: true,
                              no_parent: true),
-                   "wget --accept .txt,.html --reject .csv --domains example.com --exclude-domains hackernews.com --follow-tags a,div,span --ignore-tags area,link --include-directories /gems --exclude-directories /releases --follow-ftp --ignore-case --span-hosts --relative --no-parent #{url}")
+                   "wget --accept .txt,.html --reject .csv --accept-regex https://* --regex_type posix --domains example.com --exclude-domains hackernews.com --follow-tags a,div,span --ignore-tags area,link --include-directories /gems --exclude-directories /releases --follow-ftp --ignore-case --span-hosts --relative --no-parent #{url}")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanrisuru
 version: !ruby/object:Gem::Version
-  version: 0.16.16
+  version: 0.16.17
 platform: ruby
 authors:
 - Ryan Mammina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests