briefbag 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89c74cba17822d48234a9b16ec1a232e4bc20a48b18f675daddd670a2f04e08f
-  data.tar.gz: fedf220e8ab8d6c3f4376685685aff3c4638e71e8aeba507382ebc1361f2e1cf
+  metadata.gz: 66b7c96c40783d727444f581e65f520eaadd8b4d249e2887ffc9d0ed20b40dbc
+  data.tar.gz: f6e0ef37c64612473441876a50eb0fa5b1270c726774aef289a1c687fa4957e0
 SHA512:
-  metadata.gz: 1abfa35f9ac0383b69d805c8ebe76400165a434303b7a8924b420c20ecb512023ee01b35c12017f6c0e34d9d787d6afd40e0d5ef5de404368397d901a6fb89c8
-  data.tar.gz: 58ea42d6a9087385428d574a6a345152b1e741001589f3783c3b0468eb9291c98c7f307a85c8404bdfdb7c5ca1a42eb353e0a355d3e479648e5664ff6cfae00e
+  metadata.gz: d4e9e34c7455c10f69898525de740da05e3bde3776c818afc527768c05af05bd25fa374df28a1e12768034bcbd51b6509666a847e7ef82f1626adac8c1fb2f6a
+  data.tar.gz: ce47693102526f590fbd87b88f2b33b86cc562e76814953b5a8e9d221a8453f8c1371483c565a3633a81402234908c3ef7b2033baf1d415ae12c374fb8fca65d

data/.rubocop.yml

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

data/.ruby-version

@@ -1 +1 @@
-2.7.5@briefbag
+2.4.2@briefbag

data/CHANGELOG.md

@@ -1,19 +1,13 @@
 # CHANGELOG
 
-## 0.0.1 - 2023-01-22
+## 0.0.1 - 2023-02-03
 
 * Briefbag was born
 
-## 1.0.0 - 2023-02-24
+## 0.0.2 - 2023-03-15
 
-* Briefbag was born in ruby 2.7.5
+* Fix bugs
 
-## 1.0.1 - 2023-02-24
+## 1.0.2 - 2023-03-16
 
-* Briefbag change method work with local files
-
-
-## 2.0.1 - 2023-01-22
-
-
-* update gem Briefbag to new ruby 3.1.2 
+* Refactoring: delete anyway config, using yml from ruby, change params and upd docs, implementation rake tasks

data/README.md

@@ -1,6 +1,6 @@
 # Briefbag
 
-[![Gem Version](https://badge.fury.io/rb/briefbag.svg)](https://badge.fury.io/rb/dadatas)
+[![Gem Version](https://badge.fury.io/rb/briefbag.svg)](https://badge.fury.io/rb/briefbag)
 [![Gem](https://img.shields.io/gem/dt/briefbag.svg)](https://rubygems.org/gems/briefbag)
 
 
@@ -75,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_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'.
+- **config_path(string)** - *(required)* Сonfig path to your config file. for example path to yml file:  'config/application.yml'
 
 ```ruby
 require 'briefbag'
@@ -86,7 +86,7 @@ params_config = {
   consul_token: '233b604b-b92e-48c8-a253-5f11514e4b50',
   consul_folder: 'briefbag',
   environment: 'test', 
-  config_name: 'some_config' 
+  config_path: 'config/some_config.yml' 
 }
 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.7.5'
+  spec.required_ruby_version = '>= 2.4.2'
 
   spec.metadata = {
     'homepage_uri' => spec.homepage,
@@ -33,16 +33,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Requires Ruby faraday to http request
-  spec.add_dependency 'anyway_config', '~> 2.3.1'
-  spec.add_dependency 'diplomat', '>=2.6.4'
+  spec.add_dependency 'diplomat', '>= 2.4.4'
   spec.add_dependency 'hash_to_struct', '>=1.0.0'
-  spec.add_dependency 'rainbow', '~> 3.1.1'
-  spec.add_dependency 'rake', '~> 13.0.6'
+  spec.add_dependency 'rainbow', '>= 2.2.2'
+  spec.add_dependency 'rake', '>= 13.0.3'
 
-  spec.add_development_dependency 'bundler', '~> 2.1.4'
+  spec.add_development_dependency 'bundler', '~> 2.3.26'
   spec.add_development_dependency 'byebug', '~> 11.1.3'
-  spec.add_development_dependency 'faker', '~> 3.1.1'
+  spec.add_development_dependency 'faker', '~> 2.12.0'
   spec.add_development_dependency 'rake', '~> 13.0.6'
   spec.add_development_dependency 'rspec', '~> 3.12.0'
-  spec.add_development_dependency 'rubocop', '~> 1.44.1'
+  spec.add_development_dependency 'rubocop', '~> 1.10.0'
 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_name
+    attr_reader :config, :config_path
 
     MESSAGES = {
       notice_yml: 'NOTICE! Your app is using configs from yml file',
@@ -20,7 +20,7 @@ module Briefbag
     }.freeze
 
     def initialize(config)
-      @config_name = config[:config_name] || 'application'
+      @config_path = config[:config_path]
       @config = config
     end
 
@@ -44,23 +44,17 @@ module Briefbag
 
     def file_config
       Briefbag.warning_message(MESSAGES[:notice_yml])
-      Anyway::Settings.default_config_path = 'config'
-      data = Anyway::Config.for(config_name.to_sym, env_prefix: config[:environment])
+      data = YAML.load_file(config_path)
 
-      return HashToStruct.struct(data.deep_symbolize_keys) if defined?(Rails)
+      return HashToStruct.struct(data.deep_symbolize_keys)[config[:environment]] if defined?(Rails)
 
       HashToStruct.struct(symbolize_all_keys(data))[config[:environment]]
     end
 
     def file_exist?
-      @file_exist ||= File.exist?(yaml_file)
+      @file_exist ||= File.exist?(config_path)
     end
 
-    def yaml_file
-      @yaml_file ||= "./config/#{config_name}.yml"
-    end
-
-
     def symbolize_all_keys(h) # rubocop:disable  Naming/MethodParameterName
       if h.is_a? Hash
         h.transform_keys!(&:to_sym)

data/lib/briefbag/diplomat.rb

@@ -2,6 +2,7 @@
 
 require 'diplomat'
 require 'socket'
+require 'yaml'
 
 module Briefbag
   class Diplomat
@@ -22,7 +23,6 @@ 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,15 +39,9 @@ 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] = json_parsing(item[:value])
+        hash[item[:key].split('/').last.to_sym] = ::YAML.safe_load(item[:value])
       end
     end
 

data/lib/briefbag/version.rb

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

data/lib/tasks/settings.rake

@@ -1,21 +1,64 @@
 # frozen_string_literal: true
 
+require 'briefbag'
+require 'byebug'
+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]
+    )
 
-  # 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
+    data = diplomat_config.call
 
-  task consul2yml: :environment do
-    p 'ya rake task'
+    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_url, :consul_token, :project, :from_env, :to_env] do |_t, args|
+    project = args[:project]
+    from = args[:from_env]
+    to = args[:to_env]
+
+    Diplomat.configure do |config|
+      config.url = args[:consul_url]
+      config.options = {
+        ssl: { version: :TLSv1_2 },
+        headers: {
+          'X-Consul-Token' => args[:consul_token]
+        }
+      }
+    end
+    keys = Diplomat::Kv.get("#{from}/#{project}", 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}/#{project}/#{config_name}")
+      Diplomat::Kv.put("#{to}/#{project}/#{config_name}", config)
+      warn Rainbow("Success transfer data for key: #{config_name}").green
+    end
   end
 
+
   desc 'create application.yml from template'
   task template2yml: :environment do
     p 'ya rake task'

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: briefbag
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Michael Hitchens
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-19 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.6.4
+        version: 2.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: 2.4.4
 - !ruby/object:Gem::Dependency
   name: hash_to_struct
   requirement: !ruby/object:Gem::Requirement
@@ -56,44 +42,44 @@ dependencies:
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: 13.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.3.26
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.3.26
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.44.1
+        version: 1.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.44.1
+        version: 1.10.0
 description:
 email:
 - mmseleznev@gmail.com
@@ -204,14 +190,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.5
+      version: 2.4.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Briefbag manage your config