encrypt_env 1.4.0 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47ed1b7d3725d52b1133c37516eab8702c1423616f48ab2f0fd7b47a55ee5906
-  data.tar.gz: dfbd255526aaa28824891d8774852c970036a36c693725bd95b14f4af530afbc
+  metadata.gz: d213624f3c092fe27cacc37d05b07822891de9dd3f1b773715eb05cb18aa9d23
+  data.tar.gz: c1299d1d43226300c905da7d21b912247f6c4a9f1f26d3a22eecfba16c054e31
 SHA512:
-  metadata.gz: 2eb7ec510ce70ea0faecd43de3e2e15c28b1e80d6589042f6ede5321af837b052c288d23d88cbf7fb369b13016c521549d4ac38025e7e8db1c1ad58bfc984b80
-  data.tar.gz: 68ada1002c808cb83d9035e94ea1927734db3bd684f9789be4dfe4125415d862da21103e4111d2e492cd4c471957d44f23a92eb51e288e12afe669c49cf1094b
+  metadata.gz: 0efd3a27ab1218edc29e785e3049736568662715306a16a9a86e51c4899071ab29976003de9e3442751dfeedc39291b764b8b152d1f3c732742d3aeb84cc8bdc
+  data.tar.gz: 73edcef93e90abdedf6f78e8000bd6654f59a8a6bdd5d91a4caa7380cdd4d624077d9246534b1ade5fd4281083b8b2f84490ce75a1cbc81ba732d7eaae297f14

data/lib/encrypt_env/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Version
-  VERSION = '1.4.0'
+  VERSION = '1.4.3'
 end

data/lib/encrypt_env.rb

@@ -20,7 +20,7 @@ class EncryptEnv
     puts '2. Generate master.key and encrypted file for each environment'
 
     loop do
-      @opt = gets.chomp.to_i
+      @opt = $stdin.gets.chomp.to_i
       break if @opt == 1 || @opt == 2
 
       puts "Please enter '1' or '2'!"
@@ -30,9 +30,9 @@ class EncryptEnv
   end
 
   private_class_method def self.load_curr_opt
-    if File.file?("#{@root_path}/config/secrets.yml.enc")
+    if File.file?("#{@root_path}/config/encrypt_enc/secrets.yml.enc")
       @opt = 1
-    elsif Dir["#{@root_path}/config/secrets_*.yml.enc"].length.positive?
+    elsif Dir["#{@root_path}/config/encrypt_enc/secrets_*.yml.enc"].any?
       @opt = 2
     else
       raise 'You must setup first to encrypt file!'
@@ -49,7 +49,7 @@ class EncryptEnv
 
   private_class_method def self.check_key_existence(env = nil)
     file_name = env.nil? ? 'master.key' : "master_#{env}.key"
-    return if File.file?("#{@root_path}/config/#{file_name}")
+    return if File.file?("#{@root_path}/config/master_key/#{file_name}")
     return if ENV.key?('MASTER_KEY')
 
     message = env ? "Missing key of #{env} environment!" : 'Missing master key!'
@@ -63,7 +63,7 @@ class EncryptEnv
       raise e.message
     end
 
-    file_path = env ? "#{@root_path}/config/master_#{env}.key" : "#{@root_path}/config/master.key"
+    file_path = env ? "#{@root_path}/config/master_key/master_#{env}.key" : "#{@root_path}/config/master_key/master.key"
     key = File.file?(file_path) ? File.read(file_path).strip : ENV['MASTER_KEY']
     @master_key = [key].pack('H*')
   end
@@ -71,13 +71,13 @@ class EncryptEnv
   private_class_method def self.generate_keys
     if @opt == 1
       key = OpenSSL::Random.random_bytes(16)
-      File.open("#{@root_path}/config/master.key", 'w') { |file| file.write(key.unpack('H*')[0]) }
+      File.open("#{@root_path}/config/master_key/master.key", 'w') { |file| file.write(key.unpack('H*')[0]) }
     else
       to_hash_type(@content_to_encrypt).each_key do |env|
         next if env == 'default'
 
         key = OpenSSL::Random.random_bytes(16)
