Merge pull request #1 from HarlemSquirrel/magnus

Migrate to using magnus

.gitignore

@@ -7,13 +7,17 @@
 /spec/reports/
 /tmp/
 
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+
 # rspec failure tracking
 .rspec_status
 
-
 # Added by cargo
-
 /target
 
-# Build gems
+# Built gems
 *.gem

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.2.0] - 2023-02-22
+
+- Migrate to [magnus](https://github.com/matsadler/magnus)
+
 ## [0.1.0] - 2023-02-21
 
 - Initial release

Cargo.toml

@@ -1,13 +1,7 @@
-[package]
-name = "tzf"
-version = "0.1.0"
-edition = "2021"
+# This Cargo.toml is here to let externals tools (IDEs, etc.) know that this is
+# a Rust project. Your extensions dependencies should be added to the Cargo.toml
+# in the ext/ directory.
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-lazy_static = "1.4.0"
-tzf-rs = "0.3.0"
+[workspace]
+members = ["./ext/tzf"]
+resolver = "2"

Gemfile

@@ -6,6 +6,8 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
+gem "rake-compiler"
+gem "rb_sys"
 
 gem "rspec", "~> 3.0"
 

Gemfile.lock

@@ -1,21 +1,22 @@
 PATH
   remote: .
   specs:
-    tzf (0.2.0.pre.pre)
-      ffi (~> 1.0)
+    tzf (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     diff-lcs (1.5.0)
-    ffi (1.15.5)
     json (2.6.3)
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
+    rake-compiler (1.2.1)
+      rake
+    rb_sys (0.9.65)
     regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.12.0)
@@ -58,6 +59,8 @@ PLATFORMS
 
 DEPENDENCIES
   rake (~> 13.0)
+  rake-compiler
+  rb_sys
   rspec (~> 3.0)
   rubocop (~> 1.21)
   rubocop-rake (~> 0.6)

Rakefile

@@ -9,16 +9,13 @@ require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 
-desc "Build rust dependencies"
-task :rust_build do
-  `cargo rustc --release`
-  `cp ./target/release/libtzf.so ./lib/tzf/`
-end
+require "rake/extensiontask"
+
+desc "Build extension"
+task build: :compile
 
-desc "Clean rust dependencies"
-task :rust_clean do
-  `cargo clean`
-  `rm -f ./lib/tzf/libtzf.so`
+Rake::ExtensionTask.new("tzf") do |ext|
+  ext.lib_dir = "lib/tzf"
 end
 
-task default: %i[rust_build spec rubocop]
+task default: %i[compile spec rubocop]