nrser-rash 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94e23afa0c21f69bf7808df18eb4691d3019c750
-  data.tar.gz: a71698db070d73deeb59117e9c81d08e49b920e6
+  metadata.gz: 8c3f0dcd446901efeaf33fd45b5a74de623c6e31
+  data.tar.gz: 820c773fe4275f2d3f922208655d1f2485d3eb16
 SHA512:
-  metadata.gz: b7025b9a628fb3bccccb4ed41cd55236736b36b89f9ec0f8b14423d551416a0ea7682fbd57d9e620d2e1234779b532a4779d48cc9cc0bcc58620ef748a2fbb44
-  data.tar.gz: d166e9bcecd037c0bb51b5567ef02f8027cc7e8751eabfc377f2ae5a06355645523dda34c65ef490f0235aa889d547a70f39a19c1819eefb908b6aaceb153b11
+  metadata.gz: e6e9696d2e0847942c25457b8c80f9741485e4c176a5237c563363fa10ebf98c2ddf2f62a998b7cc08964cc8293ddee09d195775ab042db23e1874c72d62f573
+  data.tar.gz: d943da9fdaeb43c5971cdd25ee44c5a6122c5c60ada7bfb8156f046717313abe36f47c45503610985000c5cd994ccea19f3566609856169cc6c9b1048fb0e764

data/Gemfile

@@ -1,8 +1,23 @@
 source 'https://rubygems.org'
 
-# Install my user functions' deps too (need to comment-out the `nrser-rash`
-# line in there too)
-# eval_gemfile File.join( ENV['ENV_SUPPORT_DIR'], 'rash', 'Gemfile' )
+# Install my user functions' deps too
+# RubyGems API Client
+gem 'gems'
+
+# Work with XML
+gem 'nokogiri'
+
+# Work with Apple Property List files (`.plist`)
+# 
+# Kinda buggy and limited, and I think it only covers XML, but it's something.
+# 
+gem 'plist'
+
+# A generally more capable Apple Property List (`.plist`) handling toolkit,
+# though it's also more complicated and less user-friendly than `plist` from
+# what I recall, and it still can't handle some of the "old-style" plists that
+# things like `defaults` and `launchctl` can shit out.
+gem 'CFPropertyList'
 
 # Use dev versions
 # gem 'nrser', path: './dev/packages/gems/nrser'

data/lib/nrser/rash/cli/call.rb

@@ -23,7 +23,9 @@ module NRSER::Rash::CLI
   # 
   def self.call name, argv
 
-    logger.trace "calling #{ name.inspect }, argv: #{ argv.inspect }"
+    logger.trace "calling #{ name.inspect }",
+      argv: argv
+    
     # look for options
     options = {}
     args = argv.reject do |arg|
@@ -43,17 +45,14 @@ module NRSER::Rash::CLI
         true
       end
     end
-    logger.debug "options: #{ options.inspect }"
-    # options are the last arg, unless we didn't find any
-    #
-    # NOTE: this causes functions without an optional `options` arg
-    #       on the end to raise an exception when called with any options.
-    #       
-    #       i think this is the correct behavior: the function can't handle
-    #       options, and should error out.
-    args << options unless options.empty?
+    
+    logger.trace "Extracted options",
+      argv: argv,
+      args: args,
+      options: options
 
     NRSER::Rash.load_functions
+    
     if name.include? '.'
       *namespace, method_name = name.split '.'
       namespace = namespace.flat_map { |s| s.split '::' }
@@ -61,12 +60,36 @@ module NRSER::Rash::CLI
       namespace = []
       method_name = name
     end
+    
+    # Find the module the function is in
     mod = NRSER::Rash::Functions
     namespace.each do |submod_name|
       mod = mod.const_get(submod_name.capitalize)
     end
+    
+    # Get the function itself ({Metood} instance)
+    meth = mod.method method_name
+    
+    # Symbolize option keys if the method takes keyword args
+    if meth.parameters.any? { |type, *_|
+      [:key, :keyreq, :keyrest].include? type
+    }
+      options = options.map { |key, value|
+        [key.to_sym, value]
+      }.to_h
+    end
+    
+    # options are the last arg, unless we didn't find any
+    #
+    # NOTE: this causes functions without an optional `options` arg
+    #       on the end to raise an exception when called with any options.
+    #       
+    #       i think this is the correct behavior: the function can't handle
+    #       options, and should error out.
+    args << options unless options.empty?
+    
     begin
-      rtn = mod.method(method_name).call *args
+      result = meth.call *args
     rescue Exception => error
       if NRSER::Rash.config( 'PRINT_ERRORS' ).truthy?
         if NRSER::Rash.config( 'STACKTRACE' ).truthy?
@@ -79,13 +102,18 @@ module NRSER::Rash::CLI
         end
       end
     end
-    logger.debug "return value: #{ rtn.inspect }"
-    if formatted = format(rtn)
+    
+    logger.debug "Function #{ name } returned",
+      result: result
+    
+    if formatted = format( result )
       puts formatted
     end
+    
     exit 0
   end
-
+  
+  
   # formats an object to write to `$stdout`.
   # returns `nil` if there's nothing to write (different than returning '',
   # indicating the empty string should be written).

data/lib/nrser/rash/formatters.rb

@@ -102,4 +102,8 @@ module NRSER::Rash::Formatters
     sio.string
   end
   
+  def self.lines obj
+    obj.join "\n"
+  end
+  
 end # module NRSER::Rash::Formatters

data/lib/nrser/rash/version.rb

@@ -6,7 +6,7 @@ module NRSER
     # 
     # @return [String]
     # 
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
     
     # Absolute, expanded path to the gem's root directory.
     # 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nrser-rash
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - nrser