erhu 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aece6b3c18dbb9b1584bc2d2adb64afe0ba93c39a724260309eb9bba98d77ce7
-  data.tar.gz: e8f1179dfebb0dbcb879b52f345195834be61ffa91c86ffbe476c14e1bd5c23c
+  metadata.gz: b2b54c925dbff1ea4c1b885d4941dd736c6cc8a6be6efeb5b32590c81e54cf06
+  data.tar.gz: 6f565172d5728ccf9610f79beb25baf59b48103ae0baab8d1d4c85e2749f744c
 SHA512:
-  metadata.gz: 0c435ed69d9ad03f55d1d25eefd24330993a39bc1507129f26e1dbfe2bc6b1e9a67154eaa5aa8d822d25aff97e4bcfdfba6b4abe0cf025d6276326ca7b68c7a0
-  data.tar.gz: 01224f69ceeb3ceb76ce7b959e5e57568b56dea97184e4980016c447ddd12ae7cb1f98892e7e6dcdf2b7cfcd56fd86f801d4d5099917692ced6bcc2e519a3e41
+  metadata.gz: ecf3bff1ce932df65807a9d2de315695ebdac3949ad8854e700cb736704b21563db930f9ac978fbe5bfa34bd9c4e6ba3d91508b804644bd020e5502cb1c03bbc
+  data.tar.gz: edd37e9c4d8d97b2ac78db95e34454a127cbea7fe89015f838fb3581049956ccac92413a7c1b01557bb6af73f5a3a24a3bcb6e9297410f41cb6a2fbe162a9706

data/ErhuFile

@@ -1,3 +1,4 @@
 target "./thirdparty"
 # git "https://github.com/Tencent/rapidjson", tag: "v1.1.0"
-package "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.15.zip", name: "cjson"
+# package "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.15.zip", name: "cjson"
+package "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-17/wasi-sdk-17.0-macos.tar.gz", name: "wasi"

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    erhu (0.1.7)
+    erhu (0.1.9)
+      dotenv (~> 2.8, >= 2.8.1)
       down (~> 5.0)
       git (~> 1.18)
       http (~> 5.0)
@@ -19,6 +20,7 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.8.1)
     down (5.4.0)
       addressable (~> 2.8)
     ffi (1.15.5)

data/README.md

@@ -1,7 +1,17 @@
 # Erhu
 
+<div align="left">
+  <a href="https://rubygems.org/gems/erhu" alt="RubyGems Version">
+    <img src="https://img.shields.io/gem/v/erhu.svg?style=flat-square&label=current-version" alt="RubyGems Version" />
+  </a>
+</div>
+
+
 一个创新的包管理，可以用来管理C语言的包，或者管理算法的包，理论可以用在各种地方，目前主要支持C++，算法管理。
 
+## 更行记录
+- 0.1.10 增加对tar.gz的支持，如果是编译工具且有文件链接，必须采用 tar.gz
+
 ## install
 ```
 gem install erhu
@@ -33,6 +43,10 @@ package "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.15.zip", nam
 
 ## 高级用法
 
+### 项目环境变量使用
+erhu 集成了dotenv，支持项目中通过.env来指定环境变量，具体可以查看demo目录中的.env文件
+.env文件中的环境变量在 `Rakefile` 和 `erhu exec` 中可以使用
+
 ### 系统判断
 
 ```ruby
@@ -69,6 +83,9 @@ package "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.15.zip", nam
   # 该方法使用TTY::Spinner库来显示进度条，并通过调用Zip::File库中的方法来解压缩zip文件。
   # 它迭代zip文件中的每个条目，并使用条目名称中的信息来构造目标路径。
   unzip(package_file_path, "./libs/cjson")
+
+  # 解压tar.gz
+  ungzip(tar_gz_archive, destination)
 end
 ```
 

data/demo/.env

@@ -0,0 +1,2 @@
+WASM_THINKER_SDK="/path/to/wasm-thinker-sdk"
+WASI_TOOLCHAIN_PATH="/path/to/wasi-sdk-17.0"

data/erhu.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "down", "~> 5.0"
   spec.add_dependency "http", "~> 5.0"
   spec.add_dependency 'rubyzip', '~> 2.3', '>= 2.3.2'
+  spec.add_dependency 'dotenv', '~> 2.8', '>= 2.8.1'
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"

data/lib/erhu/app.rb

@@ -64,13 +64,20 @@ module Erhu
       error! e
     end
 
-    def package(package_url, name: nil, &block)
+    def package(package_url, name: nil, extension: nil, &block)
       raise "package url is required" if package_url.blank?
       raise "name: 'package name' is required" if name.blank?
-      
+
+      _extension = extract_extension(package_url)
+      if _extension == ".zip" or _extension == ".tar.gz"
+        extension ||= _extension
+      else
+        extension ||= ".zip"
+      end
+
       package_name = name
       package_hex = name.unpack('H*').first
-      package_file_path = "#{@erhu_path}/#{package_name}-#{package_hex}.zip"
+      package_file_path = "#{@erhu_path}/#{package_name}-#{package_hex}#{extension}"
       
       if File.exist?(package_file_path)
         puts "ignored #{package_url}"
@@ -96,7 +103,8 @@ module Erhu
         return
       end
 
-      self.zip(package_file_path, package_name)
+      self.zip(package_file_path, package_name) if extension == ".zip"
+      ungzip(package_file_path, File.join(@target, package_name)) if extension == ".tar.gz"
     end
 
     def zip(package_file_path, package_name)

data/lib/erhu/cli.rb

@@ -11,6 +11,7 @@ module Erhu
         puts """
         erhu init -> init your project
         erhu install(options) -> install your project depends
+        erhu exec -> run some shell (add .env to ENV)
         """
         exit
       end
@@ -46,6 +47,10 @@ module Erhu
       Erhu::App.new.run
     end
 
+    subcommands['exec'] = Proc.new do |args|
+      exec args.join(" ")
+    end
+
     if ARGV.blank?
       Erhu::App.new.run
     elsif subcommands.key?(ARGV.first)

data/lib/erhu/init.rb

@@ -11,6 +11,10 @@ require 'zip'
 require 'git'
 require 'optparse'
 require "down/http"
+require 'dotenv'
+require 'rubygems/package'
+require 'zlib'
+require 'uri'
 
 class Object
   def blank?
@@ -51,6 +55,37 @@ def unzip(zip_file_path, target_directory)
   spinner.stop("Done!")
 end
 
+def ungzip(tar_gz_archive, destination)
+  spinner = TTY::Spinner.new("[:spinner] extracted :title ...")
+  spinner.auto_spin
+  Gem::Package::TarReader.new( Zlib::GzipReader.open tar_gz_archive) do |tar|
+    dest = nil
+    tar.each do |entry|
+      spinner.update title: entry.full_name
+      if entry.full_name == '././@LongLink'
+        dest = File.join destination, entry.read.strip
+        next
+      end
+      dest ||= File.join destination, entry.full_name.split('/')[1..-1].join('/')
+      if entry.directory?
+        FileUtils.rm_rf dest unless File.directory? dest
+        FileUtils.mkdir_p dest, :mode => entry.header.mode, :verbose => false
+      elsif entry.file?
+        FileUtils.rm_rf dest unless File.file? 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
+  spinner.update title: "ALL"
+  spinner.stop("Done!")
+end
+
 def http
   http = Down::Http.new
 end
@@ -74,4 +109,15 @@ class Cmd
   rescue => e
     error! e
   end
+end
+
+def extract_extension(url)
+  uri = URI.parse(url)
+  path = uri.path
+
+  if path.end_with?('.tar.gz')
+    '.tar.gz'
+  else
+    File.extname(path)
+  end
 end

data/lib/erhu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Erhu
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

data/lib/erhu.rb

@@ -7,4 +7,8 @@ require_relative "erhu/cli"
 module Erhu
   class Error < StandardError; end
   # Your code goes here...
-end
+
+  module_eval do
+    Dotenv.load
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erhu
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - MJ
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-platform
@@ -142,6 +142,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.2
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 description: Erhu 是一个动态可编程的包管理系统
 email:
 - tywf91@gmail.com
@@ -155,6 +175,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- demo/.env
 - demo/CMakeLists.txt
 - demo/ErhuFile
 - demo/Gemfile