-        File.open("#{@root_path}/config/master_#{env}.key", 'w') { |file| file.write(key.unpack('H*')[0]) }
+        File.open("#{@root_path}/config/master_key/master_#{env}.key", 'w') { |file| file.write(key.unpack('H*')[0]) }
       end
     end
   end
@@ -92,7 +92,7 @@ class EncryptEnv
   end
 
   private_class_method def self.load_encrypted_data(env = nil)
-    file_path = env ? "#{@root_path}/config/secrets_#{env}.yml.enc" : "#{@root_path}/config/secrets.yml.enc"
+    file_path = env ? "#{@root_path}/config/encrypt_enc/secrets_#{env}.yml.enc" : "#{@root_path}/config/encrypt_enc/secrets.yml.enc"
     hex_string = File.read(file_path)
     raw_data = [hex_string].pack('H*')
 
@@ -103,7 +103,7 @@ class EncryptEnv
   end
 
   private_class_method def self.encrypt(content, typ = nil)
-    file_path = typ ? "#{@root_path}/config/secrets_#{typ}.yml.enc" : "#{@root_path}/config/secrets.yml.enc"
+    file_path = typ ? "#{@root_path}/config/encrypt_enc/secrets_#{typ}.yml.enc" : "#{@root_path}/config/encrypt_enc/secrets.yml.enc"
     cipher = OpenSSL::Cipher.new('aes-128-gcm')
     cipher.encrypt
     cipher.key = @master_key
@@ -141,7 +141,7 @@ class EncryptEnv
 
   private_class_method def self.all_decrypted_object
     obj = {}
-    env_lst = Dir["#{@root_path}/config/secrets_*.yml.enc"].map do |path|
+    env_lst = Dir["#{@root_path}/config/encrypt_enc/secrets_*.yml.enc"].map do |path|
       path.scan(/secrets_(.*)\.yml\.enc/).flatten.first
     end
     env_lst.each do |e|
@@ -182,6 +182,8 @@ class EncryptEnv
   def self.setup
     define_option
     load_content_to_encrypt
+    system("mkdir -p #{@root_path}/config/master_key")
+    system("mkdir -p #{@root_path}/config/encrypt_enc")
     generate_keys
 
     if @opt == 1
@@ -197,7 +199,7 @@ class EncryptEnv
     end
 
     File.rename("#{@root_path}/config/secrets.yml", "#{@root_path}/config/secrets.yml.old")
-    system("echo '/config/master*.key' >> #{@root_path}/.gitignore")
+    system("echo '/config/master_key/master*.key' >> #{@root_path}/.gitignore")
     system("echo '/config/secrets.yml.old' >> #{@root_path}/.gitignore")
     system("echo 'Set up complete!'")
   end
@@ -216,6 +218,7 @@ class EncryptEnv
       system("vim #{f.path}")
       encrypt(File.read(f.path), env)
       @decrypted = nil
+      @result = nil
     end
   rescue StandardError => e
     puts e.message
@@ -333,6 +336,7 @@ class EncryptEnv
     value[key] = new_value
     encrypt(value.to_hash.to_yaml, env || current_env)
     @decrypted = nil
+    @result = nil
     puts "#{key}\t=>\t#{value[key]}"
   end
 
@@ -373,13 +377,18 @@ class EncryptEnv
       value[key] = new_value
       encrypt(value.to_hash.to_yaml, env || current_env)
       @decrypted = nil
+      @result = nil
     end
 
     puts "#{key}\t=>\t#{value[key]}"
   end
 
   def self.secrets
-    ActiveSupport::OrderedOptions[hash_secrets.deep_symbolize_keys]
+    return @result if @result
+
+    @result = ActiveSupport::OrderedOptions[hash_secrets.deep_symbolize_keys]
+
+    @result
   end
 
   def self.method_missing(key, *_args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: encrypt_env
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.3
 platform: ruby
 authors:
 - Nhu Tan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -30,6 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.2
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.7
 description: Encrypts and decrypts environment variables
 email: nhutan2001@gmail.com
 executables: