drakkon 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22dc052674cbdeb00139240538434c5098c27f5b4daa59ecc35ba3fd30fc6219
-  data.tar.gz: e705e6edc55b2b979761da02ad021d4d0ae427b6b03144fc8d20835f3a89f496
+  metadata.gz: 7d96f5b298a5a1e72de4af63cc4586b919d087944132ff010e9a764ed1c6efee
+  data.tar.gz: 60245722e0177e6228bc4c4f99b89c25e394c4474ff4ce314316ac0251bab21b
 SHA512:
-  metadata.gz: f02cc623e83d177b61e9043d4852571b5be61c9ac3fea8aa73009e2469fe90636c2da8976829209342cbbd8c6358033586f1c1994bf2a3814157ebb0b19cbfe7
-  data.tar.gz: 582b9944ca4aeec1d5963fd92190f4330b97cdbcc1f99892f725dbe3629290c523bc3926e4f89ac111f96b874422a6503b2a40bde396fe606a393237cbe69033
+  metadata.gz: 6f01268dbb5324527bbd69d4dbb5bd6a4c5c9ab33866782a47fc4b264b1bc6e41f332b668d71ca288340684d0b666863baef5327b78780cfd3c677a6ee90fec8
+  data.tar.gz: 324e6d67efb2a03400dc0a474525d5f8676e323a6bc6b9f4a9a9ff92a91bc31c967332d3f45706534b00018bc9c446c6c51700e49541496c36b000f5b94cf2e5

data/lib/drakkon/build.rb

@@ -90,6 +90,10 @@ module Drakkon
       args.include?('images')
     end
 
+    def self.force_fonts?
+      args.include?('fonts')
+    end
+
     def self.force_manifest?
       args.include?('manifest')
     end

data/lib/drakkon/gem/bundle.rb

@@ -3,7 +3,8 @@ module Drakkon
     # Run Command for CLI
     module Bundle
       def self.build!(args, context)
-        return if Settings.gems.empty?
+        # Gems are not required
+        # return if Settings.gems.empty?
 
         @context = context
 
@@ -16,14 +17,63 @@ module Drakkon
 
         idx = collect
 
-        do_the_bundle(idx)
+        if Settings.bundle_compile?
+          LogBot.info('Gems Bundle', 'Compile')
+          compiled_bundle(idx)
+        else
+          LogBot.info('Gems Bundle', 'Expand')
+          expand_bundle(idx)
+        end
 
         Settings.update(:bundle_digest, digest)
       rescue TTY::Reader::InputInterrupt
         exit 0
       end
 
-      def self.do_the_bundle(idx)
+      # Including files without merging them
+      def self.expand_bundle(idx)
+        # Make Directory `app/drakkon` if it doesn't exist
+        FileUtils.mkdir_p('app/drakkon') unless File.directory?('app/drakkon')
+
+        # Create Sub Directory to make switching to compile / eaiser
+        # Always clear to ensure fresh directory
+        FileUtils.rm_rf(unbundle_dir) if File.directory?(unbundle_dir)
+        FileUtils.mkdir_p(unbundle_dir)
+
+        # Touch the file if it doesn't exist
+        FileUtils.touch(bundle_file) unless File.exist?(bundle_file)
+
+        File.open(bundle_file, 'w') do |f|
+          idx.keys.sort.reverse.each do |i|
+            idx[i].each do |file_data|
+              file = file_data[:path]
+              unless File.exist?(file)
+                LogBot.fatal('Bundle', "File not found #{file.pastel(:red)}")
+                next
+              end
+
+              file_path = "#{unbundle_dir}/#{File.basename(file_data[:safe_name])}.rb"
+
+              FileUtils.cp(file, file_path)
+              f << "require '#{file_path}'\n"
+            end
+          end
+
+          # Include other files
+          f << "require 'app/drakkon/image_index.rb' \n" if Settings.image_index?
+          f << "require 'app/drakkon/manifest.rb' \n" if Settings.manifest?
+          f << "require 'app/drakkon/font_index.rb' \n" if Settings.font_index?
+
+          # File Close
+        end
+
+        # FileUtils.cp(bundle_file, "#{drakkon_dir}/bundle/#{Time.now.to_i}.rb")
+      end
+
+      def self.compiled_bundle(idx)
+        # Always clear to ensure fresh directory
+        FileUtils.rm_rf(unbundle_dir) if File.directory?(unbundle_dir)
+
         # Make Directory `app/drakkon` if it doesn't exist
         FileUtils.mkdir_p('app/drakkon') unless File.directory?('app/drakkon')
 
@@ -33,7 +83,9 @@ module Drakkon
         File.open(bundle_file, 'w') do |f|
           # Index Writer
           idx.keys.sort.reverse.each do |i|
-            idx[i].each do |file|
+            idx[i].each do |file_data|
+              file = file_data[:path]
+
               unless File.exist?(file)
                 LogBot.fatal('Bundle', "File not found #{file.pastel(:red)}")
                 next
@@ -46,6 +98,7 @@ module Drakkon
           # Include other files
           f << "require 'app/drakkon/image_index.rb' \n" if Settings.image_index?
           f << "require 'app/drakkon/manifest.rb' \n" if Settings.manifest?
+          f << "require 'app/drakkon/font_index.rb' \n" if Settings.font_index?
 
           # File Close
         end
@@ -53,7 +106,8 @@ module Drakkon
 
       def self.collect
         idx = {}
-        Settings.gems.each_value do |gem|
+        Settings.gems.each do |gem_name, gem|
+          gem[:name] = gem_name.to_s.downcase
           case gem[:source].to_sym
           when :local then collect_local_source(idx, gem)
           else
@@ -78,7 +132,10 @@ module Drakkon
               next
             end
 
-            idx[mod.weight].push file_name
+            # Convert full file path into single string / relative naming (no directories)
+            safe_name = "#{gem.name}_#{file.gsub('/', '_')}"
+
+            idx[mod.weight].push(path: file_name, name: file, safe_name: safe_name)
           end
         end
 
@@ -86,7 +143,10 @@ module Drakkon
         if gem[:data].key?(:files)
           gem[:data][:files].each_value do |f|
             idx[f.weight] ||= []
-            idx[f.weight].push "#{path}/#{f.file}"
+            # idx[f.weight].push "#{path}/#{f.file}"
+            safe_name = "#{gem.name}_#{f.file.gsub('/', '_')}"
+
+            idx[f.weight].push(path: "#{path}/#{f.file}", name: f.file, safe_name: safe_name)
           end
 
         end
@@ -105,6 +165,11 @@ module Drakkon
         "#{@context}/app/drakkon"
       end
 
+      # Directory for uncompiled files / Relative
+      def self.unbundle_dir
+        'app/drakkon/unbundle'
+      end
+
       def self.prompt
         TTY::Prompt.new(active_color: :cyan, interrupt: :exit)
       end

data/lib/drakkon/init.rb

@@ -49,7 +49,9 @@ module Drakkon
         platforms: [],
         version: Hub.version_latest,
         image_index: true,
+        font_index: true,
         manifest: true,
+        bundle_compile: true,
         gems: {}
       }
 

data/lib/drakkon/lib/hub.rb

@@ -68,7 +68,7 @@ module Drakkon
 
     def self.config
       # Write Default
-      File.write(config_file, Oj.dump({})) unless File.exist?(config_file)
+      File.write(config_file, JSON.pretty_generate({})) unless File.exist?(config_file)
 
       @config ||= JSON.parse(File.read(config_file), { symbolize_names: true })
 
@@ -92,7 +92,7 @@ module Drakkon
 
     def self.write
       # LogBot.debug('Hub', "Writing Config: #{config_file}")
-      File.write(config_file, Oj.dump(config))
+      File.write(config_file, JSON.pretty_generate(config))
     end
 
     def self.log_file

data/lib/drakkon/lib/images/fonts.rb

@@ -0,0 +1,88 @@
+module Drakkon
+  module Fonts
+    # General Font Index Helper
+    module Index
+      def self.index
+        @index ||= {}
+
+        @index
+      end
+
+      def self.context
+        @context ||= Dir.pwd
+
+        @context
+      end
+
+      def self.digest
+        list = Dir["#{fonts_directory}/*"]
+        Digest::MD5.hexdigest(list.map { |x| Digest::MD5.file(x).hexdigest }.join)
+      end
+
+      def self.fonts_directory
+        "#{context}/fonts/"
+      end
+
+      def self.run!(force: false, dir: nil)
+        @context = dir || Dir.pwd
+
+        # Create Directory if sprites directory is missing
+        FileUtils.mkdir_p(fonts_directory)
+
+        if Settings.config[:font_digest] == digest
+          LogBot.info('Fonts Index', 'Nothing New')
+          return unless force
+        end
+
+        build_index
+
+        Settings.update(:font_digest, digest)
+
+        File.write("#{context}/app/drakkon/font_index.rb", result)
+      end
+
+      def self.build_index
+        check fonts_directory
+      end
+
+      def self.result
+        <<~RB
+          module Drakkon
+            module Fonts
+              def self.index
+                #{index.inspect}
+              end
+            end
+          end
+        RB
+      end
+
+      # Recursively Go through
+      def self.check(dir = nil)
+        LogBot.info('Font Index', "Check: #{dir}")
+
+        # Collect Fonts
+        list = Dir["#{dir}/*"]
+
+        # Ignore Empties
+        return if list.empty?
+
+        # Do other things
+        Dir["#{dir}/*"].each do |file|
+          next if File.directory?(file)
+
+          process(file)
+        end
+
+        :done
+      end
+
+      def self.process(file = nil)
+        name = File.basename(file, File.extname(file))
+        index[name] = file.gsub(fonts_directory, '')[1..]
+      end
+      # =========================================================
+    end
+    # =========================================================
+  end
+end

data/lib/drakkon/lib/images/text.rb

@@ -50,7 +50,7 @@ module Drakkon
 
         puts
 
-        exit unless prompt.yes? "#{'Are you sure?'.pastel(:bright_yellow)}"
+        exit unless prompt.yes? 'Are you sure?'.pastel(:bright_yellow).to_s
 
         generate(font: font, text: text, size: size, color: color, file: file)
       rescue TTY::Reader::InputInterrupt

data/lib/drakkon/lib/settings.rb

@@ -12,7 +12,7 @@ module Drakkon
 
     # Helper to exit if project isn't ready for drakkon usage
     def self.ready?
-      return if init?
+      return false if init?
 
       LogBot.warn('Setup', "Drakkon not configured. Run #{'init'.pastel(:green)} first")
 
@@ -51,6 +51,14 @@ module Drakkon
       config[:image_index]
     end
 
+    def self.font_index?
+      config[:font_index]
+    end
+
+    def self.bundle_compile?
+      config[:bundle_compile]
+    end
+
     def self.manifest?
       config[:manifest]
     end
@@ -63,8 +71,10 @@ module Drakkon
       # Defaults
       @config[:platforms] ||= []
       @config[:version] ||= Hub.version_latest
-      @config[:image_index] ||= true
-      @config[:manifest] ||= true
+      @config[:image_index] = true if @config[:image_index].nil?
+      @config[:manifest] = true if @config[:manifest].nil?
+      @config[:bundle_compile] = true if @config[:bundle_compile].nil?
+      @config[:font_index] = true if @config[:font_index].nil?
       @config[:gems] ||= {}
     end
 
@@ -74,7 +84,6 @@ module Drakkon
 
       if @config.nil?
         @config ||= JSON.parse(File.read(config_file), { symbolize_names: true })
-        # @config ||= Oj.load File.read(config_file)
         config_defaults
       end
 
@@ -94,7 +103,6 @@ module Drakkon
     def self.write
       # LogBot.debug('Settings', "Writing Config: #{config_file}")
       File.write(config_file, JSON.pretty_generate(config))
-      # File.write(config_file, Oj.dump(config))
     end
 
     def self.menu
@@ -102,7 +110,9 @@ module Drakkon
         menu.choice name: 'platforms', value: :platforms
         menu.choice name: 'version', value: :version
         menu.choice name: 'image_index', value: :image_index
+        menu.choice name: 'font_index', value: :font_index
         menu.choice name: 'manifest', value: :manifest
+        menu.choice name: 'bundle_compile', value: :bundle_compile
         menu.choice name: 'exit', value: :exit
       end
     rescue TTY::Reader::InputInterrupt
@@ -119,6 +129,11 @@ module Drakkon
         Settings.update(:image_index, prompt.yes?("Index Images? (Enabled: #{image_index?})"))
       when :manifest
         Settings.update(:image_index, prompt.yes?("Write Manifest? (Enabled: #{manifest?})"))
