atk_toolbox 0.0.126 → 0.0.127

data/lib/atk/os.rb

@@ -19,11 +19,11 @@ end
 # 
 # Groups
 # 
-# the groups are the pratical side of the OS, they describe the OS rather than fit it prefectly into a heirarchy
 module OS
-    # TODO: have the version pick one of the verions in the os_heirarchy according to the current OS
-    def self.version
-        raise "not yet implemented"
+    
+    # create a singleton class
+    class << (OS::CACHE = Object.new)
+        attr_accessor :is_windows, :is_mac, :is_linux, :is_unix, :is_debian, :is_ubuntu
     end
     
     def self.is?(adjective)
@@ -34,17 +34,35 @@ module OS
         adjective = adjective.to_s.downcase
         case adjective
             when 'windows'
-                return (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+                if OS::CACHE::is_windows == nil
+                    OS::CACHE::is_windows = (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+                end
+                return OS::CACHE::is_windows
             when 'mac'
-                return (/darwin/ =~ RUBY_PLATFORM) != nil
+                if OS::CACHE::is_mac == nil
+                    OS::CACHE::is_mac = (/darwin/ =~ RUBY_PLATFORM) != nil
+                end
+                return OS::CACHE::is_mac
             when 'linux'
-                return (not OS.is?(:windows)) && (not OS.is?(:mac))
+                if OS::CACHE::is_linux == nil
+                    OS::CACHE::is_linux = (not OS.is?(:windows)) && (not OS.is?(:mac))
+                end
+                return OS::CACHE::is_linux
             when 'unix'
-                return not( OS.is?(:windows))
+                if OS::CACHE::is_unix == nil
+                    OS::CACHE::is_unix = not(OS.is?(:windows))
+                end
+                return OS::CACHE::is_unix
             when 'debian'
-                return File.file?('/etc/debian_version')
+                if OS::CACHE::is_debian == nil
+                    OS::CACHE::is_debian = File.file?('/etc/debian_version')
+                end
+                return OS::CACHE::is_debian
             when 'ubuntu'
-                return OS.has_command('lsb_release') && `lsb_release -a`.match(/Distributor ID:[\s\t]*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/)
+                end
+                return OS::CACHE::is_ubuntu
         end
     end
     
@@ -59,7 +77,7 @@ module OS
             end
             return version
         elsif OS.is?("debian")
-            # TODO: support debian version
+            # FUTURE: support debian version
             return nil
         elsif OS.is?('mac')
             version = Version.extract_from(`system_profiler SPSoftwareDataType`)

data/lib/atk/set_command.rb

@@ -1,4 +1,4 @@
-require_relative './file_sys'
+require_relative './file_system'
 require_relative './os'
 require_relative './atk_info'
 
@@ -11,7 +11,7 @@ require_relative './atk_info'
 class TTY::Prompt
     def set_command(name, code)
         if OS.is?("unix")
-            exec_path = "/usr/local/bin/#{name}"
+            exec_path = "#{Atk.paths[:commands]}/#{name}"
             local_place = Atk.temp_path(name)
             # add the hash bang
             hash_bang = "#!#{Atk.paths[:ruby]}\n"
@@ -23,11 +23,16 @@ class TTY::Prompt
         elsif OS.is?("windows")
             # check for invalid file paths, see https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
             if name =~ /[><:"\/\\|?*]/
-                puts "Sorry #{name} isn't a valid file path on windows"
-                return ""
+                raise <<-HEREDOC.remove_indent
+                    
+                    
+                    When using the ATK Console.set_command(name)
+                    The name: #{name}
+                    is not a valid file path on windows
+                    which means it cannot be a command
+                HEREDOC
             end
-            username = FS.username
-            exec_path = "C:\\Users\\#{username}\\AppData\\local\\Microsoft\\WindowsApps\\#{name}"
+            exec_path = "#{Atk.paths[:commands]}\\#{name}"
             
             # create the code
             IO.write(exec_path+".rb", code)

data/lib/atk_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AtkToolbox
-    VERSION = '0.0.126'
+    VERSION = '0.0.127'
 end

data/lib/console_colors.rb

@@ -0,0 +1,104 @@
+class String
+    style_wrap = ->(name, number) do
+        # reset: \\e\\[0m
+        # some number of resets: (?:\\e\\[0m)+
+        # any ansi style/color: \\e\\[([;0-9]+)m
+        # some number of ansi-style/colors: ((?:\\e\\[([;0-9]+)m)*)
+        eval(<<-HEREDOC)
+            def #{name}()
+                # fix nested
+                self.gsub!(/(\\e\\[0m)(?:\\e\\[0m)*((?:\\e\\[([;0-9]+)m)*)/, '\\1\\2\e[#{number}m')
+                # inject start
+                self.sub!(/^((?:\\e\\[([;0-9]+)m)*)/, '\\1'+"\\e[#{number}m")
+                # append reset
+                self.replace("\#{self}\\e[0m")
+            end
+        HEREDOC
+    end
+    
+    # 
+    # generate foreground/background methods
+    # 
+    @@colors = {
+        default: 39,
+        black: 30,
+        red: 31,
+        green: 32,
+        yellow: 33,
+        blue: 34,
+        magenta: 35,
+        cyan: 36,
+        white: 37,
+        light_black: 90,
+        light_red: 91,
+        light_green: 92,
+        light_yellow: 93,
+        light_blue: 94,
+        light_magenta: 95,
+        light_cyan: 96,
+        light_white: 97,
+    }
+    for each_key, each_value in @@colors
+        # foreground
+        style_wrap[each_key, each_value]
+        # background
+        style_wrap["on_#{each_key}", each_value+10]
+    end
+    
+    # 
+    # generate style methods
+    # 
+    styles = {
+        normal:     "21;22;23;24;25;27;28;29", # reset all non-color changes
+        bold:       1,
+        dim:        2,
+        italic:     3,
+        underline:  4,
+        blink:      5,
+        flash:      6,
+        invert:     7,
+        hide:       8,
+    }
+    for each_key, each_value in styles
+        style_wrap[each_key, each_value]
+    end
+    
+    def unstyle
+        self.gsub!(/\e\[([;0-9]+)m/,"")
+    end
+    
+    def self.color_samples
+        for background, foreground in @@colors.keys.permutation(2)
+            eval("puts ' #{foreground} on_#{background} '.rjust(32).#{foreground}.on_#{background}")
+        end
+    end
+end
+
+
+# 
+# Theme
+#
+class String
+    def color_as(kind)
+        case kind
+            when :error
+                " #{self} ".white.on_red
+            when :code
+                " #{self} ".light_blue.on_black
+            when :key_term
+                " #{self} ".yellow.on_black
+            when :title
+                " #{self} ".green.on_black
+            when :argument, :message
+                " #{self} ".cyan.on_black
+            when :optional
+                " #{self} ".light_magenta.on_black
+            when :good
+                " #{self} ".green.on_black
+            when :bad
+                " #{self} ".red.on_black
+            else
+                " #{self} ".cyan.on_black
+        end
+    end
+end

data/lib/rubygems_plugin.rb

@@ -1,3 +1,18 @@
+# NOTES:
+# 
+#    this is the ideal replacement for the "after_gem_update.rb"
+#    however it (the ruby gem API) does not work as intended and has very *VERY* little documentation
+#    there may be a way to get it working, however the name of this file and the following code are required
+#    and finding their names in the ruby documentation is difficult (which is why dead code is living here)
+#    the issue is something along the lines of:
+#    - if gem 0.0.1 is already installed
+#    - then gem install atk_toolbox (upgrading to atk_toolbox 0.0.2)
+#    - will run the 0.0.1 version of this file instead of the 0.0.2 version
+#    (even durning post_install)
+#    I'm unsure of the initial behavior (aka assuming no atk_toolbox was installed)
+#    this needs to be further tested/explored before replacing "after_gem_update.rb"
+
+
 # # 
 # # right before gem install
 # # 

metadata

@@ -1,55 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: atk_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.126
+  version: 0.0.127
 platform: ruby
 authors:
 - Jeff Hykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2020-01-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: zip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -70,26 +30,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.0
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
 description: ''
 email: jeff.hykin@gmail.com
 executables: []
@@ -102,19 +42,16 @@ files:
 - lib/atk/commands/project.rb
 - lib/atk/console.rb
 - lib/atk/default_info.yaml
-- lib/atk/extra_yaml.rb
-- lib/atk/file_sys.rb
+- lib/atk/file_system.rb
 - lib/atk/git.rb
-- lib/atk/online.rb
+- lib/atk/info.rb
 - lib/atk/os.rb
-- lib/atk/package_managers.rb
 - lib/atk/remove_indent.rb
 - lib/atk/set_command.rb
 - lib/atk/version.rb
-- lib/atk/yaml_info_parser.rb
-- lib/atk/zip.rb
 - lib/atk_toolbox.rb
 - lib/atk_toolbox/version.rb
+- lib/console_colors.rb
 - lib/rubygems_plugin.rb
 - test/info.yaml
 - test/main.rb

data/lib/atk/extra_yaml.rb

@@ -1,147 +0,0 @@
-require_relative './remove_indent'
-require_relative './version'
-require 'json'
-require 'yaml'
-
-# how the new parser should work
-    # turn every meaninful peice of the yaml file into data that is represented in ruby
-        # reference objects instead of actually replacing the reference with the value
-        # reference insertion keys instead of actually performing the <<:
-        # save the style data (like 0x00 vs 0) to every peice of data
-        # save whether or not the data must be single-line 
-    # tokenize the yaml recursively with the base case of scalar values
-        # HARD: detect when values must be single-line or multiline
-            # non-complex keys are single-line
-            # anything inside of a JSON-like list or array must be single line
-            # everything else I know of can be multiline
-    # have both an inline and multiline conversion function for every data type
-    # when changing data, convert the new data into a single-line or multiline form based on the parent token
-        # if multiline, add the correct amount of indentation
-
-# 
-# 
-# JSON method
-# 
-# 
-    # example:
-        # doc = <<-HEREDOC
-        # (dependencies):
-        #     python: 3.6.7
-        #     gcc: 8.0.0
-        # HEREDOC
-        # document = YamlEdit.new(string:doc)
-        # document["(dependencies)"]["python"].replace_value_with(value: "200")
-        # puts document.string
-        # # creates:
-        # doc = <<-HEREDOC
-        # (dependencies):
-        #     python: "200"
-        #     gcc: 8.0.0
-        # HEREDOC
-
-def inject_string(string, middle_part, start_line, start_column, end_line, end_column)
-    lines = string.split("\n")
-    untouched_begining_lines = lines[0...start_line]
-    untouched_ending_lines   = lines[end_line+1..-1]
-    middle_lines = []
-
-    before_part = lines[start_line][0...start_column]
-    after_part = lines[end_line][end_column..-1]
-
-    return (untouched_begining_lines + [ before_part + middle_part + after_part ] + untouched_ending_lines).join("\n")
-end
-
-class YamlEdit
-    attr_accessor :string
-    
-    def initialize(string:nil, file:nil)
-        self.init(string:string, file: file)
-    end
-    
-    def init(string:nil, file:nil)
-        if string == nil
-            string = IO.read(file)
-        end
-        @root_node = YAML.parse(string).children[0]
-        @string = string
-        self.attach_to_all_children(@root_node, self)
-    end
-    
-    def attach_to_all_children(node, original_document)
-        if node.respond_to?(:children)
-            if node.children.is_a?(Array)
-                for each in node.children
-                    self.attach_to_all_children(each, original_document)
-                end
-            end
-        end
-        node.document = original_document
-    end
-    
-    def [](key)
-        return @root_node[key]
-    end
-    
-    def save_to(file)
-        IO.write(file, @string)
-    end
-end
-
-class Psych::Nodes::Node
-    attr_accessor :document
-    def anchor_and_tag(anchor:nil, tag:nil)
-        anchor = @anchor if anchor == nil 
-        tag = @tag if tag == nil 
-        
-        string = ""
-        if anchor
-            string += "&#{anchor} "
-        end
-        
-        if tag
-            string += "!#{tag} "
-        end
-        return string
-    end
-    
-    # saving this for later once the JSON method can be replaced
-    def indent_level
-        if self.respond_to?(:children)
-            if self.children.size > 0
-                return self.children[0].start_column
-            end
-        end
-        return 4 + self.start_column
-    end
-    
-    def [](key)
-        previous = nil
-        # for seq
-        if key.is_a?(Integer)
-            return self.children[key]
-        end
-        # for maps
-        for each in self.children.reverse
-            if each.respond_to?(:value) && each.value == key
-                return previous
-            end
-            previous = each
-        end
-    end
-    
-    def replace_value_with(value:nil, literal:nil, anchor: nil, tag:nil)
-        # check version
-        if VERSION_OF_RUBY < "2.5.0"
-            raise "\n\nSomewhere, replace_value_with() is being called, which is related to editing yaml\nthe problem is this function needs ruby >= 2.5.0\nbut the code is being run with ruby #{RUBY_VERSION}"
-        end
-        
-        if literal == nil
-            new_value = value.to_json
-        else
-            new_value = literal
-        end
-        middle_part = self.anchor_and_tag(anchor:anchor, tag:tag) + new_value
-        new_string = inject_string(@document.string, middle_part, @start_line, @start_column, @end_line, @end_column)
-        @document.init( string: new_string )
-    end
-end