ruaur 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48fbbbaa347a8cc01dc8841a5fc5524f94490c93
-  data.tar.gz: e3b9066133414ef961cc8dbfed152fc47567b53e
+  metadata.gz: 7de5353a50adba1ef0574369361580209949f41e
+  data.tar.gz: 6766347de08b199a415d44f4581fba3ab2d17f97
 SHA512:
-  metadata.gz: 271df363ba60ab12beb9b1f032ea34d456ba290c53a125032e50dff53d7422615a9baa8811768c3a263251548b0e58c1b368d38f6093a451d09504db24250e4b
-  data.tar.gz: 876728bdd812e544156d1fb4328ded85e9582218c1c53f331fdfe12814692b607725226faaa48507693234f65699f77fa201c3e0ad04e0a7f1895c5526c676f7
+  metadata.gz: 12f4fa538e4fc254d9df1c8cb8e12b942fe3d85e041550631a0e3ea7f0def4f33f615b3431878ee06aa2e5b30747dbacb20a4da0bf0e28133e46e2aa80f56e44
+  data.tar.gz: b4021b5a7c25f20b58fdb2a505c1666df76d7f97adef509a0b586750fac27bb150f3b63d269e5f2a5109336fcecf187094719702fe2f98cbb8d119b713d04882

data/bin/ruaur

@@ -22,6 +22,7 @@ end
 def parse(args)
     options = Hash.new
     options["operation"] = nil
+    options["verbose"] = false
 
     # Sync options
     options["clean"] = false
@@ -48,6 +49,14 @@ def parse(args)
             String.disable_colorization = true
         end
 
+        opts.on(
+            "-v",
+            "--verbose",
+            "Show backtrace when error occurs"
+        ) do
+            options["verbose"] = true
+        end
+
         opts.on("", "OPERATIONS")
 
         opts.on("-R", "--remove", "Remove packages") do
@@ -66,7 +75,7 @@ def parse(args)
             options["operation"] = Operation::SYNC
         end
 
-        opts.on("", "SYNC OPTIONS")
+        opts.on("", "SYNC_OPTIONS")
 
         opts.on("-c", "--clean", "Remove packages from the cache") do
             options["clean"] = true
@@ -98,7 +107,7 @@ def parse(args)
             options["upgrade"] = true
         end
 
-        opts.on("", "REMOVE OPTIONS")
+        opts.on("", "REMOVE_OPTIONS")
 
         opts.on("-n", "--nosave", "Completely remove package") do
             options["nosave"] = true
@@ -176,7 +185,7 @@ end
 options = parse(ARGV)
 
 begin
-    ruaur = RuAUR.new
+    ruaur = RuAUR.new(!String.disable_colorization)
 
     case options["operation"]
     when Operation::REMOVE
@@ -195,11 +204,30 @@ begin
             ruaur.install(options["packages"], options["noconfirm"])
         end
     end
-    exit RuAURExit::GOOD
+rescue Interrupt
+    # ^C
+    # Exit gracefully
+rescue Errno::EPIPE
+    # Do nothing. This can happen if piping to another program such as
+    # less. Usually if less is closed before we're done with STDOUT.
 rescue RuAUR::Error => e
-    puts e.message.red
+    puts e.message
+    exit RuAURExit::EXCEPTION
+rescue Exception => e
+    $stderr.puts "Oops! Looks like an error has occured! If the " \
+        "error persists, file a bug at:".word_wrap
+    $stderr.puts
+    $stderr.puts "    https://gitlab.com/mjwhitta/ruaur/issues"
+    $stderr.puts
+    $stderr.puts "Maybe the message below will help. If not, you " \
+        "can use the --verbose flag to get a backtrace.".word_wrap
+
+    $stderr.puts e.message.white.on_red
+    if (options["verbose"])
+        e.backtrace.each do |line|
+            $stderr.puts line.light_yellow
+        end
+    end
     exit RuAURExit::EXCEPTION
-rescue Interrupt => e
-    # ^C
-    puts
 end
+exit RuAURExit::GOOD

data/lib/ruaur/aur.rb

@@ -1,4 +1,5 @@
 require "archive/tar/minitar"
+require "colorize"
 require "fileutils"
 require "io/wait"
 require "json"
@@ -8,14 +9,38 @@ require "zlib"
 
 class RuAUR::AUR
     def clean
-        puts "Cleaning AUR cache...".white
+        puts colorize_status("Cleaning AUR cache...")
         Dir.chdir(@cache) do
             FileUtils.rm_rf(Dir["*"])
         end
     end
 
