atk_toolbox 0.0.143 → 0.0.148

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de7ba62b27e47339fe0c109dc7db53c60094149a8aefbf7bcf358f547d5d0b21
-  data.tar.gz: 79b2cde743d104e097c7a34cede13b716b3c36c7655ff4b4a6c089218b9a2eac
+  metadata.gz: a2ef80e16df596fae11f5ea313ae4b4afd0285a1bc135658507b938f9d6cc54f
+  data.tar.gz: b56eaac7e7a1a68a400d40afe7fde07b539355aa9f98b59c98c920f01994c8ff
 SHA512:
-  metadata.gz: 199a19bd45445d06488eca2818204fc6065be733f4d34ebfbd03bf943c0536b71a84eb6daf4298b99171cbc8d55880828565f6cac7a47800bdb04bb6eed0596d
-  data.tar.gz: b201cab5a9706de28850c84df490ac32c36e72fb5a69b046a3776bfa61fd4771a3c011c7d65589b62a85ade741b458ac0f3e8dd474090cdf5418df054b6d3c0a
+  metadata.gz: adbca59652831fbeeb6e3a3c0a17886bbe4e301ca93a237788edd86479e7891753c7f935028c1ede02dacf66a0abaa59e0ad5d6d252f0d5001581183750638ad
+  data.tar.gz: ee3d50bc9cf2b9270c8ea21833ae7aa7a82fe4b3ba415ff0e9763d67fa9115c907dc524255b990e3633e3f316efc458dabecc0d008ccc1a553445f1221110db0

data/lib/atk/atk_info.rb

@@ -33,7 +33,11 @@ class AtkPaths
                 end
                 return ruby_path
             when 'gem'
-                # FUTURE: this should eventually  link to a specific version of ruby instead of the global version
+                gem_path = AtkPaths["ruby"].sub(/\/ruby$/,"\/gem")
+                if FS.file?(gem_path)
+                    return gem_path
+                end
+                # FUTURE: this should eventually have better error handling
                 return OS.path_for_executable("gem")
             when 'repos'
                 return HOME/"atk"/"repos"
@@ -103,7 +107,7 @@ module Atk
         errors = {}
         
         # make sure ruby is the corrct version
-        if VERSION_OF_RUBY >= Version.new("3.0.0")
+        if VERSION_OF_RUBY >= Version.new("2.6.0")
             errors[:ruby_version_too_high] = true
         elsif VERSION_OF_RUBY < Version.new("2.5")
             errors[:ruby_version_too_low] = true
@@ -138,7 +142,10 @@ module Atk
         # 
         # TODO: talk about any found errors
         # 
-        
+        if errors.include?[:ruby_version_too_high]
+            puts "It looks like your ruby version is too high for ATK"
+            puts "some parts of ATK might still work, however expect it to be broken"
+        end
     end
     
     def self.setup(package_name, arguments)
@@ -398,25 +405,25 @@ class AtkPackage
             
             if @dont_exist[:yaml_file]
                 custom_message += <<-HEREDOC.remove_indent
-                    #{bad("there was no info.yaml for that package")}
+                    #{bad["there was no info.yaml for that package"]}
                     and an info.yaml is the location for defining a run action 
                     
                 HEREDOC
             elsif @dont_exist[:correctly_formatted_yaml_file]
                 custom_message += <<-HEREDOC.remove_indent
-                    #{good("there was a info.yaml for that package")}
-                    #{bad("the info.yaml is not parseable")}
+                    #{good["there was a info.yaml for that package"]}
+                    #{bad["the info.yaml is not parseable"]}
                     and an info.yaml is the location for defining a run action
                     
                 HEREDOC
             elsif @dont_exist[:using_atk_version]
                 custom_message += <<-HEREDOC.remove_indent
