Kobold 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95561edd1b18544bfc735599c499a2b0d415a2b1638a30a56257fda2175adbbc
-  data.tar.gz: a87c0b8575ea4abf21acf6325b32d8f4c371db5c6f0f9e0b7df97edb8a196021
+  metadata.gz: 75fef6957b1c19312541b59a16ac8570a1b86e5b7f41f79dba2c41800be12191
+  data.tar.gz: 017ddeb8d702b82e6394fb39728e88cf4d1b9ee0faeea5fb5d576adad2bb0836
 SHA512:
-  metadata.gz: 7e5df73b29da03d20e409b39d4752011bd56e38d5e1bef5132f09bd732a9ee4ac73e71043c2d7048f8e66b7ae36e5b5a77cff91bf15fa1ffbc6a433f7b34c340
-  data.tar.gz: 430e6ad01c0d0c89853811362b6e51cb7ce0e62d424bcd3e8cd1a875e11de3cc85f4b72bf680ea0e5529d12aee030afe8e74b0a1a0d2b863ede06543bd65601b
+  metadata.gz: ad1f5519736e748bde54452c285e236d3c3512affb98f66052a8af32a11eb1a1108a46880d026c5fd6362bf118886b45c9e1e449050566e45db00f711b0f4db8
+  data.tar.gz: e135292d11f7009d8202d357bfe6fecf93fb5fa0f5811dc4e807c2e221e4e9d6cfc4483b5a4392072d69eaf164e6bf30bc3cd1981d07d8cd5a7d1c8d2db40b46

data/lib/Kobold/init.rb

@@ -12,7 +12,7 @@ module Kobold
       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.set "_kobold_config", "format_version", value: Kobold::FORMAT_VERSION
       kobold_config.write
       File.rename ".kobold.ini", ".kobold"
     end

data/lib/Kobold/invoke.rb

@@ -16,17 +16,13 @@ module Kobold
       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}"
+          if key[0] == '_' 
             next
           end
-          repo_dir = "#{KOBOLD_DIR}/repo_cache/#{key.gsub('/', '-')}"
+          repo_dir = "#{KOBOLD_DIR}/repo_cache/#{value['repo'].gsub('/', '-')}"
 
           source_repo = nil;
           # check if source exists
@@ -34,45 +30,108 @@ module Kobold
             # 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"
+            FileUtils.mkdir_p "#{repo_dir}/worktrees/branched"
+            FileUtils.mkdir_p "#{repo_dir}/worktrees/sha"
+            FileUtils.mkdir_p "#{repo_dir}/worktrees/labelled"
+            FileUtils.mkdir_p "#{repo_dir}/branches"
+            source_repo = clone_git_repo "#{value["source"]}/#{value['repo']}.git", "#{repo_dir}/source" 
           else
             source_repo = Git.open("#{repo_dir}/source")
           end
 
+          # must be scoped here, used in various inner scopes
           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"
+
+          #   Structure of a segment of following code:
+          # if it declares a branch: make the branch
+          # if it has a label
+          #   it must have a sha
+          #   if it has a branch
+          #     use that branch + sha
+          #   else
+          #     use source + sha
+          #   end
+          # else check if it has a branch
+          #   if it has a sha
+          #     make the sha
+          #   else
+          #     make it point to branch
+          #   end
+          # else check if it has a sha
+          #   make the sha on the source
+          # else
+          #   use source
+          # end
+
+          branch_repo = nil
+          if value["branch"]
+            branch_repo_path = "#{repo_dir}/branches/#{value["branch"]}"
+            # check if branch already exists, make it if it doesnt
+            if !Dir.exist? branch_repo_path
+              FileUtils.mkdir_p "#{repo_dir}/branches"
+              source_repo.worktree(branch_repo_path, value["branch"]).add
+            end
+            branch_repo = Git.open(branch_repo_path)
+          end
+
+          target_symlink = nil
+          # if it has a label
+          if value["label"]
+
+            if !value["commit"]
+              raise "Must give a specific sha when making a label. #{key} has no specific sha given"
+            end
+            if value["branch"]
+              worktree_path = "#{repo_dir}/worktrees/labelled/#{value["label"]}/#{value["branch"]}"
+              _commit_val = value["commit"].to_s.delete_prefix('"').delete_suffix('"').delete_prefix("'").delete_suffix("'")
+              worktree_sha = branch_repo.object(_commit_val).sha;
+              target_symlink = "#{worktree_path}/#{worktree_sha}"
+              if !Dir.exist? target_symlink
+                FileUtils.mkdir_p "#{worktree_path}"
+                branch_repo.worktree(target_symlink, worktree_sha).add
+              end
+            else
+              branch = source_repo.branch.name
+              worktree_path = "#{repo_dir}/worktrees/labelled/#{value["label"]}/#{branch}"
+              _commit_val = value["commit"].to_s.delete_prefix('"').delete_suffix('"').delete_prefix("'").delete_suffix("'")
+              worktree_sha = source_repo.object(_commit_val).sha;
+              target_symlink = "#{worktree_path}/#{worktree_sha}"
+              if !Dir.exist? target_symlink
+                FileUtils.mkdir_p "#{worktree_path}"
+                source_repo.worktree(target_symlink, worktree_sha).add
+              end
+            end
+
+          elsif value["branch"]
+
+            if value['sha']
+              worktree_path = "#{repo_dir}/worktrees/branched/#{branch}"
+              _commit_val = value["commit"].to_s.delete_prefix('"').delete_suffix('"').delete_prefix("'").delete_suffix("'")
+              worktree_sha = branch_repo.object(_commit_val).sha;
+              target_symlink = "#{worktree_path}/#{worktree_sha}"
+              if !Dir.exist? target_symlink
+                FileUtils.mkdir_p "#{worktree_path}"
+                branch_repo.worktree(target_symlink, worktree_sha).add
               end
             else
-              raise "No commit given for #{key}"
+              target_symlink = "#{repo_dir}/branches/#{value['branch']}"
             end
+
+          elsif value["commit"]
+
+            worktree_path = "#{repo_dir}/worktrees/sha"
+            _commit_val = value["commit"].to_s.delete_prefix('"').delete_suffix('"').delete_prefix("'").delete_suffix("'")
+            worktree_sha = source_repo.object(_commit_val).sha;
+            target_symlink = "#{worktree_path}/#{worktree_sha}"
+            if !Dir.exist? target_symlink
+              FileUtils.mkdir_p "#{worktree_path}"
+              source_repo.worktree(target_symlink, worktree_sha).add
+            end
+
+          else
+
+            target_symlink = "#{repo_dir}/source"
+
           end
 
           # build the symlink
@@ -81,11 +140,14 @@ module Kobold
             #puts "value: " + value["dir"] + key.split('/').last
             #puts !File.symlink?(value["dir"] + key.split('/').last)
 
-            symlink1 = File.symlink?(value["dir"] + key.split('/').last)
+            symlink1 = File.symlink?(value["dir"] + value['repo'].split('/').last)
             symlink2 = File.symlink? value["dir"]
 
             if !(symlink1 || symlink2)
-              File.symlink(target_symlink, "#{value['dir']}/#{key.split('/').last}")
+              puts "value['dir'] #{value['dir']}"
+              puts "value['repo'] #{value['repo']}"
+              puts "target_symlink #{target_symlink}"
+              File.symlink(target_symlink, "#{value['dir']}/#{value['repo'].split('/').last}")
             end
             #File.symlink(target_symlink, "#{value['dir']}/#{key.split('/').last}")
 
@@ -96,7 +158,7 @@ module Kobold
             FileUtils.mkdir_p dir_components
             File.symlink(target_symlink, value["dir"]) if !File.symlink? value["dir"]
 
-            symlink1 = File.symlink?(value["dir"] + key.split('/').last)
+            symlink1 = File.symlink?(value["dir"] + ['repo'].split('/').last)
             symlink2 = File.symlink? value["dir"]
 
             if !(symlink1 || symlink2)
@@ -119,5 +181,22 @@ module Kobold
         raise "Wrong format version"
       end
     end
+
+    private
+
+    def clone_git_repo(url, path)
+      progress_bar = TTY::ProgressBar.new("[:bar] Cloning: #{url} ", bar_format: :blade, total: nil, width: 45)
+
+      thread = Thread.new(abort_on_exception: true) do
+        Git.clone url, path
+      end
+      progress_bar.start
+      while thread.status
+        progress_bar.advance
+        sleep 0.016
+      end
+      puts
+      return thread.value
+    end
   end
 end

data/lib/Kobold/version.rb

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

data/lib/Kobold.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "Kobold/version"
-require "tty-config"
+require_relative 'Kobold/version'
+require 'tty-config'
 require 'fileutils'
 require 'git'
+require 'tty-progressbar'
 
-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"
+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"

data/prototyping/.kobold

@@ -1,15 +1,28 @@
 [_kobold_config]
-format_version = 0.2.0
+format_version = 0.3.0
 
-[_kobold_include]
-files = "
-dir1/
-dir2/
-"
+;[_kobold_include]
+;files = "
+;dir1/
+;dir2/
+;"
 
-[raysan5/raylib]
+[raylib-linux]
+repo = raysan5/raylib
 source = https://github.com
-dir = external/
-commit = 'latest'
+dir = external/linux-x64/
+commit = 'b8cd102'
+label = linux-x64
+
+[raylib-web]
+repo = raysan5/raylib
+source = https://github.com
+dir = external/emscripten/
+commit = 'b8cd102'
+label = web
 
+[raygui]
+repo = raysan5/raygui
+source = https://github.com
+dir = external/
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Kobold
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - CatsAtTheRodeo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2023-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-option
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.18.0
+- !ruby/object:Gem::Dependency
+  name: tty-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
 description:
 email:
 - contact@tradam.dev
@@ -74,7 +88,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".kobold"
 - ".rubocop.yml"
 - CHANGELOG.md
 - Kobold Notes/.obsidian/app.json
@@ -93,7 +106,6 @@ files:
 - 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
@@ -121,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: Version manager for various libraries and projects.

data/.kobold

@@ -1,6 +0,0 @@
-[kobold_config]
-format_version = 0.1.0
-
-[raysan5/raylib]
-source = https://github.com
-dir = external/

data/lib/Kobold/vars.rb

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