+    def colorize_dependency(dependency)
+        return dependency if (!@colorize)
+        return dependency.light_magenta
+    end
+    private :colorize_dependency
+
+    def colorize_installed(installed)
+        return installed if (!@colorize)
+        return installed.light_yellow
+    end
+    private :colorize_installed
+
+    def colorize_status(status)
+        return status if (!@colorize)
+        return status.light_white
+    end
+    private :colorize_status
+
+    def colorize_upgrade(old, new)
+        return "#{old} -> #{new}" if (!@colorize)
+        return "#{old.light_red} -> #{new.light_green}"
+    end
+    private :colorize_upgrade
+
     def compile(package)
-        puts "Compiling #{package.name}...".white
+        puts colorize_status("Compiling #{package.name}...")
         if (Process.uid == 0)
             system("chown -R nobody:nobody .")
             system("su -s /bin/sh nobody -c \"makepkg -sr\"")
@@ -35,7 +60,7 @@ class RuAUR::AUR
     def download(package)
         FileUtils.rm_f(Dir["#{package.name}.tar.gz*"])
 
-        puts "Downloading #{package.name}...".white
+        puts colorize_status("Downloading #{package.name}...")
         tarball(package.name, package.url, "#{package.name}.tar.gz")
 
         tgz = Pathname.new("#{package.name}.tar.gz").expand_path
@@ -83,7 +108,7 @@ class RuAUR::AUR
     def extract(package)
         FileUtils.rm_rf(package.name)
 
-        puts "Extracting #{package.name}...".white
+        puts colorize_status("Extracting #{package.name}...")
         File.open("#{package.name}.tar.gz", "rb") do |tgz|
             tar = Zlib::GzipReader.new(tgz)
             Archive::Tar::Minitar.unpack(tar, ".")
@@ -98,7 +123,7 @@ class RuAUR::AUR
     private :extract
 
     def find_upgrades
-        puts "Checking for AUR updates...".white
+        puts colorize_status("Checking for AUR updates...")
 
         upgrades = Hash.new
         multiinfo(@installed.keys).each do |package|
@@ -128,12 +153,18 @@ class RuAUR::AUR
         end
 
         return nil if (body["results"].empty?)
-        return RuAUR::Package.new(body["results"])
+        return RuAUR::Package.new(body["results"], "aur", @colorize)
     end
 
-    def initialize(pacman, cache = "/tmp/ruaur-#{ENV["USER"]}")
+    def initialize(
+        pacman,
+        cache = "/tmp/ruaur-#{ENV["USER"]}",
+        colorize = false
+    )
+        cache = "/tmp/ruaur-#{ENV["USER"]}" if (cache.nil?)
         @cache = Pathname.new(cache).expand_path
         FileUtils.mkdir_p(@cache)
+        @colorize = colorize
         @installed = pacman.query_aur
         @pacman = pacman
         @rpc_url = "https://aur.archlinux.org/rpc.php"
@@ -150,7 +181,7 @@ class RuAUR::AUR
             @installed.include?(pkg_name) &&
             !package.newer?(@installed[pkg_name])
         )
-            puts "Already installed: #{pkg_name}".yellow
+            puts colorize_installed("Already installed: #{pkg_name}")
             return
         end
 
@@ -181,7 +212,9 @@ class RuAUR::AUR
                     next if (dep.start_with?("$"))
 
                     if (!@installed.has_key?(dep))
-                        puts "Installing dependency: #{dep}".magenta
+                        puts colorize_dependency(
+                            "Installing dependency: #{dep}"
+                        )
                         if (@pacman.exist?(dep))
                             @pacman.install(dep, noconfirm)
                         else
@@ -206,7 +239,7 @@ class RuAUR::AUR
         end
 
         body["results"].each do |result|
-            results.push(RuAUR::Package.new(result))
+            results.push(RuAUR::Package.new(result, "aur", @colorize))
         end
         return results.sort
     end
@@ -223,7 +256,7 @@ class RuAUR::AUR
         end
 
         body["results"].each do |result|
-            results.push(RuAUR::Package.new(result))
+            results.push(RuAUR::Package.new(result, "aur", @colorize))
         end
 
         results.each do |package|
@@ -260,8 +293,8 @@ class RuAUR::AUR
         find_upgrades.each do |pkg_name, versions|
             old, new = versions
 
-            puts "Upgrading #{pkg_name}...".white
-            puts  "#{old.red} -> #{new.green}"
+            puts colorize_status("Upgrading #{pkg_name}...")
+            puts colorize_upgrade(old, new)
             install(pkg_name, noconfirm)
         end
     end

data/lib/ruaur/package.rb

@@ -24,7 +24,41 @@ class RuAUR::Package
         return (self.name.downcase <=> other.name.downcase)
     end
 
-    def initialize(json, repo = "aur")
+    def colorize_header(repo, name, installed, version, votes)
+        header = Array.new
+
+        if (!@colorize)
+            header.push("#{repo}/#{name}")
+            if (installed && newer?(installed))
+                header.push(installed)
+                header.push("->")
+            end
+            header.push(version)
+            header.push(votes) if (votes)
+            header.push("[installed]") if (installed)
+        else
+            header.push(
+                [
+                    repo.light_blue,
+                    "/".light_blue,
+                    name.light_cyan
+                ].join
+            )
+            if (installed && newer?(installed))
+                header.push(installed.light_red)
+                header.push("->")
+            end
+            header.push(version.light_green)
+            header.push(votes.light_white) if (votes)
+            header.push("[installed]".light_magenta) if (installed)
+        end
+
+        return header.join(" ")
+    end
+    private :colorize_header
+
+    def initialize(json, repo = "aur", colorize = false)
+        @colorize = colorize
         @description = json["Description"]
         @description ||= ""
         @installed = nil
@@ -76,21 +110,19 @@ class RuAUR::Package
 
     def to_s
         out = Array.new
-        header = Array.new
-
-        header.push("#{@repo.blue}#{"/".blue}#{@name.cyan}")
-        if (@installed && newer?(@installed))
-            header.push(@installed.red)
-            header.push("->")
-        end
-        header.push(@version.green)
-        header.push(@votes.white) if (@votes)
-        header.push("[installed]".magenta) if (@installed)
-        out.push(header.join(" "))
+        out.push(
+            colorize_header(
+                @repo,
+                @name,
+                @installed,
+                @version,
+                @votes
+            )
+        )
 
         # Wrap at default minus 4 spaces
-        @description.word_wrap(76).each_line do |line|
-            out.push("    #{line.rstrip}")
+        @description.word_wrap(76).split("\n").each do |line|
+            out.push("    #{line.strip}")
         end
 
         return out.join("\n")

data/lib/ruaur/pacman.rb

@@ -1,32 +1,54 @@
+require "colorize"
+require "pathname"
+
 class RuAUR::Pacman
     def clean(noconfirm = false)
-        puts "Cleaning pacman cache...".white
-        system("sudo #{@pac_clr} -Sc") if (!noconfirm)
-        system("sudo #{@pac_clr} -Sc --noconfirm") if (noconfirm)
+        puts colorize_status("Cleaning pacman cache...")
+        system("sudo #{@pac_cmd} -Sc") if (!noconfirm)
+        system("sudo #{@pac_cmd} -Sc --noconfirm") if (noconfirm)
+    end
+
+    def colorize_installed(installed)
+        return installed if (!@colorize)
+        return installed.light_yellow
     end
+    private :colorize_installed
+
+    def colorize_status(status)
+        return status if (!@colorize)
+        return status.light_white
+    end
+    private :colorize_status
 
     def exist?(pkg_name)
