encrypt_env 1.3.0 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d5d82936ba2b4cf68e7ca1426185f039af068154afa4cd2b92261466b3089cf
-  data.tar.gz: 81dfa2bc7beec3284a4ad93318d4ab637cad10cc68b19d7edc6600abb480712b
+  metadata.gz: da8b5db8cc944d9f2ec3f293efa316cb67dc54e56695ffef220303f9ceb566d5
+  data.tar.gz: 5baa2602d7d3e8b780d45c4c080b4ca49177f10d205072e72e859c15bb795f21
 SHA512:
-  metadata.gz: c9adcf613352abd8834f2268eeb5476ee7842ce2249f7a3d255f848e7132b02a283d0e74cca5fa7792957700ef838121726e48e15e27ab5fb5bbbd5addf92407
-  data.tar.gz: 4a603f84d80ab605a1fd7a1baa04772dd4a14e0f08c0d137e03eb7f307ac6490c113d5120645339cf6d909750fbb99775963dd322a351b6b586ec8b25bb2863d
+  metadata.gz: dc119a9d8343930f9ba286d88542084692cb6f4d3f820fc7c82e64f61b6d80a5fbf8216604635e14104118c58b23d0e7ad1ef49e20f15fb0732339010ca0e3d9
+  data.tar.gz: 48eee986594c2327f0cb38ebaf52c8362c881213bbe91e5fc9b6ae247d7a677c81f608ff3b9d4f0bec34430a4438369f22415e1956aabf8308a8a0e87f1c4d6b

data/bin/encrypt_env

@@ -3,6 +3,7 @@
 # frozen_string_literal: true
 
 require 'encrypt_env'
+require_relative '../lib/encrypt_env/version'
 
 argv = ARGV
 action = argv.shift
@@ -47,17 +48,26 @@ elsif action == 'delete'
   env = argv[1]
   EncryptEnv.delete_variable(key, env)
   exit 0
+elsif ['-v', '--version', 'version'].include?(action)
+  puts Version::VERSION
+  exit 0
 elsif ['help', '--help', '-h'].include?(action)
   puts <<~HELP
     Usage:
-      encrypt_env setup
-      encrypt_env secrets
-      encrypt_env secrets_all
-      encrypt_env edit
+      encrypt_env setup                                  # To setup for the firt time
+      encrypt_env show all                               # To show all environment variables
+      encrypt_env show / encrypt_env show [environment]  # To show environment variables
+      encrypt_env edit / encrypt_env edit [environment]  # To edit environment variables
+      encrypt_env add variable_name [environment]        # To add environment variable
+      encrypt_env get variable_name [environment]        # To show value of specific variable
+      encrypt_env update variable_name [environment]     # To edit value of specific variable
+      encrypt_env delete variable_name [environment]     # To delete specific variable
+    Or: Visit "https://github.com/nnhutan/encrypt_env" for more information
   HELP
 
   exit 0
 else
   puts "Unknown action: #{action}"
+  puts "Use 'encrypt_env -h' for more help"
   exit 1
 end

data/lib/encrypt_env/version.rb

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

data/lib/encrypt_env.rb

@@ -11,6 +11,8 @@ require 'json'
 # rubocop:disable Metrics/ClassLength
 # rubocop:disable Metrics/MethodLength
 class EncryptEnv
+  @root_path = Dir.pwd
+
   private_class_method def self.define_option
     puts "Options to 'encrypt secrets.yml' file"
     puts '1. Generate only one master.key and one encrypted file for all environment'
@@ -27,9 +29,9 @@ class EncryptEnv
   end
 
   private_class_method def self.load_curr_opt
-    if File.file?("#{Dir.pwd}/config/secrets.yml.enc")
+    if File.file?("#{@root_path}/config/secrets.yml.enc")
       @opt = 1
-    elsif Dir["#{Dir.pwd}/config/secrets_*.yml.enc"].length.positive?
+    elsif Dir["#{@root_path}/config/secrets_*.yml.enc"].length.positive?
       @opt = 2
     else
       raise 'You must setup first to encrypt file!'
@@ -46,7 +48,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?("#{Dir.pwd}/config/#{file_name}")
+    return if File.file?("#{@root_path}/config/#{file_name}")
     return if ENV.key?('MASTER_KEY')
 
     message = env ? "Missing key of #{env} environment!" : 'Missing master key!'
@@ -60,7 +62,7 @@ class EncryptEnv
       raise e.message
     end
 
-    file_path = env ? "#{Dir.pwd}/config/master_#{env}.key" : "#{Dir.pwd}/config/master.key"
+    file_path = env ? "#{@root_path}/config/master_#{env}.key" : "#{@root_path}/config/master.key"
     key = File.file?(file_path) ? File.read(file_path).strip : ENV['MASTER_KEY']
     @master_key = [key].pack('H*')
   end
@@ -68,19 +70,19 @@ class EncryptEnv
   private_class_method def self.generate_keys
     if @opt == 1
       key = OpenSSL::Random.random_bytes(16)
