arcanus 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66036810d6ca7fa05522b32afeb91c36dfe96f4a
-  data.tar.gz: b38269a7f63c805c89c3da2824bbe81f773dac86
+  metadata.gz: 58a8f2fc1819948f009412e3427236a810cffcb8
+  data.tar.gz: ef68d35afa71c736d7de16c2f5fd1ad6fb1595af
 SHA512:
-  metadata.gz: a778447c3785bf38d80a6473edbe60833e665a990d9e1df5aa81727e49d73bcbed5bbe1fc227126c3fba0442fa64fa5e7700843f53ec2078a4ef55c559f7a538
-  data.tar.gz: 6de23a00c31b5b4bf63f163204f8152b746309f13db35783e72af7972624102b5ce465e67f6934b56733609a8cbcba1cba1856be6c0f0db9ecf8be1147b7e657
+  metadata.gz: d96b56f353f3460e997cd52c3430650cf820f37e621e4857568ee83f7a9709f80a2f2a4157a91a7e055ed30f106fb9f1779660f88bd9264fef35a5b1e2f9637c
+  data.tar.gz: 8e4c3aacf91f044732d408144ab37e75e8f0541b7d8d29fbb872d9bb7bd50c8cd3ac59736897c71e47071f0e7d957a42b57e425d3392c18c15955a8f5171d5fb

data/lib/arcanus.rb

@@ -37,13 +37,22 @@ module Arcanus
             'Run `arcanus setup`'
     end
 
-    unless File.exist?(@repo.unlocked_key_path)
+    if File.exist?(@repo.unlocked_key_path)
+      key = Arcanus::Key.from_file(@repo.locked_key_path)
+    elsif ENV['ARCANUS_PASSWORD']
+      key = Arcanus::Key.from_protected_file(@repo.locked_key_path, ENV['ARCANUS_PASSWORD'])
+      ENV.delete('ARCANUS_PASSWORD') # Scrub so child processes don't inherit
+    else
       raise Errors::UsageError,
             'Arcanus key has not been unlocked. ' \
-            'Run `arcanus unlock`'
+            'Run `arcanus unlock` or specify password via ARCANUS_PASSWORD environment variable'
     end
 
-    @chest = Chest.new(key_file_path: @repo.unlocked_key_path,
-                       chest_file_path: @repo.chest_file_path)
+    @chest = Chest.new(key: key, chest_file_path: @repo.chest_file_path)
+  end
+
+  def unlock(password)
+    key = Arcanus::Key.from_protected_file(@repo.locked_key_path, password)
+    key.save(key_file_path: @repo.unlocked_key_path)
   end
 end

data/lib/arcanus/chest.rb

@@ -8,8 +8,8 @@ module Arcanus
   class Chest # rubocop:disable Metrics/ClassLength
     SIGNATURE_SIZE_BITS = 256
 
-    def initialize(key_file_path:, chest_file_path:)
-      @key = Key.from_file(key_file_path)
+    def initialize(key:, chest_file_path:)
+      @key = key
       @chest_file_path = chest_file_path
       @original_encrypted_hash = YAML.load_file(chest_file_path).to_hash
       @original_decrypted_hash = decrypt_hash(@original_encrypted_hash)

data/lib/arcanus/command/edit.rb

@@ -15,14 +15,14 @@ module Arcanus::Command
               '$EDITOR environment variable is not defined'
       end
 
-      chest = Arcanus::Chest.new(key_file_path: repo.unlocked_key_path,
-                                 chest_file_path: repo.chest_file_path)
+      key = Arcanus::Key.from_file(repo.unlocked_key_path)
+      chest = Arcanus::Chest.new(key: key, chest_file_path: repo.chest_file_path)
 
       if arguments.size > 1
         edit_single_key(chest, arguments[1], arguments[2])
       else
         # Edit entire chest
-        ::Tempfile.new('arcanus-chest').tap do |file|
+        ::Tempfile.new(['arcanus-chest', '.yaml']).tap do |file|
           file.sync = true
           file.write(chest.contents.to_yaml)
           edit_until_done(chest, file.path)

data/lib/arcanus/command/export.rb

@@ -11,8 +11,8 @@ module Arcanus::Command
     def execute
       ensure_key_unlocked
 
-      chest = Arcanus::Chest.new(key_file_path: repo.unlocked_key_path,
-                                 chest_file_path: repo.chest_file_path)
+      key = Arcanus::Key.from_file(repo.unlocked_key_path)
+      chest = Arcanus::Chest.new(key: key, chest_file_path: repo.chest_file_path)
 
       env_vars = extract_env_vars(chest.contents)
 

data/lib/arcanus/command/setup.rb

@@ -98,8 +98,8 @@ module Arcanus::Command
       # but then use that chest's #save implementation to save the file
       File.open(repo.chest_file_path, 'w') { |f| f.write({}.to_yaml) }
 
-      chest = Arcanus::Chest.new(key_file_path: repo.unlocked_key_path,
-                                 chest_file_path: repo.chest_file_path)
+      key = Arcanus::Key.from_file(repo.unlocked_key_path)
+      chest = Arcanus::Chest.new(key: key, chest_file_path: repo.chest_file_path)
       chest.save
     end
 

data/lib/arcanus/command/show.rb

@@ -9,8 +9,8 @@ module Arcanus::Command
     def execute
       ensure_key_unlocked
 
-      chest = Arcanus::Chest.new(key_file_path: repo.unlocked_key_path,
-                                 chest_file_path: repo.chest_file_path)
+      key = Arcanus::Key.from_file(repo.unlocked_key_path)
+      chest = Arcanus::Chest.new(key: key, chest_file_path: repo.chest_file_path)
 
       if arguments.size > 1
         # Print specific key

data/lib/arcanus/ui.rb

@@ -36,7 +36,9 @@ module Arcanus
     #
     # @return [String, nil]
     def secret_user_input
-      @input.get(noecho: true)
+      if input = @input.get(noecho: true)
+        input.chomp # Remove trailing newline as it is not part of password
+      end
     rescue Interrupt
       exit 130 # User cancelled
     end

data/lib/arcanus/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Arcanus
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arcanus
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Shane da Silva