briefbag 1.0.4 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bcd65204c8125e2a23ae6706f2697ac20110f48b8223e43ec9b5aa2265599f8
-  data.tar.gz: 645010474f211ab098bca35fa575fda18c5980d8797bcd7383d775d138064d58
+  metadata.gz: 1be8501bb6bbcee9ee98221feb919745d30cc8319a4d1d8f4f93040659cf2e3a
+  data.tar.gz: 55809c1db40392f2e6836f1953ab98ae9a9940501238ea3bca8dc88b3c06c791
 SHA512:
-  metadata.gz: 14c91bdf8252460cc67e44f35eb670d354a2c192aa05bbbdbcdaa809e7b6c942fdc232c83ffd58a35dfd7b4cc2732f074462c64dc3261a9873b343e8992bb0fb
-  data.tar.gz: c3af83908ffffc46c20b00468d69c5d36e871c8a4d1be4bfa7ba90a3876cc78408fe44d82e79a7165cff1fe54fd0db32606d0434c5f24fb93bf1f1523fd16fba
+  metadata.gz: db8c18c6927fad881e74965149dc488efdc1928690cb529f691ff7bb9591b1f3ccf5eb0fa4a43582e7b2b208cbd2bfaeadd4c5269aa31113b65c0ca8d102cfb2
+  data.tar.gz: 05f06c368ae3b839f8274dc374b867d502365a7513651ae122ae0ffc9c18f219122237134d755406599550b886c7f39095b4da914683ab410eabfcd581c1abec

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.4.2
+  TargetRubyVersion: 3.1.2
   SuggestExtensions: false
 
 Style/StringLiterals:

data/.ruby-version

@@ -1 +1 @@
-2.4.2@briefbag
+3.1.2@briefbag

data/CHANGELOG.md

@@ -1,21 +1,9 @@
 # CHANGELOG
 
-## 0.0.1 - 2023-02-03
+## 0.0.1 - 2023-01-22
 
 * Briefbag was born
 
-## 0.0.2 - 2023-03-15
+## 2.0.1 - 2023-01-22
 
-* Fix bugs
-
-## 1.0.2 - 2023-03-16
-
-* Refactoring: delete anyway config, using yml from ruby, change params and upd docs, implementation rake tasks
-
-## 1.0.3 - 2023-03-16
-
-* Fix bugs byebug
-
-## 1.0.4 - 2023-11-13
-
-* Add function copy configs add task copy config
+* update gem Briefbag to new ruby 3.1.2 

data/README.md

@@ -1,6 +1,6 @@
 # Briefbag
 
