nub 0.0.128 → 0.0.132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc495fbfdb92d3b2cbd5f8b34373e4ffd7ccfc5f9ddfede0140d1e52c8a2e89a
-  data.tar.gz: 27067ccd9364da31e08077f0cedce3fcf46594c6f2522a115695e5d310e908bf
+  metadata.gz: 6716e8061fc1229e2f09ee178f5de3a7f393fc4813293eacb47212a51e6fc066
+  data.tar.gz: 41b6d8ade5c092f30bfac71f476d8391dfaad58c1e738519eff525fc6fcc9362
 SHA512:
-  metadata.gz: c16bb3b7b76f1d2c80a3bcc05044eb81105fa1014e33c15c82bfb1930b739cede6a40dd27606ee56bfcb846efdbb805bc574bdd4395f867994fcb21ccd9079ec
-  data.tar.gz: fb633b15decdf82c281d235a8e0fe1c1db04c30175cbef81a5680522d528cd87329b821525bced89e25aecc75681b6adace6438282038c5a511a4955d7a73158
+  metadata.gz: d699b969b580355a1ca0c6a5000a311d6aebe25e99ec42f7fb775cfeed48f335db762e7e13d57f1800b2e5c85f69b7d3a6d265fc7f5f3b1c9c1dded884b26d53
+  data.tar.gz: 77f0c05ccf459386ff39a6d274a4d11ae212a1ff88483ee601d4ecf731da10bebd0c7f10f6f7672f3244795e9a3bfbb2586599d282e9102279a362ebe0deccfe

data/lib/nub/config.rb

@@ -22,19 +22,19 @@
 require 'yaml'
 require 'colorize'
 
-require_relative 'user'
 require_relative 'log'
+require_relative 'user'
+require_relative 'module'
 
 # Simple YAML configuration for an application.
 # Uses singleton pattern for single source of truth
 module Config
   extend self
-  @@_yml = {}
+  mattr_accessor(:path, :yml)
 
-  # Public properties
-  class << self
-    attr_accessor :path
-  end
+  # Defaults
+  @@yml = {}
+  @@path = ""
 
   # Singleton new alternate
   # @param config [String] name or path of the config file
@@ -42,46 +42,52 @@ module Config
 
     # Determine caller's file path to look for sidecar config
     caller_path = caller_locations(1, 1).first.path
-    @path = File.expand_path(File.join(File.dirname(caller_path), config))
-    if !File.exists?(@path)
-      @path = "/home/#{User.name}/.config/#{config.split('/').first}"
+    @@path = File.expand_path(File.join(File.dirname(caller_path), config))
+    if !File.exists?(@@path)
+      @@path = "/home/#{User.name}/.config/#{config.split('/').first}"
     end
 
     # Open the config file or create in memory yml
     begin
-      @@_yml = File.exists?(@path) ? YAML.load_file(@path) : {}
+      @@yml = File.exists?(@@path) ? YAML.load_file(@@path) : {}
     rescue Exception => e
       Log.die(e)
     end
 
-    return nil
+    return Config
+  end
+
+  # Set back to defaults read for init again
+  def reset
+    self.yml = {}
+    self.path = ""
   end
 
   # Simple bool whether the config exists or not on disk
   def exists?
-      return File.exists?(@path)
+      return File.exists?(@@path)
   end
 
   # Hash like getter
   def [](key)
-    return @@_yml[key]
+    return @@yml[key]
   end
 
   # Hash like setter
   def []=(key, val)
-    return @@_yml[key] = val
+    return @@yml[key] = val
   end
 
   # Get the given key and raise an error if it doesn't exist
   def get!(key)
-    Log.die("couldn't find '#{key}' in config") if !@@_yml.key?(key)
-    return @@_yml[key]
+    Log.die("couldn't find '#{key}' in config") if !@@yml.key?(key)
+    return @@yml[key]
   end
 
   # Save the config file
   def save
-    return unless @@_yml
-    File.open(@path, 'w', 0600){|f| f.write(@@_yml.to_yaml)}
+    return unless @@yml
+    File.open(@@path, 'w', 0600){|f| f.write(@@yml.to_yaml)}
   end
 end
 

data/lib/nub/user.rb

@@ -28,16 +28,15 @@ module User
 
   # Drop root privileges to original user
   # Only affects ruby commands not system commands
-  # Params:
-  # +returns+:: uid, gid of prior user
+  # @returns [uid, gid] of root user
   def drop_privileges()
     uid = gid = nil
 
     if Process.uid.zero?
       uid, gid = Process.uid, Process.gid
       sudo_uid, sudo_gid = ENV['SUDO_UID'].to_i, ENV['SUDO_GID'].to_i
-      Process::Sys.setegid(sudo_uid)
-      Process::Sys.seteuid(sudo_gid)
+      Process::Sys.seteuid(sudo_uid)
+      Process::Sys.setegid(sudo_gid)
     end
 
     return uid, gid
@@ -45,9 +44,8 @@ module User
 
   # Raise privileges if dropped earlier
   # Only affects ruby commands not system commands
-  # Params:
-  # +uid+:: uid of user to assume
-  # +gid+:: gid of user to assume
+  # @param uid [String] uid of user to assume
+  # @param gid [String] gid of user to assume
   def raise_privileges(uid, gid)
     if uid and gid
       Process::Sys.seteuid(uid)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nub
 version: !ruby/object:Gem::Version
-  version: 0.0.128
+  version: 0.0.132
 platform: ruby
 authors:
 - Patrick Crummett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize