atk_toolbox 0.0.88 → 0.0.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56ed386c598760ad632d38b24699c1e161ef24ebf58596d6db1ba19787d22ce5
-  data.tar.gz: 11e708122a15021df2a99aa9c970fc086b45b69d9b4e7c91ecc2b12cd7108ed0
+  metadata.gz: 88ed1b2cf8888eddfb039a4b9f72c81098dcfeae285f93d839ba2453b53e01cc
+  data.tar.gz: 600a3100cdcc26220e6f1b96521dbfa9d930756a5b155c8896df04adb28483bc
 SHA512:
-  metadata.gz: 90ad3c2aed654ad3ff77dc19416ae1c349a0fb6b2246489a8c912d5068b36f24de9fd8ef8ef348ce62182625b8212e72bd37598b832043cb6a92906bc9cd89b0
-  data.tar.gz: b1c962f58fe49d0706b4304abeeafcc77ac78771a4fd4390cc23ca59a976cc7db2772b0be2a046cac2196acb867f0391a29c2b60e35b251d92f4186040a8226e
+  metadata.gz: 18b48ff2f1aeadaab20067aa3adbf4d6f9fa3bdfcc5fb08c9fb17df1dc8cbaf581ca1b1afc43d291f55962ffcf08758942659a7a351934220ac4228f172cd576
+  data.tar.gz: dfb0ad8d070cafeed7c45ddd2e242a0787e1b074468fcaff273f523fbdf9073a09ca7227e6962d1b7dc9f19f593ecd7d0ab8c8cd135ea6fe5bb0d23b1d8f0230

data/lib/atk/atk_info.rb

@@ -1,5 +1,8 @@
 require_relative './file_sys'
+require_relative './console'
+require_relative './yaml_info_parser'
 require_relative './os'
+require_relative './git'
 require 'yaml'
 
 class AtkPaths
@@ -41,6 +44,7 @@ class AtkPaths
 end
 
 module ATK
+    @@atk_settings_key = "atk_settings"
     def self.paths
         return AtkPaths
     end
@@ -55,20 +59,96 @@ module ATK
     
     def self.info
         settings_path = ATK.paths[:info]
-        atk_settings_key = "atk_settings"
         # if it doesn't exist then create it
         if not FS.exist?(settings_path)
-            FS.write("#{atk_settings_key}: {}", to: settings_path)
+            FS.write("#{@@atk_settings_key}: {}", to: settings_path)
             return {}
         else
             data = YAML.load_file(settings_path)
             if data.is_a?(Hash)
-                if data[atk_settings_key].is_a?(Hash)
-                    return data[atk_settings_key]
+                if data[@@atk_settings_key].is_a?(Hash)
+                    return data[@@atk_settings_key]
                 end
             else
                 return {}
             end
         end
     end
+    
+    def self.save_info(new_hash)
+        settings_path = ATK.paths[:info]
+        current_settings = ATK.info
+        updated_settings = current_settings.merge(new_hash)
+        
+        info_data = YAML.load_file(ATK.paths[:info])
+        if info_file.is_a?(Hash)
+            info_data[@@atk_settings_key] = updated_settings
+        else
+            info_data = { @@atk_settings_key => updated_settings }
+        end
+        
+        FS.save(info_data, to: ATK.paths[:info], as: :yaml )
+    end
+    
+    def self.simplify_package_name(source)
+        source = source.strip
+        # if its starts with "atk/", just remove that part
+        source = source.sub( /^atk\//, "" )
+        # if it starts with "https://github.com/", just remove that part
+        source = source.sub( /^https:\/\/github.com\//, "" )
+        return source
+    end
+    
+    def self.package_name_to_url(package_name)
+        # if its starts with "atk/", just remove that part
+        installer_name = ATK.simplify_package_name(package_name)
+        # if the package name does not have a slash in it, then assume it is a core / approved installer
+        if not (package_name =~ /.*\/.*/) 
+            # TODO: turn this into a check for is_core_repo?(package_name)
+            # path_to_core_listing = ATK.paths[:core_yaml]
+            # core = YAML.load_file(path_to_core_listing)
+            # if core[installer_name] == nil
+            #     puts "I don't see that package in the core, let me make sure I have the latest info"
+            #     download("https://raw.githubusercontent.com/aggie-tool-kit/atk/master/interface/core.yaml", as: path_to_core_listing)
+            #     core = YAML.load_file(path_to_core_listing)
+            # end
+            # if core[installer_name] != nil
+            #     repo_url = core[installer_name]["source"]
+            # else
+            #     raise "That package doesn't seem to be a core package"
+            # end
+        # if it does have a slash, then assume its a github repo
+        else
+            repo_url = "https://github.com/"+package_name
+        end
+        return repo_url
+    end
+    
+    def self.setup(package_name, arguments)
+        repo_url = Console.args[1]
+        project_folder = ATK.info["project_folder"]
+        # if there's a project folder
+        if not project_folder
+            # then use the Desktop folder
+            # TODO: improve this to ask the user for a defaul location for storing their project
+            project_folder = HOME/"Desktop"
+        end
+        project_name = Console.ask("What do you want to name the project?")
+        project_path = project_folder/project_name
+        Git.ensure_cloned_and_up_to_date(project_path, repo_url)
+        FS.in_dir(project_path) do
+            setup_command = Info.project_commands['(setup)']
+            if setup_command.is_a?(Code) || setup_command.is_a?(String)
+                puts "\n\nRunning (setup) command:\n".green
+                sleep 1
+                if setup_command.is_a?(Code)
+                    setup_command.run(arguments)
+                else 
+                    command_and_args = setup_command.split(/ */)
+                    console_args = command_and_args.concat(*arguments)
+                    system(*console_args)
+                end
+            end
+        end
+    end
 end

data/lib/atk/git.rb

@@ -1,2 +1,21 @@
 require 'git'
 require 'logger'
+
+module Git
+    def self.ensure_cloned_and_up_to_date(target_dir, git_repo_url)
+        # check if it exists
+        if FS.directory?(target_dir)
+            if Console.verbose
+                git_repo = Git.open(target_dir,  :log => Logger.new(STDOUT))
+            else
+                git_repo = Git.open(target_dir)
+            end
+        # if it doesn't exist, then clone it
+        else
+            git_repo = Git.clone(git_repo_url, target_dir)
+        end
+        # pull from origin master
+        # TODO: make this a force pull
+        git_repo.pull
+    end
+end

data/lib/atk/yaml_info_parser.rb

@@ -1,5 +1,5 @@
 require "yaml"
-require_relative './cmd'
+require_relative './console'
 require_relative './os'
 require_relative './file_sys'
 require_relative './extra_yaml'

data/lib/atk_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AtkToolbox
-  VERSION = '0.0.88'
+  VERSION = '0.0.89'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atk_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.88
+  version: 0.0.89
 platform: ruby
 authors:
 - Jeff Hykin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
@@ -97,7 +97,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/atk/atk_info.rb
-- lib/atk/cmd.rb
+- lib/atk/console.rb
 - lib/atk/default_info.yaml
 - lib/atk/extra_yaml.rb
 - lib/atk/file_sys.rb