Kobold 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd92e1c7f290dbd4fe42c2a497339329ee47ebb6249e26ec5ec08ccd9c9eba3d
-  data.tar.gz: 0a5163797dca83c701b56e15d862fa9e7f2b7eb3d749a47c44d4f3547dc15ca7
+  metadata.gz: 3365a9b108ba3abccb20d4040f8f10c2b3cfeafaffcb1eab97f8bb6ec31c96f2
+  data.tar.gz: d5449335967f96c07777761a95a5de46b4a61857fd0c782b85dbfc8ab9ef7c20
 SHA512:
-  metadata.gz: 35b37e639f5907fd4ea8d67b6819f704451892a495fe4574ed2bf8f49387ff9be153ac9e70b38df88a9c4dd75a3ab635e1213d08f6b88809d0481a3df714d0b3
-  data.tar.gz: ae51f481be6391b40610a13bedd6a36158b17cf0bdc06ac2b8d2ba155019ed21367d9be144e24084bcacb0136de17fb56003b295b9eb198bb1c0bc5cd21891d9
+  metadata.gz: 65f41daea3213f01c72847b0cf4e51cc86580d1c514f3d89575273fb1f0437c720dce10bbc455c59ef8fa733eb59f433c78c2102cbd88856dab15ac4068422eb
+  data.tar.gz: 2e12df3ae02950f89743efe353855c86409073d5031af3eba41c8c1ab4e5d7dc18d85e3e3546fbcf05c799ceef49cb09b222b7877d86193d6c4d120c758f0281

data/exe/kobold

@@ -52,8 +52,14 @@ else
   when "update"
   when "list"
     Kobold.list
+  when "fetch"
+    Kobold.fetch
   when "init"
     Kobold.init
+  when "version"
+    Kobold.version
+  when "v"
+    Kobold.version
   else
     print cmd.help
   end

data/lib/Kobold/fetch.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "tty-config"
+require 'fileutils'
+require 'git'
+
+#require_relative "Kobold/vars.rb"
+
+module Kobold
+  class << self
+    def fetch
+      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)
+
+      if Kobold::FORMAT_VERSION == settings["_kobold_config"]["format_version"]
+        # iterate over all dependencies
+        settings.each do |key, value|
+          if key[0] == '_' 
+            next
+          end
+          repo_dir = "#{KOBOLD_DIR}/repo_cache/#{value['repo'].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}/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"
+            next
+            # TODO this may need to be reworked, might not fetch new branches that are required
+            # if they havent been invoked previously.
+            # works good enough for now :3
+          else
+            source_repo = Git.open("#{repo_dir}/source")
+          end
+
+          progress_bar = TTY::ProgressBar.new("[:bar] Fetching: #{value["source"]}/#{value['repo']}.git ", bar_format: :blade, total: nil, width: 45)
+
+          thread = Thread.new(abort_on_exception: true) do
+            source_repo.fetch(all: true)
+          end
+          progress_bar.start
+          while thread.status
+            progress_bar.advance
+            sleep 0.016
+          end
+          puts
+          #return thread.value
+        end
+      end
+    end
+  end
+end

data/lib/Kobold/init.rb

@@ -9,12 +9,28 @@ module Kobold
     # 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"
+      kobold_default = <<-EOS
+[_kobold_config]
+format_version = #{Kobold::FORMAT_VERSION}
+
+; must be unique, can be anything that doesnt start with underscore
+;[raylib-linux]
+;
+; required
+;repo = raysan5/raylib
+;source = https://github.com
+;
+; optional, remove slash at the end to rename the dir the repo is in
+;dir = external/linux-x64/
+;
+; one of these 2 is required
+;branch = something
+;commit = 'b8cd102'
+;
+; optional, makes unique trunk
+;label = linux-x64
+      EOS
+      File.write('.kobold', kobold_default)
     end
   end
 end

data/lib/Kobold/invoke.rb

@@ -121,7 +121,17 @@ module Kobold
 
             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;
+
+            worktree_sha ||= :scoped # make variable in this scope instead of begin rescue scope
+            begin
+              worktree_sha = source_repo.object(_commit_val).sha;
+            rescue Git::FailedError => error
+              puts 'ERROR: Most likely failed to find SHA.'
+              puts '       Try to run "kobold fetch" or make sure SHA is valid'
+              puts "       Original Error: #{error.message}"
+              exit
+            end
+
             target_symlink = "#{worktree_path}/#{worktree_sha}"
             if !Dir.exist? target_symlink
               FileUtils.mkdir_p "#{worktree_path}"
@@ -134,8 +144,10 @@ module Kobold
 
           end
 
+          value['dir'] ||= './' # by default create in current dir if not specified
+
           # build the symlink
-          if value["dir"].end_with? "/"
+          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)
@@ -155,7 +167,7 @@ module Kobold
             FileUtils.mkdir_p dir_components
             File.symlink(target_symlink, value["dir"]) if !File.symlink? value["dir"]
 
-            symlink1 = File.symlink?(value["dir"] + ['repo'].split('/').last)
+            symlink1 = File.symlink?(value["dir"] + value['repo'].split('/').last)
             symlink2 = File.symlink? value["dir"]
 
             if !(symlink1 || symlink2)

data/lib/Kobold/version.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 module Kobold
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
   FORMAT_VERSION = "0.3.0"
+  class << self
+    def version
+      puts "Kobold:        #{Kobold::VERSION}"
+      puts "Kobold Format: #{Kobold::FORMAT_VERSION}"
+    end
+  end
 end

data/lib/Kobold.rb

@@ -10,6 +10,7 @@ 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/fetch.rb'
 
 module Kobold
   KOBOLD_DIR = "#{Dir.home}/.local/share/Kobold"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Kobold
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - CatsAtTheRodeo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-09 00:00:00.000000000 Z
+date: 2023-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-option
@@ -102,6 +102,7 @@ files:
 - Rakefile
 - exe/kobold
 - lib/Kobold.rb
+- lib/Kobold/fetch.rb
 - lib/Kobold/first_time_setup.rb
 - lib/Kobold/init.rb
 - lib/Kobold/invoke.rb