user_space 4.1.210122 → 5.0.210123

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: affe703bd77f1caf7cd1196cf3d24ccc66340bda26163a4d333ac446bc6249a7
-  data.tar.gz: 9e0ab93da71eefc3bbc90630f26788ffc7fa4f65a5f581d7da3799c9da9aac37
+  metadata.gz: 1d7d345bdf4350375456747427362e151414f4e2eac1e62e890ef7692db500f4
+  data.tar.gz: f0cf7bf35d981425f444630a22e68348a829863dc5a9eba9728368fac959af99
 SHA512:
-  metadata.gz: ef0d5faf595eb3980161f5725bf9bc1092d63bfd1ce1b46fdd3cc1b6283ee5046033cdd7b8ab881edbff0a4c6fafac54bc46593b5c342695bd303d629880608a
-  data.tar.gz: e9a9fe8cd05890af3f8527e24c1314c76be12f830ec33682b25834c561a2d9f79b25f058ebbd7d2502210078c2fe7451f796cb3eb6af4b744070c589d88a9aa3
+  metadata.gz: c91c634ae02ab53e00108491be15b8cf077caf62bc796bc275f6e1fc548940a55b0a3f87760b61dd02a15561b1098a026dc88c9097c252583c3746957c323c0a
+  data.tar.gz: '095f378b67969f6628f56bce47c12fcdd0d9b8596a434c4effd21239853e0fbd962c3e36ada329f4abd24ec62ec0e59ec11159a3e55df0bedd866db8ec2facc2'

data/README.md

@@ -1,6 +1,6 @@
 # UserSpace
 
-* [VERSION 4.1.210122](https://github.com/carlosjhr64/user_space/releases)
+* [VERSION 5.0.210123](https://github.com/carlosjhr64/user_space/releases)
 * [github](https://www.github.com/carlosjhr64/user_space)
 * [rubygems](https://rubygems.org/gems/user_space)
 
@@ -12,7 +12,7 @@ with the gem-apps cache, config, and data files.
 ## SYNOPSIS:
 
 ```ruby
-require 'json' # Using JSON parser for the config file.
+require 'rbon' # Using RBON(is not JSON!) parser for the config file.
 require 'user_space'
 
 module App
@@ -21,32 +21,25 @@ module App
   VERSION = '1.2.3'
 end
 
-USERSPACE = UserSpace.new(parser:JSON, appname:'myapp') #~> ^#<UserSpace:
+USERSPACE = UserSpace.new(parser:RBON, appname:'myapp') #~> ^#<UserSpace:
 # Will maintain these directories:
 ['~/.cache/myapp',
  '~/.config/myapp',
  '~/.local/share/myapp'
 ].all?{File.directory? File.expand_path _1} #=> true
 
-# Unless this version has been installed,
-# we copy over our data and cache directories.
-USERSPACE.install unless USERSPACE.version == App::VERSION
-# We have a version file:
-File.exist? File.expand_path '~/.local/share/myapp/VERSION' #=> true
-
 if USERSPACE.config?
-  # Because JSON hashes by String, converting to Symbol.
-  # We pad up App::CONFIG with user's preferences:
-  USERSPACE.config.each{|opt, value| App::CONFIG[opt.to_sym] = value}
+  # Update APP::CONFIG with user's preferences.
+  App::CONFIG.merge! USERSPACE.config
 else
-  # We initialize user preferences with our initial App::CONFIG
+  # Write initial configuration with App::CONFIG
   STDERR.puts "Writting '#{USERSPACE.config_file_name}'"
   USERSPACE.config = App::CONFIG
 end
 # To do the same thing, you can also say:
 # USERSPACE.configures(App::CONFIG)
 # We have a config file:
-File.exist? File.expand_path '~/.config/myapp/config.json' #=> true
+File.exist? File.expand_path '~/.config/myapp/config.rbon' #=> true
 ```
 
 ## INSTALL:

data/lib/user_space.rb

@@ -3,15 +3,15 @@ require 'fileutils'
 #`ruby`
 
 class UserSpace
-  VERSION = '4.1.210122'
+  VERSION = '5.0.210123'
   XDG = {
     'cache'  => ENV['XDG_CACHE_HOME']  || File.expand_path('~/.cache'),
     'config' => ENV['XDG_CONFIG_HOME'] || File.expand_path('~/.config'),
     'data'   => ENV['XDG_DATA_HOME']   || File.expand_path('~/.local/share'),
   }
 
-  def self.appdir
-    File.dirname File.dirname File.expand_path caller(1..2)[1].split(':',2)[0]
+  def self.appdir(lib='/lib')
+    (_ = caller(1..2)[-1]&.split(':',2)&.fetch(0)) and File.dirname(File.dirname(File.expand_path(_)))&.chomp(lib)
   end
 
   attr_reader :parser,:ext,:appname,:xdgbases,:appdir,:config
@@ -22,7 +22,7 @@ class UserSpace
                   xdgbases: ['cache', 'config', 'data'],
                   config:   'config')
     @parser,@ext,@appname,@xdgbases,@appdir,@config = parser,ext,appname,xdgbases,appdir,config
-    install(false) # install with no overwrite
+    install
   end
 
   def xdg_pairs
@@ -32,30 +32,31 @@ class UserSpace
     end
   end
 
-  # Note that initialize will not overwrite anything.
-  # This overwrites the user's data directory with a fresh install.
-  # App should consider being nice about this,
-  # like warn the user or something.
-  def install(overwrite=true)
+  # Will not overwrite anything.
+  # Only copies over missing directories and files.
+  # Verifies directory expectations.
+  def install
     xdg_pairs do |basedir, userdir|
       if File.exist?(userdir)
         # Sanity check
-        raise "Not a directory: #{userdir}" unless File.directory?(userdir)
-        # Pre-existing directory.
-        # Return unless user wants to overwrite.
-        next unless overwrite
+        assert_directory(userdir)
       else
         Dir.mkdir(userdir, 0700)
       end
       if File.directory? basedir
         Dir.glob("#{basedir}/**/*").each do |src|
           dest = src.sub(basedir, userdir)
-          if File.directory? src
-            Dir.mkdir dest unless File.exist? dest
+          if File.exist? dest
+            # Sanity checks
+            assert_directory(dest) if File.directory? src
           else
-            FileUtils.cp src, dest
+            if File.directory? src
+              Dir.mkdir dest
+            else
+              FileUtils.cp src, dest
+            end
+            FileUtils.chmod('u+rwX,go-rwx', dest)
           end
-          FileUtils.chmod('u+rwX,go-rwx', dest)
         end
       end
     end
@@ -73,16 +74,10 @@ class UserSpace
     File.join XDG['data'], @appname
   end
 
-  # Not really for public use.
   def config_file_name
     File.join XDG['config'], @appname, "#{@config}.#{@ext}"
   end
 
-  # Not really for public use.
-  def version_file_name
-    File.join XDG['data'], @appname, 'VERSION'
-  end
-
   def config?
     File.exist?(config_file_name)
   end
@@ -104,27 +99,16 @@ class UserSpace
 
   def configures(hash)
     if config? # file exists
-      config.each{|opt, value| hash[opt.to_sym] = value}
+      hash.merge! config
     else
       $stderr.puts config_file_name if $VERBOSE
       self.config = hash
     end
   end
 
-  def version?
-    File.exist?(version_file_name)
-  end
-
-  # This reads the data directory's version file
-  def version
-    File.read(version_file_name).strip
-  rescue
-    $stderr.puts $!.message   if $VERBOSE
-    $stderr.puts $!.backtrace if $DEBUG
-    nil
-  end
+  private
 
-  def version=(v)
-    File.open(version_file_name, 'w', 0600){|fh| fh.puts v}
+  def assert_directory(dir)
+    raise "Not a directory: #{dir}" unless File.directory?(dir)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: user_space
 version: !ruby/object:Gem::Version
-  version: 4.1.210122
+  version: 5.0.210123
 platform: ruby
 authors:
 - carlosjhr64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies: []
 description: |
   Maintains the user's cache, config, and data directories