drakkon 0.0.7 → 0.0.10

data/lib/drakkon/lib/manifest.rb

@@ -13,17 +13,9 @@ module Drakkon
     end
 
     def self.run!(force: false)
-      list
-      search("#{Dir.pwd}/app")
-
-      # No Dupes please
-      list.reject! { |x| x.include? 'app/drakkon/manifest.rb' }
-
-      list.map! do |file|
-        file.gsub(root_directory, '')
-      end
+      index
 
-      if Settings.config[:manifest_digest] == digest
+      if Settings.config[:manifest_digest] == digest && File.exist?('app/drakkon/manifest.rb')
         LogBot.info('Manifest', 'Nothing New')
         return unless force
       end
@@ -34,10 +26,22 @@ module Drakkon
 
       # Make Directory `app/drakkon` if it doesn't exist
       FileUtils.mkdir_p('app/drakkon') unless File.directory?('app/drakkon')
-
       File.write('app/drakkon/manifest.rb', required)
     end
 
+    # Split out | Just collect information
+    def self.index
+      list
+      search("#{Dir.pwd}/app")
+
+      # General Cleanup
+      list.reject! { |x| x.include? 'app/main.rb' }
+
+      list.map! do |file|
+        file.gsub(root_directory, '')
+      end
+    end
+
     def self.digest
       Digest::MD5.hexdigest(list.map { |x| Digest::MD5.file(x).hexdigest }.join)
     end
@@ -49,6 +53,9 @@ module Drakkon
     end
 
     def self.search(dir)
+      # Skip Drakkon
+      return if dir.include?('app/drakkon')
+
       @list.concat Dir["#{dir}/*.rb"]
 
       Dir["#{dir}/*"].each do |file|
@@ -61,11 +68,12 @@ module Drakkon
     # Generate Require Statements
     # Sure there gonna be plenty of opinions on this bad boi
     def self.required
-      <<~TEMPLATE
-        #{Manifest.list.reverse.inspect}.each do |file|
-          require file
-        end
-      TEMPLATE
+      require_strings = ''
+      list.reverse.each do |file|
+        require_strings << "require '#{file}'\n"
+      end
+
+      require_strings
     end
 
     # ----------------------

data/lib/drakkon/lib/pastel.rb

@@ -3,7 +3,7 @@ module Drakkon
   # Replace Colorize with Pastel Monkey Patch String Shim
   # https://github.com/piotrmurach/pastel#features
 
-  # Looping in GreenHat to allow disabling of Color
+  # Looping in  to allow disabling of Color
   module Color
     def self.pastel
       @pastel ||= Pastel.new

data/lib/drakkon/lib/platform_compat.rb

@@ -0,0 +1,27 @@
+module Drakkon
+  # Helper to provide platform compatibility
+  module PlatformCompat
+    def run_env
+      {
+        'PATH' => "#{version_dir}#{path_divider}#{ENV.fetch('PATH', nil)}"
+      }
+    end
+
+    def build_env
+      run_env # not sure if these will ever be different
+    end
+
+    def windows?
+      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+    end
+
+    def path_divider
+      if windows?
+        ';'
+      # Linux uses ':' (same with mac/unix?)
+      else
+        ':'
+      end
+    end
+  end
+end

data/lib/drakkon/lib/settings.rb

@@ -12,13 +12,24 @@ 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")
 
       exit 1
     end
 
+    def self.check_version!
+      return if Hub.version?(version)
+
+      LogBot.warn('Setup', "DragonRuby #{version} not installed.")
+      LogBot.warn('Setup', 'Select a version to use:')
+
+      Version.set
+
+      exit(1) unless Hub.version?(version)
+    end
+
     def self.prompt
       TTY::Prompt.new(active_color: :cyan, interrupt: :exit)
     end
@@ -51,6 +62,22 @@ module Drakkon
       config[:image_index]
     end
 
+    def self.font_index?
+      config[:font_index]
+    end
+
+    def self.sound_index?
+      config[:sound_index]
+    end
+
+    def self.bundle_compile?
+      config[:bundle_compile]
+    end
+
+    def self.manifest_compile?
+      config[:manifest_compile]
+    end
+
     def self.manifest?
       config[:manifest]
     end
@@ -59,12 +86,35 @@ module Drakkon
       "#{Dir.pwd}/.drakkon"
     end
 
