drakkon 0.0.7 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22dc052674cbdeb00139240538434c5098c27f5b4daa59ecc35ba3fd30fc6219
-  data.tar.gz: e705e6edc55b2b979761da02ad021d4d0ae427b6b03144fc8d20835f3a89f496
+  metadata.gz: 20674edb1e5357b6971a88c0dd4b222274ee75bb65bed6f8840530f8d9a804ec
+  data.tar.gz: 530c12ba7dedaa85213710fe7fd46f2b220feb02526002c21bac9450687d5cc6
 SHA512:
-  metadata.gz: f02cc623e83d177b61e9043d4852571b5be61c9ac3fea8aa73009e2469fe90636c2da8976829209342cbbd8c6358033586f1c1994bf2a3814157ebb0b19cbfe7
-  data.tar.gz: 582b9944ca4aeec1d5963fd92190f4330b97cdbcc1f99892f725dbe3629290c523bc3926e4f89ac111f96b874422a6503b2a40bde396fe606a393237cbe69033
+  metadata.gz: f52deb9d5a66285535f3cd03089575a8a7f1831923a6a7f37d688f008468711e759fe25aa7841012e499fa8f7e89f082f3fe318dcede83579f9a77ae0266635c
+  data.tar.gz: 065b90c52e8d60a35a0c3a4b1f141056a8fac63df483c074dec858bb41471ea975f67fe20a41a2fc75f27fcdec19806e3fa7a52b7a91c1ab4f52a0d166f1370b

data/lib/drakkon/build.rb

@@ -1,6 +1,8 @@
 module Drakkon
   # Run Command for CLI
   module Build
+    extend PlatformCompat
+
     def self.args(raw = nil)
       @args ||= raw
 
@@ -15,6 +17,9 @@ module Drakkon
 
       Settings.update(:platforms, platform_setup) unless Settings.platforms?
 
+      # Run Index if configured
+      Manifest.index if Settings.config[:manifest]
+
       builder = if args.empty?
                   Settings.platforms
                 else
@@ -40,8 +45,12 @@ module Drakkon
         # Clean Up Accidental Leftovers
         FileUtils.rm_r(context_name) if Dir.exist? context_name
 
-        # DragonRuby Publish doesn't like symlinks or PATH...
-        FileUtils.cp_r(context, context_name)
+        if Settings.manifest_compile?
+          manifest_compile(context, context_name)
+        else
+          # DragonRuby Publish doesn't like symlinks or PATH...
+          FileUtils.cp_r(context, context_name)
+        end
 
         # Clean Builds Dir
         FileUtils.rm_r(Dir['builds/*'])
@@ -50,7 +59,8 @@ module Drakkon
         FileUtils.rm_r("#{context_name}/builds") if Dir.exist? "#{context_name}/builds"
 
         # Execute
-        system build!(list, context_name, publish)
+        io = IO.popen(build_env, build!(list, context_name, publish))
+        output(io)
 
         # Preflight
         FileUtils.mkdir_p("#{context}/builds")
@@ -73,13 +83,52 @@ module Drakkon
     end
     # rubocop:enable Metrics/AbcSize
 
+    # Send output to console
+    def self.output(io)
+      loop do
+        next unless io.ready?
+      end
+    rescue SystemExit, Interrupt, EOFError
+      LogBot.info('Build', 'Exiting')
+    end
+
+    def self.manifest_compile(context, context_name)
+      # Base Folders
+      Dir.mkdir context_name
+      Dir.mkdir "#{context_name}/app"
+
+      # Copy Directories that are not being managed
+      FileUtils.cp_r("#{context}/fonts", "#{context_name}/fonts")
+      FileUtils.cp_r("#{context}/sprites", "#{context_name}/sprites")
+      FileUtils.cp_r("#{context}/sounds", "#{context_name}/sounds")
+      FileUtils.cp_r("#{context}/metadata", "#{context_name}/metadata")
+
+      # Copy over base files
+      FileUtils.cp("#{context}/app/main.rb", "#{context_name}/app/main.rb")
+      FileUtils.cp_r("#{context}/app/drakkon", "#{context_name}/app/drakkon")
+
+      # Compile into Manifest
+      File.open("#{context_name}/app/drakkon/manifest.rb", 'w') do |f|
+        Manifest.index.reverse.each do |file|
+          f << File.read("#{context}/#{file}")
+        end
+      end
+    end
+
     def self.metadata_version(context)
       File.read("#{context}/metadata/game_metadata.txt").split("\n").find { |y| y.include? 'version' }.split('=').last
     end
 
     # DEW THE BUILD
     def self.build!(list, context, package = '--package')
-      "PATH=#{version_dir}:$PATH dragonruby-publish #{package} --platforms=#{list} #{context}"
+      # 5.25 not liking the blank package flag
+      cmd = []
+      cmd.push './dragonruby-publish'
+      cmd.push package unless package.nil? || package.empty?
+      cmd.push "--platforms=#{list}"
+      cmd.push context
+
+      cmd
     end
 
     def self.version_dir
@@ -90,6 +139,14 @@ module Drakkon
       args.include?('images')
     end
 
+    def self.force_fonts?
+      args.include?('fonts')
+    end
+
+    def self.force_sounds?
+      args.include?('sounds')
+    end
+
     def self.force_manifest?
       args.include?('manifest')
     end

data/lib/drakkon/cli.rb

@@ -21,6 +21,7 @@ module Drakkon
       when :build then Build.go!(args)
       when :publish then Build.go!([], '')
       when :images then Images::CLI.run!(args)
+      when :utils then Utils::CLI.run!(args)
       when :install then Version.install!(args)
       when :gem then Gems::CLI.init!(args)
       when :skeleton then Skeleton::CLI.init!(args)
@@ -48,7 +49,8 @@ module Drakkon
         menu.choice name: 'build', value: :build
         menu.choice name: 'publish', value: :publish
         menu.choice name: 'install (DragonRuby Versions)', value: :install
-        menu.choice name: 'images', value: :images
+        menu.choice name: 'Image Helpers [images]', value: :images
+        menu.choice name: 'Utilities [utils]', value: :utils
         menu.choice name: 'gem (Shared Code)', value: :gem
         menu.choice name: 'skeleton (Templates)', value: :skeleton
         menu.choice name: 'console (pry)', value: :console

data/lib/drakkon/gem/bundle.rb

@@ -3,11 +3,12 @@ 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
 
-        if Settings.config[:bundle_digest] == digest && !args.include?('bundle')
+        if Settings.config[:bundle_digest] == digest && !args.include?('bundle') && File.exist?(bundle_file)
           LogBot.info('Gems Bundle', 'Nothing New')
           return unless args.include?('bundle')
         else
@@ -16,14 +17,64 @@ 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/font_index.rb' \n" if Settings.font_index?
+          f << "require 'app/drakkon/sound_index.rb' \n" if Settings.sound_index?
+          f << "require 'app/drakkon/manifest.rb' \n" if Settings.manifest?
+
+          # 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 +84,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
@@ -45,6 +98,8 @@ module Drakkon
 
           # Include other files
           f << "require 'app/drakkon/image_index.rb' \n" if Settings.image_index?
+          f << "require 'app/drakkon/font_index.rb' \n" if Settings.font_index?
+          f << "require 'app/drakkon/sound_index.rb' \n" if Settings.sound_index?
           f << "require 'app/drakkon/manifest.rb' \n" if Settings.manifest?
 
           # File Close
@@ -53,7 +108,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
@@ -68,17 +124,22 @@ module Drakkon
         path = gem[:data][:path]
 
         # Modules
-        gem[:data][:modules].each do |mod|
-          idx[mod.weight] ||= []
-          mod.files.each do |file|
-            file_name = "#{path}/#{file}.rb"
-            unless File.exist?(file_name)
-              LogBot.fatal('Bundle',
-                           "Module File not found #{mod.name.pastel(:bright_blue)}, #{file_name.pastel(:red)}")
-              next
-            end
+        if gem[:data].key?(:modules)
+          gem[:data][:modules].each do |mod|
+            idx[mod.weight] ||= []
+            mod.files.each do |file|
+              file_name = "#{path}/#{file}.rb"
+              unless File.exist?(file_name)
+                LogBot.fatal('Bundle',
+                             "Module File not found #{mod.name.pastel(:bright_blue)}, #{file_name.pastel(:red)}")
+                next
+              end
+
+              # Convert full file path into single string / relative naming (no directories)
+              safe_name = "#{gem.name}_#{file.gsub('/', '_')}"
 
-            idx[mod.weight].push file_name
+              idx[mod.weight].push(path: file_name, name: file, safe_name: safe_name)
+            end
           end
         end
 
@@ -86,7 +147,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 +169,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/gem/cli.rb

@@ -10,6 +10,8 @@ module Drakkon
 
       # General Run
       def self.init!(raw)
+        Settings.ready?
+
         args(raw)
         cmd = args.shift
 

data/lib/drakkon/gem/helpers/modules.rb

@@ -3,6 +3,8 @@ module Drakkon
     # General Helpers for Gem Class
     module GemHelpers
       def select_modules
+        return if (data[:modules].nil? || data[:modules].empty?) && modules.empty?
+
         data[:modules] = prompt_modules.map do |selected|
           modules.find { |x| x[:name] == selected }
         end
