notifaction 0.3.0 → 0.3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1fbf23fc97a9f930d9dd79d440516eb4b33b148
-  data.tar.gz: eaf15cfb3496e21a565ae26d7710edc16a93ede9
+  metadata.gz: 77df94c1102f5000ccf7ed328b995f6b00959421
+  data.tar.gz: d4cafdd7d6cd7282e158c6e5759bc7e605e70699
 SHA512:
-  metadata.gz: 4b733df88dbbda18da7cb2f5e4563b37d918c72032e62f7dbc9481f2b9e94f39d683ac9db93583116fe5e03de6cbcbf1148550155692ed779779583362a0a57c
-  data.tar.gz: 4b63bc5169ee2ee76ffba4b9d79943b5d3d824dce2f36847b53fd861b1ca8f2c2f8cc3ff5feb614ae4eb23edb013437a3301b59ebaca8bcb0656597aefc38286
+  metadata.gz: 595feaf6b98cea3fb016df821b678800db211e5b69b7b1995ea724a8bacb0018549d17810c7a36c82c735e0691242f9ccfa6b6fc61b295cbec8ecc0f72558c72
+  data.tar.gz: a47f2a2474241f442f88193b34ac53c9f3fa269a26379b32493b4e2a20bdc98e319c2a1ad4ebc8ecfe3f198a0b1354fb4c3b4d11296ad91be179e4fb21314193

data/lib/notifaction.rb

@@ -9,5 +9,3 @@ require "notifaction/notify"
 require "notifaction/config"
 require "notifaction/version"
 require "notifaction/utils"
-
-$config = Notifaction::Cfg.new

data/lib/notifaction/notify.rb

@@ -26,7 +26,7 @@ class Notify
   def self.error(message, config = {})
     handler = Notifaction::Type::Terminal.new
     handler.error(message, config)
-    handler.quit unless self.auto_quit_enabled(config)
+    handler.quit unless self.auto_quit_enabled(config, handler.user_conf)
   end
 
   # Prints a pre-formatted warning message to the console
@@ -104,7 +104,7 @@ class Notify
 
   #
   # @since 0.3.0
-  def self.auto_quit_enabled(config)
-    config[:auto_quit] == false || $config.conf["auto_quit"] == false
+  def self.auto_quit_enabled(config, user_conf)
+    config[:auto_quit] == false || user_conf.conf["auto_quit"] == false
   end
 end

data/lib/notifaction/type.rb

@@ -4,6 +4,14 @@ require "uri"
 module Notifaction
   module Type
     class Base
+      attr_accessor :user_conf
+
+      #
+      # @since 0.3.0.1
+      def initialize
+        @user_conf = Notifaction::Cfg.new
+      end
+
       #
       # @since 0.2.8
       def deprecation_notice(version)
@@ -19,7 +27,7 @@ module Notifaction
       #
       # @since 0.3.0
       def fire_hooks(payload)
-        hooks = $config.hooks
+        hooks = @user_conf.hooks
 
         return if hooks.nil?
 

data/lib/notifaction/types/terminal.rb

@@ -82,15 +82,15 @@ module Notifaction
       end
 
       def show_symbol(config)
-        config[:symbol] || config[:fancy] || $config.conf["fancy"] == true
+        config[:symbol] || config[:fancy] || @user_conf.conf["fancy"] == true
       end
 
       def show_time(config)
-        config[:show_time] || $config.conf["show_time"]
+        config[:show_time] || @user_conf.conf["show_time"]
       end
 
       def show_message(config)
-        config[:print] == false || $config.conf["print"] == false
+        config[:print] == false || @user_conf.conf["print"] == false
       end
     end
   end

data/lib/notifaction/version.rb

@@ -1,3 +1,3 @@
 module Notifaction
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.0.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifaction
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.0.1
 platform: ruby
 authors:
 - Яyan Priebe