mundler 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48991edd8f68a6db41fc93f84ba8631ffce3e296aecfaeac6bfd8ed1cd8d7a4c
-  data.tar.gz: 6b09d50fe5fb6a5b79f6fdf92a87a1968a1e028474a606f98312acd18e00a23a
+  metadata.gz: e34cffc5ea496c40d16c21f544456bf5fa2db7f921e7c70aa000c5b5fdb5cdc5
+  data.tar.gz: 125ad566d2322fa8d931a428c5d8cdfc7df98818dd3e793c1a7a23b66e225758
 SHA512:
-  metadata.gz: ab39110a71818d4f1f544e7dd6effe6ff2cb88557db5d2d18cd430f70bff5bd6a4947d3533f8b66f4aea3bca12210910ce42f452e089c72138d0e2ed0becf65e
-  data.tar.gz: d33d00f82e5be842c712e9b90fba5d101453ce52dcbc3e171d41922c22d4ae0bc7cb14a6fdcc6a4f8f35e9f6cc0b4791368a91589235553b599d62690a292068
+  metadata.gz: 326e51648e28ea76872db38f4d8c03168960fad4ed5ee8c53e37b7d6da3d8605f62152a1aa87d22dd04b6e4070bfa60fad265cb52ec5dc8046c323f5f4488219
+  data.tar.gz: ba5c5387ddfa27ac31e10f53c128e4b26c319c03dcfde893bea970309025bc44d1cfdb568662e60071a3a255d72312b758d870bb180e9407e8626dfb81a90c99

data/exe/mundle

@@ -4,4 +4,6 @@ require "bundler/setup"
 require "mundler"
 require "mundler/cli"
 
+Bundler.require
+
 Mundler::CLI.start(ARGV)

data/lib/mundler/build_config.rb

@@ -61,10 +61,90 @@ module Mundler
         .join("\n")
     end
 
-    def platform(attributes)
-      type = @config.platform_types[attributes[:name].to_s]
-      raise "Can't find platform: #{attributes[:name]}" unless type
-      type.config(attributes, self)
+    def platform(platform_attrs)
+      platform_name = platform_attrs[:name].to_s
+      type = @config.platform_types[platform_name]
+      raise "Can't find platform: #{platform_name}" unless type
+
+      options = {}
+      @config.libraries.each do |library_name, library_options|
+        library_type = @config.library_types[library_name]
+
+        raise "Unknown library: #{library_name}" unless library_type
+
+        library_builder = library_type.new
+
+        puts "Using #{library_name} library (#{platform_name})"
+        library_builder.build(platform_name, library_options)
+        library_attrs = library_builder.platform_configuration(platform_name, library_options)
+        raise "Library #{library_name} for platform #{platform_name} returned expected result" unless library_attrs.is_a?(Hash)
+        merge_platform_attributes!(options, library_attrs)
+      end
+
+      merge_platform_attributes!(options, platform_attrs[:options])
+
+      type.config(options, self)
+    end
+
+    # Merge with a bit of specific logic to make sure build settings
+    #
+    # E.g. if lhs was something like
+    #
+    # ```
+    # {
+    #   cc: { flags: "-I#{sdl_install}/include/SDL2" },
+    #   linker: { flags: "-L#{sdl_install}/lib -lSDL2 -lSDL2_image -lSDL2_ttf" }
+    # }
+    # ```
+    #
+    # and rhs was like
+    #
+    # ```
+    # {
+    #   cc: { flags: "abc" },
+    #   linker: { flags: "def" },
+    #   more_options: true
+    # }
+    # ```
+    #
+    # result would be
+    # ```
+    # {
+    #   cc: { flags: ["-I#{sdl_install}/include/SDL2", "abc"] },
+    #   linker: { flags: ["-L#{sdl_install}/lib -lSDL2 -lSDL2_image -lSDL2_ttf", "def"] }
+    #   more_options: true
+    # }
+    # ```
+    #
+    def merge_platform_attributes!(lhs, rhs)
+      rhs = rhs.dup
+
+      [:cc, :linker].each do |cc_or_linker|
+        [:command, :flags].each do |command_or_flags|
+          lhs_flags = lhs.dig(cc_or_linker, command_or_flags)
+          rhs_flags = rhs.dig(cc_or_linker, command_or_flags)
+
+          if rhs_flags
+            lhs[cc_or_linker] ||= {}
+            lhs[cc_or_linker][command_or_flags] ||= []
+            lhs_flags = lhs.dig(cc_or_linker, command_or_flags)
+
+            if lhs_flags.is_a?(String)
+              lhs[cc_or_linker][command_or_flags] = [lhs_flags]
+            end
+
+            if rhs_flags.is_a?(String)
+              rhs[cc_or_linker][command_or_flags] = [rhs_flags]
+            end
+
+            lhs[cc_or_linker][command_or_flags] = lhs[cc_or_linker][command_or_flags] + rhs[cc_or_linker][command_or_flags]
+          end
+        end
+
+        rhs.delete(cc_or_linker)
+      end
+
+      lhs.merge!(rhs)
     end
 
     def env_vars

data/lib/mundler/clean_environment.rb

@@ -0,0 +1,11 @@
+module Mundler
+  def self.with_clean_env(&blk)
+    if defined?(Bundler) && Bundler.respond_to?(:with_unbundled_env)
+      Bundler.with_unbundled_env(&blk)
+    elsif defined?(Bundler)
+      Bundler.with_clean_env(&blk)
+    else
+      blk.call
+    end
+  end
+end

data/lib/mundler/cli.rb

@@ -11,11 +11,12 @@ module Mundler
     desc "install", "Download and compile mruby"
     def install
       Mundler::Project.new(Dir.pwd).install
+      puts("\e[32mMundle complete!\e[0m")
     rescue Mundler::CompilationError
-      $stderr.puts("\e[31mFailed to install\e[0m")
+      $stderr.puts("\e[31mMundle failed\e[0m")
       exit 1
     rescue Interrupt
-      $stderr.puts("\e[31mUser cancelled\e[0m")
+      $stderr.puts("\e[31mMundle failed (user cancelled)\e[0m")
       exit 1
     rescue MundlefileNotFound
       $stderr.puts("\e[31mMundlefile not found in the current directory\e[0m")
@@ -27,6 +28,7 @@ module Mundler
       project = Mundler::Project.new(Dir.pwd)
       project.clean
       project.install
+      puts("\e[32mMundle complete!\e[0m")
     rescue Mundler::CompilationError
       $stderr.puts("\e[31mFailed to install\e[0m")
       exit 1

data/lib/mundler/config.rb

@@ -10,11 +10,15 @@ module Mundler
       @gemboxes = []
       @gems = []
       @platform_types = {}
+      @library_types = {}
       @env = {}
+      @libraries = {}
     end
 
     attr_reader :mruby
     attr_reader :platform_types
+    attr_reader :library_types
+    attr_reader :libraries
     attr_reader :env
 
     def hex
@@ -38,9 +42,11 @@ module Mundler
         #{mruby.inspect}
         #{platforms.inspect}
         #{platform_types.keys.sort.inspect}
+        #{library_types.keys.sort.inspect}
         #{hashable_string_for_hash(env)}
         #{gemboxes.inspect}
         #{gems.inspect}
+        #{hashable_string_for_hash(libraries)}
       HASHABLE
     end
 
@@ -50,9 +56,9 @@ module Mundler
       str = "{"
       sorted_keys = hash.keys.sort
 
-      sorted_keys.each do |key|
+      sorted_keys.map do |key|
         str = str + "#{key}=>#{hash[key]}"
-      end
+      end.join(", ")
 
       str + "}"
     end

data/lib/mundler/dsl.rb

@@ -3,13 +3,12 @@ module Mundler
     def initialize(path)
       @config = Config.new
       @path = path
+
+      load_libraries
+      load_platforms
     end
 
     def evaluate!
-      platforms = Dir.glob(File.join(__dir__, "platforms", "*.rb"))
-      platforms.each do |platform|
-        instance_eval(File.read(platform))
-      end
       begin
         instance_eval(File.read(@path), @path)
       rescue Errno::ENOENT
@@ -19,6 +18,20 @@ module Mundler
 
     attr_reader :config
 
+    def load_libraries
+      libraries = Dir.glob(File.join(__dir__, "libraries", "*.rb"))
+      libraries.each do |library|
+        instance_eval(File.read(library))
+      end
+    end
+
+    def load_platforms
+      platforms = Dir.glob(File.join(__dir__, "platforms", "*.rb"))
+      platforms.each do |platform|
+        instance_eval(File.read(platform))
+      end
+    end
+
     private
 
     def mruby(url: nil, tag: nil, branch: nil)
@@ -52,5 +65,13 @@ module Mundler
     def env(name, value)
       config.env[name] = value
     end
+
+    def library(name, options = {})
+      config.libraries[name.to_s] = options
+    end
+
+    def define_library(name, library_class)
+      config.library_types[name.to_s] = library_class
+    end
   end
 end

data/lib/mundler/libraries/example.rb

@@ -0,0 +1,13 @@
+# class ExampleLibrary
+#   def build(platform, options)
+#   end
+
+#   def platform_configuration(platform, options)
+#     {
+#       cc: { flags: "X" },
+#       linker: { flags: "Y" }
+#     }
+#   end
+# end
+
+# define_library "example", ExampleLibrary

data/lib/mundler/mruby.rb

@@ -29,7 +29,8 @@ module Mundler
       FileUtils.rm_rf(@path)
       FileUtils.mkdir_p(@path)
       FileUtils.cd(@path)
-      git_clone = Proc.new do
+
+      Mundler.with_clean_env do
         system(
           {
             # The {mundler gem path}/cached_git directory contains a binary called
@@ -38,15 +39,7 @@ module Mundler
             "PATH" => ([cached_git_dir] + ENV["PATH"].split(":")).join(":")
           },
           "git clone #{mruby_url} . >/dev/null 2>&1"
-        ) || error_out("Failed to clone mruby: #{mruby_url}")
-      end
-
-      if defined?(Bundler) && Bundler.respond_to?(:with_unbundled_env)
-        Bundler.with_unbundled_env(&git_clone)
-      elsif defined?(Bundler)
-        Bundler.with_clean_env(&git_clone)
-      else
-        git_clone.call
+        ) || raise(Mundler::CloneError, "Failed to clone #{mruby_url}")
       end
 
       if version
@@ -70,6 +63,22 @@ module Mundler
     def compile(build_config)
       logfile = Tempfile.new(['mundler_build', '.log'])
 
+      version = (
+        @config.mruby[:tag] ||
+        @config.mruby[:branch] ||
+        @config.mruby[:version]
+      )
+
+      @config.gemboxes.each do |gembox|
+        puts "Using #{gembox} gembox"
+      end
+      @config.gems.each do |gem|
+        puts "Using #{gem[:name]} gem"
+      end
+
+      puts "Using mruby (#{version})"
+
+
       success_indicator = File.join(@path, ".mundler_built_successfully")
       if File.file?(success_indicator)
         return
@@ -87,14 +96,14 @@ module Mundler
               directory = pathname.directory? ? pathname.to_s : Pathname.new(file).dirname.to_s
               next if covered.include?(directory)
               covered << directory
-              print "\e[32m.\e[0m"
+              print "\e[34m.\e[0m"
             end
           end
           sleep(0.3)
         end
       end
 
-      clean = Proc.new do
+      Mundler.with_clean_env do
         rake = `which rake`.chomp
         system(
           {
@@ -115,9 +124,7 @@ module Mundler
         end
 
         cleaned = true
-      end
 
-      compile = Proc.new do
         rake = `which rake`.chomp
         system(
           {
@@ -138,20 +145,11 @@ module Mundler
         end
       end
 
-      if defined?(Bundler) && Bundler.respond_to?(:with_unbundled_env)
-        Bundler.with_unbundled_env(&clean)
-        Bundler.with_unbundled_env(&compile)
-      elsif defined?(Bundler)
-        Bundler.with_clean_env(&clean)
-        Bundler.with_clean_env(&compile)
-      else
-        clean.call
-        compile.call
-      end
+      puts "\n\n"
 
-      output_thread.kill
       FileUtils.touch(success_indicator)
     ensure
+      output_thread.kill if output_thread
       logfile.close
       logfile.delete
     end

data/lib/mundler/platforms/host.rb

@@ -1,7 +1,6 @@
 module HostPlatform
-  def self.config(host_options, build_config)
+  def self.config(options, build_config)
     build = ""
-    options = host_options[:options]
 
     if options[:cc]
       build += "  conf.cc do |cc|\n"

data/lib/mundler/platforms/ios.rb

@@ -1,7 +1,8 @@
 module IOSPlatform
   def self.config(options, build_config)
     valid_archs = [:armv7, :arm64]
-    options[:archs] ||= valid_archs
+    default_archs = [:arm64]
+    options[:archs] ||= default_archs
 
     options[:archs].map do |arch|
       unless valid_archs.include?(arch)
@@ -19,11 +20,11 @@ module IOSPlatform
         -isysroot #{ios_sdk}
       )
 
-      cc_command = options.dig(:options, :cc, :command) || clang
-      linker_command = options.dig(:options, :linker, :command) || clang
+      cc_command = options.dig(:cc, :command) || clang
+      linker_command = options.dig(:linker, :command) || clang
 
-      cc_flags = flags + Array(options.dig(:options, :cc, :flags) || [])
-      linker_flags = flags + Array(options.dig(:options, :linker, :flags) || [])
+      cc_flags = flags + Array(options.dig(:cc, :flags) || [])
+      linker_flags = flags + Array(options.dig(:linker, :flags) || [])
 
       <<~BUILD
         MRuby::CrossBuild.new("ios__#{arch}") do |conf|

data/lib/mundler/platforms/ios_simulator.rb

@@ -1,6 +1,6 @@
 module IOSSimulatorPlatform
   def self.config(options, build_config)
-    valid_archs = [:i386, :x86_64]
+    valid_archs = [:i386, :x86_64, :arm64]
     options[:archs] ||= valid_archs
 
     options[:archs].map do |arch|
@@ -19,19 +19,25 @@ module IOSSimulatorPlatform
         -isysroot #{ios_simulator_sdk}
       )
 
+      cc_command = options.dig(:cc, :command) || clang
+      linker_command = options.dig(:linker, :command) || clang
+
+      cc_flags = flags + Array(options.dig(:cc, :flags) || [])
+      linker_flags = flags + Array(options.dig(:linker, :flags) || [])
+
       <<~BUILD
         MRuby::CrossBuild.new("ios_simulator__#{arch}") do |conf|
           #{build_config.gemboxes}
           #{build_config.gems}
 
           conf.cc do |cc|
-            cc.command = #{clang.inspect}
-            cc.flags = #{flags.inspect}
+            cc.command = #{cc_command.inspect}
+            cc.flags = #{cc_flags.inspect}
           end
 
           conf.linker do |l|
-            l.command = #{clang.inspect}
-            l.flags = #{flags.inspect}
+            l.command = #{linker_command.inspect}
+            l.flags = #{linker_flags.inspect}
           end
         end
       BUILD

data/lib/mundler/version.rb

@@ -1,3 +1,3 @@
 module Mundler
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/mundler.rb

@@ -8,9 +8,11 @@ require "mundler/build_config"
 require "mundler/dsl"
 require "mundler/mruby"
 require "mundler/project"
+require "mundler/clean_environment"
 
 module Mundler
   class CompilationError < StandardError; end
+  class CloneError < CompilationError; end
   class NotInstalledError < StandardError; end
   class MundlefileNotFound < StandardError; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mundler
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Daniel Inkpen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -65,9 +65,11 @@ files:
 - lib/mundler/build_config.rb
 - lib/mundler/cached_git/cached_git
 - lib/mundler/cached_git/git
+- lib/mundler/clean_environment.rb
 - lib/mundler/cli.rb
 - lib/mundler/config.rb
 - lib/mundler/dsl.rb
+- lib/mundler/libraries/example.rb
 - lib/mundler/mruby.rb
 - lib/mundler/platforms/android.rb
 - lib/mundler/platforms/host.rb