eyaml 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e589d4929a268cf0c2d783b52e67da11a5ddea2a471f826f5d440de02b39f56e
-  data.tar.gz: 1f94b57be40ec52893b62aea8f16ee0a81a997b69672852c3430553e2aa24f5f
+  metadata.gz: 2e61459ec54369ee49ca605cefb648f5cc8851a5d39a06ce8c9178a3d70efdf8
+  data.tar.gz: 45c22149cb9105febb7871944e94ed662d407e3cf043132bc0e486b1e95bda82
 SHA512:
-  metadata.gz: 6a1ba5c9640edbe938325c02290405c102ba10f7a68f01c7701740944a208cf531abdc95b94f3ed730e9db90ebf89db848eedf6ad45eec7ddf6b39c362b4480f
-  data.tar.gz: 4e3490d63c5319fa6855a4257fe848663709ecc4e1d54105332f9b2a30352edf0a9221999f58a1a5ba61165721ef0d3627a5c166204a533ac55c6a6c4b6b29c1
+  metadata.gz: 2d348c4d42a142d95a8bc4017fbdf083b8254374f47e60c312af21b9790b92d8a06feb3dc43473e14cdcd79d7b2518c5b2a1165ac40918ca58ce00bd5430e5d2
+  data.tar.gz: 57319ccb5fff1a29e49624076da3ca9a058fecfb87b47e137e006e89616bda4599d613cdb6b693421940b0483526cc7d528d25b83ea6f31557dbbbe1f164f123

data/.gitignore

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

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    eyaml (0.1.0)
+    eyaml (0.1.1)
       rbnacl (~> 7.1)
       thor (~> 1.1)
 

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.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)
 

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)
+      @private_key = private_key.nil? ? nil : EYAML::Util.ensure_binary_encoding(private_key)
     end
 
     def decrypt

data/lib/eyaml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eyaml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Emil Stolarsky
@@ -86,6 +86,7 @@ files:
 - Rakefile
 - bin/console
 - bin/eyaml
+- bin/publish
 - bin/setup
 - eyaml.gemspec
 - lib/eyaml.rb