erhu 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 227adb4306e0ba58bcd720a8bcefa6ff095a549120691e12caf82ed5617f45d3
-  data.tar.gz: 9c513925800b676c24a3416260d852123d5a513cad06a340e2b8e082387a0ca1
+  metadata.gz: 825a09bb2a8491c0d8a761c46a186be8c584e7e9b07c529de6c3ed462000fd08
+  data.tar.gz: e1cabbaa754f6b8b3e894c67af432a65b0dfc702ee48671ef9dbf71d012481f6
 SHA512:
-  metadata.gz: 9dbcbd06bc4f7d18aff1493648b50b832426b7c39b4276a489c1c1318d46fe145af501c9361361d090957c8f6252be1d3cf112beb93fe368746d0ca4061370b5
-  data.tar.gz: c13fb491276df6ea20c70d1572ec245f7afed0be2ac1244380d00dc11d0b7eff3168fb5c9eeff869730a211d57c3ea0e75387e937803d34e8b2de6d943e47ae1
+  metadata.gz: 8ab03cada045123a1db0363084204d43fc478f7189b7e4fbbdc83eadf444d469bbe6f8e9ba4f3c35614a009c2b6ca577a1cfbbb2fdb71eca6a1638f00703cdc9
+  data.tar.gz: 0bfeda9e72ccf4cdb29dc8e74bb5e1dadf0a5dbfdfbd464b3b191e93121f330f2dd6766d608afde101dde2a1597ee587a56948dcd6def9699f5fa52f69d92dca

data/Gemfile

@@ -6,14 +6,14 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
-gem 'tty-platform'
-gem "tty-command"
-gem "tty-progressbar"
-gem "tty-spinner"
+# gem 'tty-platform'
+# gem "tty-command"
+# gem "tty-progressbar"
+# gem "tty-spinner"
 
-gem "pastel"
-gem "rugged"
+# gem "pastel"
+# gem "rugged"
 
-gem 'faraday'
-gem 'faraday-follow_redirects'
-gem 'rubyzip'
+# gem 'faraday'
+# gem 'faraday-follow_redirects'
+# gem 'rubyzip'

data/Gemfile.lock

@@ -1,23 +1,43 @@
 PATH
   remote: .
   specs:
-    erhu (0.1.1)
+    erhu (0.1.4)
+      faraday (~> 2.7, >= 2.7.4)
+      faraday-follow_redirects (~> 0.3.0)
+      git (~> 1.18)
+      pastel (~> 0.8.0)
+      rubyzip (~> 2.3, >= 2.3.2)
+      tty-command (~> 0.10.1)
+      tty-platform (~> 0.3.0)
+      tty-progressbar (~> 0.18.2)
+      tty-spinner (~> 0.9.3)
 
 GEM
   remote: https://rubygems.org/
   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)
+    git (1.18.0)
+      addressable (~> 2.8)
+      rchardet (~> 1.8)
+    method_source (1.0.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)
-    rugged (1.6.2)
     strings-ansi (0.2.0)
     tty-color (0.6.0)
     tty-command (0.10.1)
@@ -36,19 +56,13 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  ruby
+  x86_64-linux
 
 DEPENDENCIES
   erhu!
-  faraday
-  faraday-follow_redirects
-  pastel
+  pry
   rake (~> 13.0)
-  rubyzip
-  rugged
-  tty-command
-  tty-platform
-  tty-progressbar
-  tty-spinner
 
 BUNDLED WITH
    2.4.6

data/README.md

@@ -7,9 +7,11 @@
 gem install erhu
 ```
 
+注意：你的系统必须有cmake和pkg-config，mac用户可以用homebrew安装
+
 ## 如何使用
 
-在根目录里面建立`ErhuFile`，用于拉取依赖
+在根目录里面建立`ErhuFile`， 当前也可以使用`erhu init`用于拉取依赖
 
 ```ruby
 target "./thirdparty"

data/erhu.gemspec

@@ -30,6 +30,16 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "tty-platform", '~> 0.3.0'
+  spec.add_dependency 'tty-command', '~> 0.10.1'
+  spec.add_dependency 'tty-progressbar', '~> 0.18.2'
+  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 'rubyzip', '~> 2.3', '>= 2.3.2'
+
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
 

data/exe/erhu

@@ -4,4 +4,4 @@
 require "bundler/setup"
 require_relative "../lib/erhu"
 
-Erhu::App.new.run
+Erhu.cli

data/lib/erhu/app.rb

@@ -40,26 +40,25 @@ module Erhu
         FileUtils.rm_rf("#{@target}/#{name}")
       end
 
-      bar = TTY::ProgressBar.new("clone #{name} [:bar] :percent", total: 50)
-      transfer_progress = lambda do |total_objects, indexed_objects, received_objects, local_objects, total_deltas, indexed_deltas, received_bytes|      
-        bar.ratio = indexed_objects / total_objects.to_f
-      end
-      
-      repo = Rugged::Repository.clone_at(repository_url, 
-        "#{@target}/#{name}",
-        depth: 1,
-        checkout_branch: branch,
-        transfer_progress: transfer_progress
-      )
-      if ! tag.blank? && ! repo.tags[tag].blank?
-        tag_repo = repo.tags[tag]
-        target = tag_repo.target      
-        repo.checkout(target.oid, strategy: :safe)
+      warn!("Do not use Git for version control without careful consideration.")
+
+      spinner = TTY::Spinner.new("[:spinner] git clone #{repository_url} ...")
+      spinner.auto_spin
+      repo = Git.clone(repository_url, "#{@target}/#{name}", branch: branch)
+      unless tag.blank?
+        
+        tags = repo.tags
+        if tags.map { |tag| tag.name }.include?(tag)
+          commit_id = tags.select { |node| node.name == tag }.first.objectish
+          repo.checkout(tag, start_point: commit_id, new_branch: true)
+        end
       end
+      spinner.stop("Done!")
+
       block.call(repo, self) unless block.blank?
 
-      self.database[name] = {repository_url: repository_url, 
-        branch: branch, name: name, tag: tag, commit: repo.head.target.oid
+      self.database[name] = {repository_url: repository_url,
+        branch: branch, name: name, tag: tag, commit: repo.revparse('HEAD')
       }
     rescue => e
       error! e
@@ -108,6 +107,7 @@ module Erhu
 
     def zip(package_file_path, package_name)
       spinner = TTY::Spinner.new("[:spinner] extracted :title ...", format: :pulse_2)
+      spinner.auto_spin
 
       Zip::File.open(package_file_path) do |zip_file|
         zip_file.each do |entry|        

data/lib/erhu/cli.rb

@@ -0,0 +1,58 @@
+module Erhu
+  module_function
+  def cli()
+    options = {}
+    subcommands = {}
+
+    OptionParser.new do |opts|
+      opts.banner = "Usage: erhu [command]"
+    
+      opts.on("-h", "--help", "Prints help") do
+        puts """
+        erhu init -> init your project
+        erhu install(options) -> install your project depends
+        """
+        exit
+      end
+    
+      # Define global options here
+    
+    end.parse!
+
+    subcommands['init'] = Proc.new do |args|
+      File.open("Erhufile", "w") do |f|
+        f.puts 'target "./thirdparty"'
+        f.puts 'git "https://github.com/Tencent/rapidjson", tag: "v1.1.0"'
+        f.puts 'package "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.15.zip", name: "cjson"'
+      end
+      
+      # Create Rakefile
+      File.open("Rakefile", "w") do |f|
+        f.puts 'require "erhu"'
+        f.puts
+        f.puts 'task :build do |t|'
+        f.puts '  Cmd.new().chdir("./build")'
+        f.puts '    .run("cmake", "..")'
+        f.puts '    .run("make")'
+        f.puts 'end'
+        f.puts
+        f.puts 'task run: [:build] do |t|'
+        f.puts '  Cmd.new().chdir("./target").run("./Erhu")'
+        f.puts 'end'
+      end
+    end
+    
+    subcommands['install'] = Proc.new do |args|
+      Erhu::App.new.run
+    end
+
+    if ARGV.blank?
+      Erhu::App.new.run
+    elsif subcommands.key?(ARGV.first)
+      subcommands[ARGV.first].call(ARGV[1..-1])
+    else
+      puts "Invalid command. Use -h or --help for usage information."
+    end
+
+  end
+end

data/lib/erhu/init.rb

@@ -4,13 +4,14 @@ require "tty-progressbar"
 require "tty-spinner"
 require "pastel"
 require 'fileutils'
-require 'rugged'
 require "uri"
 require 'yaml'
 require 'faraday'
 require 'faraday/follow_redirects'
 require 'tempfile'
 require 'zip'
+require 'git'
+require 'optparse'
 
 class Object
   def blank?
@@ -28,12 +29,17 @@ end
 
 def error!(*args)
   error = pastel.red.bold.detach
-  puts "error: #{error.(*args)}"
+  puts "Error: #{error.(*args)}"
+end
+
+def warn!(*args)
+  warning  = pastel.yellow.detach
+  puts "Warning: #{warning.(*args)}"
 end
 
 class Cmd
-  def initialize(pty: true, uuid: false, color: true)
-    @cmd = TTY::Command.new(pty: pty, uuid: uuid, color: color)
+  def initialize(pty: true, uuid: false, color: true, printer: :pretty)
+    @cmd = TTY::Command.new(pty: pty, uuid: uuid, color: color, pretty: printer)
   end
 
   def chdir(path)
@@ -50,4 +56,4 @@ class Cmd
   rescue => e
     error! e
   end
-end
+end

data/lib/erhu/version.rb

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

data/lib/erhu.rb

@@ -2,6 +2,7 @@
 require_relative "erhu/init"
 require_relative "erhu/version"
 require_relative "erhu/app"
+require_relative "erhu/cli"
 
 module Erhu
   class Error < StandardError; end

metadata

@@ -1,15 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: erhu
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - MJ
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-24 00:00:00.000000000 Z
-dependencies: []
+date: 2023-03-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tty-platform
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: tty-command
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
+  name: tty-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.4
+  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
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.2
 description: Erhu 是一个动态可编程的包管理系统
 email:
 - tywf91@gmail.com
@@ -26,6 +164,7 @@ files:
 - exe/erhu
 - lib/erhu.rb
 - lib/erhu/app.rb
+- lib/erhu/cli.rb
 - lib/erhu/init.rb
 - lib/erhu/version.rb
 - sig/erhu.rbs