-        return !%x(#{@pac_noclr} -Ss "^#{pkg_name}$").empty?
+        return !%x(#{@pac_nocolor} -Ss "^#{pkg_name}$").empty?
     end
 
-    def initialize
-        @pac_noclr = "pacman --color=never"
-        @pac_clr = "pacman --color=always"
+    def initialize(colorize = false)
+        if (ScoobyDoo.where_are_you("pacman").nil?)
+            raise RuAUR::Error::MissingDependencyError.new("pacman")
+        end
+
+        @colorize = colorize
+        @pac_nocolor = "pacman --color=never"
+        @pac_color = "pacman --color=always"
+        @pac_cmd = @pac_color
+        @pac_cmd = @pac_nocolor if (!@colorize)
         @installed = query
     end
 
     def install(pkg_name, noconfirm = false)
         if (@installed.include?(pkg_name))
-            puts "Already installed: #{pkg_name}".yellow
+            puts colorize_installed("Already installed: #{pkg_name}")
             return
         end
 
-        puts "Installing #{pkg_name}...".white
+        puts colorize_status("Installing #{pkg_name}...")
         if (!noconfirm)
-            system("sudo #{@pac_clr} -S #{pkg_name} --needed")
+            system("sudo #{@pac_cmd} -S #{pkg_name} --needed")
         else
             system(
-                "sudo #{@pac_clr} -S #{pkg_name} --needed --noconfirm"
+                "sudo #{@pac_cmd} -S #{pkg_name} --needed --noconfirm"
             )
         end
 
@@ -34,18 +56,18 @@ class RuAUR::Pacman
     end
 
     def install_local(pkgs, noconfirm = false)
-        puts "Installing compiled packages...".white
+        puts colorize_status("Installing compiled packages...")
         xzs = pkgs.join(" ")
         if (!noconfirm)
-            system("sudo #{@pac_clr} -U #{xzs}")
+            system("sudo #{@pac_cmd} -U #{xzs}")
         else
-            system("sudo #{@pac_clr} -U #{xzs} --noconfirm")
+            system("sudo #{@pac_cmd} -U #{xzs} --noconfirm")
         end
     end
 
     def query(pkg_name = "")
         results = Hash.new
-        %x(#{@pac_noclr} -Q #{pkg_name}).split("\n").map do |line|
+        %x(#{@pac_nocolor} -Q #{pkg_name}).split("\n").each do |line|
             line = line.split
             results[line[0]] = line[1]
         end
@@ -58,10 +80,12 @@ class RuAUR::Pacman
         ).expand_path
 
         results = Hash.new
-        %x(#{@pac_noclr} -Qm #{pkg_name}).split("\n").delete_if do |p|
+        %x(
+            #{@pac_nocolor} -Qm #{pkg_name}
+        ).split("\n").delete_if do |p|
             # Skip packages in community
             Dir["#{community}/#{p.split.join("-")}"].any?
-        end.map do |line|
+        end.each do |line|
             line = line.split
             results[line[0]] = line[1]
         end
@@ -69,11 +93,11 @@ class RuAUR::Pacman
     end
 
     def remove(pkg_names, nosave = false)
-        puts "Removing #{pkg_names.join(" ")}...".white
+        puts colorize_status("Removing #{pkg_names.join(" ")}...")
         if (!nosave)
-            system("sudo #{@pac_clr} -R #{pkg_names.join(" ")}")
+            system("sudo #{@pac_cmd} -R #{pkg_names.join(" ")}")
         else
-            system("sudo #{@pac_clr} -Rn #{pkg_names.join(" ")}")
+            system("sudo #{@pac_cmd} -Rn #{pkg_names.join(" ")}")
         end
     end
 
@@ -81,7 +105,9 @@ class RuAUR::Pacman
         results = Array.new
         return results if (pkg_names.nil? || pkg_names.empty?)
 
-        %x(#{@pac_noclr} -Ss #{pkg_names}).each_line do |line|
+        %x(
+            #{@pac_nocolor} -Ss #{pkg_names}
+        ).split("\n").each do |line|
             reg = "^([^\/ ]+)\/([^ ]+) ([^ ]+)( .*)?$"
             match = line.match(/#{reg}/)
             if (match)
@@ -101,7 +127,8 @@ class RuAUR::Pacman
                             "URLPath" => nil,
                             "Version" => version
                         },
-                        repo
+                        repo,
+                        @colorize
                     )
                 )
                 if (trailing.include?("[installed]"))
@@ -116,8 +143,8 @@ class RuAUR::Pacman
     end
 
     def upgrade(noconfirm = false)
-        puts "Updating...".white
-        system("sudo #{@pac_clr} -Syyu") if (!noconfirm)
-        system("sudo #{@pac_clr} -Syyu --noconfirm") if (noconfirm)
+        puts colorize_status("Updating...")
+        system("sudo #{@pac_cmd} -Syyu") if (!noconfirm)
+        system("sudo #{@pac_cmd} -Syyu --noconfirm") if (noconfirm)
     end
 end

data/lib/ruaur.rb

@@ -16,7 +16,7 @@ class RuAUR
         @aur.clean
     end
 
-    def initialize
+    def initialize(colorize = false)
         [
             "makepkg",
             "pacman",
@@ -28,8 +28,9 @@ class RuAUR
             end
         end
 
-        @pacman = RuAUR::Pacman.new
-        @aur = RuAUR::AUR.new(@pacman)
+        @colorize = colorize
+        @pacman = RuAUR::Pacman.new(@colorize)
+        @aur = RuAUR::AUR.new(@pacman, nil, @colorize)
         @lock = Pathname.new("/tmp/ruaur.lock").expand_path
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruaur
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Can search and install packages for Arch Linux