atk_toolbox 0.0.141 → 0.0.146

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a67b7004ab8a7b4b35cc19e901de6014abcc77040a9b036bdcb36e66d854f884
-  data.tar.gz: f8e3c8095334ae41cc453faa8b1f22e173231f97bdf90b7149d90ff2cc866769
+  metadata.gz: ee7360620aad7d051e61244d65e447827376658930abdfa15139461799e750fd
+  data.tar.gz: 232c4358d173dc80c584979988e7d67685b4cdf937561ce4bf7c4ced901b5148
 SHA512:
-  metadata.gz: 8fde714bf9e3e16796fb58d549df564db9aae5df9c1f8d2f12f9cbc22120fb5914abef98ce67fff31ed23304f9c38455f2e4eb49449e41d62c539ca6cf52d05d
-  data.tar.gz: ea85b214c7d6f75f8c4b6147d32a0c25738a0f8c67387eb7880f0e35628f65e3cb6138d8a6f73ac4f7bb7ef80fe205e8928c923f40a35ce39126f168482146fd
+  metadata.gz: 1e6a3af6e1bdd5973f8410bed1fe61cb136c3b6be2702e6ae969f3c832f9dfefe3a209037a7f43ac69ba267893e7e11327c2e5bbcfd8e90bdafbad9e8606a4e1
+  data.tar.gz: 755f9dbe27434729fbaf983a1d22c1f80db31a7f342ba45525a90f89b60ad3c7a3ba45b47d51634ad300e7cc29e1b67257d3854397f77039ce275b9ea791cc09

data/lib/after_gem_update.rb

@@ -1,7 +1,7 @@
 require 'atk_toolbox'
 
 previous_version = Console.args[0]
-puts "previous_version is: #{previous_version} "
+# TODO: previous_version is currently always null
 
 # helper function
 download_and_install_command = ->(command) do

data/lib/atk/atk_info.rb

@@ -103,7 +103,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 +138,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 +401,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/commands/project.rb

@@ -1,6 +1,12 @@
 require_relative '../atk_info'
 
 module Atk
+    class ExecFailed < Exception
+    end
+    
+    class NoSuchCommand < Exception
+    end
+    
     def self.project(args)
         # 
         # no arguments
@@ -140,13 +146,13 @@ module Atk
                         elsif command.is_a?(Code)
                             result = command.run(*command_args)
                         elsif command == nil
-                            puts "I don't think that command is in the info.yaml file"
+                            raise NoSuchCommand
                         end
                         
                         # if command resulted in error then raise an error
                         if not result
                             colored_command_name = command_name.color_as :key_term
-                            raise <<-HEREDOC.remove_indent
+                            raise ExecFailed, <<-HEREDOC.remove_indent
                                 
                                 When running: #{"project execute ".color_as :code}#{colored_command_name}
                                 The script for #{colored_command_name} hit an error and had an exit code of: #{$?.exitstatus}

data/lib/atk/console.rb

@@ -63,7 +63,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 +78,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 +240,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

@@ -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)"

data/lib/atk/info.rb

@@ -152,6 +152,7 @@ class Info
         rescue => exception
             # if no version, then don't worry about parsing
         end
+
         if @version.is_a?(Version)
             begin
                 if @version <= Version.new("1.0.0")

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.141'
+    VERSION = '0.0.146'
 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

data/test/info.yaml

@@ -1,46 +1,15 @@
-(using_atk_version): 1.0
+(using_atk_version): 1.1.0
 (project):
     name: A Project
     description: A new project
     
-    paths: &paths
-        root: ./
-        testing_folder: &tests ./code/tests
-        cpp_tests: [ *tests, cpp ]
-    
-    commands: &commands # if you dont know what the & means, see https://blog.daemonl.com/2016/02/yaml.html
-        build_mac: !language/ruby |
-            require 'atk_toolbox'
-            file = FS.read('./mac/setup_readable_version.sh')
-            # remove comments
-            file.gsub!(/^ *#.+\n/, "")
-            # make everything a single line
-            file = file.split("\n").join(";")
-            # save
-            FS.write(file, to: './mac/setup.sh')
-
-    dependencies: &dependencies
-        atk: 0.0.1
-    
-    (advanced_setup):
-        (paths):
-            <<: *paths
-        (put_new_dependencies_under): [ '(project)', 'basic_info', 'dependencies' ]
-        # caveats for a specific OS
-        when(--os is 'mac'):
-            (project_commands):
-                <<: *commands
-            (dependencies):
-                <<: *dependencies
-            
-        when(--os is 'windows'):
-            (project_commands):
-                <<: *commands
-            (dependencies):
-                <<: *dependencies
-                
-        when(--os is 'linux'):
-            (project_commands):
-                <<: *commands
-            (dependencies):
-                <<: *dependencies
+    (commands): &commands # if you dont know what the & means, see https://blog.daemonl.com/2016/02/yaml.html
+        test_commands:
+            ruby test/main.rb
+        (setup):
+            # a library that helps with publishing
+            gem install gem-release
+        publish:
+            ruby scripts/publish.rb
+        test_changes:
+            ruby scripts/test_changes.rb && ruby ./lib/after_gem_update.rb

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: atk_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.141
+  version: 0.0.146
 platform: ruby
 authors:
 - Jeff Hykin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.0
 description: ''
@@ -58,7 +58,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 +73,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.0.3
+signing_key:
 specification_version: 4
 summary: The Ruby gem for all the standard tools ATK uses internally
 test_files: []