mundler 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e34cffc5ea496c40d16c21f544456bf5fa2db7f921e7c70aa000c5b5fdb5cdc5
-  data.tar.gz: 125ad566d2322fa8d931a428c5d8cdfc7df98818dd3e793c1a7a23b66e225758
+  metadata.gz: 2a1e212a7e64550513e7b9581af1cddf8e4b9162bfa68cb44c0e1723cc1530ed
+  data.tar.gz: b426f4f7f1b4b7da2dfc2a252a48cf232cd18f6709306d35c50060867b317f03
 SHA512:
-  metadata.gz: 326e51648e28ea76872db38f4d8c03168960fad4ed5ee8c53e37b7d6da3d8605f62152a1aa87d22dd04b6e4070bfa60fad265cb52ec5dc8046c323f5f4488219
-  data.tar.gz: ba5c5387ddfa27ac31e10f53c128e4b26c319c03dcfde893bea970309025bc44d1cfdb568662e60071a3a255d72312b758d870bb180e9407e8626dfb81a90c99
+  metadata.gz: dd5a38523ad21a2ca981eb1cb996c0ccb14e78e1d6fb56e3fa20750b5ad3c57839ab48da45c539517542f471927e250e038dcab222f4299cac70368e6a92b665
+  data.tar.gz: 9535ee1e6dea408f0887a97a8320ec0d1a42f1cb18603cf4dd3ed761a91a12d5258fbe6a0ea8c7cf31d1ce47bb1bff1e0e56e4c2aa32d746e68ceee637f2ca01

data/lib/mundler/build_config.rb

@@ -16,8 +16,12 @@ module Mundler
       end.join("\n")
     end
 
-    def gems
+    def gems(platform_name)
       @config.gems.map do |gem|
+        if !gem[:platforms].empty? && !gem[:platforms].include?(platform_name.to_sym)
+          next
+        end
+
         # e.g. gem = {:name=>"mruby-regexp-pcre", :path=>nil, :github=>nil, :core=>nil}
         args = ":mgem => #{gem[:name].inspect}"
 
@@ -165,13 +169,21 @@ module Mundler
 
         #{host_platform}
           #{gemboxes}
-          #{gems}
+          #{gems(:host)}
         end
 
         #{non_host_platforms}
       CONTENTS
 
-      (contents.strip + "\n").gsub("\n\n\n", "\n\n")
+      contents = contents.strip + "\n"
+
+      3.times do
+        contents.gsub!("\n  \n", "\n\n")
+        contents.gsub!("\n\n\n", "\n\n")
+        contents.gsub!("\n\nend", "\nend")
+      end
+
+      contents
     end
   end
 end

data/lib/mundler/dsl.rb

@@ -53,13 +53,19 @@ module Mundler
       config.platforms << { name: name.to_s, options: options }
     end
 
-    def gem(name, core: nil, path: nil, github: nil)
+    def gem(name, core: nil, path: nil, github: nil, platforms: [])
       if path && !path.start_with?("/")
         app_path = Pathname.new(@path).dirname.to_s
         path = File.expand_path(File.join(app_path, path))
       end
 
-      config.gems << { name: name, path: path, github: github, core: core }
+      config.gems << {
+        name: name,
+        path: path,
+        github: github,
+        core: core,
+        platforms: Array(platforms)
+      }
     end
 
     def env(name, value)

data/lib/mundler/mruby.rb

@@ -44,7 +44,8 @@ module Mundler
 
       if version
         system("git reset --hard #{version} >/dev/null 2>&1") ||
-          error_out("Failed to set version to #{version}")
+          system("git reset --hard origin/#{version} >/dev/null 2>&1") ||
+          exit_out("Failed to set mruby version to \"#{version}\".")
       end
 
       FileUtils.touch(success_indicator)
@@ -73,7 +74,11 @@ module Mundler
         puts "Using #{gembox} gembox"
       end
       @config.gems.each do |gem|
-        puts "Using #{gem[:name]} gem"
+        if gem[:platforms].empty?
+          puts "Using #{gem[:name]} gem"
+        else
+          puts "Using #{gem[:name]} gem for platforms: #{gem[:platforms]}"
+        end
       end
 
       puts "Using mruby (#{version})"
@@ -169,6 +174,11 @@ module Mundler
 
     private
 
+    def exit_out(msg)
+      STDERR.puts("\e[31m#{msg}\e[0m")
+      exit(1)
+    end
+
     def installed?
       success_indicator = File.join(@path, ".mundler_built_successfully")
       File.file?(success_indicator)

data/lib/mundler/platforms/android.rb

@@ -25,7 +25,7 @@ module AndroidPlatform
 
         #{cc_and_linker(options[:options])}
           #{build_config.gemboxes}
-          #{build_config.gems}
+          #{build_config.gems(:android)}
         end
       BUILD
     end.join("\n")

data/lib/mundler/platforms/ios.rb

@@ -29,7 +29,7 @@ module IOSPlatform
       <<~BUILD
         MRuby::CrossBuild.new("ios__#{arch}") do |conf|
           #{build_config.gemboxes}
-          #{build_config.gems}
+          #{build_config.gems(:ios)}
 
           conf.cc do |cc|
             cc.command = #{cc_command.inspect}

data/lib/mundler/platforms/ios_simulator.rb

@@ -28,7 +28,7 @@ module IOSSimulatorPlatform
       <<~BUILD
         MRuby::CrossBuild.new("ios_simulator__#{arch}") do |conf|
           #{build_config.gemboxes}
-          #{build_config.gems}
+          #{build_config.gems(:ios_simulator)}
 
           conf.cc do |cc|
             cc.command = #{cc_command.inspect}

data/lib/mundler/platforms/wasm.rb

@@ -0,0 +1,33 @@
+module WASMPlatform
+  def self.config(options, build_config)
+    cc_command = "emcc"
+    linker_command = "emcc"
+    archiver_command = "emar"
+
+    cc_flags = ["-Os"]
+
+    <<~BUILD
+      MRuby::CrossBuild.new("wasm") do |conf|
+        toolchain :clang
+
+        #{build_config.gemboxes}
+        #{build_config.gems(:wasm)}
+
+        conf.cc do |cc|
+          cc.command = #{cc_command.inspect}
+          cc.flags = #{cc_flags.inspect}
+        end
+
+        conf.linker do |l|
+          l.command = #{linker_command.inspect}
+        end
+
+        conf.archiver do |a|
+          a.command = #{archiver_command.inspect}
+        end
+      end
+    BUILD
+  end
+end
+
+define_platform "wasm", WASMPlatform

data/lib/mundler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mundler
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Daniel Inkpen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,7 @@ files:
 - lib/mundler/platforms/host.rb
 - lib/mundler/platforms/ios.rb
 - lib/mundler/platforms/ios_simulator.rb
+- lib/mundler/platforms/wasm.rb
 - lib/mundler/project.rb
 - lib/mundler/version.rb
 homepage: https://github.com/Dan2552/mundler