encrypt_env 1.3.2 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1c84dbd7de0bdce6a21e412fbadf6652fa6828283e034478408f0d1ac9e7a26
-  data.tar.gz: 8b40b35df40234c55fc6210bbb720564b3a342195636d2b3e8c4b17d0bb38fd7
+  metadata.gz: '0967afce5032fb58cb38bb051f399219769a5468be4e1a785ef603122f6d8b63'
+  data.tar.gz: e902376e9b700ffc88a451c6bddd1b49d5150994a835a37af1a8f3096ba94baf
 SHA512:
-  metadata.gz: 871c3408a490cdc32e486eff60e787961c1915aa65fc3d7bba6cd10b15b3439b0a9d4b941abf0459427019ca0736bec381c567958c88c86d5542f35e63880cce
-  data.tar.gz: 0bcbbe97212f1ef1ce7c49b6184dd07ab1b3beb09a2abfc0e290abe5951b5c794e2df0a1340a38389dd825b563f966a5ae897ccecb361271165e31cc0130f46c
+  metadata.gz: 4cf2f4a63f8afb1b4cce6e4ac2e1ff2886225bef2a38761f1cac5426229c765f1e10cfc406562456eec374163f57a1c8de6bf1be6b0b2516e86a207176fe051b
+  data.tar.gz: bf731d891797f4f1437758fbeeeb680ec0338547ec7ab13dbaf62984e1ad34e2db80ccc5fe1e8b58b2460c12a4b3e27513197d4e5a742c8caf0a707814a3e0cc

data/bin/encrypt_env

@@ -3,71 +3,86 @@
 # frozen_string_literal: true
 
 require 'encrypt_env'
+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')
+  parser.on('-v', '--version', 'version') do
+    puts Version::VERSION
+    exit
+  end
+  parser.on('-h', '--help', 'help') do
+    puts <<~HELP
+      Usage:
+        encrypt_env setup                                  # To setup for the firt time
+
+        encrypt_env show                                   # To show environment variables of current environment
+        encrypt_env show -a                                # To show all environment variables
+        encrypt_env show -e [environment]                  # To show specific environment variables
+        encrypt_env show [variable_name] -e [environment]  # To show value of specific variable
+
+        encrypt_env edit                                   # To edit environment variables of current environment
+        encrypt_env edit -e [environment]                  # To edit specific environment variables
+        encrypt_env edit [variable_name] -e [environment]  # To edit value of specific variable
+
+        encrypt_env create variable_name                   # To create environment variable in current environment
+        encrypt_env create variable_name -e [environment]  # To create environment variable in specific environment
+        # To create environment variable in specific environment with value and type
+        encrypt_env create variable_name -s [value] -e [environment]
+        encrypt_env create variable_name -s [value] -e [environment] -t [type]
+
+        encrypt_env delete variable_name                   # To delete environment variable in current environment
+        encrypt_env delete variable_name -e [environment]  # To delete environment variable in specific environment
+
+      Or: Visit "https://github.com/nnhutan/encrypt_env" for more information
+    HELP
+    exit
+  end
+end
+
+parsers.parse!(into: options)
+
 argv = ARGV
 action = argv.shift
+variable_name = argv.shift
 
-if action == 'setup'
+case action
+when 'setup'
   EncryptEnv.setup
-  exit 0
-elsif action == 'show'
-  if argv[0]
-    EncryptEnv.show(argv[0])
-  else
-    EncryptEnv.show
+
+when 'show', 'edit'
+  if action == 'show' && options[:all]
+    EncryptEnv.show('all')
+    exit
+  end
+  EncryptEnv.send(action, options[:environment], variable_name)
+
+when 'create'
+  unless variable_name
+    puts "Please provide 'variable's name'!"
+    exit
   end
-  exit 0
-elsif action == 'all'
-  EncryptEnv.show('all')
-  exit 0
-elsif action == 'edit'
-  if argv[0]
-    EncryptEnv.edit(argv[0])
+
+  if options[:set]
+    EncryptEnv.create_with_value(variable_name, options[:set], options[:environment], options[:type])
   else
-    EncryptEnv.edit
+    EncryptEnv.send(action, variable_name, options[:environment])
+  end
+
+when 'delete'
+  unless variable_name
+    puts "Please provide 'variable's name'!"
+    exit
   end
-  exit 0
-elsif action == 'get'
-  key = argv[0]
-  env = argv[1]
-  EncryptEnv.valueof(key, env)
-  exit 0
-elsif action == 'new'
-  key = argv[0]
-  env = argv[1]
-  EncryptEnv.update_variable(key, env, true)
-  exit 0
-elsif action == 'update'
-  key = argv[0]
-  env = argv[1]
-  EncryptEnv.update_variable(key, env, false)
-  exit 0
-elsif action == 'delete'
-  key = argv[0]
-  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                                  # 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
+
+  EncryptEnv.send(action, variable_name, options[:environment])
 else
   puts "Unknown action: #{action}"
   puts "Use 'encrypt_env -h' for more help"
-  exit 1
+  exit
 end

data/lib/encrypt_env/version.rb

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

data/lib/encrypt_env.rb

@@ -153,19 +153,23 @@ class EncryptEnv
   def self.secrets_all
     return all_decrypted_object if @opt == 2
 
