erhu 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c32c20c8ee9ba7e4091402f5921f6e534269f37df35b4eb7fc3d84e210bd561c
-  data.tar.gz: 430ab7355c7f954f1b9c884ec931462057ada64cafaf3e42e661aa1421d663d8
+  metadata.gz: 825a09bb2a8491c0d8a761c46a186be8c584e7e9b07c529de6c3ed462000fd08
+  data.tar.gz: e1cabbaa754f6b8b3e894c67af432a65b0dfc702ee48671ef9dbf71d012481f6
 SHA512:
-  metadata.gz: 1733da1090e350510005ecf8021fbe097e493af7fc86a9d6d84d1e300b1f4bef60f9e54fe76bdabb3071ff808fde9266e4e351c7017ce0421ea026dc9f9cea77
-  data.tar.gz: 6b5b3cf0073821a78b6eb5ad9cb04e16473aeb5497be11f10c7f38c5a537437599527482bc845aa1b833baff8543353a61003e92639b297206d00020d54c4638
+  metadata.gz: 8ab03cada045123a1db0363084204d43fc478f7189b7e4fbbdc83eadf444d469bbe6f8e9ba4f3c35614a009c2b6ca577a1cfbbb2fdb71eca6a1638f00703cdc9
+  data.tar.gz: 0bfeda9e72ccf4cdb29dc8e74bb5e1dadf0a5dbfdfbd464b3b191e93121f330f2dd6766d608afde101dde2a1597ee587a56948dcd6def9699f5fa52f69d92dca

data/Gemfile.lock

@@ -4,9 +4,9 @@ PATH
     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)
-      rugged (~> 1.6, >= 1.6.2)
       tty-command (~> 0.10.1)
       tty-platform (~> 0.3.0)
       tty-progressbar (~> 0.18.2)
@@ -15,18 +15,29 @@ PATH
 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)
@@ -50,6 +61,7 @@ PLATFORMS
 
 DEPENDENCIES
   erhu!
+  pry
   rake (~> 13.0)
 
 BUNDLED WITH

data/README.md

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

data/erhu.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   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 'rugged', '~> 1.6', '>= 1.6.2'
+  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'

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

@@ -1,5 +1,3 @@
-require 'optparse'
-
 module Erhu
   module_function
   def cli()

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.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erhu
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - MJ
@@ -81,25 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: rugged
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement