atk_toolbox 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f919029a07ca905076c275a25b5095c8e51bfeab821cdc41c2992dd4b121c5b
-  data.tar.gz: 2075c6ba4538e2fe0f78e33ff4a3ad0f60bb0c67cbb72c8426bfc1dd0318abf8
+  metadata.gz: '05948ecaeb302fe7fac8223a0c9236c506c6f42b5f61f70ae599a337de1f1a82'
+  data.tar.gz: 332cdebeb6df4e8b3ed5d36078b1b9ec327b82c0dd2d6336f22509ed3a9d8226
 SHA512:
-  metadata.gz: 3c94d50770aaa1215b2283091f2b94c4eb5e490c3b6e84c96ec666e107ae9b0a122bbe993cf31a6f7cd4c4674e74f2d3a042a6f1a609e548191dc9c256a48273
-  data.tar.gz: 3dab6e99578a1b3f7d4212e9bbcebee9559acbd0e7b5ffd2acd14af17d348cdafcfdf1106c38b65635feed28437a1cd7c48e909ab5695df6233c9370702175a4
+  metadata.gz: f1b9926571e1a245bedaa1f5af9dbe40e07d41c05daf2128cb775e7e4cf0a5f97899252a877937c8fb683d1c4e29fa2f4f183966ddfcc461b370c30df1314f5f
+  data.tar.gz: 1ef3ed00db4fa1ac0d59c79b42983684939b212f8d2a6a4777d179293193505f46d41833165b41c400e03444e3d6c33da53daaf5857ccf2f1718ad31b37f817d

data/lib/atk/yaml_info_parser.rb

@@ -2,6 +2,8 @@
 require "yaml"
 require_relative './cmd'
 require_relative './os'
+require_relative './extra_file_utils'
+require_relative '../yaml_edit/yaml_edit.rb'
 require 'fileutils'
 
 # 
@@ -97,7 +99,7 @@ class Info
     
     def self.init
         # copy the default yaml to the current dir
-        FileUtils.cp(File.join(__dir__, "default_info.yaml"), File.join(Dir.pwd, "info.yaml"))
+        FileUtils.cp(__dir__/"default_info.yaml", Dir.pwd/"info.yaml")
     end
     
     # TODO: write tests for this function
@@ -215,7 +217,7 @@ class Info
         # get the local yaml file
         # TODO: have this search the parent dir's to find it 
         begin
-            @@data = YAML.load_file("./info.yaml")
+            @@data = YAML.load_file(Info.source_path)
         rescue => exception
             puts "Couldn't find an info.yaml file in #{Dir.pwd}"
             exit
@@ -256,4 +258,18 @@ class Info
         Info.load_if_needed
         return @@data[element.to_s]
     end
-end
+    
+    def self.source_path()
+        return "."/"info.yaml"
+    end
+    
+    def self.set_key(key_list, new_value)
+        path = Info.source_path
+        IO.write(path, YAML.set_key(IO.read(path), key_list, new_value))
+    end
+    
+    def self.remove_key(key_list, new_value)
+        path = Info.source_path
+        IO.write(path, YAML.remove_key(IO.read(path), key_list))
+    end
+end

data/lib/atk_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AtkToolbox
-  VERSION = '0.0.35'
+  VERSION = '0.0.36'
 end

data/lib/yaml_edit/yaml_edit.rb

@@ -2,6 +2,7 @@ require_relative '../atk/os'
 require_relative '../atk/remove_indent'
 require 'open3'
 require 'json'
+require 'yaml'
 
 def execute_with_local_python(python_file_path, *args)
     # save the current directory
@@ -15,22 +16,31 @@ def execute_with_local_python(python_file_path, *args)
     return [stdout_str, stderr_str, status]
 end
 
-def set_key(yaml_string, key_list, new_value)
-    # run the python file with the virtual environment
-    stdout_str, stderr_str, status = execute_with_local_python('set_key.py', yaml_string, key_list.to_json, new_value.to_json)
-    if not status.success?
-        raise "\n\nFailed to set key in yaml file:\n#{stderr_str}"
+module YAML
+    def set_key(yaml_string, key_list, new_value)
+        if not key_list.is_a?(Array)
+            raise "when using YAML.set_key, the second argument needs to be a list of keys"
+        end
+        # run the python file with the virtual environment
+        stdout_str, stderr_str, status = execute_with_local_python('set_key.py', yaml_string, key_list.to_json, new_value.to_json)
+        if not status.success?
+            raise "\n\nFailed to set key in yaml file:\n#{stderr_str}"
+        end
+        return stdout_str
     end
-    return stdout_str
-end
 
-def remove_key(yaml_string, key_list)
-    # run the python file with the virtual environment
-    stdout_str, stderr_str, status = execute_with_local_python('remove_key.py', yaml_string, key_list.to_json)
-    if not status.success?
-        raise "\n\nFailed to remove key in yaml file:\n#{stderr_str}"
+    def remove_key(yaml_string, key_list)
+        if not key_list.is_a?(Array)
+            raise "when using YAML.remove_key, the second argument needs to be a list of keys"
+        end
+        # run the python file with the virtual environment
+        stdout_str, stderr_str, status = execute_with_local_python('remove_key.py', yaml_string, key_list.to_json)
+        if not status.success?
+            raise "\n\nFailed to remove key in yaml file:\n#{stderr_str}"
+        end
+        return stdout_str
     end
-    return stdout_str
+    module_function :remove_key, :set_key
 end
 
 # yaml_test_string = <<-HEREDOC

data/test/info.yaml

@@ -1,68 +1,67 @@
 # Example of Project settings
 (using_atk_version): 1.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
+  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
+      run: !language/ruby puts "hi"
+      stop: \`pkill node`
+      compile: gcc *.cpp
             # TODO: add inline support for doing things like auto-generating commands
-            ? !inline [ *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
-    
-    (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
+      [*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
+
+  (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
         # caveats for a specific OS
-        when(--os is 'mac'):
-            (dependencies):
-                <<: *base_dependencies
-                python2: v2.7
-            
-        when(--os is 'windows'):
-            (project_commands):
-                <<: *basic_commands 
-                show_files: dir # this is a custom command specific to windows
-        when(--os is 'linux'):
+    when(--os is 'mac'):
+      (dependencies):
+        <<: *base_dependencies
+        python2: v2.7
+
+    when(--os is 'windows'):
+      (project_commands):
+        <<: *basic_commands
+        show_files: dir         # this is a custom command specific to windows
+    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
-                    
+      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"

data/test/main.rb

@@ -2,4 +2,4 @@ require_relative '../lib/atk_toolbox'
 
 Dir.chdir __dir__
 
-p Info.project_commands
+Info.set_key(["test"], "it worked?")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atk_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Jeff Hykin