atk_toolbox 0.0.84 → 0.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8841a9aa0feefe4e47ae2e17eabaaf215250ae696c34609451568378413d64bf
-  data.tar.gz: '04488e8100cb9104c52170b481154140a2ccac0bbb9ed3d9aaa671ee7dc34f2d'
+  metadata.gz: d1be06eba95081b6c96474395cec11725013051340b97824f372f8a6c4db543e
+  data.tar.gz: 8278323e7bc9ccbd279d3e335d30f1a92c863b1487909d4c168da681dce52efe
 SHA512:
-  metadata.gz: 4b559b9aa56477166b510d1d3a12ca3be8f7fb1f0d560a1e8c290941ac2c5a65454341de6b512a30f61c0c1ad53d6613d4ef0f657e9b286d6409df39b127e897
-  data.tar.gz: a27421f4c09fee847348920fcdcdac08ef84bc026e3d85da4e78f9f36900909c3622b40f110a82e571e8d7f2f4a2b6132f8317a8b608bb8c08bcb5edfee727d9
+  metadata.gz: 4e18239ef2c6c43890bbb7f63ecdea67d4be98690dff0bde533aac8f1d52219487f8724e1c82fd9cffc536b5e2ebaf9e15a653ef9d50dc4cffbd3f54e40872a9
+  data.tar.gz: 8f730ef8cc49c963992a1214e47e79d23cd8e0a34eb2f6101463177b4a9079e789b5a678c4f7bad78609627e616132eb5cfaf2d04ca84d2d8cc9861b3c614121

data/lib/atk/file_sys.rb

@@ -19,7 +19,10 @@ class String
     # ex: "foldername"/"filename"
     def /(next_string)
         if OS.is?("windows")
-            self + "\\" + next_string
+            next_string_without_leading_or_trailing_slashes = next_string.gsub(/(^\\|^\/|\\$|\/$)/,"")
+            output = self + "\\" + next_string
+            # replace all forward slashes with backslashes
+            output.gsub(/\//,"\\")
         else
             File.join(self, next_string)
         end
@@ -170,26 +173,31 @@ class FileSys
     def self.touch(*args)
         return FileUtils.touch(*args)
     end
+    singleton_class.send(:alias_method, :touch_file, :touch)
+    singleton_class.send(:alias_method, :new_file, :touch)
     
     def self.touch_dir(path)
         if not FileSys.directory?(path)
             FileUtils.makedirs(path)
         end
     end
+    singleton_class.send(:alias_method, :new_folder, :touch_dir)
     
     # Pathname aliases
     def self.absolute_path?(path)
         Pathname.new(path).absolute?
     end
-    def self.abs?(path)
-        Pathname.new(path).absolute?
-    end
+    singleton_class.send(:alias_method, :is_absolute_path, :absolute_path?)
+    singleton_class.send(:alias_method, :abs?, :absolute_path?)
+    singleton_class.send(:alias_method, :is_abs, :abs?)
+    
     def self.relative_path?(path)
         Pathname.new(path).relative?
     end
-    def self.rel?(path)
-        Pathname.new(path).relative?
-    end
+    singleton_class.send(:alias_method, :is_relative_path, :relative_path?)
+    singleton_class.send(:alias_method, :rel?, :relative_path?)
+    singleton_class.send(:alias_method, :is_rel, :rel?)
+    
     def self.path_pieces(path)
         # use this function like this:
         # *path, filename, extension = FS.path_peices('/Users/jeffhykin/Desktop/place1/file1.pdf')
@@ -244,20 +252,19 @@ class FileSys
     end
     def self.time_modified(*args)
     end
-    def self.folder?(*args)
-        File.directory?(*args)
-    end
-    def self.dir?(*args)
-        File.directory?(*args)
-    end
-    def self.exists?(*args)
-        File.exist?(*args)
-    end
+    
     def self.join(*args)
         if OS.is?("windows")
-            self + "\\" + next_string
+            folders_without_leading_or_trailing_slashes = args.map do |each|
+                # replace all forward slashes with backslashes
+                backslashed_only = each.gsub(/\//,"\\")
+                # remove leading/trailing backslashes
+                backslashed_only.gsub(/(^\\|^\/|\\$|\/$)/,"")
+            end
+            # join all of them with backslashes
+            folders_without_leading_or_trailing_slashes.join("\\")
         else
-            File.join(self, next_string)
+            File.join(*args)
         end
     end
     
@@ -274,33 +281,56 @@ class FileSys
     def self.extname(*args)
         File.extname(*args)
     end
-    def self.directory?(*args)
+    def self.folder?(*args)
         File.directory?(*args)
     end
+    singleton_class.send(:alias_method, :is_folder, :folder?)
+    singleton_class.send(:alias_method, :dir?, :folder?)
+    singleton_class.send(:alias_method, :is_dir, :dir?)
+    singleton_class.send(:alias_method, :directory?, :folder?)
+    singleton_class.send(:alias_method, :is_directory, :directory?)
+    
+    def self.exists?(*args)
+        File.exist?(*args)
+    end
+    singleton_class.send(:alias_method, :does_exist, :exists?)
+    singleton_class.send(:alias_method, :exist?, :exists?)
+    
     def self.file?(*args)
         File.file?(*args)
     end
+    singleton_class.send(:alias_method, :is_file, :file?)
+    
     def self.empty?(*args)
         File.empty?(*args)
     end
-    def self.exist?(*args)
-        File.exist?(*args)
-    end
+    singleton_class.send(:alias_method, :is_empty, :empty?)
+    
     def self.executable?(*args)
         File.executable?(*args)
     end
+    singleton_class.send(:alias_method, :is_executable, :executable?)
+    
     def self.symlink?(*args)
         File.symlink?(*args)
     end
+    singleton_class.send(:alias_method, :is_symlink, :symlink?)
+    
     def self.owned?(*args)
         File.owned?(*args)
     end
+    singleton_class.send(:alias_method, :is_owned, :owned?) 
+    
     def self.pipe?(*args)
         File.pipe?(*args)
     end
+    singleton_class.send(:alias_method, :is_pipe, :pipe?) 
+    
     def self.readable?(*args)
         File.readable?(*args)
     end
+    singleton_class.send(:alias_method, :is_readable, :readable?) 
+    
     def self.size?(*args)
         if File.directory?(args[0])
             # recursively get the size of the folder
@@ -309,21 +339,33 @@ class FileSys
             File.size?(*args)
         end
     end
+    singleton_class.send(:alias_method, :is_size, :size?) 
+    
     def self.socket?(*args)
         File.socket?(*args)
     end
+    singleton_class.send(:alias_method, :is_socket, :socket?) 
+    
     def self.world_readable?(*args)
         File.world_readable?(*args)
     end
+    singleton_class.send(:alias_method, :is_world_readable, :world_readable?) 
+    
     def self.world_writable?(*args)
         File.world_writable?(*args)
     end
+    singleton_class.send(:alias_method, :is_world_writable, :world_writable?) 
+    
     def self.writable?(*args)
         File.writable?(*args)
     end
+    singleton_class.send(:alias_method, :is_writable, :writable?) 
+    
     def self.writable_real?(*args)
         File.writable_real?(*args)
     end
+    singleton_class.send(:alias_method, :is_writable_real, :writable_real?) 
+    
     def self.expand_path(*args)
         File.expand_path(*args)
     end
@@ -368,5 +410,5 @@ class FileSys
         FileSys.write(open(URI.encode(the_url)).read, to: file_name)
     end
 end
-# create an FS alias
+# create an FS singleton_class.send(:alias_method, :FS = :FileSys)
 FS = FileSys

data/lib/atk/yaml_info_parser.rb

@@ -228,9 +228,11 @@ class Info
                 @@data = YAML.load_file(Info.source_path)
                 if @@data['(using_atk_version)'] != 1.0
                     raise <<-HEREDOC.remove_indent
+                    
+                    
                         When opening the info.yaml file, the (using_atk_version) was listed as: #{@@data['(using_atk_version)']}
                         The version of atk_toolbox you have installed is only capable of handling version 1.0
-                        either atk_toolbox needs to be updated, or the info.yaml version needs to be updated.
+                        either atk_toolbox needs to be changed, or the (using_atk_version) version needs to be changed.
                     HEREDOC
                 end
             rescue => exception
@@ -238,7 +240,7 @@ class Info
                 raise exception
             end
         else
-            raise "Couldn't find an info.yaml file in #{Dir.pwd}"
+            raise "\n\nCouldn't find an info.yaml file in #{Dir.pwd}"
         end
         @@project = @@data['(project)']
         if @@project == nil
@@ -262,6 +264,10 @@ class Info
         @@paths = @@settings['(paths)'] || {}
         # TODO: make this deeply recursive
         for each_key, each_value in @@paths
+            # if its an array, just join it together
+            if each_value.is_a?(Array)
+                each_value = FS.join(*each_value)
+            end
             if each_value.is_a?(String)
                 # remove the ./ if it exists
                 if each_value =~ /\A\.\//

data/lib/atk_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AtkToolbox
-  VERSION = '0.0.84'
+  VERSION = '0.0.85'
 end

data/test/info.yaml

@@ -1,86 +1,46 @@
-# Example of Project settings
-(using_atk_version): 1.0
+(using_atk_version): 0.0
 (project):
-    name: The ATK Repo
-    description: Blah
-    homepage: www.blah.com
-
-    auto_generated_commands: &auto_generated_commands !evaluate/ruby |
-        commands = {}
-        # check for a scripts directory
-        script_file_paths = Dir["scripts/*"]
-        for each in script_file_paths
-            commands[File.basename(each, ".*")] = "./#{each}"
-        end
-        commands
-
-    basic_setup: &basic_setup_reference
-        (project_commands): &basic_commands
-            # auto-insert the !lang/console if they dont put one
-            run: !language/ruby puts "hi"
-            stop: \`pkill node`
-            compile: gcc *.cpp
-            # TODO: add inline support for doing things like auto-generating commands
-            [*auto_generated_commands]:
-        (environment_variables):
-            JAVA_VERSION: '8.9'
-        (structures):
-            npm-package: v1.0.0
-            vs-code-package: v1.0.0
-            git-repo: v1.0.0
-        (dependencies): &base_dependencies
-            python3: v3.7.0
-            node: v11.11.0
-            npm: v6.7.0
-            git: v2.21.0
+    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):
-        (local_package_managers): [npm, pip]     # by default the local package managers are always here
-        (put_new_dependencies_under): [(project), basic_info, (dependencies)]
-        <<: *basic_setup_reference
-                                   # this injects all the (basic_setup) here
+        (paths):
+            <<: *paths
+        (put_new_dependencies_under): [ '(project)', 'basic_info', 'dependencies' ]
         # caveats for a specific OS
         when(--os is 'mac'):
+            (project_commands):
+                <<: *commands
             (dependencies):
-                <<: *base_dependencies
-                python2: v2.7
-
+                <<: *dependencies
+            
         when(--os is 'windows'):
             (project_commands):
-                <<: *basic_commands
-                show_files: dir # this is a custom command specific to windows
+                <<: *commands
+            (dependencies):
+                <<: *dependencies
+                
         when(--os is 'linux'):
-            # caveats for a specific OS sub-version
-            when(--os is 'arch'):
-                (project_commands):
-                    <<: *basic_commands
-                                        # this injects all the (project_commands) here
-                    my_ip_address: ip   # this is a custom command specific to arch linux
-        # # caveats for a different context
-        # when(--context is 'testing'):
-        #     (environment_variables):
-        #         CMAKE_LIB: "testing"
-        #     (project_commands):
-        #         run: node tests.rb
-        #     when(--os is 'windows'):
-        #         (environment_variables):
-        #             CMAKE_LIB: "C:\\testing"
-test:
-    thing:
-      - 1
-      - 2
-      - 3
-      - alkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkad
-challenges:
-  - A bit discouraging with how non-binary expressions are. Forcing them into categories feels inaccurate
-  - video contents:
-      - multiple faces (very hard to get one face with genuine expressions)
-      - people not directly facing the camera
-      - glasses, headphones, hats, microphones
-      - shaky video
-      - lighting
-      - |
-        single faces are generally people actively talking or interviewing, not being passive.
-        People who are passive are generally participating in something else, and usually that means other faces are on screen
-        This means very little
-      - face touching
+            (project_commands):
+                <<: *commands
+            (dependencies):
+                <<: *dependencies

data/test/main.rb

@@ -2,4 +2,4 @@ require_relative '../lib/atk_toolbox'
 
 Dir.chdir __dir__
 
-Info.set_key(["test"], { "thing" => [1,2,3,"alkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkadalkdjfajdlkfjadsfljkad"] })
+puts Info.paths.to_yaml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atk_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.84
+  version: 0.0.85
 platform: ruby
 authors:
 - Jeff Hykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: The Ruby gem for all the standard tools ATK uses internally