-[![Gem Version](https://badge.fury.io/rb/briefbag.svg)](https://badge.fury.io/rb/briefbag)
+[![Gem Version](https://badge.fury.io/rb/briefbag.svg)](https://badge.fury.io/rb/dadatas)
 [![Gem](https://img.shields.io/gem/dt/briefbag.svg)](https://rubygems.org/gems/briefbag)
 
 
@@ -27,9 +27,11 @@ And what if you need to share the configuration file with colleagues, or use thi
 Consul comes to the rescue. Thanks to him, you can act config and undress in different stands.
 Generation `.yml` file there are 2 rake tasks: rake
 
-Need add to you Rakefile
+- **rake settings:consul2yml** -  Get key/value variables from consul to `.yml` file
+- **rake settings:template2yml** - Generate basic `.yml` for your app. Based on it, you can fill it with any values
 
 
+Need add to you Rakefile
 ```ruby
 
 require 'briefbag'
@@ -38,24 +40,6 @@ spec = Gem::Specification.find_by_name 'briefbag'
 load "#{spec.gem_dir}/lib/tasks/settings.rake"
 ```
 
-- **rake settings:consul2yml** -  Get key/value variables from consul to `.yml` file
-- **rake settings:transfer_config** - Transfer all collection configs in new consul folder
-
-```shell
-  #rake settings:consul2yml[consul_host,consul_port,consul_token, my_project, environment,config_folder]  
-  rake settings:consul2yml['127.0.0.1',8500,'consul_token','my_project','development',"config/configuration.yml"]  
-```
-
-```shell
-  #rake settings:consul2yml[consul_host,consul_port,consul_token, my_project, from_path, to_path]  
-  rake settings:transfer_config['127.0.0.1',8500,'consul_token','my_project','from','to']  
-```
-
-
-
-
-
-
 #### Notifications:
 If you use `.yml` .You will see: 
 > NOTICE! Your app using configs from yml file
@@ -91,7 +75,7 @@ Or install it yourself as:
 - **consul_token(string)** - *(optional)* If you use ACL Token.
 - **consul_folder(string)** *(required)* Name config folder in consul.
 - **environment(string)** - *(optional)* Default value ${development}. Environment in consul.
-- **config_path(string)** - *(required)* Сonfig path to your config file. for example path to yml file:  'config/application.yml'
+- **config_name(string)** - *(optional)* Default value ${application}. Config name in your application for example path to yml file:  'config/application.yml' you need use name 'application'.
 
 ```ruby
 require 'briefbag'
@@ -102,7 +86,7 @@ params_config = {
   consul_token: '233b604b-b92e-48c8-a253-5f11514e4b50',
   consul_folder: 'briefbag',
   environment: 'test', 
-  config_path: 'config/some_config.yml' 
+  config_name: 'some_config' 
 }
 configs = Briefbag::Configuration.new(params_config).call
 => #<struct database=#<struct adapter="postgresql", host="localhost", port=5432, database="tets_dev", username="postgres", password=""... 

data/briefbag.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary = 'Briefbag manage your config'
   spec.homepage = 'https://github.com/MichaelHitchens/briefbag'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.4.2'
+  spec.required_ruby_version = '>= 3.1.2'
 
   spec.metadata = {
     'homepage_uri' => spec.homepage,
@@ -33,15 +33,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Requires Ruby faraday to http request
-  spec.add_dependency 'diplomat', '>= 2.4.4'
+  spec.add_dependency 'anyway_config', '~> 2.3.1'
+  spec.add_dependency 'diplomat', '>=2.6.4'
   spec.add_dependency 'hash_to_struct', '>=1.0.0'
-  spec.add_dependency 'rainbow', '>= 2.2.2'
-  spec.add_dependency 'rake', '>= 13.0.3'
+  spec.add_dependency 'rainbow', '~> 3.1.1'
+  spec.add_dependency 'rake', '~> 13.0.6'
 
   spec.add_development_dependency 'bundler', '~> 2.3.26'
   spec.add_development_dependency 'byebug', '~> 11.1.3'
-  spec.add_development_dependency 'faker', '~> 2.12.0'
+  spec.add_development_dependency 'faker', '~> 3.1.1'
   spec.add_development_dependency 'rake', '~> 13.0.6'
   spec.add_development_dependency 'rspec', '~> 3.12.0'
-  spec.add_development_dependency 'rubocop', '~> 1.10.0'
+  spec.add_development_dependency 'rubocop', '~> 1.44.1'
 end

data/lib/briefbag/configuration.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'briefbag/diplomat'
+require 'anyway_config'
 require 'rainbow'
 require 'hash_to_struct'
-require 'yaml'
 
 module Briefbag
   class Configuration
-    attr_reader :config, :config_path
+    attr_reader :config, :config_name
 
     MESSAGES = {
       notice_yml: 'NOTICE! Your app is using configs from yml file',
@@ -20,17 +20,16 @@ module Briefbag
     }.freeze
 
     def initialize(config)
-      @config_path = config[:config_path]
+      @config_name = config[:config_name] || 'application'
       @config = config
     end
 
     def call
-      return file_config if file_exist?
-
       diplomat = Briefbag::Diplomat.new(config).call
-      return Briefbag.aborting_message(MESSAGES[:error_consul]) unless diplomat.success?
+      return file_config if file_exist? && config[:environment].eql?('development')
 
-      diplomat_config(diplomat[:consul_data])
+      return diplomat_config(diplomat[:consul_data]) if diplomat.success?
+      return Briefbag.aborting_message(MESSAGES[:error_consul]) unless diplomat.success?
     rescue StandardError
       return Briefbag.aborting_message(MESSAGES[:error_yml]) unless file_exist?
 
@@ -44,15 +43,24 @@ module Briefbag
 
     def file_config
       Briefbag.warning_message(MESSAGES[:notice_yml])
-      data = YAML.load_file(config_path)
+      Anyway::Settings.default_config_path = 'config'
+      data = Anyway::Config.for(config_name.to_sym, env_prefix: config[:environment])
 
-      return HashToStruct.struct(data.deep_symbolize_keys)[config[:environment]] if defined?(Rails)
+      return HashToStruct.struct(data.deep_symbolize_keys) if defined?(Rails)
 
-      HashToStruct.struct(symbolize_all_keys(data))[config[:environment]]
+      HashToStruct.struct(symbolize_all_keys(data))
     end
 
     def file_exist?
-      @file_exist ||= File.exist?(config_path)
+      @file_exist ||= File.exist?(yaml_file)
+    end
+
+    def yaml_file
+      @yaml_file ||= "./config/#{config_name}.yml"
+    end
+
+    def local_keys
+      @local_keys ||= YAML.safe_load(File.read(yaml_file))[environment].keys
     end
 
     def symbolize_all_keys(h) # rubocop:disable  Naming/MethodParameterName

data/lib/briefbag/diplomat.rb

@@ -2,7 +2,6 @@
 
 require 'diplomat'
 require 'socket'
-require 'yaml'
 
 module Briefbag
   class Diplomat
@@ -23,6 +22,7 @@ module Briefbag
 
     def configuration
       ::Diplomat.configure do |conf|
+        # Set up a custom Consul URL
         conf.url = url_build
         break if config[:consul_token].nil?
 
@@ -39,9 +39,15 @@ module Briefbag
       ::Diplomat::Kv.get_all(consul_folder)
     end
 
+    def json_parsing(value)
+      return JSON.parse(value.force_encoding('UTF-8')) if value.encoding.eql? 'ASCII-8BIT'
+
+      JSON.parse(value)
+    end
+
     def mapping_hash
       consul_data.each_with_object({}) do |item, hash|
-        hash[item[:key].split('/').last.to_sym] = ::YAML.safe_load(item[:value])
+        hash[item[:key].split('/').last.to_sym] = json_parsing(item[:value])
       end
     end
 
@@ -61,7 +67,7 @@ module Briefbag
     end
 
     def url_build
-      Object.const_get("URI::HTTP#{port.eql?(443) ? 'S' : ''}").build(host: host, port: port)
+      Object.const_get("URI::HTTP#{port.eql?(443) ? 'S' : ''}").build(host:, port:)
     end
 
     def check_consul

data/lib/briefbag/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Briefbag
-  VERSION = '1.0.4'
+  VERSION = '2.0.1'
 end

data/lib/tasks/settings.rake

@@ -1,65 +1,23 @@
 # frozen_string_literal: true
 
-require 'briefbag'
-require 'rails'
-
 namespace :settings do
   desc 'create application.yml from consul data'
-  task :consul2yml,
-       [:consul_host, :consul_port, :consul_token, :consul_folder, :environment, :config_path] do |_t, args|
-    diplomat_config = Briefbag::Diplomat.new(
-      consul_host: args[:consul_host],
-      consul_port: args[:consul_port].to_i,
-      consul_token: args[:consul_token],
-      consul_folder: args[:consul_folder],
-      environment: args[:environment]
-    )
-
-    data = diplomat_config.call
-
-    return warn Rainbow('Consul is down').red unless data.success?
-
-    yml_file = "#{Rails.root}/#{args[:config_path]}"
-    if Rails.env.development? && !File.exist?(yml_file)
-      configs = { "#{args[:environment]}": data.consul_data.deep_symbolize_keys }
-      warn Rainbow("Create #{args[:config_path]}").green
-      File.write(yml_file, configs.deep_stringify_keys.to_yaml)
-      warn Rainbow("Done! File #{args[:config_path]} created!").green
-    else
-      warn Rainbow("Skip! File #{args[:config_path]} exists.").red
-    end
-  end
-
-  desc 'Transfer configs file in consul from/to projects'
-  task :transfer_config, [:consul_host, :consul_port, :consul_token, :from, :to] do |_t, args|
-    url = URI::HTTP.build(host: args[:consul_host], port: args[:consul_port])
-
-    from = args[:from]
-    to = args[:to]
-
-    Diplomat.configure do |config|
-      config.url = url
-      config.options = {
-        ssl: { version: :TLSv1_2 },
-        headers: {
-          'X-Consul-Token' => args[:consul_token]
-        }
-      }
-    end
-
-    keys = Diplomat::Kv.get(from.to_s, keys: true)
-    keys.delete_at(0) # delete self name folder
-    config_names = keys.map { |k| k.split('/').last }
 
-    config_names.each do |config_name|
-      warn Rainbow("Start read data for key: #{config_name}").yellow
-      config = Diplomat::Kv.get("#{from}/#{config_name}")
-      Diplomat::Kv.put("#{to}/#{config_name}", config)
-      warn Rainbow("Success transfer data for key: #{config_name}").green
-    end
+  # task :consul2yml [:consul_host, :consul_port, :consul_token, :consul_folder, :environment] do |_t, args|
+  #   ss = Briefbag::Diplomat.new(consul_host: args[:consul_host],
+  #                               consul_port: args[:consul_port],
+  #                               consul_token: args[:consul_token],
+  #                               consul_folder: args[:consul_folder],
+  #                               environment: args[:environment]).call
+  #   puts ss
+  # end
+
+  task consul2yml: :environment do
+    p 'ya rake task'
   end
 
   desc 'create application.yml from template'
   task template2yml: :environment do
+    p 'ya rake task'
   end
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: briefbag
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.1
 platform: ruby
 authors:
 - Michael Hitchens
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: anyway_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.6.4
 - !ruby/object:Gem::Dependency
   name: hash_to_struct
   requirement: !ruby/object:Gem::Requirement
@@ -42,30 +56,30 @@ dependencies:
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.44.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.44.1
 description:
 email:
 - mmseleznev@gmail.com
@@ -190,14 +204,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.2
+      version: 3.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Briefbag manage your config