ndr_pseudonymise 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdbd09c95ec2fa5a5fdb791a177654ae9c9cc520a1461c1df54cc5035c001c66
-  data.tar.gz: 3bb60274d7eed27d033bb7efca0262d48c0e8d322b6708eb0d6ddb37a9673a2a
+  metadata.gz: de8ff4d87384ab58d1e16263095f619dc03269d4342829fd47cfc2dff98d539d
+  data.tar.gz: 4186c0f859293592e4f78d3acbd000a3caad604c3e0129979f02aba3a036b55c
 SHA512:
-  metadata.gz: 7180d2bf8a99f0b5493e0204bf9f3dff7100f8663f1560b2b207a05fa235431674b60490093cbd6eeef5e350ad7460f470ad895d71d3506b71d73dd29e52ad3b
-  data.tar.gz: 3261dcbbd12a6770d7d03e76bb84aa6e327de4b0acaec762e0650e5d8ba4425f5780ef051e8ef2a7063d5327ba8e28b1539ad4587520d0484d239377916d1555
+  metadata.gz: 9ccfc71d5b259a5694bd96fb06e4014977e5d1287ff8f816bf46f59b12b40c83e1f31a327c4c37e8434d477df34c9b4f9391c769e294739ee6bc6d197ee503c3
+  data.tar.gz: f3b2aab13ee7ab67bb398d0c5c5966452afa9e42aa809b787ad668c84d6af1ad78cc45bff27adb342f31651f4f88cd60101341ce2275c2afe7ab39131835423a

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 * No unreleased changes
 
+## 0.4.2 / 2022-10-25
+## Changed
+* ndr_encrypt add recursively includes directory contents
+
 ## 0.4.1 / 2022-10-18
 ## Added
 # Add ndr_encrypt utility script for image encryption.

data/lib/ndr_pseudonymise/ndr_encrypt/repository.rb

@@ -1,5 +1,6 @@
 require 'csv'
 require 'fileutils'
+require 'find'
 require 'set'
 require 'stringio'
 
@@ -35,9 +36,16 @@ module NdrPseudonymise
         raise(ArgumentError, 'Invalid ndr_encrypted encrypted store') unless valid_repository?
 
         paths.each do |path|
-          git_blobid, _encrypted_id = hash_object(path,
-                                                  key_name: key_name, pub_key: pub_key, write: true)
-          File.open(index_filename, 'ab') { |f| f << [git_blobid, path].to_csv }
+          Find.find(path) do |fn|
+            next unless File.file?(fn)
+
+            real_encrypted_dir = File.realdirpath(File.join(@repo_dir, ENCRYPTED_DIR))
+            next if File.realdirpath(fn).start_with?(real_encrypted_dir)
+
+            git_blobid, _encrypted_id = hash_object(fn, key_name: key_name,
+                                                        pub_key: pub_key, write: true)
+            File.open(index_filename, 'ab') { |f| f << [git_blobid, fn].to_csv }
+          end
         end
       end
 

data/lib/ndr_pseudonymise/version.rb

@@ -1,3 +1,3 @@
 module NdrPseudonymise
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/ndr_pseudonymise.gemspec

@@ -27,10 +27,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'minitest', '>= 5.0'
   spec.add_development_dependency 'mocha'
-  spec.add_development_dependency 'ndr_dev_support', '>= 6.0'
+  spec.add_development_dependency 'ndr_dev_support', '>= 1.1'
   spec.add_development_dependency 'ndr_import'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '>= 12.3.3'
 
-  spec.required_ruby_version = '>= 2.6.0'
+  # Ruby 2.6.0 or later expected for normal operation, and needed for testing,
+  # but we support 2.0.0 for the ndr_encrypt utility
+  spec.required_ruby_version = '>= 2.0.0'
 end

data/script/ndr_encrypt/README.md

@@ -4,6 +4,21 @@
 retrieved safely. The files still need to be hosted securely, but public /
 private key encryption provides additional protection.
 
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'ndr_pseudonymise'
+```
+
+or for command line usage only, without installing any gems:
+
+``` shell
+$ git clone https://github.com/NHSDigital/ndr_pseudonymise.git
+$ ndr_pseudonymise/script/ndr_encrypt/ndr_encrypt --help
+```
+
 ## Overview
 
 We define a simple suite of tools, `ndr_encrypt`, to generate the encrypted
@@ -81,6 +96,8 @@ BASE64
 
 # Add the object to the repository
 ndr_encrypt add --key_name=ourkey1 --pub_key=ourkey1.pub test/dir/ok.gif
+# or add the directory contents recursively
+# ndr_encrypt add --key_name=ourkey1 --pub_key=ourkey1.pub test
 
 # Move aside the original file, to test recovery
 mv test/dir/ok.gif{,.orig}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_pseudonymise
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - NCRS development team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: ndr_import
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="