drakkon 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d96f5b298a5a1e72de4af63cc4586b919d087944132ff010e9a764ed1c6efee
-  data.tar.gz: 60245722e0177e6228bc4c4f99b89c25e394c4474ff4ce314316ac0251bab21b
+  metadata.gz: 20674edb1e5357b6971a88c0dd4b222274ee75bb65bed6f8840530f8d9a804ec
+  data.tar.gz: 530c12ba7dedaa85213710fe7fd46f2b220feb02526002c21bac9450687d5cc6
 SHA512:
-  metadata.gz: 6f01268dbb5324527bbd69d4dbb5bd6a4c5c9ab33866782a47fc4b264b1bc6e41f332b668d71ca288340684d0b666863baef5327b78780cfd3c677a6ee90fec8
-  data.tar.gz: 324e6d67efb2a03400dc0a474525d5f8676e323a6bc6b9f4a9a9ff92a91bc31c967332d3f45706534b00018bc9c446c6c51700e49541496c36b000f5b94cf2e5
+  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
@@ -94,6 +143,10 @@ module Drakkon
       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

@@ -8,7 +8,7 @@ module Drakkon
 
         @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
@@ -61,8 +61,9 @@ 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?
+          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
@@ -97,8 +98,9 @@ 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?
+          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
@@ -122,20 +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('/', '_')}"
+              # 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)
+              idx[mod.weight].push(path: file_name, name: file, safe_name: safe_name)
+            end
           end
         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,20 +60,11 @@ module Drakkon
     def self.settings
       LogBot.info('Init', 'Settings Setup')
 
-      opts = {
-        platforms: [],
-        version: Hub.version_latest,
-        image_index: true,
-        font_index: true,
-        manifest: true,
-        bundle_compile: 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/{images → fonts}/fonts.rb

@@ -15,12 +15,12 @@ module Drakkon
       end
 
       def self.digest
-        list = Dir["#{fonts_directory}/*"]
+        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/"
+        "#{context}/fonts"
       end
 
       def self.run!(force: false, dir: nil)
@@ -29,7 +29,7 @@ module Drakkon
         # Create Directory if sprites directory is missing
         FileUtils.mkdir_p(fonts_directory)
 
-        if Settings.config[:font_digest] == digest
+        if Settings.config[:font_digest] == digest && File.exist?("#{context}/app/drakkon/font_index.rb")
           LogBot.info('Fonts Index', 'Nothing New')
           return unless force
         end

data/lib/drakkon/lib/hub.rb

@@ -74,7 +74,8 @@ module Drakkon
 
       # 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

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)

data/lib/drakkon/lib/images/compress.rb

@@ -0,0 +1,60 @@
+module Drakkon
+  module Images
+    # Dirty Compression.. Bad Idea?
+    module Compress
+      def self.run!(_args = [])
+        puts <<~HELP
+                    Usage
+                    - Run in the directory you wish to modify the images
+                    - Converts the Images to Webp and then back to PNG
+          Images:
+        HELP
+
+        images.sort.each do |img|
+          img_s = img.gsub("#{Dir.pwd}/", '').pastel(:yellow)
+          puts "  - #{img_s}"
+        end
+        puts
+
+        exit unless prompt.yes? "#{'Are you sure?'.pastel(:bright_yellow)} Compress!? #{'(Destructive)'.pastel(:red)}"
+
+        start
+      end
+
+      def self.start
+        images.each do |img|
+          LogBot.info('Image Compress', img)
+          process(img)
+        end
+      end
+
+      def self.process(file)
+        basename = File.basename(file, '.png')
+        path = File.dirname(file)
+
+        # Write Webp
+        image = MiniMagick::Image.open(file)
+        image.format 'webp'
+        image.write "#{path}/#{basename}.webp"
+
+        # Write back to PNG
+        image = MiniMagick::Image.open("#{path}/#{basename}.webp")
+        image.format 'png'
+        image.write "#{path}/#{basename}.png"
+
+        # Delete Temp
+        FileUtils.rm("#{path}/#{basename}.webp")
+      end
+
+      def self.images
+        Dir["#{Dir.pwd}/*.png"]
+      end
+
+      def self.prompt
+        TTY::Prompt.new(active_color: :cyan, interrupt: :exit)
+      end
+      # =========================================================
+    end
+    # =========================================================
+  end
+end

data/lib/drakkon/lib/images/double.rb

@@ -0,0 +1,77 @@
+module Drakkon
+  module Images
+    # General Image Index Helper
+    module Double
+      def self.run!(args = [])
+        # Alpha
+        alpha = if args.empty?
+                  prompt.ask('Amount of Doubled Alpha? (e.g. 0..1): ')
+                else
+                  args.shift
+                end
+        LogBot.info('Double Image Alhpa', "Alpha: #{alpha}")
+
+        puts <<~HELP
+          Usage [alpha]
+                     - Run in the directory you wish to modify the images
+                     - Adds the layer onto itself with a alpha value via MiniMagick
+          Current Directory;
+                       #{Dir.pwd.pastel(:yellow)}
+
+           Images:
+        HELP
+
+        images.sort.each do |img|
+          img_s = img.gsub("#{Dir.pwd}/", '').pastel(:yellow)
+          puts "  - #{img_s}"
+        end
+        puts
+
+        unless prompt.yes? "#{'Are you sure?'.pastel(:bright_yellow)} Double Images!? #{'(Destructive)'.pastel(:red)}"
+          exit
+        end
+
+        start(alpha)
+      end
+
+      def self.start(alpha)
+        images.each do |img|
+          double(img, alpha)
+        end
+      end
+
+      def self.double(file, alpha)
+        image = MiniMagick::Image.open(file)
+
+        LogBot.info('Image Double', "#{File.basename file}")
+
+        # Create a copy of the image for overlay
+        overlay = image.clone
+
+        # Apply alpha to the overlay
+        overlay = overlay.compose('Over') do |c|
+          c.gravity 'center' # Center the overlay
+          c.define "compose:args=1,0,0,#{alpha}" # Control the alpha
+        end
+
+        # Combine the original image and the overlay
+        result = image.composite(overlay) do |c|
+          c.gravity 'center' # Center the overlay on the original image
+        end
+
+        # Save the result
+        result.write(file)
+      end
+
+      def self.images
+        Dir["#{Dir.pwd}/**/*.png"]
+      end
+
+      def self.prompt
+        TTY::Prompt.new(active_color: :cyan, interrupt: :exit)
+      end
+      # =========================================================
+    end
+    # =========================================================
+  end
+end