eyaml 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e589d4929a268cf0c2d783b52e67da11a5ddea2a471f826f5d440de02b39f56e
-  data.tar.gz: 1f94b57be40ec52893b62aea8f16ee0a81a997b69672852c3430553e2aa24f5f
+  metadata.gz: c4f178a1f6b7fb06fde94557868732ec3b13a6d90f5682f2505f29c7c3699dfe
+  data.tar.gz: 63434158bf5b56334cefbf3d73da83e357a39f02e17c7aaad2e63d0622ee70b5
 SHA512:
-  metadata.gz: 6a1ba5c9640edbe938325c02290405c102ba10f7a68f01c7701740944a208cf531abdc95b94f3ed730e9db90ebf89db848eedf6ad45eec7ddf6b39c362b4480f
-  data.tar.gz: 4e3490d63c5319fa6855a4257fe848663709ecc4e1d54105332f9b2a30352edf0a9221999f58a1a5ba61165721ef0d3627a5c166204a533ac55c6a6c4b6b29c1
+  metadata.gz: 945cb549642f915c0ecb60c2fc55709dced0e4805b7e3367657cb2daee7242995d8b09ab6fd0546e58334b557bd6bcb9ca03f8e13d3f1484c71d90ea0ba47b91
+  data.tar.gz: db020b6d97d9f8296d8ec8c51101d2db12deb04535c89bec2949a256a6fb2e0854a910e9e08b3b160f265878b68594040d41ace1263ad49477dcecdddf03baf2

data/.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    # Checks for workflow files stored in the default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+*.gem

data/Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "ffi", github: "cheddar-me/ffi", branch: "apple-m1", submodules: true
+gem "ffi", "~> 1.15.5"
 gem "rbnacl"
 
 gem "railties"

data/Gemfile.lock

@@ -1,75 +1,70 @@
-GIT
-  remote: https://github.com/cheddar-me/ffi.git
-  revision: 6d091e74c04c4bae9680c47595d58e879469790c
-  branch: apple-m1
-  submodules: true
-  specs:
-    ffi (1.15.0)
-
 PATH
   remote: .
   specs:
-    eyaml (0.1.0)
+    eyaml (0.2.0)
       rbnacl (~> 7.1)
       thor (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.3.1)
-      actionview (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.1)
+      actionview (= 7.0.1)
+      activesupport (= 7.0.1)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.3.1)
-      activesupport (= 6.1.3.1)
+    actionview (7.0.1)
+      activesupport (= 7.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.3.1)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     erubi (1.10.0)
-    fakefs (1.3.2)
-    i18n (1.8.10)
+    fakefs (1.4.0)
+    ffi (1.15.5)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    minitest (5.14.4)
-    nokogiri (1.11.2-arm64-darwin)
+    minitest (5.15.0)
+    nokogiri (1.13.0-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.0-x86_64-linux)
       racc (~> 1.4)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.3.1)
-      actionpack (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
+    railties (7.0.1)
+      actionpack (= 7.0.1)
+      activesupport (= 7.0.1)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rake (13.0.3)
+      zeitwerk (~> 2.5)
+    rake (13.0.6)
     rbnacl (7.1.1)
       ffi
     rspec (3.10.0)
@@ -84,19 +79,20 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    thor (1.1.0)
+    rspec-support (3.10.3)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   arm64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   eyaml!
   fakefs
-  ffi!
+  ffi (~> 1.15.5)
   pry
   railties
   rake (~> 13.0)

data/bin/publish

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+
+gem build eyaml
+gem push $(ls -t *.gem | head -1)

data/lib/eyaml/cli.rb

@@ -2,18 +2,13 @@ module EYAML
   class InvalidFormatError < StandardError; end
 
   class CLI < Thor
-    class_option :keydir, aliases: "-k", type: :string, desc: "Directory containing EYAML keys"
-
     desc "encrypt", "(Re-)encrypt one or more EYAML files"
     def encrypt(*files)
       files.each do |file|
         file_path = Pathname.new(file)
         next unless file_path.exist?
 
-        bytes_written = EYAML.encrypt_file_in_place(
-          file_path,
-          keydir: options.fetch(:keydir, nil)
-        )
+        bytes_written = EYAML.encrypt_file_in_place(file_path)
 
         puts "Wrote #{bytes_written} bytes to #{file_path}."
       end
@@ -21,6 +16,7 @@ module EYAML
 
     method_option :output, type: :string, desc: "print output to the provided file, rather than stdout", aliases: "-o"
     method_option :"key-from-stdin", type: :boolean, desc: "read the private key from STDIN", default: false
+    method_option :keydir, type: :string, desc: "Directory containing EYAML keys", aliases: "-k"
     desc "decrypt", "Decrypt an EYAML file"
     def decrypt(file)
       file_path = Pathname.new(file)
@@ -48,6 +44,7 @@ module EYAML
     end
 
     method_option :write, type: :boolean, aliases: "-w", desc: "rather than printing both keys, print the public and write the private into the keydir", default: false
+    method_option :keydir, type: :string, desc: "Directory containing EYAML keys", aliases: "-k"
     desc "keygen", "Generate a new EYAML keypair"
     def keygen
       public_key, private_key = EYAML.generate_keypair(

data/lib/eyaml/encryption_manager.rb

@@ -16,10 +16,10 @@ module EYAML
       end
     end
 
-    def initialize(yaml, public_key, private_key)
+    def initialize(yaml, public_key, private_key = nil)
       @tree = yaml
-      @public_key = EYAML::Util.ensure_binary_encoding(public_key)
-      @private_key = EYAML::Util.ensure_binary_encoding(private_key)
+      @public_key = RbNaCl::Util.hex2bin(public_key)
+      @private_key = private_key && RbNaCl::Util.hex2bin(private_key.strip)
     end
 
     def decrypt

data/lib/eyaml/util.rb

@@ -6,14 +6,6 @@ module EYAML
       def pretty_yaml(some_hash)
         some_hash.to_yaml.delete_prefix("---\n")
       end
-
-      def ensure_binary_encoding(str)
-        if str.encoding == Encoding::BINARY
-          return str
-        end
-
-        RbNaCl::Util.hex2bin(str)
-      end
     end
   end
 end

data/lib/eyaml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EYAML
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/eyaml.rb

@@ -26,17 +26,16 @@ module EYAML
       [public_key, private_key]
     end
 
-    def encrypt(plaindata, keydir: nil)
+    def encrypt(plaindata)
       public_key = load_public_key(plaindata)
-      private_key = load_private_key_from(public_key: public_key, keydir: keydir)
 
-      encryption_manager = EncryptionManager.new(plaindata, public_key, private_key)
+      encryption_manager = EncryptionManager.new(plaindata, public_key)
       encryption_manager.encrypt
     end
 
-    def encrypt_file_in_place(file_path, keydir: nil)
+    def encrypt_file_in_place(file_path)
       plaindata = YAML.load_file(file_path)
-      cipherdata = encrypt(plaindata, keydir: keydir)
+      cipherdata = encrypt(plaindata)
 
       eyaml = format_for_file(cipherdata, file_path)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyaml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Emil Stolarsky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,6 +75,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
@@ -86,6 +87,7 @@ files:
 - Rakefile
 - bin/console
 - bin/eyaml
+- bin/publish
 - bin/setup
 - eyaml.gemspec
 - lib/eyaml.rb