@@ -13,6 +15,9 @@ module Drakkon
         valid_structure?
         load_modules
 
+        # Ignore if no modules
+        return if data[:modules].nil? || data[:modules].empty?
+
         data[:modules] = data[:modules].map(&:name).map do |selected|
           modules.find { |x| x[:name] == selected }
         end

data/lib/drakkon/init.rb

@@ -27,15 +27,30 @@ module Drakkon
       metadata
 
       # TODO: Validate / Confirm
-      File.write('app/main.rb', main_tick)
+      try_write('app/main.rb') do |to|
+        File.write(to, main_tick)
+      end
+    end
+
+    def self.try_write(to, &blk)
+      if File.exist?(to)
+        LogBot.warn('Init', "- Tried to create #{to} but it already exists")
+      else
+        LogBot.info('Init', "- Created #{to}")
+        blk.call(to)
+      end
     end
 
     def self.metadata
       # Icon is required for build
-      FileUtils.cp(metdata_dir('icon.png'), 'metadata/')
+      try_write('metadata/icon.png') do |to|
+        FileUtils.cp(metdata_dir('icon.png'), to)
+      end
 
       # Copy metdata files
-      FileUtils.cp(metdata_dir('game_metadata.txt'), 'metadata/')
+      try_write('metadata/game_metadata.txt') do |to|
+        FileUtils.cp(metdata_dir('game_metadata.txt'), to)
+      end
     end
 
     def self.metdata_dir(file_name = nil)
@@ -45,18 +60,11 @@ module Drakkon
     def self.settings
       LogBot.info('Init', 'Settings Setup')
 
-      opts = {
-        platforms: [],
-        version: Hub.version_latest,
-        image_index: true,
-        manifest: true,
-        gems: {}
-      }
-
-      # TODO: Be better, this is lazy...
-      opts.each do |key, value|
-        Settings.update(key, value)
-      end
+      # If we're here, it means Settings.init? returned false,
+      # which eans the config file doesn't exist.
+      # As a happy accident, accessing Settings.config for the first time also
+      # writes out a default config file
+      Settings.config
     end
 
     def self.directories

data/lib/drakkon/lib/fonts/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}/**/*"].select { |file| File.file?(file) }
+        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 && File.exist?("#{context}/app/drakkon/font_index.rb")
+          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/hub.rb

@@ -68,13 +68,14 @@ 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 })
 
       # TODO: Optimize this a bit more
       config_defaults.each do |key, value|
-        @config[key] ||= value
+        # ||= Is problematic with falses
+        @config[key] = value unless @config.key?(key)
       end
 
       @config
@@ -92,7 +93,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/biggest.rb

@@ -7,16 +7,17 @@ module Drakkon
       end
 
       def self.start
-        index = []
         LogBot.info('Image Biggest Index')
-        images.each do |img|
-          index.push process(img)
+        index = images.map do |img|
+          process(img)
         end
 
-        w = index.max_by(&:w).w
-        h = index.max_by(&:h).h
+        img_w = index.max_by(&:w)
+        img_h = index.max_by(&:h)
 
-        puts "Largest Size is: { w: #{w}, h: #{h} }"
+        puts "Largest Sizes: { w: #{img_w.w}, h: #{img_h.h} }"
+        puts "  Width:  #{img_w}"
+        puts "  Height: #{img_h}"
       end
 
       def self.process(file)
@@ -24,6 +25,7 @@ module Drakkon
         img = MiniMagick::Image.open(file)
 
         {
+          file: File.basename(file),
           w: img.width,
           h: img.height
         }

data/lib/drakkon/lib/images/bulk_rename.rb

@@ -58,22 +58,10 @@ module Drakkon
         end
       end
 
-      def self.process(file, filter, size)
-        image = MiniMagick::Image.open(file)
-
-        # Ignore if the same for w/h
-        return if image.width == size.split('x', 2).first.to_i && image.height == size.split('x', 2).last.to_i
-
-        LogBot.info('Image Resize', "Resizing: #{file}: #{size}")
-        image.filter filter
-        image.resize size
-        image.write file
-      end
-
       def self.images
         # Dir["#{Dir.pwd}/*.png"].sort_by(&:File.basename)
 
-        Dir["#{Dir.pwd}/*.png"].sort_by { |x| File.mtime(x) }
+        Dir["#{Dir.pwd}/*.png"]
       end
 
       def self.prompt

data/lib/drakkon/lib/images/cli.rb

@@ -25,50 +25,66 @@ module Drakkon
         when :flip_flop then Images::FlipFlop.run!(args)
         when :rotate then Images::Rotate.run!(args)
         when :canvas then Images::Canvas.run!(args)
+        when :desaturate then Images::Desaturate.run!(args)
         when :blur then Images::Blur.run!(args)
         when :split then Images::SplitSpriteSheet.run!(args)
         when :combine then Images::SpriteSheetCombine.run!(args)
+        when :double then Images::Double.run!(args)
         when :trim then Images::Trim.run!(args)
         when :gif_split then Images::GifSplit.run!(args)
         when :sepia then Images::Sepia.run!(args)
         when :modulate then Images::Modulate.run!(args)
+        when :layers then Images::Layers.run!(args)
+        when :hue_modulate then Images::HueModulate.run!(args)
         when :bulk_rename then Images::BulkRename.run!(args)
+        when :downcase_norm then Images::DowncaseNormalize.run!(args)
         when :text_to_image then Images::TextToImage.run!(args)
+        when :compress then Images::Compress.run!(args)
         when :index then Images::Index.run!(force: true)
         when :exit then exit(0)
         else
           start(menu, args)
         end
+      rescue TTY::Reader::InputInterrupt
+        exit 0
       end
       # rubocop:enable Metrics/CyclomaticComplexity
 
+      # rubocop:disable Metrics/BlockLength
       def self.menu
         prompt.select('Image Helpers:', filter: true, per_page: 20) do |menu|
           menu.choice name: 'Listing; Filter', value: :list
-          menu.choice name: 'Biggest: Find largest dimensions', value: :biggest
-          menu.choice name: 'Convert alpha to white', value: :white
-          menu.choice name: 'Resize WxH', value: :resize
-          menu.choice name: 'Scale', value: :scale
-          menu.choice name: 'Shift (Splice/Gravity)', value: :shift
-          menu.choice name: 'Roll', value: :roll
-          menu.choice name: 'Flip/Flop', value: :flip_flop
-          menu.choice name: 'Rotate', value: :rotate
-          menu.choice name: 'Canvas (Change/Retain)', value: :canvas
-          menu.choice name: 'Desaturate (Grey Colorspace)', value: :desaturate
-          menu.choice name: 'Blur', value: :blur
-          menu.choice name: 'Split SpriteSheet (split)', value: :split
-          menu.choice name: 'Create SpriteSheet (combine)', value: :combine
-          menu.choice name: 'Trim Transparency (trim)', value: :trim
-          menu.choice name: 'Gif Split (gif_split)', value: :gif_split
-          menu.choice name: 'Sepia', value: :sepia
-          menu.choice name: 'Modulate', value: :modulate
-          menu.choice name: 'TextToImage', value: :text_to_image
-          menu.choice name: 'Index (Re-run Index)', value: :index
+          menu.choice name: 'Biggest: Find largest dimensions [biggest]', value: :biggest
+          menu.choice name: 'Convert alpha to white [white]', value: :white
+          menu.choice name: 'Resize WxH [resize]', value: :resize
+          menu.choice name: 'Scale [scale]', value: :scale
+          menu.choice name: 'Shift (Splice/Gravity) [shift]', value: :shift
+          menu.choice name: 'Roll [roll]', value: :roll
+          menu.choice name: 'Flip/Flop [flip_flop]', value: :flip_flop
+          menu.choice name: 'Rotate [rotate]', value: :rotate
+          menu.choice name: 'Canvas (Change/Retain) [canvas]', value: :canvas
+          menu.choice name: 'Desaturate (Grey Colorspace) [desaturate]', value: :desaturate
+          menu.choice name: 'Blur [blur]', value: :blur
+          menu.choice name: 'Split SpriteSheet [split]', value: :split
+          menu.choice name: 'Create SpriteSheet [combine]', value: :combine
+          menu.choice name: 'Double Image [double]', value: :double
+          menu.choice name: 'Trim Transparency (:trim]', value: :trim
+          menu.choice name: 'Gif Split [gif_split]', value: :gif_split
+          menu.choice name: 'Sepia [sepia]', value: :sepia
+          menu.choice name: 'Modulate [modulate]', value: :modulate
+          menu.choice name: 'Layers [layers]', value: :layers
+          menu.choice name: 'Bulk Rename [bulk_rename]', value: :bulk_rename
+          menu.choice name: 'Downcase Normalize [downcase_norm]', value: :downcase_norm
+          menu.choice name: 'Hue Modulate [hue_modulate]', value: :hue_modulate
+          menu.choice name: 'TextToImage [text_to_image]', value: :text_to_image
+          menu.choice name: 'Compress (file size) [compress]', value: :compress
+          menu.choice name: 'Index (Re-run Index) [index]', value: :index
           menu.choice name: 'exit', value: :exit
         end
       rescue TTY::Reader::InputInterrupt
         exit 0
       end
+      # rubocop:enable Metrics/BlockLength
 
       def self.prompt
         TTY::Prompt.new(active_color: :cyan, interrupt: :exit)