-                    #{good("there was a info.yaml for that package")}
-                    #{good("the info.yaml was parseable")}
-                    #{@dont_exist[:using_atk_version] && bad("the info.yaml didn't have a (using_atk_version) key")}
-                    #{@dont_exist[:package_info]      && bad("the info.yaml didn't have a (package_info) key")}
-                    #{@dont_exist[:actions]           && bad("the info.yaml didn't have a (package_info): (actions) key")}
-                    #{@dont_exist[:run_action]        && bad("the info.yaml didn't have a (package_info): (actions): (run) key")}
+                    #{good["there was a info.yaml for that package"]}
+                    #{good["the info.yaml was parseable"]}
+                    #{@dont_exist[:using_atk_version] && bad["the info.yaml didn't have a (using_atk_version) key"]}
+                    #{@dont_exist[:package_info]      && bad["the info.yaml didn't have a (package_info) key"]}
+                    #{@dont_exist[:actions]           && bad["the info.yaml didn't have a (package_info): (actions) key"]}
+                    #{@dont_exist[:run_action]        && bad["the info.yaml didn't have a (package_info): (actions): (run) key"]}
                 HEREDOC
             end
             

data/lib/atk/autocomplete.rb

@@ -10,4 +10,31 @@ module Atk
         #     end
         # end
     end
+    
+    # 
+    # zsh autocomplete
+    # 
+        #compdef _
+
+        # _atk()
+        # {
+        #     orig_words=( ${words[@]} )
+        #     local comp_words="${COMP_WORDS[1]}"
+        #     local comp_cword="${COMP_CWORD}"
+        #     local mylist="$( ruby -e  '
+        #                         require "yaml"
+        #                         class Nil ; def [](); end; end;
+        #                         if ARGV.length == 2
+        #                             puts YAML.load_file("./info.yaml")["(project)"]["(commands)"].keys.map{|each| each.inspect}
+        #                         else
+        #                             # puts `ls`
+        #                         end
+        #                     ' $orig_words
+        #     )"
+        #     COMPREPLY=($(compgen -W $mylist) )
+        #     _alternative "arguments:custom arg:(($mylist))"
+        # }
+
+        # complete -F _atk _
+        # compdef _atk _
 end

data/lib/atk/console.rb

@@ -3,10 +3,12 @@ require_relative "../console_colors.rb"
 require_relative "./remove_indent.rb"
 
 # easy access to the commandline
-class String
-    # add a - operator to strings that makes it behave like a system() call 
-    def -@
-        return system(self)
+module Atk
+    refine String do
+        # add a - operator to strings that makes it behave like a system() call 
+        def -@
+            return system(self)
+        end
     end
 end
 
@@ -63,7 +65,7 @@ Console = Class.new do
         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 ]
+    for each in [ :ask, :keypress, :multiline, :mask, :yes?, :no?, :select, :multi_select, :enum_select, :expand, :collect, :suggest, :slider, :say, :warn, :error ]
         eval(<<-HEREDOC)
             def #{each}(*args, **kwargs)
                 self._load_prompt() if CACHE::prompt == nil
@@ -78,6 +80,11 @@ Console = Class.new do
         HEREDOC
     end
     
+    def ok(message)
+        puts message.green + "\n[press enter to continue]".light_black
+        gets
+    end
+    alias :ok? :ok
     
     attr_accessor :verbose
     
@@ -235,7 +242,7 @@ Console = Class.new do
             
             # users are going to have to manually escape things like ^, !, % etc depending on the context they're used in
             
