dinomischus 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c817f8c29b1b2fc3db6af10567c63b806ccaf7974fb6119364b2d76a8ef0ad1e
-  data.tar.gz: 6ee738a175fe7a9ab23bafa356c7c989468daec3dcf9d1d1b4ec7de525acd0c1
+  metadata.gz: 9be59068e706c1dbc49c6f9571fd3f9213caeab3b36794a48aac55ee72a9c721
+  data.tar.gz: 935a13f4059df89faed1d9d7391fb9564a083dd7f78f91133bc1d2108c66ebfa
 SHA512:
-  metadata.gz: 73e65a9ec46a854ae953f84b671c35f1e2766852057c435cf008d8f6771e32818120148d7b64f79b891a2f66c217e7ae2671e4270130dcf9377dfe8bf726b58a
-  data.tar.gz: 88b1974e147c1becc5d2142d4ef878f0efd711d33454b9e633b6c9b984f4e665b599db69a58708cd5eb87fd2f1e424529cac082d7ad2153730e07984d2ba6612
+  metadata.gz: e91250f997fae463e4a6d2ed1c340258d30645d692c509339949b5d90b43cbf398adf072e65246096d210f3b5b23923ab77f2d7fa2e0dc8df27c1b7ea266a1a2
+  data.tar.gz: 9d06db65c79a773f5d6719710e172596c4ba2769d3d7a3d3858153165fe5ece37870df77cc71ffa52d3dd2e994816e8ac4a5d6e07b015a5b745b593d765c3201

data/README.md

@@ -109,6 +109,20 @@ hash = Dinomischus.load_file('project_name_config_index.yml')
 ```
 The setting value of ```:fruit``` changed to ```banana``` depending on the file read later.
 
+### For Reading by the CLI
+
+get 1 value
+
+```
+bash$ dinomischus -g -f [FileName] -k [key]
+```
+
+get key-value list
+
+```
+bash$ dinomischus -l -f [FileName]
+```
+
 ### For Write Setting
 
 

data/exe/dinomischus

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'dinomischus'
+require_relative '../lib/dinomischus'
 require 'optparse'
 Version = Dinomischus::VERSION
 
@@ -21,11 +21,11 @@ class Command
     @options.include?(name)
   end
 
-  # 指定したオプションを全て指定いるか？
+  # 指定したオプションを全て指定しているか？
   def has_all?(*names)
     all_finded = true
     names.each do |nm|
-      finded = @options.include?(@option.get(nm)) 
+      finded = @options.include?(nm) 
       $stderr.puts("This Command needs '#{nm}' option. ") unless finded
       all_finded &&= finded
     end
@@ -44,6 +44,16 @@ class Command
   def self.CmdList( path )
     Dinomischus.load_file( path )
   end
+
+  def self.PrintHash( hash )
+    # pp "#{value}"
+    max_length = hash.keys.max_by(&:length).length
+    print "{\n"
+    hash.each do |k, v|
+      print sprintf("  %<key>-#{max_length}s : %<value>s \n", {key:k, value:v})
+    end
+    print "}\n"
+  end
 end
 
 # メニュー振り分け処理と引数チェック
@@ -59,7 +69,7 @@ case true
   when cmd.has?(:list) then
     return unless cmd.has_all?(:file)
     value = Command.CmdList( cmd.get(:file) )
-    pp "#{value}"
+    Command.PrintHash(value)
 
   # CUI メニュー表示
   when cmd.has?(:menu) then

data/lib/dinomischus.rb

@@ -1,13 +1,11 @@
 require 'yaml'
 
-require File.expand_path("../dinomischus/version", __FILE__)
-
-require File.expand_path("../dinomischus/crypt_aes.rb", __FILE__)
-require File.expand_path("../dinomischus/merge_yaml.rb", __FILE__)
-require File.expand_path("../dinomischus/l_key.rb", __FILE__)
-require File.expand_path("../dinomischus/l_def.rb", __FILE__)
-require File.expand_path("../dinomischus/l_conf.rb", __FILE__)
-require File.expand_path("../dinomischus/menu.rb", __FILE__)
+require_relative "./dinomischus/version"
+require_relative "./dinomischus/utils/merge_yaml.rb"
+require_relative "./dinomischus/l_key.rb"
+require_relative "./dinomischus/l_def.rb"
+require_relative "./dinomischus/l_conf.rb"
+require_relative "./dinomischus/menu.rb"
 
 
 module Dinomischus
@@ -40,13 +38,24 @@ module Dinomischus
   def self.load_file( path, specify = false )
     # get loading target
     yml = YAML.load_file(path)
-    files = yml[0].has_key?(:conf_path) ? yml : [ {conf_path: path} ]
+    # files = yml[0].has_key?(:conf_path) ? yml : [ {conf_path: path} ]
+    # base_dir = yml[0].has_key?
+    files = []
+    base_dir = ""
+    if yml[0].has_key?(:conf_path) then
+      files = yml
+      base_dir = File.dirname(path)
+    else
+      files = [ {conf_path: path} ]
+      base_dir = Dir.pwd
+    end
 
     # loading config files...
     config_list = {}
     files.each do |p|
       items = {}
-      items = load_conf(p[:conf_path], specify)
+      conf_path = File.expand_path(p[:conf_path], base_dir )
+      items = load_conf(conf_path, specify)
       merge_yaml(config_list, items)
     end
     config_list

data/lib/dinomischus/l_conf.rb

@@ -4,7 +4,7 @@ require 'optparse'
 require 'securerandom'
 require 'base64'
 
-require File.expand_path('../crypt_aes.rb', __FILE__)
+require_relative './utils/crypt_dino.rb'
 
 module Dinomischus
 
@@ -32,7 +32,8 @@ module Dinomischus
       key_path = yml[0][:key_path]
       raise RuntimeError.new("鍵ファイルが存在しません。#{key_path}") if !File.exist?(key_path)
       
-      val_text = do_encrypt ? "?#{exec_encrypt( key_path, value)}" : value
+      #val_text = do_encrypt ? "?#{exec_encrypt( key_path, value)}" : value
+      val_text = do_encrypt ? "?#{Dinomischus::dino_encrypt( key_path, value)}" : value
       
       yml[1][key.to_sym] = {"value": val_text, "desc": desc}
       File.open(conf_path, 'w') do |f|
@@ -46,7 +47,8 @@ module Dinomischus
       raise RuntimeError.new("設定ファイルが存在しません。#{conf_path}") if !File.exist?(conf_path)
 
       conf_file = YAML.load_file(conf_path)
-      key_path = conf_file[0][:key_path]
+      key_path = sprintf("%s", conf_file[0][:key_path] )
+      key_path = File.expand_path(key_path, File.dirname(conf_path))
       raw_items = conf_file[1]
       items = {}
       raw_items.keys.each do |key|
@@ -70,7 +72,8 @@ module Dinomischus
       if value.match /^\?.*/
         ret.gsub!("\n","")
         ret = ret[/\?(.*)/, 1]
-        ret = exec_decrypt(key_path, ret) 
+        #ret = exec_decrypt(key_path, ret) 
+        ret = Dinomischus::dino_decrypt(key_path, ret) 
       else
         ret = value
       end

data/lib/dinomischus/l_def.rb

@@ -4,8 +4,7 @@ require 'optparse'
 require 'securerandom'
 require 'base64'
 
-require File.expand_path('../crypt_aes.rb', __FILE__)
-require File.expand_path('../l_conf.rb', __FILE__)
+require_relative './l_conf.rb'
 
 module Dinomischus
   attr_reader :items
@@ -31,7 +30,8 @@ module Dinomischus
       files = load_file(def_path)
       configs = {}
       files.each do |f|
-        cfg = Dinomischus::ConfFile.load_file(f[:conf_path])
+        conf_path = File.expand_path(f[:conf_path], def_path)
+        cfg = Dinomischus::ConfFile.load_file(conf_path)
         configs.merge!(cfg)
       end
       configs

data/lib/dinomischus/l_key.rb

@@ -4,8 +4,6 @@ require 'optparse'
 require 'securerandom'
 require 'base64'
 
-require File.expand_path('../crypt_aes.rb', __FILE__)
-
 module Dinomischus
   class KeyFile
 

data/lib/dinomischus/utils/crypt_dino.rb

@@ -0,0 +1,37 @@
+require 'base64'
+require 'securerandom'
+require_relative './crypt_aes.rb'
+
+module Dinomischus
+  def self.dino_encrypt(key_path, value)
+      raise RuntimeError.new("鍵ファイルが存在しません。#{key_path}") if !File.exist?(key_path)
+      
+      keys = YAML.load_file(key_path)
+      enctype = keys[:key][:type] 
+      if enctype == "sha256"
+        # sha256の処理。
+        pass = keys[:key][:value]
+        enc1 = Crypter::CryptAes.encrypt( value, pass, true )
+        enc2 = Crypter::CryptAes.encrypt( enc1.to_s, pass, false )
+      else
+        raise RuntimeError.new("未サポートの暗号です。#{enctype}")
+      end
+      enc2[0]
+  end
+
+  def self.dino_decrypt(key_path, value)
+      raise RuntimeError.new("鍵ファイルが存在しません。#{key_path}") if !File.exist?(key_path)
+      
+      keys = YAML.load_file(key_path)
+      enctype = keys[:key][:type] 
+      if enctype == "sha256"
+        pass = keys[:key][:value]
+        v2 = Crypter::CryptAes.decrypt( value, pass )
+        v1raw = YAML.load(v2)
+        v1 = Crypter::CryptAes.decrypt( v1raw[0], pass, v1raw[1])
+      else
+        raise RuntimeError.new("未サポートの暗号です。#{enctype}")
+      end
+  end
+end
+

data/lib/dinomischus/version.rb

@@ -1,3 +1,3 @@
 module Dinomischus
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dinomischus
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Kuroko Sin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-08 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -30,12 +30,13 @@ files:
 - dinomischus.gemspec
 - exe/dinomischus
 - lib/dinomischus.rb
-- lib/dinomischus/crypt_aes.rb
 - lib/dinomischus/l_conf.rb
 - lib/dinomischus/l_def.rb
 - lib/dinomischus/l_key.rb
 - lib/dinomischus/menu.rb
-- lib/dinomischus/merge_yaml.rb
+- lib/dinomischus/utils/crypt_aes.rb
+- lib/dinomischus/utils/crypt_dino.rb
+- lib/dinomischus/utils/merge_yaml.rb
 - lib/dinomischus/version.rb
 homepage: https://github.com/kurokoSin/Dinomischus
 licenses: