serde 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef630a330c26e9c27d399fdb3a8b29d0fac648faddc8cd91e60021331f61f11c
-  data.tar.gz: e8c5cbec885a6328a62bb5f146e12a80b79292c888ca231b58c0f7b67269d06b
+  metadata.gz: 8c38f55a677eb7150048034063e1a1a2617fa2b0fe3386fd08c3ddf6c22790ab
+  data.tar.gz: 5302cb5830f3ec3cbdba65d48b5dc1e88cd7f7a346299609f45719ce64cc4569
 SHA512:
-  metadata.gz: b0fdc7bddcb9c1a2685e43ca0ed073ee9364b3adf03a6dddfd2152a44d822ad4548c8a611857f66a187e7ed6c18902624e352954f1b8d6b4a953c5300e36dfb0
-  data.tar.gz: 593d5868ff447e0cc990adca0ff2e8178fae72b3fd9c028020217aea88fa5494c8eb4e79328ab8dad8defaac31aadf87fe5b6d812931ba9f82a49739c3cdc194
+  metadata.gz: afd1d28e37b256579d1df046bd05e4b895d326870ab4975e30656dd9b2548d4df08a4b9d6c6cc8c76de2c9523ee1626d540c6d6ae271073269d5179fae5c21cd
+  data.tar.gz: 17a79bbd39641e7cad2a43b423104be711e4c7b55d4f64c80f05b33128b2761ceee840a97381d1e1feba64adb4de8c70381bec157635ed66de415aae8ae2ace2

data/.gitignore

@@ -1,5 +1,3 @@
-/.rustc
-/bin/*
 /tmp
 /serde-*.gem
 .ruby-version

data/lib/serde.rb

@@ -34,14 +34,9 @@ module Serde
           Dir.chdir(dir) do
             SerializerGenerator.call(dir, self)
 
-            root_path = File.expand_path('..', __dir__)
             rust_path = File.expand_path('../rust', __dir__)
-            bin_path = File.expand_path('../bin', __dir__)
 
-            # rubocop:disable Metrics/LineLength
-            # `cd #{rust_path}; #{bin_path}/rustc --edition=2018 --crate-name serde_rb src/lib.rs --crate-type staticlib --crate-type cdylib --emit=dep-info,link -C opt-level=3 -C metadata=aff563bf4af79579 --out-dir #{rust_path}/target/release -L dependency=#{rust_path}/target/release/deps --extern serde=#{rust_path}/target/release/deps/libserde-6a9e4ab445963d7f.rlib --extern serde_derive=#{rust_path}/target/release/deps/libserde_derive-20596753c2ed9015.dylib --extern serde_json=#{rust_path}/target/release/deps/libserde_json-489658cb61f64325.rlib -L #{root_path}/.rustc/rust-std-beta-x86_64-apple-darwin/rust-std-x86_64-apple-darwin/lib/rustlib/x86_64-apple-darwin/lib`
-            `cd #{rust_path}; #{bin_path}/cargo build --release`
-            # rubocop:enable Metrics/LineLength
+            `cd #{rust_path}; cargo +beta build --release`
             `cp #{rust_path}/target/release/libserde_rb*.a #{dir}/serde_rb/libserde_rb.a`
             `cd #{dir}/serde_rb; ruby extconf.rb; make clean; make`
 

data/serde.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.5.3'
 
   spec.name    = 'serde'
-  spec.version = '0.0.7'
+  spec.version = '0.0.8'
   spec.authors = ['Alexander Komarov']
   spec.email   = %w[ak@akxcv.com]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serde
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Alexander Komarov
@@ -109,8 +109,6 @@ files:
 - Rakefile
 - bench/bench.rb
 - examples/app/new.rb
-- lib/rubygems_plugin.rb
-- lib/rustc_installer.rb
 - lib/serde.rb
 - lib/serde/generate.rb
 - lib/serde/serializer_generator.rb

data/lib/rubygems_plugin.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-Gem.post_install do
-  puts 'installing rustc'
-  require_relative 'rustc_installer.rb'
-end

data/lib/rustc_installer.rb

@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-
-# TODO: test on different systems and architectures
-
-require 'tmpdir'
-require 'net/http'
-require 'fileutils'
-require 'rubygems/package'
-require 'zlib'
-
-# https://github.com/rust-lang/rustup.rs/blob/243e3d5889a58116fb7eb910e8508b9d0d0a0b04/rustup-init.sh#L172
-# not considering android and mips for now
-ostype = `uname -s`.chomp
-cputype = `uname -m`.chomp
-
-if ostype == 'Darwin' && cputype == 'i386' && !`sysctl hw.optional.x86_64 | grep -q ': 1'`.nil?
-  cputype = 'x86_64'
-end
-
-ostype =
-  case ostype
-  when 'Linux' then 'unknown-linux-gnu'
-  when 'FreeBSD' then 'unknown-freebsd'
-  when 'NetBSD' then 'unknown-netbsd'
-  when 'DragonFly' then 'unknown-dragonfly'
-  when 'Darwin' then 'apple-darwin'
-  when /MINGW/, /MSYS/, /CYGWIN/ then 'pc-windows-gnu'
-  else raise "unrecognized OS type: #{ostype}"
-  end
-
-cputype =
-  case cputype
-  when 'i386', 'i486', 'i686', 'i786', 'x86' then 'i686'
-  when 'xscale', 'arm' then 'arm'
-  when 'armv6l' then 'armeabihf'
-  when 'armv7l', 'armv8l' then 'armv7eabihf'
-  when 'aarch64' then 'aarch64'
-  when 'x86_64', 'x86-64', 'x64', 'amd64' then 'x86_64'
-  when 'ppc' then 'powerpc'
-  when 'ppc64' then 'powerpc64'
-  when 'ppc64le' then 'powerpc64le'
-  else raise "unknown CPU type: #{cputype}"
-  end
-
-rustc_name = "rustc-beta-#{cputype}-#{ostype}"
-ruststd_name = "rust-std-beta-#{cputype}-#{ostype}"
-cargo_name = "cargo-beta-#{cputype}-#{ostype}"
-
-TAR_LONGLINK = '././@LongLink'
-DESTINATION = File.expand_path('../.rustc', __dir__)
-
-def download_and_extract(name) # rubocop:disable Metrics/MethodLength
-  File.write(
-    "#{name}.tar.gz",
-    Net::HTTP.get(URI("https://static.rust-lang.org/dist/2018-11-27/#{name}.tar.gz")),
-  )
-
-  # https://stackoverflow.com/a/19139114
-  Gem::Package::TarReader.new(Zlib::GzipReader.open("#{name}.tar.gz")) do |tar|
-    dest = nil
-    tar.each do |entry|
-      if entry.full_name == TAR_LONGLINK
-        dest = File.join DESTINATION, entry.read.strip
-        next
-      end
-      dest ||= File.join DESTINATION, entry.full_name
-      if entry.directory?
-        File.delete dest if File.file? dest
-        FileUtils.mkdir_p dest, mode: entry.header.mode, verbose: false
-      elsif entry.file?
-        FileUtils.rm_rf dest if File.directory? dest
-        File.open dest, 'wb' do |f|
-          f.print entry.read
-        end
-        FileUtils.chmod entry.header.mode, dest, verbose: false
-      elsif entry.header.typeflag == '2' # Symlink!
-        File.symlink entry.header.linkname, dest
-      end
-      dest = nil
-    end
-  end
-end
-
-Dir.mktmpdir do |dir|
-  Dir.chdir(dir) do
-    # manifest = Net::HTTP.get(URI('https://static.rust-lang.org/dist/channel-rust-beta.toml'))
-    # puts manifest
-    FileUtils.mkdir_p(File.expand_path('../bin', __dir__))
-
-    FileUtils.rm(File.expand_path('../bin/cargo', __dir__)) rescue nil
-
-    download_and_extract(rustc_name)
-    download_and_extract(ruststd_name)
-    download_and_extract(cargo_name)
-
-    # TODO: windows?
-    FileUtils.ln_s(
-      "#{DESTINATION}/#{cargo_name}/cargo/bin/cargo",
-      File.expand_path('../bin/cargo', __dir__),
-    )
-  end
-end