-      File.open("#{Dir.pwd}/config/master.key", 'w') { |file| file.write(key.unpack('H*')[0]) }
+      File.open("#{@root_path}/config/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("#{Dir.pwd}/config/master_#{env}.key", 'w') { |file| file.write(key.unpack('H*')[0]) }
+        File.open("#{@root_path}/config/master_#{env}.key", 'w') { |file| file.write(key.unpack('H*')[0]) }
       end
     end
   end
 
   private_class_method def self.load_content_to_encrypt
-    secret_file = File.expand_path("#{Dir.pwd}/config/secrets.yml")
+    secret_file = File.expand_path("#{@root_path}/config/secrets.yml")
     @content_to_encrypt = File.read(secret_file)
   end
 
@@ -89,7 +91,7 @@ class EncryptEnv
   end
 
   private_class_method def self.load_encrypted_data(env = nil)
-    file_path = env ? "#{Dir.pwd}/config/secrets_#{env}.yml.enc" : "#{Dir.pwd}/config/secrets.yml.enc"
+    file_path = env ? "#{@root_path}/config/secrets_#{env}.yml.enc" : "#{@root_path}/config/secrets.yml.enc"
     hex_string = File.read(file_path)
     raw_data = [hex_string].pack('H*')
 
@@ -100,7 +102,7 @@ class EncryptEnv
   end
 
   private_class_method def self.encrypt(content, typ = nil)
-    file_path = typ ? "#{Dir.pwd}/config/secrets_#{typ}.yml.enc" : "#{Dir.pwd}/config/secrets.yml.enc"
+    file_path = typ ? "#{@root_path}/config/secrets_#{typ}.yml.enc" : "#{@root_path}/config/secrets.yml.enc"
     cipher = OpenSSL::Cipher.new('aes-128-gcm')
     cipher.encrypt
     cipher.key = @master_key
@@ -138,7 +140,7 @@ class EncryptEnv
 
   private_class_method def self.all_decrypted_object
     obj = {}
-    env_lst = Dir["#{Dir.pwd}/config/secrets_*.yml.enc"].map do |path|
+    env_lst = Dir["#{@root_path}/config/secrets_*.yml.enc"].map do |path|
       path.scan(/secrets_(.*)\.yml\.enc/).flatten.first
     end
     env_lst.each do |e|
@@ -189,9 +191,9 @@ class EncryptEnv
       end
     end
 
-    File.rename("#{Dir.pwd}/config/secrets.yml", "#{Dir.pwd}/config/secrets.yml.old")
-    system("echo '/config/master*.key' >> #{Dir.pwd}/.gitignore")
-    system("echo '/config/secrets.yml.old' >> #{Dir.pwd}/.gitignore")
+    File.rename("#{@root_path}/config/secrets.yml", "#{@root_path}/config/secrets.yml.old")
+    system("echo '/config/master*.key' >> #{@root_path}/.gitignore")
+    system("echo '/config/secrets.yml.old' >> #{@root_path}/.gitignore")
     system("echo 'Set up complete!'")
   end
 
@@ -213,18 +215,19 @@ class EncryptEnv
   end
 
   def self.show(env = nil)
-    # require "awesome_print"
+    require 'awesome_print'
+    require 'date'
     value = secrets(env)
-    # ap({})
-    # ap(value) unless @have_error
-    jj value unless @have_error
+    ap(value) unless @have_error
+    # jj value unless @have_error
     @have_error = false
   end
 
   def self.valueof(key, env = nil)
+    tail_msg = env ? " in '#{env}' environent" : nil
     value = secrets(env)
     unless value.key?(key)
-      puts "key '#{key}' does not exist!"
+      puts "key '#{key}' does not exist#{tail_msg}!"
       return
     end
     puts value[key]
@@ -237,8 +240,8 @@ class EncryptEnv
       return
     end
 
-    tail_confirm = env ? " in '#{env}' environent" : nil
-    confirm = "Really? You want to delete '#{key}'#{tail_confirm}? (y/n)"
+    tail_msg = env ? " in '#{env}' environent" : nil
+    confirm = "Really? You want to delete '#{key}'#{tail_msg}? (y/n)"
     puts confirm
     a = $stdin.gets.chomp
     return unless a == 'y'
@@ -246,13 +249,13 @@ class EncryptEnv
     value = secrets(env)
 
     unless value.key?(key)
-      puts "#{key} does not exist!"
+      puts "#{key} does not exist#{tail_msg}!"
       return
     end
 
     value.delete(key)
     encrypt(value.to_hash.to_yaml, env || current_env)
-    puts "delete '#{key}' successfully!"
+    puts "Delete '#{key}' successfully!"
   end
 
   def self.update_variable(key, env = nil, add_variable = false)
@@ -261,20 +264,20 @@ class EncryptEnv
       puts 'Only for option 2!'
       return
     end
+    tail_msg = env ? " in '#{env}' environment" : nil
 
     value = secrets(env)
     if add_variable && value.key?(key)
-      puts 'Key existed!'
+      puts "Key existed#{tail_msg}!"
       return
     end
 
     if !value.key?(key) && !add_variable
-      tail_msg = env ? " in #{env} environment" : nil
       puts "'#{key}' does not exist#{tail_msg}. You want to add '#{key}' as the new key? (y/n)"
       a = $stdin.gets.chomp
       return unless a == 'y'
 
-      add_variable = false
+      add_variable = true
     end
 
     action = add_variable && 'add' || 'edit'
@@ -285,11 +288,15 @@ class EncryptEnv
       f.flush
       f.rewind
       system("vim #{f.path}")
-      new_value = File.read(f.path)
-      value[key] = new_value.strip
+      # new_value = File.read(f.path)
+      new_value = YAML.load_file(f.path)
+      # value[key] = new_value.strip
+      value[key] = new_value
       encrypt(value.to_hash.to_yaml, env || current_env)
       @decrypted = nil
     end
+
+    puts "#{key}\t=>\t#{value[key]}"
   end
 end
 # rubocop:enable Metrics/ClassLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: encrypt_env
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.3
 platform: ruby
 authors:
 - Nhu Tan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -39,6 +39,7 @@ extra_rdoc_files: []
 files:
 - bin/encrypt_env
 - lib/encrypt_env.rb
+- lib/encrypt_env/version.rb
 homepage: https://github.com/nnhutan/encrypt_env.git
 licenses:
 - MIT