erhu 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67f03be8e9f501c9c5aeabb72e8c1c02b8af4071ae7202650b8eb613e7ef9d89
-  data.tar.gz: 0b1e04f538c108856d3cce11f841bcf65e291a8f4ba27aa805717cf63ccdb0b0
+  metadata.gz: aece6b3c18dbb9b1584bc2d2adb64afe0ba93c39a724260309eb9bba98d77ce7
+  data.tar.gz: e8f1179dfebb0dbcb879b52f345195834be61ffa91c86ffbe476c14e1bd5c23c
 SHA512:
-  metadata.gz: d64097dfa0d355254252925da1d7353807a5e356662f99bf4152ecc80bfac2197c52f11bde20e603cb41244ace8aebb20465c7543ed2b6d885af94d77fb63a90
-  data.tar.gz: 3ed530e799f073492f0f007a982a0e202a10f59356f798949633f8d7946514c6260da6e928d605026508c4a7eca18f3abfcba132d93822e7778cdd5e75d07b50
+  metadata.gz: 0c435ed69d9ad03f55d1d25eefd24330993a39bc1507129f26e1dbfe2bc6b1e9a67154eaa5aa8d822d25aff97e4bcfdfba6b4abe0cf025d6276326ca7b68c7a0
+  data.tar.gz: 01224f69ceeb3ceb76ce7b959e5e57568b56dea97184e4980016c447ddd12ae7cb1f98892e7e6dcdf2b7cfcd56fd86f801d4d5099917692ced6bcc2e519a3e41

data/ErhuFile

@@ -0,0 +1,3 @@
+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"

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    erhu (0.1.4)
-      faraday (~> 2.7, >= 2.7.4)
-      faraday-follow_redirects (~> 0.3.0)
+    erhu (0.1.7)
+      down (~> 5.0)
       git (~> 1.18)
+      http (~> 5.0)
       pastel (~> 0.8.0)
       rubyzip (~> 2.3, >= 2.3.2)
       tty-command (~> 0.10.1)
@@ -17,26 +17,33 @@ GEM
   specs:
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    coderay (1.1.3)
-    faraday (2.7.4)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-follow_redirects (0.3.0)
-      faraday (>= 1, < 3)
-    faraday-net_http (3.0.2)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    down (5.4.0)
+      addressable (~> 2.8)
+    ffi (1.15.5)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
     git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    method_source (1.0.0)
+    http (5.1.1)
+      addressable (~> 2.8)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      llhttp-ffi (~> 0.4.0)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
+    llhttp-ffi (0.4.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
     public_suffix (5.0.1)
     rake (13.0.6)
     rchardet (1.8.0)
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     strings-ansi (0.2.0)
     tty-color (0.6.0)
@@ -52,6 +59,9 @@ GEM
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
 
 PLATFORMS
@@ -61,7 +71,6 @@ PLATFORMS
 
 DEPENDENCIES
   erhu!
-  pry
   rake (~> 13.0)
 
 BUNDLED WITH

data/README.md

@@ -7,8 +7,6 @@
 gem install erhu
 ```
 
-注意：你的系统必须有cmake和pkg-config，mac用户可以用homebrew安装
-
 ## 如何使用
 
 在根目录里面建立`ErhuFile`， 当前也可以使用`erhu init`用于拉取依赖
@@ -24,4 +22,57 @@ package "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.15.zip", nam
 
 然后就在项目目录中使用 erhu 命令即可拉取对应的代码
 
-示例项目可以看 example 目录
+示例项目可以看 demo 目录
+
+## 注意事项
+1. 请不要随便用git来做依赖管理
+2. package只支持zip压缩包，暂时没有计划做其他
+3. ErhuFile着色采用ruby编程语言即可，同时整个文件均可执行ruby脚本
+4. 判断系统安装对应的包，请看高级用法的系统判断
+5. 下载后可以有高级使用办法，比如进入里面继续cmake等等，具体请看高级用法的安装后处理
+
+## 高级用法
+
+### 系统判断
+
+```ruby
+# platform.windows?  # => false
+# platform.unix?     # => true
+# platform.linux?    # => false
+# platform.mac?      # => true
+if platform.windows?
+  package "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.15.zip", name: "cjson"
+end
+```
+
+### 安装后处理
+> 警告一般不建议这么做，而是采用Rakefile的方式来做处理
+
+```ruby
+# 方法定义 git(repository_url, branch: nil, name: nil, tag: nil, &block) 
+git "https://github.com/Tencent/rapidjson", tag: "v1.1.0" do |repo, env|
+  # repo 的接口请看 https://rubydoc.info/gems/git/Git/Base
+  # env 的接口请看 https://github.com/mjason/erhu/blob/main/lib/erhu/app.rb
+  # 还有一些高级接口 https://github.com/mjason/erhu/blob/main/lib/erhu/init.rb
+end
+
+# 方法定义 package(package_url, name: nil, &block)
+package "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.15.zip", name: "cjson" do |package_file_path, env|
+  # package_file_path 下载包的地址，String类型，你得自己解压
+  # env 同上
+
+  # 解压示例
+  # 
+  # zip_file_path: String类型，包含要解压缩的zip文件的路径
+  # target_directory: String类型，包含要提取zip文件的位置
+  #
+  # 该方法使用TTY::Spinner库来显示进度条，并通过调用Zip::File库中的方法来解压缩zip文件。
+  # 它迭代zip文件中的每个条目，并使用条目名称中的信息来构造目标路径。
+  unzip(package_file_path, "./libs/cjson")
+end
+```
+
+具体使用案例，可以查看项目里的 demo 目录
+
+## 总结
+这是一个很灵活的包管理，希望你用的开心，开源协议MIT

data/demo/CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.15)
+
+project(Erhu)
+
+add_executable(${PROJECT_NAME} main.cpp)
+
+# 设置编译产物的输出目录
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/target"
+)

data/demo/ErhuFile

@@ -0,0 +1,3 @@
+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"

data/demo/Gemfile

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# gem "rails"
+gem 'tty-platform'
+gem "tty-command"
+gem "tty-progressbar"
+gem "tty-spinner"
+gem "pry"
+
+gem "pastel"
+gem "rugged"
+
+gem 'faraday'
+gem 'faraday-follow_redirects'
+gem 'rubyzip'

data/demo/Gemfile.lock

@@ -0,0 +1,52 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.3)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-net_http (3.0.2)
+    method_source (1.0.0)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    rugged (1.6.2)
+    strings-ansi (0.2.0)
+    tty-color (0.6.0)
+    tty-command (0.10.1)
+      pastel (~> 0.8)
+    tty-cursor (0.7.1)
+    tty-platform (0.3.0)
+    tty-progressbar (0.18.2)
+      strings-ansi (~> 0.2)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      unicode-display_width (>= 1.6, < 3.0)
+    tty-screen (0.8.1)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    unicode-display_width (2.4.2)
+
+PLATFORMS
+  arm64-darwin-22
+
+DEPENDENCIES
+  faraday
+  faraday-follow_redirects
+  pastel
+  pry
+  rubyzip
+  rugged
+  tty-command
+  tty-platform
+  tty-progressbar
+  tty-spinner
+
+BUNDLED WITH
+   2.4.6

data/demo/Rakefile

@@ -0,0 +1,11 @@
+require "erhu"
+
+task :build do |t|
+  Cmd.new().chdir("./build")
+    .run("cmake", "..")
+    .run("make")
+end
+
+task run: [:build] do |t|
+  Cmd.new().chdir("./target").run("./Erhu")
+end

data/demo/main.cpp

@@ -0,0 +1,8 @@
+#include  <iostream>
+
+using namespace std;
+
+int main(int argc, char* argv[]) {
+  cout << "使用erhu来做包管理是你的第一选择" << endl;
+  return 0;
+}

data/erhu.gemspec

@@ -36,8 +36,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tty-spinner', '~> 0.9.3'
   spec.add_dependency 'pastel', '~> 0.8.0'
   spec.add_dependency 'git', '~> 1.18'
-  spec.add_dependency 'faraday', '~> 2.7', '>= 2.7.4'
-  spec.add_dependency 'faraday-follow_redirects', '~> 0.3.0'
+  spec.add_dependency "down", "~> 5.0"
+  spec.add_dependency "http", "~> 5.0"
   spec.add_dependency 'rubyzip', '~> 2.3', '>= 2.3.2'
 
   # Uncomment to register a new dependency of your gem

data/lib/erhu/app.rb

@@ -2,17 +2,17 @@ module Erhu
   class App
     attr_accessor :erhufile
     def initialize(erhufile_path=nil)
-      @erhufile = erhufile_path || File.join(Dir.pwd, "erhuFile")
+      @erhufile = erhufile_path || File.join(Dir.pwd, "ErhuFile")
 
       @erhu_path = File.join(Dir.pwd, ".erhu")
       unless Dir.exist?(@erhu_path)
         FileUtils.mkdir_p(@erhu_path)
         puts "Created #{@erhu_path}"
-      end    
+      end
       @database_path = File.join(@erhu_path, "database.yml")
     end
 
-    def database    
+    def database
       if File.exist?(@database_path)
         @database ||= YAML.load_file(@database_path) || {}
       else
@@ -77,25 +77,19 @@ module Erhu
         return
       end
 
-      conn = Faraday.new do |faraday|
-        faraday.use Faraday::FollowRedirects::Middleware
-        faraday.adapter Faraday.default_adapter
-      end
-
-      bar = TTY::ProgressBar.new("Downloading #{package_name} [:bar] :percent", total: 50, interval: 0.1)
-
-      streamed = []
-      response = conn.get(package_url) do |req|
-        req.options.on_data = Proc.new do |chunk, overall_received_bytes, env|
-          content_length = env.response_headers["content-length"]&.to_f
-          bar.ratio = overall_received_bytes / content_length if !content_length.blank? && content_length > 0
-          streamed << chunk
-        end
-      end
+      bar = TTY::ProgressBar.new("downloading #{package_name} :percent [:bar]", total: 50)
+      total_size = 0
 
-      File.open(package_file_path, 'w') do |f|
-        f.write(streamed.join)
-      end
+      http.download package_url, destination: package_file_path,
+        content_length_proc: -> (content_length) {
+          total_size = content_length
+        },
+        progress_proc: -> (progress) {
+          if total_size > 0
+            bar.ratio = progress / total_size.to_f
+          end
+        }
+      bar.finish
 
       unless block.blank?
         block.call(package_file_path, self)
@@ -106,18 +100,7 @@ module Erhu
     end
 
     def zip(package_file_path, package_name)
-      spinner = TTY::Spinner.new("[:spinner] extracted :title ...")
-      spinner.auto_spin
-
-      Zip::File.open(package_file_path) do |zip_file|
-        zip_file.each do |entry|        
-          dest_path = File.join(@target, package_name, entry.name.split('/')[1..-1].join('/'))
-          entry.extract(dest_path)
-          spinner.update title: entry.name
-        end
-      end
-      spinner.update title: "ALL"
-      spinner.stop("Done!")
+      unzip(package_file_path, File.join(@target, package_name))
     end
 
     def run

data/lib/erhu/init.rb

@@ -6,12 +6,11 @@ require "pastel"
 require 'fileutils'
 require "uri"
 require 'yaml'
-require 'faraday'
-require 'faraday/follow_redirects'
 require 'tempfile'
 require 'zip'
 require 'git'
 require 'optparse'
+require "down/http"
 
 class Object
   def blank?
@@ -37,6 +36,25 @@ def warn!(*args)
   puts "Warning: #{warning.(*args)}"
 end
 
+def unzip(zip_file_path, target_directory)
+  spinner = TTY::Spinner.new("[:spinner] extracted :title ...")
+  spinner.auto_spin
+
+  Zip::File.open(zip_file_path) do |zip_file|
+    zip_file.each do |entry|        
+      dest_path = File.join(target_directory, entry.name.split('/')[1..-1].join('/'))
+      entry.extract(dest_path)
+      spinner.update title: entry.name
+    end
+  end
+  spinner.update title: "ALL"
+  spinner.stop("Done!")
+end
+
+def http
+  http = Down::Http.new
+end
+
 class Cmd
   def initialize(pty: true, uuid: false, color: true, printer: :pretty)
     @cmd = TTY::Command.new(pty: pty, uuid: uuid, color: color, pretty: printer)

data/lib/erhu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erhu
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - MJ
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-25 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-platform
@@ -95,39 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.18'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: down
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: faraday-follow_redirects
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -156,10 +150,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ErhuFile
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- demo/CMakeLists.txt
+- demo/ErhuFile
+- demo/Gemfile
+- demo/Gemfile.lock
+- demo/Rakefile
+- demo/main.cpp
 - erhu.gemspec
 - exe/erhu
 - lib/erhu.rb