atk_toolbox 0.0.129 → 0.0.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f9360594ff9688633f537e595460ce9f4047ab4e7683a55453f4ddd852f702
-  data.tar.gz: 85259724896a5f69ab8bc4ef16ffd859063d1658758d1f29f2988d6dc15aea0d
+  metadata.gz: b369f7ae82e59686f07304f57e859e8437c3b369ee59c7b8ee8885a0a1fc3d2d
+  data.tar.gz: d5e67cd57d72c8e42464158912f566266cee10cd23922ded50610f9b437f12eb
 SHA512:
-  metadata.gz: 0f27efc85e09e207e15b78d465d8e56cb4a7ec4c7c9b6b46f7c431d0a5d62919e4b2c8b3a58ca38f34d924f3b00966f8bb511632bf1ac3498893c98eaddef3fe
-  data.tar.gz: 468182f80cc8fe99b60a4b65188429698bf857342fbdf8997ee57bbe0eacd6bc65fb2e97269a2dcc7b733cfe5112c5d42c048d99ac3325db197a603ce3aaa62d
+  metadata.gz: 8b7cb087906053a8523a2b185239ded611a0b908a20d85ae5a91d62fec8cb6dcda3e32919e0e7ada286bda483dbe114bdae658c87646d9cd124023c189816389
+  data.tar.gz: a579e2622583111e1a6abecba07c4002ec7f4f5be99ddc2adfe08f5da64c33e75c15ddaa7c9b4698a53cdc2ff537acbe3aeee8319a02fe442a48abdc7faa7209

data/lib/atk/console.rb

@@ -1,4 +1,3 @@
-require "tty-prompt"
 require_relative "./os.rb"
 require_relative "../console_colors.rb"
 
@@ -16,9 +15,39 @@ end
 # 
 # Console 
 # 
-# see https://github.com/piotrmurach/tty-prompt
-class TTY::Prompt
+Console = Class.new do
+    
+    CACHE = Class.new do
+        attr_accessor :prompt
+    end.new
+    
+    # 
+    # prompt properties
+    # 
+    # see https://github.com/piotrmurach/tty-prompt
+    def _load_prompt
+        require "tty-prompt"
+        CACHE::prompt = TTY::Prompt.new
+    end
+    # generate interface for TTY prompt with lazy require
+    for each in [ :ask, :keypress, :multiline, :mask, :yes?, :no?, :select, :multi_select, :enum_select, :expand, :collect, :suggest, :slider, :say, :ok, :warn, :error, :on ]
+        eval(<<-HEREDOC)
+            def #{each}(*args, **kwargs)
+                self._load_prompt() if CACHE::prompt == nil
+                if block_given?
+                    CACHE::prompt.#{each}(*args, **kwargs) do |*block_args, **block_kwargs|
+                        yield(*block_args, **block_kwargs)
+                    end
+                else
+                    CACHE::prompt.#{each}(*args, **kwargs)
+                end
+            end
+        HEREDOC
+    end
+    
+    
     attr_accessor :verbose
+    
     def _save_args
         if @args == nil
             @args = []
@@ -150,9 +179,7 @@ class TTY::Prompt
             end
         end
     end
-end
-
-Console = TTY::Prompt.new
+end.new
 
 def log(*args)
     if Console.verbose

data/lib/atk/os.rb

@@ -22,9 +22,9 @@ end
 module OS
     
     # create a singleton class
-    class << (OS::CACHE = Object.new)
+    CACHE = Class.new do
         attr_accessor :is_windows, :is_mac, :is_linux, :is_unix, :is_debian, :is_ubuntu, :version
-    end
+    end.new
     
     def self.is?(adjective)
         # summary:
@@ -34,40 +34,40 @@ module OS
         adjective = adjective.to_s.downcase
         case adjective
             when 'windows'
-                if OS::CACHE::is_windows == nil
-                    OS::CACHE::is_windows = (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+                if CACHE::is_windows == nil
+                    CACHE::is_windows = (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
                 end
-                return OS::CACHE::is_windows
+                return CACHE::is_windows
             when 'mac'
-                if OS::CACHE::is_mac == nil
-                    OS::CACHE::is_mac = (/darwin/ =~ RUBY_PLATFORM) != nil
+                if CACHE::is_mac == nil
+                    CACHE::is_mac = (/darwin/ =~ RUBY_PLATFORM) != nil
                 end
-                return OS::CACHE::is_mac
+                return CACHE::is_mac
             when 'linux'
-                if OS::CACHE::is_linux == nil
-                    OS::CACHE::is_linux = (not OS.is?(:windows)) && (not OS.is?(:mac))
+                if CACHE::is_linux == nil
+                    CACHE::is_linux = (not OS.is?(:windows)) && (not OS.is?(:mac))
                 end
-                return OS::CACHE::is_linux
+                return CACHE::is_linux
             when 'unix'
-                if OS::CACHE::is_unix == nil
-                    OS::CACHE::is_unix = not(OS.is?(:windows))
+                if CACHE::is_unix == nil
+                    CACHE::is_unix = not(OS.is?(:windows))
                 end
-                return OS::CACHE::is_unix
+                return CACHE::is_unix
             when 'debian'
-                if OS::CACHE::is_debian == nil
-                    OS::CACHE::is_debian = File.file?('/etc/debian_version')
+                if CACHE::is_debian == nil
+                    CACHE::is_debian = File.file?('/etc/debian_version')
                 end
-                return OS::CACHE::is_debian
+                return CACHE::is_debian
             when 'ubuntu'
-                if OS::CACHE::is_ubuntu == nil
-                    OS::CACHE::is_ubuntu = OS.has_command('lsb_release') && `lsb_release -a`.match(/Distributor ID:[\s\t]*Ubuntu/)
+                if CACHE::is_ubuntu == nil
+                    CACHE::is_ubuntu = OS.has_command('lsb_release') && `lsb_release -a`.match(/Distributor ID:[\s\t]*Ubuntu/)
                 end
-                return OS::CACHE::is_ubuntu
+                return CACHE::is_ubuntu
         end
     end
     
     def self.version
-        return OS::CACHE::version if OS::CACHE::version != nil
+        return CACHE::version if CACHE::version != nil
         # these statements need to be done in order from least to greatest
         if OS.is?("ubuntu")
             version_info = `lsb_release -a`
@@ -89,7 +89,7 @@ module OS
         elsif OS.is?('windows')
             version = nil
         end
-        OS::CACHE::version = version
+        CACHE::version = version
     end
     
     def self.path_for_executable(name_of_executable)

data/lib/atk_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AtkToolbox
-    VERSION = '0.0.129'
+    VERSION = '0.0.130'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atk_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.129
+  version: 0.0.130
 platform: ruby
 authors:
 - Jeff Hykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt