ghcurl 0.5.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b51925892c13aec5ed7e86f931e8319f9b4ddb06c0c14d6c08816776b3e5b922
-  data.tar.gz: 01ce411ded642b6f0cac664e3a966ad2053f7b0a7f3a5d536a28e27f0531a43a
+  metadata.gz: fec37deabe100d853deadbbf290658a5336a3ea0570948a0247a0f9fe6ece0c5
+  data.tar.gz: 48eddecd5fa148528eee00072e1270ec7a5af4d4bea22a942d84f2e27f1da3ef
 SHA512:
-  metadata.gz: 4194359adb2d54b6fca4069e7d8f67ff205bd2b350ce70648aca80281e7d6a392eb7e46c50257a330341f18be67cf1ccc2a50bcf40becb104b60beb0ffb0367c
-  data.tar.gz: 8e04c84f09936c07f8c975443933a757452677c58e7613339747f6983a3297cff21642d4633a0e47fe39251648554f47227135eda3dd557acd575faffe465a5b
+  metadata.gz: a7d4839bcc4066350d2a8a4fb35364a6d297fc413193bd68e6366f196d60ecccedd4f1a5b8fa2ee17b4e6e653ecb75a94910f4008dbb235f96a8f4e60d890613
+  data.tar.gz: c0b96d5a08f55fab2d326dcc69b4703b7852c44eb61f5ce9dc30c2cba5eea357e47790e3830ec775ea11f7a38ec64faaf962aff88d092d144d7e60b8acaeda07

data/README.md

@@ -4,34 +4,79 @@
 
 [![Gem Version](https://badge.fury.io/rb/ghcurl.svg)](https://rubygems.org/gems/ghcurl) 
 
+
+Download files and install from Github releases.
+
 ```bash
 gem install ghcurl
 ```
 
-<br>
+</div>
 
-Download files and install from Github releases.
+`ghcurl` can recognize your OS and arch, give you the proper option to download. You can search by regular expression, specify a version, and install it to a path or according to the environment variable `GHCURL_BIN_PATH` or just `/usr/local/bin`. It will automatically extract a tar/zip file to make the installation process better.
 
-</div>
+Note it doesn't work on Windows.
+
+<br>
 
 ## Usage
 
-Download latest deb/rpm package and install, notice the argument `deb` / `rpm` are just regular expressions.
 ```bash
-ghcurl cli/cli deb -i
-ghcurl cli/cli rpm -i
+$ ghcurl [user/]repo [regexp] [options]
 ```
 
-Things can be easier.
+**-o**
+
+This is optional, download will default to `~/.cache/ghcurl`
+1. `-o path` Download into path
+2. `-o path/name` Download as path/name
+
+**-v**
+1. `-v 1.0.0` Download tag version 1.0.0
+2. `-v3.1.4` This is also OK to download tag version 3.1.4
+
+**-i**
+1. `-i` Install to `/usr/local/bin` or `GHCURL_BIN_PATH`
+2. `-i path` Install to path
+
+**-r**
+1. `-r name` Install the binary as name 
+
+<br>
+
+## Example
+
+Things can be easier. We consider these as popular binaries:  https://github.com/ibraheemdev/modern-unix
+
+Notice: `-i` means to install.
+
 ```bash
 # It knows that's sharkdp/fd
 ghcurl fd -i
+
+# It's cli/cli !
+ghcurl gh -i
+
+# Much easier to install rbspy!
+ghcurl rbspy -i
+```
+
+Download latest deb/rpm package and install, notice the argument `deb` / `rpm` are just regular expressions.
+```bash
+ghcurl cli/cli deb -i
+ghcurl cli/cli rpm -i
 ```
 
 Normal download
 ```bash
+# The easiest way to download
+ghcurl gh
+
+# Download to /tmp
+ghcurl gh -o /tmp
+
 # Download latest rbspy-x86_64-unknown-linux-gnu.tar.gz to ~/.cache/ghcurl
-ghcurl rbspy/rbspy x86_64.*linux
+ghcurl rbspy/rbspy 'x86_64.*linux'
 
 # Download rbspy version 0.11.1 
 ghcurl rbspy/rbspy 'x86_64.*linux' -v0.11.1
@@ -40,13 +85,16 @@ ghcurl rbspy/rbspy 'x86_64.*linux' -v0.11.1
 Download a binary and install it to anywhere
 ```bash
 # Install to /usr/local/bin
-ghcurl BetaPictoris/timeleft timeleft -i 
+ghcurl starship linux-gnu -i 
 
 # Install to ~/tmp/bin
-ghcurl BetaPictoris/timeleft timeleft -i ~/tmp/bin
+ghcurl BetaPictoris/timeleft -i ~/tmp/bin
+
+# Download as /tmp/github-cli and install
+ghcurl gh -o /tmp/github-cli -i
 
 # Install and rename it to, here, 'gd' in /usr/local/bin
-ghcurl dlvhdr/gh-dash linux-amd64 -i gd
+ghcurl dlvhdr/gh-dash linux-amd64 -i -r 'gd'
 
 # or, like this
 ghcurl dlvhdr/gh-dash linux-amd64 -i ~/tmp/bin/gd

data/bin/ghcurl

@@ -3,24 +3,23 @@
 # File          : ghcurl.rb
 # Authors       : ccmywish <ccmywish@qq.com>
 # Created on    : <2022-04-12>
-# Last modified : <2022-04-14>
+# Last modified : <2022-04-26>
 #
 # ghcurl:
 #
-#   Download files (and install) from Github releases
+#   Download files and install from Github releases
 #
 # ------------------------------------------------------
 
 require 'ghcurl'
-require 'nokogiri'
-require 'open-uri'
 require 'highline'
 require 'cliswitch'
+require 'fileutils'
 
 module Ghcurl
 
   WAREHOUSE = File.expand_path("~/.cache/ghcurl")
-  BIN_PATH  = ENV['GHCURL_BIN_PATH'] || "/usr/local/bin"
+  BIN_PATH  = ENV['GHCURL_BIN_PATH'].chomp('/') || "/usr/local/bin"
   HL = HighLine.new
 
   class Error < StandardError; end
@@ -36,14 +35,25 @@ module Ghcurl
   end
   
 
-  def curl(url, name)
-    #if !test('d', WAREHOUSE)
-    #  require 'fileutils'
-    #  FileUtils.mkdir_p(WAREHOUSE)
-    #end
-    cmd = "curl -L #{url} --create-dirs -o #{WAREHOUSE}/#{name}"
+  #
+  # @return absolute download path
+  #
+  def curl(url, name, to)
+    if to == nil
+      to = WAREHOUSE + '/' + name
+    elsif test 'd', to
+      to = to.chomp('/')  + '/' + name
+    elsif to.include?('/')
+      # noop
+    else
+      # just a rename in WAREHOUSE
+      to = WAREHOUSE + '/' + name
+    end
+
+    cmd = "curl -L #{url} --create-dirs -o #{to}"
     system cmd
-    log "Downloaded to #{WAREHOUSE}/#{name}"
+    log "Downloaded to #{to}"
+    return to
   end
 
 
@@ -58,7 +68,8 @@ module Ghcurl
     
     oses = [
              ['linux'],
-             ['mac', 'apple'],
+             ['freebsd'],
+             ['mac', 'apple', 'darwin'],
              ['windows']
            ]
 
@@ -115,8 +126,11 @@ module Ghcurl
   end
 
 
-  def download(repo, regexp, version: nil)
+  def download(repo, regexp, version: nil, download_to: nil)
 
+    require 'octokit'
+
+    # adjust repo name : user/repo
     if repo =~ /^https:\/\/github.com/
       require 'uri'
       uri = URI(repo)
@@ -134,27 +148,32 @@ module Ghcurl
     end
 
     log "checking..."
-    unless version
-      doc = Nokogiri::HTML5 URI.open("https://github.com/#{repo}/releases/latest")
-    else
-      doc = Nokogiri::HTML5 URI.open("https://github.com/#{repo}/releases/tag/v#{version}")
+    begin
+      unless version
+        doc = Octokit::Client.new.latest_release(repo)
+      else
+        doc = Octokit::Client.new.release_for_tag(repo, 'v' + version)
+      end
+    rescue Octokit::NotFound
+      puts "ghcurl: Not found #{repo} v#{version} !"
+    rescue Error => e
+      puts e
+      exit 0
     end
 
-
-    links = doc.css("li>a[href^='/#{repo}/releases/download']")
+    links = doc.to_hash[:assets]
     if links.empty?
-      puts doc.css('li a').map(&:to_s)
       log <<~EOE
-      The search result is empty, check the args:
+      The search result is empty, check the args!
               repo:    #{repo}
               version: #{version ? version:'nil'}
-
+      
+      Maybe there's no assets in this release
       EOE
-      puts
+      exit 0
     end
 
-
-    links = links.map { _1['href'] }
+    links = links.map { _1[:browser_download_url] }
 
 
     if regexp 
@@ -186,97 +205,221 @@ module Ghcurl
       end
     end
 
-    url = "https://github.com" + links[0].split('/')[0..-2].join('/') + '/' + link
+    url = links[0].split('/')[0..-2].join('/') + '/' + link
 
     log "Downloading #{url}"
     
-    $downloaded = link.split('/').last
-
-    curl(url, $downloaded)
+    dl_name = link.split('/').last
 
+    return curl(url, dl_name, download_to)
   end
 
 
-  def install(ware, place: BIN_PATH)
+  #
+  # This function is a little confusing
+  #
+  # target: The absolute path to a downloaded file
+  # name  : The software name
+  #
+  def install(target, rename_as: nil,  install_to: nil)
 
-    ware_name = ''
-    if ware.include?('/')
-      ware_name = ware.split('/').last
-    else
-      ware_name = ware
+    if target.end_with?('.deb')
+      log "Install the deb package"
+      system "sudo dpkg -i #{target}"
+      return
+    end
+
+    if target.end_with?('.rpm')
+      log "Install the rpm package"
+      system "sudo rpm -i #{target}"
+      return
+    end
+
+
+    if install_to.nil?
+      install_to = BIN_PATH
+    end
+
+
+    #
+    # Handle zip situation
+    #
+    zip_flag = false
+
+    if target.match?(/\.zip$/) or target.match?(/\.tar\.(\w){1,3}/)
+
+      zip_flag = true
+
+      # unzipped to dir
+      unzip_dir = ""
+      # unzipped files
+      files = ""
+      # the target unzipped file name (this includes the path prefix)
+      unzip_name = ""
+
+    # unzip 
+    if target.match? /\.zip$/
+      log "Unzip zip file"
+      unzip_dir = target.chomp('.zip')
+      system "unzip -q #{target} -d #{unzip_dir}"
     end
     
-    if  (! $downloaded.include?(ware_name)) and (!$downloaded.end_with?('.deb')) and (!$downloaded.end_with?('.rpm')) 
-      log "Do you want to rename or install it to a different path?"
-      re = HL.ask "Input path or name, or just enter to say no."
-      if !re.empty? 
-        place = re
+    # .gz, .bz2, .xz
+    if target.match? /\.tar\.(\w){1,3}/
+      log "Unzip tar file"
+      unzip_dir = target.split('.')[0..-3].join('.')
+      FileUtils.mkdir_p(unzip_dir)
+      system "tar xf #{target} --directory=#{unzip_dir}"
+    end
+    
+
+    #
+    # @return [Array] file names in the dir
+    #
+    def _iterate_dir(dir)
+      result = []
+      chd = Dir.children(dir)
+      chd_files = chd.select{|f| File.file? "#{dir}/#{f}"}
+      
+      chd_files.each { result << "#{dir}/#{_1}"[2..] }
+
+      chd_dirs  = chd.select{|d| File.directory?("#{dir}/#{d}") && ( d != '.git')}
+      chd_dirs.each do |d|
+        sub_dir = "#{dir}/#{d}"
+        result.concat _iterate_dir(sub_dir)
       end
+      result
     end
     
-    case RUBY_PLATFORM
-    when /ucrt/i, /mingw/i
-      install_on_windows($downloaded, place)
+
+    Dir.chdir unzip_dir do
+      files = _iterate_dir('.')
+    end
+
+    
+    if files.size > 1
+      unzip_name = HL.choose do |menu|
+        menu.index_color  = :rgb_77bbff
+        menu.prompt = "Which one do you want to install? "
+        menu.choices( *files )
+      end
     else
-      install_on_nix($downloaded, place)
+      unzip_name = files[0]
     end
-    log "Install finish!"
-  end
 
+    end # end of zipped file handle
 
-  def install_on_nix(ware, place)
 
-    target = "#{WAREHOUSE}/#{ware}"
+    # Get software real name
+    if zip_flag
+      name = unzip_name.split('/').last
+    else
+      name = target.split('/').last
+    end
 
-    if target.end_with?('.deb')
-      log "Install deb package for you"
-      system "sudo dpkg -i #{target}"
-      return
+
+    if (name.size > 10     ||
+        name.include?('.') ||
+        name.include?('-') ||
+        name.include?('_')) && (not rename_as)
+      log "Do you want to rename the '#{name}'?"
+      re = HL.ask "Input name, or just leave it blank to say no."
+      if !re.empty? 
+        rename_as = re
+      end
     end
 
-    if target.end_with?('.rpm')
-      log "Install rpm package for you"
-      system "sudo rpm -i #{target}"
-      return
+
+    if zip_flag
+      # Now: 
+      #   target     is /home/xx/xx.zip
+      #   unzip_dir  is /home/xx/xx
+      #   unzip_file is            abc/cde/file (new target)
+      target = unzip_dir + '/' + unzip_name
     end
 
+    log "Renamed as '#{rename_as}'" if rename_as 
 
-    if test 'd', place
-      cmd = "sudo install -Dt #{place} -m 755 #{target} "
-      system cmd
-      log "Install #{ware} to " + place
 
+    case RUBY_PLATFORM
+    when /ucrt/i, /mingw/i
+      install_on_windows(target, name, install_to, rename_as)
     else
-      unless place.include?('/')
-        # User just give it another name
-        place = BIN_PATH + '/' + place
+      install_on_nix(target, name, install_to, rename_as)
+    end
+  end
+
+
+  #
+  # @param target [String] the absulute path of to be installed software 
+  # @param name   [String] the name of the software
+  #
+  def install_on_nix(target, name, install_to, rename_as)
+    install_to = install_to.chomp('/')  
+
+    if test 'd', install_to
+      log "Ready to install #{name}"
+      if rename_as
+        dest = "#{install_to}/#{rename_as}"
+        system "sudo cp #{target} " + dest
+        system "sudo chmod +x " + dest
+        log "Installed as " + dest
       else
-        # User give it a path and its name
+        cmd = "sudo install -Dt #{install_to} -m 755 #{target} "
+        system cmd
+        log "Install #{name} to " + install_to
       end
-      log "Installed as " + place
-      system "sudo cp #{target} #{place}"
-      system "sudo chmod +x #{place}"
+      log "Install finish!"
+    else
+      log "#{install_to} is not a directory!"
     end
 
   end
 
 
-  def install_on_windows
-    log "Sorry, not implemented yet!"
+  def install_on_windows(target, name, install_to, rename_as)
+    log "Sorry, not implemented yet on Windows! Can you help?"
   end
 
 
+  #
+  # For -l option
+  #
   def list_wares
-    
-    puts blue("In #{WAREHOUSE}")
-    puts
+    FileUtils.mkdir_p(WAREHOUSE)
+    puts blue("ghcurl: #{WAREHOUSE}")
     Dir.children(WAREHOUSE).each_with_index do |dict,i|
-      puts "  #{blue(i+1)}. #{bold(green(dict))}"
+      puts "#{blue(i+1)}. #{bold(green(dict))}"
     end
-    puts
   end
 
 
+  #
+  # For -d option
+  #
+  def delete_wares(name)
+    begin 
+
+    if name.nil? 
+      re = HL.ask "Do you want to delete all downloaded files?[Enter to yes or n]"
+      case re.downcase
+      when '','y','ye','yes','true'
+        FileUtils.rm_rf WAREHOUSE
+        log "Delete all done"
+      end
+    else
+      FileUtils.rm WAREHOUSE + '/' + name
+      log "Delete #{name} done"
+    end
+
+    rescue Exception => e
+      puts bold(red("ghcurl: #{e}"))
+      list_wares
+    end
+
+  end # end def delete_wares
+
+
   def help
     puts <<~EOC
     ghcurl (v#{VERSION}): Download files and install from Github releases
@@ -284,18 +427,21 @@ module Ghcurl
     Default install to env 'GHCURL_BIN_PATH' or /usr/local/bin
 
     usage:
-      ghcurl [user]/repo [regexp] => Search latest version with regexp to download
-      ghcurl repo [re] -v tag     => Download a specific tag version
-      ghcurl repo [deb/rpm]       => Download and install deb/rpm package
-      ghcurl repo [re] -i [path]  => Download and install to path
-      ghcurl repo [re] -i name    => Download and install as 'name'
-      ghcurl -l                   => List downloaded files
-      ghcurl -h                   => Print this help
+      ghcurl [user]/repo [regexp]   => Search latest version with regexp to download
+      ghcurl repo [re] -v tag       => Download a specific tag version
+      ghcurl repo [re] -o [path]    => Download into path or rename
+      ghcurl repo [re] -i [path]    => Download and install to path
+      ghcurl repo [re] -o [path] -i => Download into path and install
+      ghcurl repo [re] -i -r name   => Download and install as 'name'
+      ghcurl -l                     => List downloaded files
+      ghcurl -d [name]              => Delete a downloaded file or all
+      ghcurl -h                     => Print this help
 
     example:
       ghcurl bat         => Search sharkdp/bat the latest
       ghcurl cli deb -i  => Search cli/cli /deb/
       ghcurl rbspy/rbspy 'x86_64.*linux' -v0.11.1
+      ghcurl dlvhdr/gh-dash linux-amd64 -i -r 'gd'
 
     EOC
   end
@@ -311,9 +457,12 @@ extend Ghcurl
 
 class Ghcurl::CLI < CliSwitch
   option name: 'install', short: '-i', arg_required: 'optional'
+  option name: 'output',  short: '-o', long: '--output', arg_required: 'required'
+  option name: 'rename',  short: '-r', arg_required: 'required'
   option name: 'version', short: '-v', arg_required: 'required'
-  option name: 'help', short: '-h', long: '--help', arg_required: 'noarg'
-  option name: 'list', short: '-l', arg_required: 'noarg'
+  option name: 'help',    short: '-h', long: '--help', arg_required: 'noarg'
+  option name: 'list',    short: '-l', arg_required: 'noarg'
+  option name: 'delete',  short: '-d', arg_required: 'optional'
 end
 
 args, opts = Ghcurl::CLI.new.parse(ARGV)
@@ -323,16 +472,13 @@ if args.empty? and opts.empty?
   exit 
 end
 
-if args.size >= 2
-  repo_or_name, regexp = args[0], args[1]
-else
-  repo_or_name, regexp = args[0], nil
-end
-
 
+repo_or_name, regexp = args[0], args[1]
 version = nil
 need_install = false
+download_to = nil
 install_to = nil
+rename_as  = nil
 
 opts.each do 
   case _1.name 
@@ -342,11 +488,18 @@ opts.each do
   when 'list'
     list_wares
     exit
+  when 'delete'
+    delete_wares(_1.next_arg)
+    exit
   when 'version'
     version = _1.next_arg
+  when 'output'
+    download_to = _1.next_arg
   when 'install'
     need_install = true
     install_to = _1.next_arg
+  when 'rename'
+    rename_as = _1.next_arg
   end
 end
 
@@ -354,16 +507,14 @@ end
 # p repo_or_name
 # p regexp
 # p need_install
+# p download_to
 # p install_to
+# p rename_as
 
 begin
-download(repo_or_name, regexp, version: version)
+ware = download(repo_or_name, regexp, version: version, download_to: download_to)
 if need_install
-  if install_to
-    install(repo_or_name, place: install_to)
-  else
-    install(repo_or_name)
-  end
+  install(ware, rename_as: rename_as, install_to: install_to)
 end
 rescue Interrupt
 end

data/lib/ghcurl.rb

@@ -2,7 +2,7 @@
 # File          : ghcurl.rb
 # Authors       : ccmywish <ccmywish@qq.com>
 # Created on    : <2022-04-12>
-# Last modified : <2022-04-14>
+# Last modified : <2022-04-26>
 #
 # ghcurl:
 #
@@ -12,7 +12,7 @@
 
 module Ghcurl
 
-  VERSION  = "0.5.1"
+  VERSION  = "0.7.1"
 
 end
 
@@ -24,6 +24,7 @@ end
 Ghcurl::DEFAULT_WARES = {
 
   cli: 'cli/cli',
+  gh:  'cli/cli',
 
   fd:  'sharkdp/fd',
   bat: 'sharkdp/bat',
@@ -61,5 +62,7 @@ Ghcurl::DEFAULT_WARES = {
   xh:      'ducaale/xh',
   zoxide:  'ajeetdsouza/zoxide',
 
-  scc:     'boyter/scc'
+  scc:      'boyter/scc',
+  rbspy:    'rbspy/rbspy',
+  starship: 'starship/starship'
 }

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ghcurl
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.1
 platform: ruby
 authors:
 - ccmywish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '4.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '4.22'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement