wasify 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6c74bf50fb9cb72177396e5687833064870c6d6b7a4a9a4fac91056751312ed
-  data.tar.gz: b164d1649f05462fa7ef8f2166e78bd305369c2905b098ec14ac2759148b341d
+  metadata.gz: 956439b8cb59f80aaf152c60599eea4fb4946edf6269f61c6ca457fdeef5650f
+  data.tar.gz: 72b83e12f5517a817d74445d94ce62073dd588d6266e70331175e3c9dee04e10
 SHA512:
-  metadata.gz: 52df9a60f3c3c974ab0b129b17fb8df1762dca688d00ad981786d2eaa18a34508dcdde92419ff8af4f9bcedba26c3a795039a04644dec864467c0ef2c60006f7
-  data.tar.gz: e42fcb4ec79e0c0748581b33cbfa7a11b5b701e4c7596d520d66cf72d1debf3c331cb6d3beb9875bb1a50805130ae55a907234e6e8dcbc289dbdf852569fb726
+  metadata.gz: 3261f2ad61f94f8cbdcd947f6e4db72735d12ff337a487f3ab7b941a18905e7ba860a8b5e968389572747a53e81e3f6e3a6ae43a15459e3817938667b888f351
+  data.tar.gz: 0c58d216c5d11b85d40107b7e0f5a0593e8cdbf96c246fa8946b858ee578569630b89a1fb73bdc4f2ef7989e28c51d70b23268a917cf7c934adf309456401e11

data/exe/wasify

@@ -5,7 +5,10 @@ require 'wasify'
 
 raise 'Wrong number of arguments! Usage: wasify entrypoint.rb' if ARGV.length != 1
 
-if ARGV[0] == 'prepack'
+if ARGV[0] == "-v"
+  require "wasify/version"
+  puts "Wasify version #{Wasify::VERSION}"
+elsif ARGV[0] == 'prepack'
   Wasify.prepack
 else
   Wasify.pack

data/lib/wasify/cmd_runner.rb

@@ -9,7 +9,7 @@ class Wasify
 
     def self.unzip_binary
       system('tar xfz ruby-3_2-wasm32-unknown-wasi-full-js.tar.gz')
-      system('chmod u+rw 3_2-wasm32-unknown-wasi-full-js')
+      system('chmod -R u+rw 3_2-wasm32-unknown-wasi-full-js')
     end
 
     def self.move_binary

data/lib/wasify/deps_manager.rb

@@ -1,52 +1,92 @@
 # frozen_string_literal: true
 
+require "fileutils"
+
 class Wasify
   # methods finding and copying dependecies
   class DepsManager
     def self.get_specs(deps)
-      bundler_specs = Bundler.load.specs
-      lf = bundler_specs.map(&:loaded_from)
-      lf.select! { |item| !item.include?("/bundler-") && !item.include?("/wasify-") }
-
-      spec_paths = []
-      lf.each do |spec_path_str|
-        if File.exist?(spec_path_str)
-          spec_paths.append(spec_path_str)
-        else
-          loop do
-            puts "#{spec_path_str} doesn't exist. Specify gemspec path or write 'skip' to skip specfile."
-            path = $stdin.gets.chomp
-            break if File.exist?(path) || (path == 'skip')
-          end
-          spec_paths.append(path) unless path == 'skip'
-        end
+      # Bundler internals are annoying to look through. And mostly undocumented.
+      # It's amazing what you can find via "bundle exec irb" and then "Bundler.load".
+      bundler_specs = Bundler.load.requested_specs.to_a
+
+      # By default, Bundler only "installs" git: gems and path: gems partway.
+      # The specification remains dynamic. So if you require "lib/scarpe/version"
+      # in the gemspec, it breaks when vendored, because the specification is
+      # separated from the gem source (like lib/scarpe/version.rb). When
+      # a gem is built and installed, the gemspec is "baked" to a static version,
+      # either Ruby or YAML. But git: and path: gems don't do that. So we
+      # need to bake them ourselves using spec.to_ruby.
+      # (Thanks to Benedikt Deicke, who pointed out to_ruby.)
+
+      spec_contents = {}
+      bundler_specs.each do |spec|
+        next if ["bundler", "wasify"].include?(spec.name)
+
+        spec_contents["#{spec.full_name}.gemspec"] = spec.to_ruby
       end
-      spec_paths
+      spec_contents
     end
 
     def self.get_deps
-      deps = Bundler.load.specs.map(&:full_gem_path)
-      modded_string_deps = []
-      deps.each do |i|
-        modded_string_deps.append(i)
+      return @all_gems if @all_gems
+
+      @all_gems = {}
+
+      # We don't want to copy random files (e.g. .git directories, .bundle) in a path: or git: gem dir.
+      # But also, Bundler has multiple kinds of specs. Installed baked specs often omit the file list
+      # or cut it down to just executables and top-level README-type files. So we have to do things
+      # differently for installed and non-installed specs :-(
+      specs = Bundler.load.requested_specs.to_a
+      specs.each do |spec|
+        root_path = File.expand_path spec.full_gem_path # Pretty sure the expand is unneeded
+
+        files = case spec
+        when Gem::Specification
+          #puts "#{spec.full_name} is a git: or path: gem"
+          spec.files
+        when Bundler::StubSpecification
+          # The specification file is wrong, but there should be only the right files already installed...
+          #puts "#{spec.full_name} is locally installed"
+          files = :all
+        else
+          raise "Not implemented! Figure out how to get Bundler data from a #{spec.class}!"
+        end
+
+        @all_gems[spec.full_name] = {
+          root: root_path,
+          files: files,
+        }
       end
-      modded_string_deps
+
+      @all_gems
     end
 
     def self.copy_deps
-      deps = get_deps
-      deps.each do |i|
-        status = system("cp -r #{i} ./3_2-wasm32-unknown-wasi-full-js/usr/local/lib/ruby/gems/3.2.0/gems")
-        puts "Gem at #{i} not copied." unless status
+      get_deps.each do |gem_name, dep|
+        dest_dir = "./3_2-wasm32-unknown-wasi-full-js/usr/local/lib/ruby/gems/3.2.0/gems/#{gem_name}"
+        if dep[:files] == :all
+          FileUtils.cp_r dep[:root], dest_dir
+        elsif dep[:files].respond_to?(:each)
+          dep[:files].each do |file|
+            src = "#{dep[:root]}/#{file}"
+            dest = "#{dest_dir}/#{file}"
+            FileUtils.mkdir_p File.dirname(dest)
+            #STDERR.puts "cp: #{src.inspect} #{dest.inspect}"
+            FileUtils.cp src, dest
+          end
+        else
+          raise "Unexpected file list object!"
+        end
       end
     end
 
     def self.copy_specs
       deps = get_deps
       specs = get_specs(deps)
-      specs.each do |s|
-        status = system("cp #{s} ./3_2-wasm32-unknown-wasi-full-js/usr/local/lib/ruby/gems/3.2.0/specifications")
-        puts "Specification at #{s} not copied." unless status
+      FileUtils.mkdir_p "./3_2-wasm32-unknown-wasi-full-js/usr/local/lib/ruby/gems/3.2.0/specifications/"
+      specs.each do |name, contents|
+        File.write("./3_2-wasm32-unknown-wasi-full-js/usr/local/lib/ruby/gems/3.2.0/specifications/#{name}", contents)
       end
     end
 

data/lib/wasify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Wasify
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wasify
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Giovanni Borgh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2023-12-02 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -32,7 +32,6 @@ files:
 - lib/wasify/template.erb
 - lib/wasify/version.rb
 - sig/wasify.rbs
-- wasify.gemspec
 homepage: https://github.com/AlawysDelta/wasify
 licenses:
 - MIT
@@ -57,5 +56,5 @@ requirements: []
 rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
-summary: Packs and run Ruby code on WASM
+summary: Packs and runs Ruby code on WASM
 test_files: []

data/wasify.gemspec

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/wasify/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'wasify'
-  spec.version = Wasify::VERSION
-  spec.authors = ['Giovanni Borgh']
-  spec.email = ['gio96b@gmail.com']
-
-  spec.summary = 'Packs and run Ruby code on WASM'
-  spec.license = 'MIT'
-  spec.homepage = 'https://github.com/AlawysDelta/wasify'
-  spec.required_ruby_version = '>= 3.2.0'
-
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/AlawysDelta/wasify'
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = 'exe'
-  spec.executables = ['wasify']
-  spec.require_paths = ['lib']
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end