upm 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c755b3ead00bb1808a980d25cf2a7eeaf9e21b0061749aa06b6be6c40eecd4f
-  data.tar.gz: f7a18d62933dae46ad1e005bf01478c13c198e500332bfe39ffb077f1c7ec977
+  metadata.gz: 34ab54fc955906c85199e43735991d297f7db20e2f78a53c49ae22ce08ddd30f
+  data.tar.gz: 123c3e08566179a36f32ed0cb4e304a72eb75f785ce128bd1b8959c3d7ca78c2
 SHA512:
-  metadata.gz: dab6d3ee5f5a2969f566ceda7414b7e9821cd9084123894bb3331949fed19ada5f4e9d68802b4c057db11422c56cc62740007033a1a4b6870b08e911a8033002
-  data.tar.gz: b7150c73d16573cc37626dfa40a6639c824ab6af1f1392b580dc6db7885631902bb5c3ca096b09a27afdc3579e1ab153b30e5f57e1438ddaaf43017fa4a502a2
+  metadata.gz: 723b556018ce78091e5a9bf6b6132a3a730707b40bbc6db98377441e0c7ef7cfd4e164a841b750379805a136c4477e5059377af81da5c3402edf7290d31f11c1
+  data.tar.gz: ea06d30b45f4624637cd515dc400d909462b7022e92bf961c7191fda601f272a80bdfa1589370d3118a1ca5f039e879773be25b964cfef0d07182225e78247b9

data/.gitignore

@@ -1 +1 @@
-*.gem
+pkg/

data/Rakefile

@@ -1,16 +1,20 @@
-gem_version = File.read("VERSION").strip
 pkgname = "upm"
+gem_version = File.read("VERSION").strip
+
+gemfile = "#{pkgname}-#{gem_version}.gem"
 
 task :build do
   system "gem build .gemspec"
+  system "mkdir pkg/" unless File.directory? "pkg"
+  system "mv #{gemfile} pkg/"
 end
  
 task :release => :build do
-  system "gem push #{pkgname}-#{gem_version}.gem"
+  system "gem push pkg/#{gemfile}"
 end
 
 task :gem => :build
 
 task :install => :build do
-  system "gem install #{pkgname}-#{gem_version}.gem"
+  system "gem install pkg/#{gemfile}"
 end

data/TODO.md

@@ -30,11 +30,14 @@ Related tool: intoli/exodus
 
 Use fzf for "list" output (or other commands that require selecting, like "remove")
 
-## Proper ARGV parser
+## Commandline argument parser
 
-* Something better than "command, *args = ARGV" (with "--help" available, at the very least.)
+* Add options to commands:
+  * upm upgrade --download-only
+  * upm install --help
+  * upm help install
 
-## Streaming pipes
+## Streaming pipes with colours
 
 * Make the `run` command able to grep the output while streaming the results to the screen.
 * Make run pretend to be a tty, so I don't need `--color=always`.
@@ -78,4 +81,6 @@ Why not!
 
 Do a ping test on available mirrors, and use fzf to select.
 
+## Interrupt catcher
 
+Don't print backtrace when ^C is pressed.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/upm/core_ext.rb

@@ -4,6 +4,25 @@ class DateTime
   def to_i; to_time.to_i; end
 end
 
+class File
+  def self.which(bin)
+    ENV["PATH"].split(":").each do |dir|
+      full_path = File.join(dir, bin)
+      return full_path if File.exists? full_path
+    end
+    nil
+  end
+
+  def self.which_is_best?(*bins)
+    bins.flatten.each do |bin|
+      if location = which(bin)
+        return location
+      end
+    end
+    nil
+  end
+end
+
 module Enumerable
   #
   # Split this enumerable into chunks, given some boundary condition. (Returns an array of arrays.)

data/lib/upm/tool.rb

@@ -39,21 +39,26 @@ module UPM
     }
 
     @@tools = {}
+    def self.tools; @@tools; end
 
     def self.register_tools!
       Dir["#{__dir__}/tools/*.rb"].each { |lib| require_relative(lib) }
     end
 
     def self.os_release
-      @os_release ||= open("/etc/os-release") do |io|
-        io.read.scan(/^(\w+)="?(.+?)"?$/)
-      end.to_h
+      @os_release ||= begin
+        open("/etc/os-release") do |io|
+          io.read.scan(/^(\w+)="?(.+?)"?$/)
+        end.to_h
+      rescue Errno::ENOENT
+        {}
+      end
     end
 
     def self.current_os_names
       # ID=ubuntu
       # ID_LIKE=debian
-      os_release.values_at("ID", "ID_LIKE")
+      os_release.values_at("ID", "ID_LIKE").compact
     end
 
     def self.nice_os_name
@@ -62,13 +67,16 @@ module UPM
 
     def self.for_os(os_names=nil)
       os_names = os_names ? [os_names].flatten : current_os_names
-      @@tools.find { |name, tool| os_names.any? { |name| tool.os.include? name } }.last
-    end
 
-    def self.tools
-      @@tools
+      if os_names.any?
+        @@tools.find { |name, tool| os_names.any? { |name| tool.os.include? name } }.last
+      else
+        @@tools.find { |name, tool| File.which(tool.identifying_binary) }.last
+      end
     end
 
+    ###################################################################
+
     def initialize(name, &block)
       @name = name
       instance_eval(&block)
@@ -85,7 +93,10 @@ module UPM
     end
 
     def help
-      puts "    Detected OS: #{Tool.nice_os_name}"
+      if osname = Tool.nice_os_name
+        puts "    Detected OS: #{osname}"
+      end
+
       puts "Package manager: #{@name}"
       puts
       puts "Available commands:"
@@ -100,23 +111,16 @@ module UPM
       end
     end
 
-    def print_files(*paths, include: nil, exclude: nil)
-      lesspipe do |less|
-        paths.each do |path|
-          less.puts "<8>=== <11>#{path} <8>========".colorize
-          open(path) do |io|
-            enum = io.each_line
-            enum = enum.grep(include) if include
-            enum = enum.reject { |line| line[exclude] } if exclude
-            enum.each { |line| less.puts line }
-          end
-          less.puts
-        end
+    ## DSL methods
+
+    def identifying_binary(id_bin=nil)
+      if id_bin 
+        @id_bin = id_bin
+      else
+        @id_bin || @name
       end
     end
 
-    ## DSL methods
-
     def prefix(name)
       @prefix = name
     end
@@ -174,6 +178,21 @@ module UPM
       end
     end
 
+    def print_files(*paths, include: nil, exclude: nil)
+      lesspipe do |less|
+        paths.each do |path|
+          less.puts "<8>=== <11>#{path} <8>========".colorize
+          open(path) do |io|
+            enum = io.each_line
+            enum = enum.grep(include) if include
+            enum = enum.reject { |line| line[exclude] } if exclude
+            enum.each { |line| less.puts line }
+          end
+          less.puts
+        end
+      end
+    end
+
   end # class Tool
 
 end # module UPM

data/lib/upm/tools/xbps.rb

@@ -2,11 +2,13 @@ UPM::Tool.new "xbps" do
 
   os "void"
 
+  identifying_binary "xbps-install"
+
   command "install", "xbps-install", root: true
-  command "update", "xbps-install -S", root: true
+  command "update",  "xbps-install -S", root: true
   command "upgrade", "xbps-install -Su", root: true
-  command "files", "xbps-query -f"
-  command "search", "xbps-query --regex -Rs"
+  command "files",   "xbps-query -f"
+  command "search",  "xbps-query --regex -Rs"
   # command "info", ""
   
   command "list" do |args|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - epitron