smpl_prflr 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e831f2e767a19c097213f666ba1d2b4cc84b3af52e89b63fe6dafae66f96570d
-  data.tar.gz: 0c344feef44fe4104b7079dd97472263daff3e64fec9cd197b99ec5bf34a1f95
+  metadata.gz: 4512a90321b13ef139c866db48da2d2d470db633f1a61338ef429d0d0d12bb0b
+  data.tar.gz: 68ba88dc28766ccdd6d5f901e705dc27df67918e1da35fd208e41e14aa364a36
 SHA512:
-  metadata.gz: 30ac0c5de973a642f055f399ecb1cc2880345c8d5bd99b382f1ce94ab888a966958e2bc8150dc5bba97effbf5c157f14d54d06238759b54198bdcb7750a934dd
-  data.tar.gz: 56f70de2928425215e4697c7a84255d5f323eef520362e9c9a55f4e3747f06f966aabc4c6894b0bf07345aa3721d54e0e869a0a035c2d7d20e3ea6773f39f161
+  metadata.gz: d3e79a2500b151477282f1098af5df11cf584f66f4de11db81bb0faaf6b48076578e73e89a47c0df52f8cf3103f7b70cd2acb4df58800f92752b0cf4cbee1512
+  data.tar.gz: 58ace1f5a79d7d6a6cc83cac4abe7fe6aaac89cd141f91dad5a770bb0d672bc0d80644c76cdf2c1d00741d9c03c3bb48245b4009656c7fa406f6d4e03f4ffcd5

data/.rubocop.yml

@@ -61,4 +61,7 @@ Style/IdenticalConditionalBranches:
   Enabled: false
 
 Style/ExplicitBlockArgument:
+  Enabled: false
+
+Style/RedundantFreeze:
   Enabled: false

data/README.md

@@ -23,7 +23,7 @@ requre 'smpl_prflr'
 
  include SmplPrflr 
 
- initialize_profiler!(mod: "production")
+ initialize_profiler! :production
  
  p { block_of_your_own_code }
 ```

data/bin/smpl_prflr

@@ -9,7 +9,11 @@ require 'redis'
 #  url: 127.0.0.1
 #  method GET
 def my_method env
-  redis = Redis.new host: "127.0.0.1", port: 6379, db: 15
+  redis = Redis.new(
+    host: "127.0.0.1" || env[:HOST],
+    port: 6379 || env[:PORT],
+    db: 15 || env[:DB]
+  )
   result = redis.get(:profile) || "Nothing to profile"
   [200, {}, [result]]
 rescue StandardError

data/lib/smpl_prflr/constants.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2019-2022 Kondratev Ilya
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module SmplPrflr
+  module Constants
+    MODES = {
+      production: "config/production.yml",
+      development: "config/development.yml",
+      test: "config/test.yml"
+    }.freeze
+
+    HOST = "127.0.0.1".freeze
+    PORT = "6379"
+    DB = "15"
+  end
+end

data/lib/smpl_prflr/version.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2019-2022 Kondratev Ilya
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module SmplPrflr
+  VERSION = "0.0.9".freeze
+end

data/lib/smpl_prflr.rb

@@ -23,35 +23,41 @@
 # SOFTWARE.
 
 require 'logger'
-require "config"
+require "figaro"
 require 'ruby-prof'
 require 'redis'
-require 'profiler/constants'
-require 'active_support/all'
+require 'smpl_prflr/constants'
 
 module SmplPrflr
+  class ProfilerError < StandardError; end
+
   # @author KILYA
   # Init logger
+  #
   # Init Profiler
+  #
   # Load env
+  #
   # Init Redis
+  # @raise [ProfilerError]
   def initialize_profiler!(mod = :development)
-    Config.setup do |config|
-      config.const_name = "Settings"
-      config.use_env = false
-    end
-
-    env = mod.to_sym
-    path = Dir.pwd << ("/config")
-    Config.load_and_set_settings(Config.setting_files(path, env))
-    Settings.env = env
+    path = File.expand_path(
+      Constants::MODES[mod.to_sym]
+    )
+    Figaro.application = Figaro::Application.new(
+      environment: mod.to_sym,
+      path: path
+    )
+    Figaro.load
 
     @logger = Logger.new($stdout)
     @redis = Redis.new(
-      host: Settings.HOST || Profiler::Constants::DEFAULT_HOST,
-      port: Settings.PORT || Profiler::Constants::DEFAULT_PORT,
-      db: Settings.DB || Profiler::Constants::DEFAULT_DB
+      host: Figaro.env.host || SmplPrflr::Constants::HOST,
+      port: Figaro.env.port || SmplPrflr::Constants::PORT,
+      db: Figaro.env.db || SmplPrflr::Constants::DB
     )
+  rescue StandardError => e
+    raise ProfilerError.new e.message
   end
 
   # @author KILYA
@@ -65,11 +71,11 @@ module SmplPrflr
   # Profile block of your code
   # @return [nil]
   def p
-    output = String.new
     result = RubyProf.profile do
       yield
     end
 
+    output = String.new
     printer = RubyProf::FlatPrinter.new(result)
     printer.print(output, min_percent: 0)
     @redis.set(:profile, output)

data/smpl_prflr.gemspec

@@ -1,4 +1,9 @@
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'English'
+require 'smpl_prflr/version'
+
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   if s.respond_to? :required_rubygems_version=
@@ -7,7 +12,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.7'
   s.required_ruby_version = '>=2.2'
   s.name = 'smpl_prflr'
-  s.version = '0.0.8'
+  s.version = SmplPrflr::VERSION
   s.executables << 'smpl_prflr'
   s.license = 'MIT'
   s.summary = 'Profiler'
@@ -21,5 +26,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'ruby-prof', '~> 1.4', '>= 1.4.3'
   s.add_dependency 'redis', '~> 4.6'
   s.add_dependency 'rack', '~> 2.2'
-  s.add_dependency 'config', '~> 4.0'
+  s.add_dependency 'figaro', '~> 1.2'
 end

data/test/test_ping.rb

@@ -1,5 +1,6 @@
 require 'minitest/autorun'
 require 'smpl_prflr'
+require 'smpl_prflr/version'
 
 class TestPing < Minitest::Test
   include SmplPrflr
@@ -7,4 +8,8 @@ class TestPing < Minitest::Test
   def test_reverse_string
     assert_equal("PONG", ping)
   end
+
+  def test_version
+    assert_equal("0.0.8", SmplPrflr::VERSION)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smpl_prflr
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ilya Kondratev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -87,19 +87,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: config
+  name: figaro
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.2'
 description: SmplPrflr for profiler own code.
 email: ilyafulleveline@gmail.com
 executables:
@@ -115,8 +115,9 @@ files:
 - README.md
 - Rakefile
 - bin/smpl_prflr
-- lib/profiler/constants.rb
 - lib/smpl_prflr.rb
+- lib/smpl_prflr/constants.rb
+- lib/smpl_prflr/version.rb
 - smpl_prflr.gemspec
 - test/test_ping.rb
 homepage: https://github.com/ikondratev/smpl_prflr

data/lib/profiler/constants.rb

@@ -1,7 +0,0 @@
-module Profiler
-  module Constants
-    DEFAULT_HOST = "127.0.0.1".freeze
-    DEFAULT_PORT = 6379
-    DEFAULT_DB = 15
-  end
-end