-    decrypt
+    decrypt unless @decrypted
     @decrypted
   end
 
   def self.secrets(env = nil)
     load_curr_opt unless @opt
-    return secrets_all if env == 'all'
+    if env == 'all'
+      result = secrets_all
+      @decrypted = nil
+      return result
+    end
 
     if @opt == 1
-      decrypt
+      decrypt unless @decrypted
       @decrypted[env || current_env]
     else
-      decrypt(env || current_env)
+      decrypt(env || current_env) unless @decrypted
       @decrypted
     end
   rescue StandardError => e
@@ -197,7 +201,9 @@ class EncryptEnv
     system("echo 'Set up complete!'")
   end
 
-  def self.edit(env = nil)
+  def self.edit(env = nil, variable_name = nil)
+    variable_name && (return create(variable_name, env, true))
+
     load_curr_opt unless @opt
     env ||= current_env if @opt == 2
     return unless decrypt(env)
@@ -214,7 +220,9 @@ class EncryptEnv
     puts e.message
   end
 
-  def self.show(env = nil)
+  def self.show(env = nil, variable_name = nil)
+    variable_name && (return valueof(variable_name, env))
+
     require 'awesome_print'
     require 'date'
     value = secrets(env)
@@ -233,7 +241,7 @@ class EncryptEnv
     puts value[key]
   end
 
-  def self.delete_variable(key, env = nil)
+  def self.delete(key, env = nil)
     load_curr_opt unless @opt
     if @opt == 1
       puts 'Only for option 2!'
@@ -253,34 +261,104 @@ class EncryptEnv
       return
     end
 
+    tmp_value = value[key]
     value.delete(key)
     encrypt(value.to_hash.to_yaml, env || current_env)
-    puts "Delete '#{key}' successfully!"
+    puts "Delete '#{key}' with value '#{tmp_value}' successfully!"
+  end
+
+  private_class_method def self.define_type_new_variable
+    types = {
+      '1' => 'integer',
+      '2' => 'float',
+      '3' => 'string',
+      '4' => 'boolean'
+    }
+    puts 'What is the type of variable? (1/2/3/4)'
+    puts "1.\t integer"
+    puts "2.\t float"
+    puts "3.\t string"
+    puts "4.\t boolean"
+    puts "Or enter 'q' to cancle!"
+
+    loop do
+      type = $stdin.gets.chomp
+      return types[type] if %w[1 2 3 4].include?(type)
+
+      exit if type == 'q'
+
+      puts 'Just "1", "2", "3", "4" or "q" to cancel!'
+    end
+  end
+
+  private_class_method def self.type_coercion(value, type)
+    unless %w[integer float string boolean].include?(type)
+      puts "Variable's type must be 'interger', 'float', 'string' or 'boolean'!"
+      exit
+    end
+
+    type = define_type_new_variable if type.nil?
+
+    case type
+    when 'integer'
+      value.to_i
+    when 'float'
+      value.to_f
+    when 'string'
+      value
+    when 'boolean'
+      (value == 'true')
+    end
   end
 
-  def self.update_variable(key, env = nil, add_variable = false)
+  def self.create_with_value(key, new_value, env = nil, type = nil)
     load_curr_opt unless @opt
     if @opt == 1
       puts 'Only for option 2!'
       return
     end
+
+    new_value = type_coercion(new_value, type)
+
     tail_msg = env ? " in '#{env}' environment" : nil
 
     value = secrets(env)
-    if add_variable && value.key?(key)
+
+    if value.key?(key)
       puts "Key existed#{tail_msg}!"
       return
     end
 
-    if !value.key?(key) && !add_variable
-      puts "'#{key}' does not exist#{tail_msg}. You want to add '#{key}' as the new key? (y/n)"
+    value[key] = new_value
+    encrypt(value.to_hash.to_yaml, env || current_env)
+    @decrypted = nil
+    puts "#{key}\t=>\t#{value[key]}"
+  end
+
+  def self.create(key, env = nil, is_edit = false)
+    load_curr_opt unless @opt
+    if @opt == 1
+      puts 'Only for option 2!'
+      return
+    end
+    tail_msg = env ? " in '#{env}' environment" : nil
+
+    value = secrets(env)
+
+    if !is_edit && value.key?(key)
+      puts "Key existed#{tail_msg}!"
+      return
+    end
+
+    if !value.key?(key) && is_edit
+      puts "'#{key}' does not exist#{tail_msg}. You want to create '#{key}' as the new key? (y/n)"
       a = $stdin.gets.chomp
       return unless a == 'y'
 
-      add_variable = true
+      is_edit = false
     end
 
-    action = add_variable && 'add' || 'edit'
+    action = is_edit && 'edit' || 'create'
     file_name = env ? "#{action}_#{key}_#{env}" : "#{action}_#{key}"
 
     Tempfile.create(file_name) do |f|
@@ -288,11 +366,24 @@ 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
+
+  # def self.get
+  #   self
+  # end
+
+  def self.method_missing(key, *_args)
+    secrets unless @decrypted
+    @decrypted[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.2
+  version: 1.3.5
 platform: ruby
 authors:
 - Nhu Tan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print