ghcurl 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b51925892c13aec5ed7e86f931e8319f9b4ddb06c0c14d6c08816776b3e5b922
-  data.tar.gz: 01ce411ded642b6f0cac664e3a966ad2053f7b0a7f3a5d536a28e27f0531a43a
+  metadata.gz: '0069ec92dd2a2638c346d29aec05b591f52556ccee9906c28a3382506d5d5bd6'
+  data.tar.gz: db516685965cfeadfb7e7db426ee8b328e5f6267af1158bbdc21c23e2aeddce7
 SHA512:
-  metadata.gz: 4194359adb2d54b6fca4069e7d8f67ff205bd2b350ce70648aca80281e7d6a392eb7e46c50257a330341f18be67cf1ccc2a50bcf40becb104b60beb0ffb0367c
-  data.tar.gz: 8e04c84f09936c07f8c975443933a757452677c58e7613339747f6983a3297cff21642d4633a0e47fe39251648554f47227135eda3dd557acd575faffe465a5b
+  metadata.gz: 71a3fd97dc832a34b358f87a1be6b925e07647e83506545d13384229a42a24f34a6ab4c6c362a3b482b914e5bbff620fa8a0f3aa545dc771db371ad7eb366c7a
+  data.tar.gz: 3b407e1b7b4ebf046621567d9a1aba7d60cbd55754de54b4e85b7c9af583a57054cd7b50868761249ae385f9aded3eae9d5ca0cc8913245e03b14eaa50bc2f09

data/README.md

@@ -12,26 +12,39 @@ gem install ghcurl
 
 Download files and install from Github releases.
 
+It's quite easy to use `ghcurl`, because it can recognize your OS and arch, always give you the best option to download by default. What's more, 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`. The best of it is to automatically extract a tar/zip file to make the installation process smooth in a terminal.
+
+It may be difficult to use it on Windows, welcome contributions!
+
 </div>
 
 ## 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
-```
+Things can be easier. We consider these as popular binaries:  https://github.com/ibraheemdev/modern-unix
+
+Notice: `-i` means to install.
 
-Things can be easier.
 ```bash
 # It knows that's sharkdp/fd
 ghcurl fd -i
+
+# Much easier to install rbspy!
+ghcurl rbspy -i
+
+# On Linux, it's very handy
+ghcurl cli -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
 # 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
@@ -46,7 +59,7 @@ ghcurl BetaPictoris/timeleft timeleft -i
 ghcurl BetaPictoris/timeleft timeleft -i ~/tmp/bin
 
 # 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,11 +3,11 @@
 # File          : ghcurl.rb
 # Authors       : ccmywish <ccmywish@qq.com>
 # Created on    : <2022-04-12>
-# Last modified : <2022-04-14>
+# Last modified : <2022-04-15>
 #
 # ghcurl:
 #
-#   Download files (and install) from Github releases
+#   Download files and install from Github releases
 #
 # ------------------------------------------------------
 
@@ -16,11 +16,12 @@ 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
@@ -37,10 +38,6 @@ module Ghcurl
   
 
   def curl(url, name)
-    #if !test('d', WAREHOUSE)
-    #  require 'fileutils'
-    #  FileUtils.mkdir_p(WAREHOUSE)
-    #end
     cmd = "curl -L #{url} --create-dirs -o #{WAREHOUSE}/#{name}"
     system cmd
     log "Downloaded to #{WAREHOUSE}/#{name}"
@@ -58,7 +55,8 @@ module Ghcurl
     
     oses = [
              ['linux'],
-             ['mac', 'apple'],
+             ['freebsd'],
+             ['mac', 'apple', 'darwin'],
              ['windows']
            ]
 
@@ -190,43 +188,21 @@ module Ghcurl
 
     log "Downloading #{url}"
     
-    $downloaded = link.split('/').last
-
-    curl(url, $downloaded)
+    download_name = link.split('/').last
 
+    curl(url, download_name)
+    return download_name
   end
 
 
-  def install(ware, place: BIN_PATH)
 
-    ware_name = ''
-    if ware.include?('/')
-      ware_name = ware.split('/').last
-    else
-      ware_name = ware
-    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
-      end
-    end
-    
-    case RUBY_PLATFORM
-    when /ucrt/i, /mingw/i
-      install_on_windows($downloaded, place)
-    else
-      install_on_nix($downloaded, place)
-    end
-    log "Install finish!"
-  end
+  def install(dl_name, rename_as: nil,  install_to: nil)
 
+    if install_to.nil?
+      install_to = BIN_PATH
+    end
 
-  def install_on_nix(ware, place)
-
-    target = "#{WAREHOUSE}/#{ware}"
+    target = "#{WAREHOUSE}/#{dl_name}"
 
     if target.end_with?('.deb')
       log "Install deb package for you"
@@ -241,42 +217,177 @@ module Ghcurl
     end
 
 
-    if test 'd', place
-      cmd = "sudo install -Dt #{place} -m 755 #{target} "
-      system cmd
-      log "Install #{ware} to " + place
+    #
+    # The zipped file
+    #
+    
+    zip_flag = false
+    # unzipped to dir
+    unzip_dir = ""
+    # unzipped files
+    files = ""
+    # our desired software name
+    name  = ""
+    
+    if target.match?(/\.zip$/) or target.match?(/\.tar\.(\w){1,3}/)
+
+      zip_flag = true
+
+    # unzip 
+    if target.match? /\.zip$/
+      log "Unzip zip file"
+      unzip_dir = target.chomp('.zip')
+      system "unzip -q #{target} -d #{unzip_dir}"
+    end
+    
+    # .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
+    
+
+    
+    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
+    
+
+
+    Dir.chdir unzip_dir do
+      files = _iterate_dir('.')
+    end
+
+    
+    if files.size > 1
+      name = HL.choose do |menu|
+        menu.index_color  = :rgb_77bbff
+        menu.prompt = "Which one do you want to install? "
+        menu.choices( *files )
+      end
+    else
+      name = files[0]
+    end
+
+    end # end of zipped file handle
+
+
+    if !zip_flag
+      # downloaded name in WAREHOUSE
+      name = dl_name
+    end
+
+
+    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 zip_flag
+      # add unzip_dir prefix
+      name = unzip_dir.delete_prefix(WAREHOUSE + '/') + '/' + name
+    end
+
+    if rename_as 
+      log "Renamed as '#{rename_as}'"
+    end
+
+
+    case RUBY_PLATFORM
+    when /ucrt/i, /mingw/i
+      install_on_windows(name, install_to, rename_as)
     else
-      unless place.include?('/')
-        # User just give it another name
-        place = BIN_PATH + '/' + place
+      install_on_nix(name, install_to, rename_as)
+    end
+  end
+
+
+  def install_on_nix(name, install_to, rename_as)
+    install_to = install_to.chomp('/')
+    target = WAREHOUSE + '/' + name
+
+    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!"
+    log "Sorry, not implemented yet on Windows! Can you help?"
   end
 
 
+  #
+  # For -l option
+  #
   def list_wares
-    
-    puts blue("In #{WAREHOUSE}")
-    puts
+    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?"
+      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
@@ -288,14 +399,16 @@ module Ghcurl
       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 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 +424,11 @@ extend Ghcurl
 
 class Ghcurl::CLI < CliSwitch
   option name: 'install', short: '-i', arg_required: 'optional'
+  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 +438,12 @@ 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
 install_to = nil
+rename_as  = nil
 
 opts.each do 
   case _1.name 
@@ -342,11 +453,16 @@ opts.each do
   when 'list'
     list_wares
     exit
+  when 'delete'
+    delete_wares(_1.next_arg)
+    exit
   when 'version'
     version = _1.next_arg
   when 'install'
     need_install = true
     install_to = _1.next_arg
+  when 'rename'
+    rename_as = _1.next_arg
   end
 end
 
@@ -355,15 +471,12 @@ end
 # p regexp
 # p need_install
 # p install_to
+# p rename_as
 
 begin
-download(repo_or_name, regexp, version: version)
+dl_name = download(repo_or_name, regexp, version: version)
 if need_install
-  if install_to
-    install(repo_or_name, place: install_to)
-  else
-    install(repo_or_name)
-  end
+  install(dl_name, 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-15>
 #
 # ghcurl:
 #
@@ -12,7 +12,7 @@
 
 module Ghcurl
 
-  VERSION  = "0.5.1"
+  VERSION  = "0.6.0"
 
 end
 
@@ -61,5 +61,6 @@ Ghcurl::DEFAULT_WARES = {
   xh:      'ducaale/xh',
   zoxide:  'ajeetdsouza/zoxide',
 
-  scc:     'boyter/scc'
+  scc:     'boyter/scc',
+  rbspy:   'rbspy/rbspy'
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghcurl
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - ccmywish