+    def self.image_magick_installed?
+      # Use Minimagick's utilities to check if ImageMagick is installed
+      # https://github.com/minimagick/minimagick/pull/193
+      !MiniMagick::Utilities.which('convert').nil?
+
+      # MiniMagick::Image.open('metadata/icon.png')
+    rescue MiniMagick::Invalid, Errno::ENOENT
+      false
+    end
+
+    def self.enable_image_index?
+      return false unless image_magick_installed?
+
+      # TODO: Determine if this should default to True?
+      return true if config[:image_index].nil?
+
+      config[:image_index]
+    end
+
     def self.config_defaults
       # Defaults
       @config[:platforms] ||= []
       @config[:version] ||= Hub.version_latest
-      @config[:image_index] ||= true
-      @config[:manifest] ||= true
+      @config[:image_index] = enable_image_index?
+      @config[:manifest] = true if @config[:manifest].nil?
+      @config[:bundle_compile] = true if @config[:bundle_compile].nil?
+      @config[:manifest_compile] = false if @config[:manifest_compile].nil?
+      @config[:font_index] = true if @config[:font_index].nil?
+      @config[:sound_index] = true if @config[:sound_index].nil?
       @config[:gems] ||= {}
     end
 
@@ -74,8 +124,8 @@ module Drakkon
 
       if @config.nil?
         @config ||= JSON.parse(File.read(config_file), { symbolize_names: true })
-        # @config ||= Oj.load File.read(config_file)
         config_defaults
+        write
       end
 
       @config
@@ -94,7 +144,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 +151,11 @@ 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: 'sound_index', value: :sound_index
         menu.choice name: 'manifest', value: :manifest
+        menu.choice name: 'manifest_compile', value: :manifest_compile
+        menu.choice name: 'bundle_compile', value: :bundle_compile
         menu.choice name: 'exit', value: :exit
       end
     rescue TTY::Reader::InputInterrupt
@@ -119,6 +172,16 @@ 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 :manifest_compile
+        Settings.update(:manifest_compile,
+                        prompt.yes?("Bundle Manifest On Build? (Enabled: #{config[:manifest_compile]})"))
+      when :font_index
+        Settings.update(:font_index, prompt.yes?("Index Fonts? (Enabled: #{config[:font_index]})"))
+      when :sound_index
+        Settings.update(:font_index, prompt.yes?("Index Sounds? (Enabled: #{config[:sound_index]})"))
       when :exit
         exit 0
       end

data/lib/drakkon/lib/sounds/sounds.rb

@@ -0,0 +1,126 @@
+module Drakkon
+  module Sounds
+    # General Sound Index Helper
+    module Index
+      def self.index
+        @index ||= {}
+
+        @index
+      end
+
+      def self.context
+        @context ||= Dir.pwd
+
+        @context
+      end
+
+      def self.catalog
+        # Better way to do this?
+        @catalog ||= Hash.new { |hash, key| hash[key] = Hash.new(&hash.default_proc) }
+
+        @catalog
+      end
+
+      def self.file_list
+        Dir["#{sounds_directory}/**/*"].select { |file| File.file?(file) }
+      end
+
+      def self.digest
+        Digest::MD5.hexdigest(file_list.map { |x| Digest::MD5.file(x).hexdigest }.join)
+      end
+
+      def self.sounds_directory
+        "#{context}/sounds"
+      end
+
+      def self.run!(force: false, dir: nil)
+        @context = dir || Dir.pwd
+
+        # Create Directory if sprites directory is missing
+        FileUtils.mkdir_p(sounds_directory)
+
+        if Settings.config[:sound_digest] == digest && File.exist?("#{context}/app/drakkon/sound_index.rb")
+          LogBot.info('Sounds Index', 'Nothing New')
+          return unless force
+        end
+
+        build_index
+
+        Settings.update(:sound_digest, digest)
+
+        File.write("#{context}/app/drakkon/sound_index.rb", result)
+      end
+
+      def self.build_index
+        check sounds_directory
+      end
+
+      def self.result
+        <<~RB
+             module Drakkon
+               module Sounds
+                 def self.index
+                   #{index.inspect}
+                 end
+
+          def self.catalog
+                   #{catalog.inspect}
+                 end
+
+               end
+             end
+        RB
+      end
+
+      # Recursively Go through
+      def self.check(dir = nil)
+        LogBot.info('Sound Index', "Check: #{dir}")
+
+        # Collect Sounds
+        list = file_list
+
+        # Ignore Empties
+        return if list.empty?
+
+        # Do other things
+        Dir["#{dir}/*"].each do |file|
+          if File.directory?(file)
+            check(file)
+            next
+          end
+
+          process(file)
+        end
+
+        :done
+      end
+
+      def self.process(file = nil)
+        # Safety
+        return if file.nil?
+
+        full_name = file.gsub(sounds_directory, '')[1..].gsub(File.extname(file), '')
+
+        name = File.basename(file, File.extname(file))
+        path = file.gsub(sounds_directory, '')[1..]
+        index[full_name] = path
+
+        details = { path: full_name }
+        tag = WahWah.open(file)
+        details[:duration_s] = tag.duration
+        details[:duration_tick] = tag.duration * 60
+
+        # Catalog
+        catalog_list = path.split('/')[0..-2]
+        catalog_location = []
+        catalog_list.each do |idx|
+          catalog_location.push idx
+          catalog.dig(*catalog_location)
+        end
+        catalog.dig(*catalog_list)[name] = details
+      end
+      # =========================================================
+    end
+    # =========================================================
+  end
+end

data/lib/drakkon/lib/utils/cli.rb

@@ -0,0 +1,38 @@
+module Drakkon
+  module Utils
+    # General Entry Point For Images Subcommand
+    module CLI
+      def self.run!(args = [])
+        args ||= []
+        cmd = if args.empty?
+                nil
+              else
+                args.shift.to_sym
+              end
+        start(cmd, args)
+      end
+
+      def self.start(cmd, args)
+        case cmd
+        when :normalize then Utils::DowncaseNormalize.run!(args)
+        else
+          start(menu, args)
+        end
+      end
+
+      def self.menu
+        prompt.select('Utilties:', filter: true, per_page: 20) do |menu|
+          menu.choice name: 'Rename Files - Normalize [normalize]', value: :normalize
+        end
+      rescue TTY::Reader::InputInterrupt
+        exit 0
+      end
+
+      def self.prompt
+        TTY::Prompt.new(active_color: :cyan, interrupt: :exit)
+      end
+      # =========================================================
+    end
+    # =========================================================
+  end
+end

data/lib/drakkon/lib/utils/rename_normalize.rb

@@ -0,0 +1,75 @@
+module Drakkon
+  module Utils
+    # This downcases all the things
+    module DowncaseNormalize
+      def self.run!(_args = nil)
+        puts <<~HELP
+          Usage: Run in the directory you wish to rename files
+          	- Downcase
+          	- Normalize
+          	- To Underscores:
+          	- Space
+          	- Perentheses
+          	- Dash
+          	- Remove Double Underscores
+          	- Remove Commas
+          	- Delete Final Chars
+          		- If Underscore
+          Current Directory;
+          #{Dir.pwd.pastel(:yellow)}
+
+          Files:
+        HELP
+
+        files.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)} Rename!? #{'(Destructive)'.pastel(:red)}"
+
+        start
+      end
+
+      def self.start
+        files.each do |file|
+          process(file)
+        end
+      end
+
+      # Image file name normalization. Downcase and replace spaces with underscore, commas, and double underscores
+      def self.process(file)
+        new_name = File.basename(file).downcase.gsub(' ', '_').gsub('(', '_').gsub(')', '_').gsub('-', '_').gsub(',', '_').gsub('__', '_').gsub(
+          '__', '_'
+        )
+        path = File.dirname(file)
+
+        # Remove Final Underscore last char of basename is an underscore
+        ext = File.extname(new_name)
+        basename = File.basename(new_name, ext)
+        if basename[-1] == '_' && basename.length > 1
+          new_name = basename[0..-2]
+          new_name += ext
+        end
+
+        # Skip if the same
+        return if new_name == File.basename(file)
+
+        LogBot.info('Rename Files Normalize', "Old: #{File.basename(file)}, New: #{new_name}")
+        FileUtils.mv(file, "#{path}/#{new_name}")
+      end
+
+      # Select all local dir files
+      def self.files
+        Dir["#{Dir.pwd}/*"]
+      end
+
+      def self.prompt
+        TTY::Prompt.new(active_color: :cyan, interrupt: :exit)
+      end
+      # =========================================================
+    end
+    # =========================================================
+  end
+end

data/lib/drakkon/lib/version.rb

@@ -37,11 +37,25 @@ module Drakkon
         exit(1)
       end
 
+      # rubocop:disable Metrics/BlockLength
       Dir.mktmpdir('drakkon-sauce-') do |tmp|
         # full_path = "#{Dir.pwd}/#{zip}"
 
-        # Execut Unzip / Better Way to do this?
-        system("unzip -q -d #{tmp} #{zip}")
+        # Unzip install file
+        Zip::File.open(zip) do |zip_file|
+          zip_file.each do |entry|
+            path = File.join(tmp, entry.name)
+            FileUtils.mkdir_p(File.dirname(path))
+
+            next if File.exist?(path)
+
+            # Extract
+            zip_file.extract(entry, path)
+
+            # Preserve Permissions
+            FileUtils.chmod(entry.unix_perms, path)
+          end
+        end
 
         # Find Dir
         dr_dir = Dir["#{tmp}/*"].first
