nsrr 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e34599bcac4f2fea33a2528d51aa4144cd68dcc2dfafa406d3916f158c7be5f
-  data.tar.gz: 5863f09d1c7e513af9c5443e8f53ee31119eb44fbd80abb0f1bdfd7bcb90d8ea
+  metadata.gz: b433dcda839233f397d05a81a4ce0c49adde566947eb34c96c29c543553528fa
+  data.tar.gz: a40cc44ea9962d07fe5f9a80a2811ccf19b94bd26419021b71c1363dac365c92
 SHA512:
-  metadata.gz: 46522e99a17f25b030f0b51cce2eb12010f9f25f23fad7847891f3e5b46578d67d4ff4fbdc356e54259b198ca5fc2ddf12369700037b8a48e8642b28687122b5
-  data.tar.gz: 729d9f04bfd27c5c3519a81c9891df279d41074f97b2310d062c628e834db87ba15f57889d9a6a4194c8a4523bc745b4897e28731f9451eb90ead00a92a3cafc
+  metadata.gz: 5f7612061deeb3b32302a93bf4635c885e180635069c79856c0fa4603b115ba5d890b1d0f45774a0bfe65b24b4da1ee219208674b02f3df73e32ab022d472fc4
+  data.tar.gz: 6c98712083ec799a08f4fc32b1f07a1f8760f3d5046da7f96575e579d6f8fa8e4b38964f0ea8d003e0619b074d85aa86de81065df1ac0554450868b388322eb8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 7.0.0 (April 18, 2021)
+
+### Enhancements
+- **General Changes**
+  - Added `--file` option to specify a regular expression to match a file name,
+    (by @k0kubun)
+
 ## 6.0.0 (January 16, 2021)
 
 ### Enhancements

data/README.md

@@ -7,7 +7,7 @@ The official ruby gem built to simplify file downloads and dataset integration t
 
 ## Prerequisites
 
-You must have **Ruby 2.4+ installed** on your system to use the NSRR gem.
+You must have **Ruby 2.7+ installed** on your system to use the NSRR gem.
 
 - [Install Ruby on Windows](https://github.com/remomueller/documentation/blob/master/windows/130-ruby.md)
 - [Install Ruby on Mac](https://github.com/remomueller/documentation/blob/master/macos/130-install-rvm.md)
@@ -65,6 +65,26 @@ You can combine the file check flag with the folder depth flag as well.
 nsrr download shhs/datasets --shallow --fast
 ```
 
+You can specify a regular expression to filter files that are downloaded.
+
+```console
+nsrr download nchsdb/health_data --file="^PROCEDURE.*\.csv$"
+```
+
+```console
+      create nchsdb/health_data/
+     skipped DEMOGRAPHIC.csv
+     skipped DIAGNOSIS.csv
+     skipped ENCOUNTER.csv
+     skipped MEASUREMENT.csv
+     skipped MEDICATION.csv
+  downloaded PROCEDURE.csv
+  downloaded PROCEDURE_SURG_HX.csv
+     skipped SLEEP_ENC_ID.csv
+     skipped SLEEP_STUDY.csv
+     skipped Sleep_Study_Data_File_Format.pdf
+```
+
 ### Open the console and download entire datasets
 
 ```console

data/lib/nsrr/commands/download.rb

@@ -21,6 +21,7 @@ module Nsrr
         (@token, argv) = parse_parameter_with_value(argv, ["token"], "")
         (@file_comparison, argv) = parse_parameter(argv, ["fast", "fresh", "md5"], "md5")
         (@depth, argv) = parse_parameter(argv, ["shallow", "recursive"], "recursive")
+        (@file, argv) = parse_parameter_with_value(argv, ["file"], "")
         @dataset_slug = argv[1].to_s.split("/").first
         @full_path = (argv[1].to_s.split("/")[1..-1] || []).join("/")
       end
@@ -35,7 +36,7 @@ module Nsrr
           @token = Nsrr::Helpers::Authorization.get_token(@token) if @token.to_s == ""
           @dataset = Dataset.find(@dataset_slug, @token)
           if @dataset
-            @dataset.download(@full_path, depth: @depth, method: @file_comparison)
+            @dataset.download(@full_path, depth: @depth, method: @file_comparison, file: Regexp.new(@file))
           else
             puts "\nThe dataset " + @dataset_slug.white + " was not found."
             datasets = all_datasets
@@ -80,7 +81,7 @@ module Nsrr
         result = default
         options.each do |option|
           argv.each do |arg|
-            result = arg.gsub(/^--#{option}=/, "") if arg =~ /^--#{option}=\w/
+            result = arg.gsub(/^--#{option}=/, "") if arg =~ /^--#{option}=[^\s]/
           end
         end
         [result, argv]

data/lib/nsrr/models/dataset.rb

@@ -69,6 +69,7 @@ module Nsrr
 
         begin
           puts "           File Check: " + options[:method].to_s.white
+          puts "           File Regex: " + options[:file].inspect.white
           puts "                Depth: " + options[:depth].to_s.white
           puts ""
           if @download_token.nil?
@@ -100,6 +101,12 @@ module Nsrr
         create_folder_for_path(full_path)
 
         files(full_path).select(&:is_file).each do |file|
+          unless file.file_name.match?(options[:file])
+            puts "     skipped".blue + " #{file.file_name}"
+            @files_skipped += 1
+            next
+          end
+
           current_folder = ::File.join(slug.to_s, file.folder.to_s)
           result = file.download(options[:method], current_folder, @download_token)
           case result

data/lib/nsrr/version.rb

@@ -2,7 +2,7 @@
 
 module Nsrr
   module VERSION #:nodoc:
-    MAJOR = 6
+    MAJOR = 7
     MINOR = 0
     TINY = 0
     BUILD = nil # "pre", "beta1", "beta2", "rc", "rc2", nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nsrr
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Remo Mueller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.6.3
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: Download files easily from the NSRR website, https://sleepdata.org