-            simple_char = "[a-zA-Z0-9_.,;`=-*?\\/\\[\\]]"
+            simple_char = "[a-zA-Z0-9_.,;`=\\-*?\\/\\[\\]]"
             
             # if its a simple argument just pass it on
             if argument =~ /\A(#{simple_char})*\z/

data/lib/atk/file_system.rb

@@ -7,7 +7,7 @@ require_relative './remove_indent'
 if OS.is?("unix")
     HOME = Etc.getpwuid.dir
 else # windows
-    HOME = `echo %HOMEPATH%`.chomp
+    HOME = "C:"+`echo %HOMEPATH%`.chomp
 end
 
 class String
@@ -141,6 +141,52 @@ module FileSystem
         return output
     end
     
+    def self.merge(from, into: nil, force: true)
+        to = into
+        if !FS.exist?(from)
+            raise <<~HEREDOC
+                
+                
+                When calling FileSystem.merge(#{from.inspect}, into: #{into.inspect})
+                The path: #{from.inspect}
+                Doesn't exist
+            HEREDOC
+        end
+        
+        # recursive case (folder)
+        if FS.is_folder(from)
+            # if theres a target file in the way
+            if FS.exist?(to) && ( !FS.is_folder(to) )
+                if force
+                    # remove it
+                    FS.delete(to)
+                else
+                    # continue with the process
+                    return
+                end
+            end
+            # create a folder if needed
+            if !FS.exist?(to)
+                FS.touch_dir(to)
+            end
+            # become recursive for all contents
+            for each in FS.ls(from)
+                FS.merge(from/each, into: to/each, force: force)
+            end
+        # base case (file)
+        else
+            if FS.exist?(to)
+                if force
+                    FS.delete(to)
+                else
+                    # do nothing
+                    return
+                end
+            end
+            FS.copy(from: from, to: FS.dirname(to), new_name: nil)
+        end
+    end
+    
     def self.copy(from:nil, to:nil, new_name:"", force: true, preserve: false, dereference_root: false)
         if new_name == ""
             raise "\n\nFileSystem.copy() needs a new_name: argument\nset new_name:nil if you wish the file/folder to keep the same name\ne.g. FileSystem.copy(from:'place/thing', to:'place', new_name:nil)"
@@ -178,12 +224,15 @@ module FileSystem
             HEREDOC
         end
         to = FileSystem.dirname(path)/new_name
-        # make sure the path is clear
-        if force
-            FileSystem.delete(to)
+        # if they are different
+        if FS.absolute_path(to) != FS.absolute_path(path)
+            # make sure the path is clear
+            if force
+                FileSystem.delete(to)
+            end
+            # perform the rename
+            return File.rename(path, to)
         end
-        # perform the rename
-        File.rename(path, to)
     end
     
     def self.touch(path)
@@ -252,7 +301,7 @@ module FileSystem
         Dir.children(path)
     end
     def self.pwd
-        Dir.pwd
+        FS.join(Dir.pwd, "")
     end
     def self.cd(*args, verbose: false)
         if args.size == 0

data/lib/atk/info.rb

@@ -210,7 +210,7 @@ class Info
         return @folder
     end
     def self.folder()
-        folder = Dir.pwd
+        folder = FileSystem.join(Dir.pwd, "") # join with nothing to fix windows pathing
         loop do
             # if the info.yaml exists in that folder
             if FileSystem.file?( FileSystem.join(folder, "info.yaml"))

data/lib/atk_toolbox.rb

@@ -1,3 +1,5 @@
+require 'ruby2_keywords'
+
 # require all the ruby files
 files = Dir.glob(File.join(__dir__, "atk", "**/*.rb"))
 for each in files

data/lib/atk_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AtkToolbox
-    VERSION = '0.0.143'
+    VERSION = '0.0.148'
 end

data/lib/console_colors.rb

@@ -64,7 +64,7 @@ class String
     end
     
     def unstyle
-        self.gsub!(/\e\[([;0-9]+)m/,"")
+        self.gsub!(/\e\[([;0-9]+)m/,"") || self
     end
     
     def self.color_samples

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atk_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.143
+  version: 0.0.148
 platform: ruby
 authors:
 - Jeff Hykin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -30,6 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.0
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: ''
 email: jeff.hykin@gmail.com
 executables: []
@@ -58,7 +78,7 @@ homepage: http://github.com//atk-toolbox
 licenses:
 - CC-BY-ND-4.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - "./lib"
@@ -73,9 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: The Ruby gem for all the standard tools ATK uses internally
 test_files: []