Kobold 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c742718fdab33d2dcf4ca03749e3df35e57a3ffbf988f2ba2a58904ce3414c3
-  data.tar.gz: abd99306ceb78dde69e0dcb504670c2cd9bcb54f9c792ffee570b74e4c9ee07c
+  metadata.gz: 95561edd1b18544bfc735599c499a2b0d415a2b1638a30a56257fda2175adbbc
+  data.tar.gz: a87c0b8575ea4abf21acf6325b32d8f4c371db5c6f0f9e0b7df97edb8a196021
 SHA512:
-  metadata.gz: 5e654583ded3e1113c5c427c32547414ee020290401ac27c43bc7de77e948f9d1314f0ed3dd8272f55627e592277001f0ec776ff6175198232457c6cb0af47cf
-  data.tar.gz: e75b81edfe86a795b9fdfcf64a04f03611b5adedcaf32d9772047f141cca651b12f6b7706b69738d28fd7b57f4270d6848b95feb92743e2e76a7ba4edffaac03
+  metadata.gz: 7e5df73b29da03d20e409b39d4752011bd56e38d5e1bef5132f09bd732a9ee4ac73e71043c2d7048f8e66b7ae36e5b5a77cff91bf15fa1ffbc6a433f7b34c340
+  data.tar.gz: 430e6ad01c0d0c89853811362b6e51cb7ce0e62d424bcd3e8cd1a875e11de3cc85f4b72bf680ea0e5529d12aee030afe8e74b0a1a0d2b863ede06543bd65601b

data/exe/kobold

@@ -2,7 +2,7 @@
 
 require 'Kobold'
 require 'tty-option'
-require 'pry'
+#require 'pry'
 
 module Kobold
   class Command
@@ -11,24 +11,19 @@ module Kobold
     usage do
       program "kobold"
 
-      command "init"
+      commands "init", "invoke"
 
-      desc "Initializes empty Kobold configuration file"
     end
 
     argument :command do
       optional
-      desc "askjd"
+      desc "Accepts commands for Kobold to execute."
     end
 
     flag :help do
       short "-h"
       long "--help"
-      desc "Print usage"
-    end
-
-    flag :init do
-      desc "initialize"
+      desc "Print usage."
     end
 
     def run
@@ -37,7 +32,7 @@ module Kobold
       elsif params.errors.any?
         puts params.errors.summary
       else
-        pp params.to_h
+        #pp params.to_h
       end
     end
   end
@@ -50,6 +45,16 @@ run = cmd.run
 
 if cmd.params[:command] == nil || cmd.params == "invoke"
   Kobold.invoke
-elsif cmd.params[:command] == "init"
-  Kobold.init  
+else
+  case cmd.params[:command]
+  when "add"
+  when "remove"
+  when "update"
+  when "list"
+    Kobold.list
+  when "init"
+    Kobold.init
+  else
+    print cmd.help
+  end
 end

data/lib/Kobold/first_time_setup.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "tty-config"
+require 'fileutils'
+require 'git'
+
+module Kobold
+  class << self
+    def first_time_setup
+      FileUtils.mkdir_p "#{KOBOLD_DIR}/repo_cache"
+    end
+  end
+end
+

data/lib/Kobold/init.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "tty-config"
+require 'fileutils'
+require 'git'
+
+module Kobold
+  class << self
+    # create empty file with current
+    # file version in current dir
+    def init
+      kobold_config = TTY::Config.new
+      kobold_config.filename = ".kobold"
+      kobold_config.extname = ".ini"
+      kobold_config.set "kobold_config", "format_version", value: Kobold::FORMAT_VERSION
+      kobold_config.write
+      File.rename ".kobold.ini", ".kobold"
+    end
+  end
+end

data/lib/Kobold/invoke.rb

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+require "tty-config"
+require 'fileutils'
+require 'git'
+
+#require_relative "Kobold/vars.rb"
+
+module Kobold
+  class << self
+    def invoke
+      Kobold.first_time_setup if !File.directory? "#{KOBOLD_DIR}/repo_cache"
+      if !File.file? "#{Dir.pwd}/.kobold"
+        puts "ERROR: Kobold file not found at '#{Dir.pwd}'"
+        return
+      end
+      settings = Kobold.read_config(Dir.pwd)
+
+      #puts Kobold::FORMAT_VERSION + " " + settings["kobold_config"]["format_version"]
+      if Kobold::FORMAT_VERSION == settings["_kobold_config"]["format_version"]
+        #settings.delete "kobold_config"
+
+        # iterate over all dependencies
+        settings.each do |key, value|
+          if Kobold::CONFIG_TITLES.include? key
+            #puts "skipping #{key}"
+            next
+          end
+          repo_dir = "#{KOBOLD_DIR}/repo_cache/#{key.gsub('/', '-')}"
+
+          source_repo = nil;
+          # check if source exists
+          if !Dir.exist? "#{repo_dir}/source" # TODO: make this properly check for git repo
+            # if it doesnt, make it
+            FileUtils.mkdir_p "#{repo_dir}/source"
+            FileUtils.mkdir_p "#{repo_dir}/worktrees"
+            FileUtils.mkdir_p "#{repo_dir}/branches" # these are also worktrees, but just for the branch specifically if possible. TODO for later
+            #puts "#{value["source"]}/#{key}.git", "#{repo_dir}/source"
+            source_repo = Git.clone "#{value["source"]}/#{key}.git", "#{repo_dir}/source"
+          else
+            source_repo = Git.open("#{repo_dir}/source")
+          end
+
+          target_symlink = nil
+          # check if requested version exists
+          if value["tag"]
+            dir_name = value["tag"].to_s.gsub("/","-")
+            # TODO make the thing
+          else # use hash as name
+            if value["commit"]
+              # use given commit name, also check it exists
+              begin # git errors when it does not find the hash
+                #if value["commit"].is_a? Float
+                #  value["commit"] = value["commit"].to_i.to_s
+                #end
+                commit_val = value["commit"].to_s.delete_prefix('"').delete_suffix('"').delete_prefix("'").delete_suffix("'")
+                if commit_val == 'latest'
+                  # TODO just use source git repo
+                  target_symlink = "#{repo_dir}/source"
+                elsif commit_sha
+                  commit_sha = source_repo.object(commit_val).sha;
+                  target_symlink = "#{repo_dir}/worktrees/#{commit_sha}"
+                  if !Dir.exist? target_symlink
+                    # make it
+                    source_repo.worktree(target_symlink, commit_sha).add
+                  end
+                else
+                  raise "Cannot find commit"
+                end
+              rescue # we catch this error here
+                raise "Cannot find commit"
+              end
+            else
+              raise "No commit given for #{key}"
+            end
+          end
+
+          # build the symlink
+          if value["dir"].end_with? "/"
+            FileUtils.mkdir_p value["dir"]
+            #puts "value: " + value["dir"] + key.split('/').last
+            #puts !File.symlink?(value["dir"] + key.split('/').last)
+
+            symlink1 = File.symlink?(value["dir"] + key.split('/').last)
+            symlink2 = File.symlink? value["dir"]
+
+            if !(symlink1 || symlink2)
+              File.symlink(target_symlink, "#{value['dir']}/#{key.split('/').last}")
+            end
+            #File.symlink(target_symlink, "#{value['dir']}/#{key.split('/').last}")
+
+          else
+            dir_components = value["dir"].split "/"
+            dir_components.pop
+            dir_components = dir_components.join "/"
+            FileUtils.mkdir_p dir_components
+            File.symlink(target_symlink, value["dir"]) if !File.symlink? value["dir"]
+
+            symlink1 = File.symlink?(value["dir"] + key.split('/').last)
+            symlink2 = File.symlink? value["dir"]
+
+            if !(symlink1 || symlink2)
+              File.symlink(target_symlink, value["dir"])
+            end
+            #File.symlink(target_symlink, value["dir"])
+          end
+
+        end
+
+        # iterate over all sub kobold files
+        sub_kobolds = if settings["_kobold_include"] then settings["_kobold_include"]["files"].strip.split("\n") else [] end
+        sub_kobolds.each do |path|
+          Dir.chdir(path.strip) do
+            invoke
+          end
+        end
+
+      else
+        raise "Wrong format version"
+      end
+    end
+  end
+end

data/lib/Kobold/read_config.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "tty-config"
+#require 'fileutils'
+
+module Kobold
+  class << self
+    def read_config(dir)
+      config = TTY::Config.new
+      config.append_path dir
+      settings = config.read ".kobold", format: :ini
+      return settings
+    end
+  end
+end

data/lib/Kobold/vars.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+#require_relative "Kobold/version"
+
+module Kobold
+  CONFIG_TITLES = [ 
+    "_kobold_config",
+    "_kobold_include",
+  ]
+end

data/lib/Kobold/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Kobold
-  VERSION = "0.1.0"
-  FORMAT_VERSION = "0.1.0"
+  VERSION = "0.2.0"
+  FORMAT_VERSION = "0.2.0"
 end

data/lib/Kobold.rb

@@ -5,106 +5,14 @@ require "tty-config"
 require 'fileutils'
 require 'git'
 
+require_relative "Kobold/vars.rb"
+require_relative "Kobold/read_config.rb"
+require_relative "Kobold/first_time_setup.rb"
+require_relative "Kobold/invoke.rb"
+require_relative "Kobold/init.rb"
+
 module Kobold
   KOBOLD_DIR = "#{Dir.home}/.local/share/Kobold"
   class << self
-
-    # read configuration file
-    #   for each item:
-    # 1. check if repo exists
-    # ~2. check if correct version exists~
-    # 3. check if symlink is correct
-
-    def invoke
-      first_time_setup if !File.directory? "#{KOBOLD_DIR}/repo_cache"
-      config = TTY::Config.new
-      config.append_path Dir.pwd
-      settings = config.read ".kobold", format: :ini
-
-      puts Kobold::FORMAT_VERSION + " " + settings["kobold_config"]["format_version"]
-      if Kobold::FORMAT_VERSION == settings["kobold_config"]["format_version"]
-        settings.delete "kobold_config"
-
-        # iterate over all dependencies
-        settings.each do |key, value|
-          puts "key:#{key}"
-          repo_dir = "#{KOBOLD_DIR}/repo_cache/#{key.gsub('/', '-')}"
-
-          master_repo = nil;
-          # check if master exists
-          if !Dir.exist? "#{repo_dir}/master" # TODO: make this properly check for git repo
-            # if it doesnt, make it
-            FileUtils.mkdir_p "#{repo_dir}/master"
-            FileUtils.mkdir_p "#{repo_dir}/worktrees"
-            puts "#{value["source"]}/#{key}.git", "#{repo_dir}/master"
-            master_repo = Git.clone "#{value["source"]}/#{key}.git", "#{repo_dir}/master"
-          else
-            master_repo = Git.open("#{repo_dir}/master")
-          end
-
-          target_symlink = nil
-          # check if requested version exists
-          if value["tag"]
-            dir_name = value["tag"].to_s.gsub("/","-")
-            # TODO make the thing
-          else # use hash as name
-            if value["commit"]
-              # use given commit name, also check it exists
-              begin # git errors when it does not find the hash
-                if value["commit"].is_a? Float
-                  value["commit"] = value["commit"].to_i.to_s
-                end
-                commit_sha = master_repo.object(value["commit"].to_s.delete_prefix('"').delete_suffix('"').delete_prefix("'").delete_suffix("'")).sha;
-                if commit_sha
-                  target_symlink = "#{repo_dir}/worktrees/#{commit_sha}"
-                  if !Dir.exist? target_symlink
-                    # make it
-                    master_repo.worktree(target_symlink, commit_sha).add
-                  end
-                else
-                  raise "Cannot find commit"
-                end
-              rescue # we catch this error here
-                raise "Cannot find commit"
-              end
-            else
-              raise "No commit given for #{key}"
-            end
-          end
-
-          # build the symlink
-          if value["dir"].end_with? "/"
-            FileUtils.mkdir_p value["dir"]
-            File.symlink target_symlink, "#{value['dir']}/#{key.split('/').last}" 
-          else
-            dir_components = value["dir"].split "/"
-            dir_components.pop
-            dir_components = dir_components.join "/"
-            FileUtils.mkdir_p dir_components
-            File.symlink target_symlink, value["dir"]
-          end
-
-        end
-
-      else
-        raise "Wrong format version"
-      end
-
-    end
-
-    def first_time_setup
-      FileUtils.mkdir_p "#{KOBOLD_DIR}/repo_cache"
-    end
-
-    # create empty file with current
-    # file version in current dir
-    def init
-      kobold_config = TTY::Config.new
-      kobold_config.filename = ".kobold"
-      kobold_config.extname = ".ini"
-      kobold_config.set "kobold_config", "format_version", value: Kobold::FORMAT_VERSION
-      kobold_config.write
-      File.rename ".kobold.ini", ".kobold"
-    end
   end
 end

data/prototyping/.gitignore

@@ -1,2 +1,4 @@
 external
 external/raylib
+dir1
+dir2

data/prototyping/.kobold

@@ -1,7 +1,15 @@
-[kobold_config]
-format_version = 0.1.0
+[_kobold_config]
+format_version = 0.2.0
+
+[_kobold_include]
+files = "
+dir1/
+dir2/
+"
 
 [raysan5/raylib]
 source = https://github.com
 dir = external/
-commit = '0851960'
+commit = 'latest'
+
+

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: Kobold
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - CatsAtTheRodeo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-30 00:00:00.000000000 Z
-dependencies: []
+date: 2023-09-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tty-option
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: tty-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.18.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.18.0
 description:
 email:
 - contact@tradam.dev
@@ -33,6 +89,11 @@ files:
 - Rakefile
 - exe/kobold
 - lib/Kobold.rb
+- lib/Kobold/first_time_setup.rb
+- lib/Kobold/init.rb
+- lib/Kobold/invoke.rb
+- lib/Kobold/read_config.rb
+- lib/Kobold/vars.rb
 - lib/Kobold/version.rb
 - prototyping/.gitignore
 - prototyping/.kobold