@@ -78,6 +92,7 @@ module Drakkon
         # Finish
         LogBot.info('Version', "#{dr_version} Installed!")
       end
+      # rubocop:enable Metrics/BlockLength
     end
 
     def self.prompt

data/lib/drakkon/release.rb

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

data/lib/drakkon/run/commands/utils.rb

@@ -0,0 +1,14 @@
+module Drakkon
+  # Run Command for CLI
+  module Run
+    # Runnable Terminal Commands
+    module Commands
+      def self.cmd_utils(_args)
+        Utils::Index.run!(force: true, dir: Run.context)
+      end
+
+      # ========================================================================
+    end
+    # ==========================================================================
+  end
+end

data/lib/drakkon/run/helpers.rb

@@ -1,6 +1,8 @@
 module Drakkon
   # Run Command for CLI
   module Run
+    extend PlatformCompat
+
     def self.index
       @index ||= build_index
       @index
@@ -18,13 +20,14 @@ module Drakkon
 
     # Exec skips the weird shell stuff
     def self.run_cmd
-      "PATH=#{version_dir}:$PATH exec dragonruby #{@context}"
+      ['./dragonruby', @context, *args]
       # "PATH=#{version_dir}:$PATH exec dragonruby #{@context} > #{log_file}"
     end
 
-    def self.log_file
-      "#{Hub.dir}/log.txt"
-    end
+    # No longer used
+    # def self.log_file
+    #   "#{Hub.dir}/log.txt"
+    # end
 
     def self.dragonruby(value = nil)
       @dragonruby ||= value
@@ -50,6 +53,14 @@ module Drakkon
       args.include?('manifest')
     end
 
+    def self.force_fonts?
+      args.include?('fonts')
+    end
+
+    def self.force_sounds?
+      args.include?('sounds')
+    end
+
     def self.prompt
       TTY::Prompt.new(active_color: :cyan, interrupt: :exit)
     end

data/lib/drakkon/run/reader_shim.rb

@@ -15,7 +15,7 @@ module TTY
     attr_accessor :line, :breaker
 
     def read_line(prompt = '', value: '', echo: true, raw: true, nonblock: false)
-      # Greenhat Shim:: Store Line
+      #  Shim:: Store Line
       self.breaker = false
       self.line = Line.new(value, prompt: prompt)
       screen_width = TTY::Screen.width
@@ -27,17 +27,17 @@ module TTY
             (code = codes[0])
         char = codes.pack('U*')
 
-        # GreenHat Shim / Back Tab Down Submodule
+        #  Shim / Back Tab Down Submodule
         if [:back_tab, :ctrl_c].include? console.keys[char] 
           clear_display(line, screen_width)
           trigger_key_event(char, line: line.to_s)
           break
         end
 
-        # Greenhat Shim
+        #  Shim
         if EXIT_KEYS.include?(console.keys[char])
           trigger_key_event(char, line: line.to_s)
-          raise Interrupt
+          raise TTY::Reader::InputInterrupt
         end
 
         clear_display(line, screen_width) if raw && echo
@@ -92,7 +92,7 @@ module TTY
           end
         end
 
-        # Greenhat Shim do things
+        #  Shim do things
         next unless [CARRIAGE_RETURN, NEWLINE].include?(code) || breaker
 
         buffer = ''
@@ -103,7 +103,11 @@ module TTY
       add_to_history(line.text.rstrip) if track_history? && echo
 
       line.text
+			# ===================================
+		rescue 
+			puts 'rescue'
     end
+		# ===================================
   end
 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

@@ -4,6 +4,8 @@ module Drakkon
     # General Run
     def self.go!(raw)
       Settings.ready?
+      Settings.check_version!
+
       args(raw)
 
       # Save Current Directory before changing to Version Directory
@@ -49,7 +51,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,11 +64,13 @@ 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?
+      Sounds::Index.run!(force: force_sounds?) if Settings.sound_index?
       Gems::Bundle.build!(args, @context)
     end
 
     def self.runtime
-      @dragonruby = IO.popen(run_cmd)
+      @dragonruby = IO.popen(run_env, run_cmd)
     end
 
     def self.restart

data/lib/drakkon/skeleton/deploy.rb

@@ -14,7 +14,10 @@ module Drakkon
 
         template[:files].each do |files|
           file_src = "#{template[:path]}/#{files[:source]}"
-          raise 'Missing File!' unless File.exist?(file_src)
+          unless File.exist?(file_src)
+            LogBot.fatal('Skeleton', "Missing File! File: #{file_src}")
+            exit 0
+          end
 
           src = File.read(file_src)
           result = process_variables(src, variables)