encrypt_env 1.3.6 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58a9ebf47dac3a056a4ec7d890463591f8ed9f0a749597cf8aa388b2359cc7bd
-  data.tar.gz: 607a5c85ae34aa79a60983919f7d1c972769417bbd0ab59d9e2e1cfc19a791b7
+  metadata.gz: 3c2be77fd3504dd29034cbfc8c8fd64b337357bbb297f5510faf53805d46d8d2
+  data.tar.gz: a21a92c449fb73c43e66907837428026674b55d784242e8946e301727a0a0340
 SHA512:
-  metadata.gz: ad618c7bd4b93b11f0eda7ad786d363b41bd4d1c9498426931f04e5859e3e4f6f9d6e7aabbd3f15d90ccb3a23e8cfdfe614e68fc63a4e013d5c2e54434212aac
-  data.tar.gz: 41c5be08c7ee2c47b147564abeb12b83906f876f23efe50e22b0717e124cf3a30a78da1b9025859ded45a77771df6434324192d052d4dd83274e72a5efd5ab3f
+  metadata.gz: a3419ab5edeff49a4f40bd559f6da219630ebf8c7c3c44aa7ea5cf612a3bbb8e7223ef1bfb4c018a4ad21de1c7d83667f51de33c3275c3f3908035edbe975a3d
+  data.tar.gz: c2e59193da968fadaa428171b18844f58d2f80f966e779908cd28bb267cb22bc6d2b1b6409baf88f426f6dd5573837226dd9c8997188c87b8c5e1aeda42b0603

data/bin/encrypt_env

@@ -7,11 +7,23 @@ require 'optparse'
 require_relative '../lib/encrypt_env/version'
 
 options = {}
-parsers = OptionParser.new do |parser|
-  parser.on('-e', '--environment ENVIRONMENT', 'environment')
-  parser.on('-s', '--set VALUE', 'value')
-  parser.on('-t', '--type TYPE', 'type of variable')
-  parser.on('-a', '--all', 'show all')
+OptionParser.new do |parser|
+  parser.on('-e', '--environment ENVIRONMENT', 'environment') do |opts|
+    options[:environment] = opts
+  end
+
+  parser.on('-s', '--set VALUE', 'value') do |opts|
+    options[:set] = opts
+  end
+
+  parser.on('-t', '--type TYPE', 'type of variable') do |opts|
+    options[:type] = opts
+  end
+
+  parser.on('-a', '--all', 'show all') do |_opts|
+    options[:all] = true
+  end
+
   parser.on('-v', '--version', 'version') do
     puts Version::VERSION
     exit
@@ -43,9 +55,9 @@ parsers = OptionParser.new do |parser|
     HELP
     exit
   end
-end
+end.parse!
 
-parsers.parse!(into: options)
+# parsers.parse!
 
 argv = ARGV
 action = argv.shift

data/lib/encrypt_env/version.rb

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

data/lib/encrypt_env.rb

@@ -6,6 +6,7 @@ require 'yaml'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'tempfile'
 require 'json'
+require 'active_support/ordered_options'
 
 # gem 'encrypt_env'
 # rubocop:disable Metrics/ClassLength
@@ -19,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'!"
@@ -29,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"].length.positive?
       @opt = 2
     else
       raise 'You must setup first to encrypt file!'
@@ -48,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!'
@@ -62,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
@@ -70,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
@@ -91,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*')
 
@@ -102,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
@@ -140,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|
@@ -157,7 +158,7 @@ class EncryptEnv
     @decrypted
   end
 
-  def self.secrets(env = nil)
+  def self.hash_secrets(env = nil)
     load_curr_opt unless @opt
     if env == 'all'
       result = secrets_all
@@ -181,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
@@ -196,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
@@ -225,7 +228,7 @@ class EncryptEnv
 
     require 'awesome_print'
     require 'date'
-    value = secrets(env)
+    value = hash_secrets(env)
     ap(value) unless @have_error
     # jj value unless @have_error
     @have_error = false
@@ -233,7 +236,7 @@ class EncryptEnv
 
   def self.valueof(key, env = nil)
     tail_msg = env ? " in '#{env}' environent" : nil
-    value = secrets(env)
+    value = hash_secrets(env)
     unless value.key?(key)
       puts "key '#{key}' does not exist#{tail_msg}!"
       return
@@ -254,7 +257,7 @@ class EncryptEnv
     a = $stdin.gets.chomp
     return unless a == 'y'
 
-    value = secrets(env)
+    value = hash_secrets(env)
 
     unless value.key?(key)
       puts "#{key} does not exist#{tail_msg}!"
@@ -322,7 +325,7 @@ class EncryptEnv
 
     tail_msg = env ? " in '#{env}' environment" : nil
 
-    value = secrets(env)
+    value = hash_secrets(env)
 
     if value.key?(key)
       puts "Key existed#{tail_msg}!"
@@ -343,7 +346,7 @@ class EncryptEnv
     end
     tail_msg = env ? " in '#{env}' environment" : nil
 
-    value = secrets(env)
+    value = hash_secrets(env)
 
     if !is_edit && value.key?(key)
       puts "Key existed#{tail_msg}!"
@@ -377,12 +380,12 @@ class EncryptEnv
     puts "#{key}\t=>\t#{value[key]}"
   end
 
-  # def self.get
-  #   self
-  # end
+  def self.secrets
+    ActiveSupport::OrderedOptions[hash_secrets.deep_symbolize_keys]
+  end
 
   def self.method_missing(key, *_args)
-    secrets unless @decrypted
+    hash_secrets unless @decrypted
     @decrypted[key]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: encrypt_env
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.1
 platform: ruby
 authors:
 - Nhu Tan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print