+      when :bundle_compile
+        Settings.update(:bundle_compile,
+                        prompt.yes?("Create Bundle / Compile Gems? (Enabled: #{config[:bundle_compile]})"))
+      when :font_index
+        Settings.update(:font_index, prompt.yes?("Index Fonts? (Enabled: #{config[:font_index]})"))
       when :exit
         exit 0
       end

data/lib/drakkon/release.rb

@@ -1,3 +1,3 @@
 module Drakkon
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 end

data/lib/drakkon/run/helpers.rb

@@ -50,6 +50,10 @@ module Drakkon
       args.include?('manifest')
     end
 
+    def self.force_fonts?
+      args.include?('fonts')
+    end
+
     def self.prompt
       TTY::Prompt.new(active_color: :cyan, interrupt: :exit)
     end

data/lib/drakkon/run/tty.rb

@@ -7,7 +7,7 @@ module Drakkon
 
       cmd = @list.shift
       if index.include? cmd
-        Commands.send("cmd_#{cmd}".to_sym, @list)
+        Commands.send(:"cmd_#{cmd}", @list)
       else
         puts "Unknown Command: '#{cmd.pastel(:red)}'"
         puts

data/lib/drakkon/run.rb

@@ -49,7 +49,7 @@ module Drakkon
       # Watch for Updates
       # ======================================
       # Force the bundle
-      files = Gems::Bundle.collect.values.flatten
+      files = Gems::Bundle.collect.values.flatten.map(&:path)
       files.push "#{Run.context}/sprites/" if Settings.image_index?
 
       Filewatcher.new(files, every: true).watch do |changes|
@@ -62,6 +62,7 @@ module Drakkon
     def self.run_setup
       Images::Index.run!(force: force_images?) if Settings.image_index?
       Manifest.run!(force: force_manifest?) if Settings.manifest?
+      Fonts::Index.run!(force: force_fonts?) if Settings.font_index?
       Gems::Bundle.build!(args, @context)
     end
 

data/lib/drakkon/web.rb

@@ -29,40 +29,3 @@ module Drakkon
   end
   # ==========================================================================
 end
-
-# set :port, 4567
-# set :bind, '0.0.0.0'
-# set :server, :puma
-# set :show_exceptions, false
-# disable :logging # Duplicate Log Entries
-# set :dump_errors, false # Duplicate Eception Dumping
-
-# use Rack::CommonLogger
-
-module Drakkon
-  module Web
-    # WebApp
-    class Runny < Sinatra::Base
-      configure do
-        set :public_folder, Dir.pwd
-      end
-
-      # I hate you Cors
-      enable :cross_origin
-      before do
-        response.headers['Access-Control-Allow-Origin'] = '*'
-        response.headers['Access-Control-Allow-Headers'] = '*'
-        response.headers['Access-Control-Allow-Methods'] = 'GET,PUT,POST,PATCH,DELETE,OPTIONS'
-
-        response.headers['Cross-Origin-Opener-Policy'] = 'same-origin'
-        response.headers['Cross-Origin-Embedder-Policy'] = 'require-corp'
-      end
-
-      get '/' do
-        File.read(File.join(settings.public_folder, 'index.html'))
-      end
-      # ========================================================================
-    end
-    # ==========================================================================
-  end
-end

data/lib/drakkon.rb

@@ -13,8 +13,8 @@ require 'tty-pager'
 # Templates
 require 'erb'
 
-# Parsing
-require 'oj'
+# Parsing || Move to vanilla JSON for simplification
+# require 'oj'
 
 # Image Handling
 require 'mini_magick'
@@ -34,9 +34,6 @@ require 'sinatra/base'
 # Load All Sub Directories / Order Matters
 require_all "#{File.dirname(__FILE__)}/drakkon"
 
-# Oj Settings
-Oj.default_options = { symbol_keys: true, mode: :compat }
-
 # HashDot Instead of Struct
 require 'hash_dot'
 Hash.use_dot_syntax = true

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: drakkon
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Davin Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-15 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: filewatcher
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: tty-option
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +196,7 @@ files:
 - lib/drakkon/lib/images/cli.rb
 - lib/drakkon/lib/images/desaturate.rb
 - lib/drakkon/lib/images/flip_flop.rb
+- lib/drakkon/lib/images/fonts.rb
 - lib/drakkon/lib/images/gif.rb
 - lib/drakkon/lib/images/index.rb
 - lib/drakkon/lib/images/list.rb