nsrr 0.4.0 → 5.0.0.rc

data/lib/nsrr/models/file.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'digest/md5'
-require 'nsrr/helpers/constants'
-require 'nsrr/helpers/download_request'
+require "digest/md5"
+require "nsrr/helpers/color"
+require "nsrr/helpers/constants"
+require "nsrr/helpers/download_request"
 
 module Nsrr
   module Models
@@ -11,25 +12,25 @@ module Nsrr
       attr_reader :dataset_slug, :full_path, :folder, :file_name, :is_file, :file_size, :file_checksum_md5, :archived
 
       def initialize(json = {})
-        @dataset_slug = json['dataset']
-        @full_path = json['full_path']
-        @folder = json['folder']
-        @file_name = json['file_name']
-        @is_file = json['is_file']
-        @file_size = json['file_size']
-        @file_checksum_md5 = json['file_checksum_md5']
-        @archived = json['archived']
-        @latest_checksum = ''
+        @dataset_slug = json["dataset"]
+        @full_path = json["full_path"]
+        @folder = json["folder"]
+        @file_name = json["file_name"]
+        @is_file = json["is_file"]
+        @file_size = json["file_size"]
+        @file_checksum_md5 = json["file_checksum_md5"]
+        @archived = json["archived"]
+        @latest_checksum = ""
         @latest_file_size = -1
       end
 
       # method:
-      #   'md5'       => [default] Checks if a downloaded file exists with the exact md5 as the online version, if so, skips that file
-      #   'fresh'     => Downloads every file without checking if it was already downloaded
-      #   'fast'      => Only checks if a download file exists with the same file size as the online version, if so, skips that file
+      #   "md5"       => [default] Checks if a downloaded file exists with the exact md5 as the online version, if so, skips that file
+      #   "fresh"     => Downloads every file without checking if it was already downloaded
+      #   "fast"      => Only checks if a download file exists with the same file size as the online version, if so, skips that file
       def download(method, path, token)
-        do_md5_check = (method == 'md5')
-        redownload_all = (method == 'fresh')
+        do_md5_check = (method == "md5")
+        redownload_all = (method == "fresh")
 
         if do_md5_check
           if md5_matches?(path)
@@ -55,14 +56,14 @@ module Nsrr
       # If the second download and check fail, the file is marked as failed, and the downloader continues to the subsequent file.
       def force_download(path, token, method)
         download_folder = ::File.join(Dir.pwd, path.to_s, @file_name.to_s)
-        auth_section = (token.to_s == '' ? '' : "/a/#{token}")
-        download_url = "#{Nsrr::WEBSITE}/datasets/#{@dataset_slug}/files#{auth_section}/m/nsrr-gem-v#{Nsrr::VERSION::STRING.gsub('.', '-')}/#{@full_path.to_s}"
+        auth_section = (token.to_s == "" ? "" : "/a/#{token}")
+        download_url = "#{Nsrr::WEBSITE}/datasets/#{@dataset_slug}/files#{auth_section}/m/nsrr-gem-v#{Nsrr::VERSION::STRING.gsub(".", "-")}/#{@full_path.to_s}"
         download_request = Nsrr::Helpers::DownloadRequest.new(download_url, download_folder)
         download_request.get
         download_success = false
-        if download_request.error.to_s == ''
+        if download_request.error.to_s == ""
           # Check to see if the file downloaded correctly
-          # If the file size doesn't match, attempt one additional download
+          # If the file size does not match, attempt one additional download
           download_success = did_download_succeed?(method, path)
           unless download_success
             download_request = Nsrr::Helpers::DownloadRequest.new(download_url, download_folder)
@@ -70,12 +71,12 @@ module Nsrr
             download_success = did_download_succeed?(method, path)
           end
         end
-        if download_request.error.to_s == '' and download_success
-          puts "  downloaded".colorize(:green) + " #{@file_name}"
+        if download_request.error.to_s == "" and download_success
+          puts "  downloaded".green + " #{@file_name}"
           download_request.file_size
-        elsif download_request.error.to_s == ''
-          puts "      failed".colorize(:red) + " #{@file_name}"
-          if method == 'fast'
+        elsif download_request.error.to_s == ""
+          puts "      failed".red + " #{@file_name}"
+          if method == "fast"
             puts "             File size mismatch, expected: #{@file_size}"
             puts "                                   actual: #{@latest_file_size}"
           else
@@ -83,17 +84,17 @@ module Nsrr
             puts "                                       actual: #{@latest_checksum}"
           end
           ::File.delete(download_folder) if ::File.exist?(download_folder)
-          'fail'
+          "fail"
         else
-          puts '      failed'.colorize(:red) + " #{@file_name}"
+          puts "      failed".red + " #{@file_name}"
           puts "             #{download_request.error}"
-          'fail'
+          "fail"
         end
       end
 
       def skip
-        puts '   identical'.colorize(:light_blue) + " #{file_name}"
-        'skip'
+        puts "   identical".blue + " #{file_name}"
+        "skip"
       end
 
       def md5_matches?(path)
@@ -105,7 +106,7 @@ module Nsrr
         @latest_checksum = if ::File.exist?(download_folder)
                              Digest::MD5.file(download_folder).hexdigest
                            else
-                             ''
+                             ""
                            end
         @latest_checksum
       end
@@ -125,7 +126,7 @@ module Nsrr
       end
 
       def did_download_succeed?(method, path)
-        if method == 'fast'
+        if method == "fast"
           file_size_matches?(path)
         else
           md5_matches?(path)

data/lib/nsrr/version.rb

@@ -2,11 +2,11 @@
 
 module Nsrr
   module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 4
+    MAJOR = 5
+    MINOR = 0
     TINY = 0
-    BUILD = nil # 'pre', 'beta1', 'beta2', 'rc', 'rc2', nil
+    BUILD = "rc" # "pre", "beta1", "beta2", "rc", "rc2", nil
 
-    STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, BUILD].compact.join(".")
   end
 end

data/nsrr.gemspec

@@ -8,27 +8,30 @@
 # gem list -r nsrr
 # gem install nsrr
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'nsrr/version'
+require "nsrr/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'nsrr'
+  spec.name          = "nsrr"
   spec.version       = Nsrr::VERSION::STRING
-  spec.authors       = ['Remo Mueller']
-  spec.email         = ['remosm@gmail.com']
-  spec.summary       = 'Download files easily from the NSRR website, https://sleepdata.org'
-  spec.description   = 'The official ruby gem to download files and datasets from the [NSRR](https://sleepdata.org)'
-  spec.homepage      = 'https://github.com/nsrr/nsrr-gem'
-  spec.license       = 'CC-BY-NC-SA-3.0'
+  spec.authors       = ["Remo Mueller"]
+  spec.email         = ["remosm@gmail.com"]
+  spec.summary       = "Download files easily from the NSRR website, https://sleepdata.org"
+  spec.description   = "The official ruby gem to download files and datasets from the [NSRR](https://sleepdata.org)"
+  spec.homepage      = "https://github.com/nsrr/nsrr-gem"
 
-  spec.files         = Dir['{bin,lib}/**/*'] + ['CHANGELOG.md', 'LICENSE', 'Rakefile', 'README.md', 'nsrr.gemspec']
+  spec.required_ruby_version = ">= 2.4.6"
+  spec.required_rubygems_version = ">= 2.6.3"
+
+  spec.license       = "MIT"
+
+  spec.files         = Dir["{bin,lib}/**/*"] + ["CHANGELOG.md", "LICENSE", "Rakefile", "README.md", "nsrr.gemspec"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test)/})
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'bundler', '~> 1.13'
-  spec.add_dependency 'colorize', '~> 0.8.1'
-  spec.add_dependency 'minitest'
-  spec.add_dependency 'rake'
+  spec.add_dependency "bundler", ">= 1.3.0"
+  spec.add_dependency "minitest"
+  spec.add_dependency "rake"
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nsrr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 5.0.0.rc
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +70,7 @@ files:
 - lib/nsrr/commands/download.rb
 - lib/nsrr/commands/update.rb
 - lib/nsrr/helpers/authorization.rb
+- lib/nsrr/helpers/color.rb
 - lib/nsrr/helpers/constants.rb
 - lib/nsrr/helpers/download_request.rb
 - lib/nsrr/helpers/hash_helper.rb
@@ -95,7 +82,7 @@ files:
 - nsrr.gemspec
 homepage: https://github.com/nsrr/nsrr-gem
 licenses:
-- CC-BY-NC-SA-3.0
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -105,15 +92,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.3
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Download files easily from the NSRR website, https://sleepdata.org