ruaur 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83cbf04615a1414be0c3404f7aa1c962a5b3590401eab9c4b3cf25017a8ab4ca
-  data.tar.gz: bd321ac45942fe11f8aa789cbbeb00668e7c6eaa716b54f33bf7a78e6e3677e2
+  metadata.gz: 9e474910ffaa637774171bc17f605acad0fd8783e18413136df7e056902f381e
+  data.tar.gz: a8d72cbbc230066eb3fe37f715ebfa64d96266cbfd6b916f53a36bdf69fa80c7
 SHA512:
-  metadata.gz: 530dce80035de54be309892c47fcad31f51111ff3625431a1d5c244e9b1034a8547166f295a81d9ae77d734e04284983210e12e14aa31185a93b53b6315af08b
-  data.tar.gz: 9469c51d712c9248354852369f92769d8ab6b4437af81cb086b2068762a60f1346099bf7afa3af3f814e7e85c0b5c4d97f50e946e850c55571e5e57bd0ea13b5
+  metadata.gz: 738d440ec561e5fea8cfeefe282feffc01ca178b3a7050b62d23b9e9a9b4c97238e7570b49231673761df56f8f86df78fa3c0482bf9a1f9bd0c22da6029dc485
+  data.tar.gz: 9751eb31cd8bb56e3707b2a40d23b8a292e3de2fbb4a0e460b8a1226307c2cf62cc41027ff4178495515ff5dc2e9b7a5d58539ca7eb31c5a7f6156edaae17ca6

data/bin/ruaur

@@ -30,7 +30,7 @@ def parse(args)
         opts.on("", "OPTIONS")
 
         opts.on("-h", "--help", "Display this help message") do
-            puts opts
+            puts(opts)
             exit
         end
 
@@ -46,9 +46,9 @@ def parse(args)
             options["verbose"] = true
         end
 
-        opts.on("--version", "Show version") do
+        opts.on("-V", "--version", "Show version") do
             __FILE__.match(/ruaur-(\d+\.\d+\.\d+)/) do |m|
-                puts m[1]
+                puts("ruaur version #{m[1]}")
             end
             exit RuAURExit::GOOD
         end
@@ -57,7 +57,7 @@ def parse(args)
 
         opts.on("-Q", "--query", "Query the package database") do
             if (options["operation"])
-                puts opts
+                puts(opts)
                 exit RuAURExit::MULTIPLE_OPERATIONS
             end
             options["operation"] = RuAUR::Operation::Query
@@ -65,7 +65,7 @@ def parse(args)
 
         opts.on("-R", "--remove", "Remove package(s)") do
             if (options["operation"])
-                puts opts
+                puts(opts)
                 exit RuAURExit::MULTIPLE_OPERATIONS
             end
             options["operation"] = RuAUR::Operation::Remove
@@ -73,7 +73,7 @@ def parse(args)
 
         opts.on("-S", "--sync", "Synchronize package(s)") do
             if (options["operation"])
-                puts opts
+                puts(opts)
                 exit RuAURExit::MULTIPLE_OPERATIONS
             end
             options["operation"] = RuAUR::Operation::Sync
@@ -147,25 +147,25 @@ def parse(args)
     begin
         parser.parse!
     rescue OptionParser::InvalidOption => e
-        puts e.message
-        puts parser
+        puts(e.message)
+        puts(parser)
         exit RuAURExit::INVALID_OPTION
     rescue OptionParser::InvalidArgument => e
-        puts e.message
-        puts parser
+        puts(e.message)
+        puts(parser)
         exit RuAURExit::INVALID_ARGUMENT
     rescue OptionParser::MissingArgument => e
-        puts e.message
-        puts parser
+        puts(e.message)
+        puts(parser)
         exit RuAURExit::MISSING_ARGUMENT
     rescue OptionParser::AmbiguousOption => e
-        puts e.message
-        puts parser
+        puts(e.message)
+        puts(parser)
         exit RuAURExit::AMBIGUOUS_ARGUMENT
     end
 
     if (!RuAUR::validate_options(options))
-        puts parser
+        puts(parser)
         exit RuAURExit::INVALID_OPERATION
     end
 
@@ -186,7 +186,7 @@ begin
         ruaur.remove(options["packages"], options["options"])
     when RuAUR::Operation::Sync
         ret = ruaur.sync(options["packages"], options["options"])
-        puts ret if (ret)
+        puts(ret) if (ret)
     end
 rescue Interrupt
     # ^C
@@ -195,23 +195,30 @@ 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
+    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:"
+        ].join(" ").wrap
+    )
     $stderr.puts
-    $stderr.puts "Oops! Looks like an error has occured! If the " \
-        "error persists, file a bug at:"
+    $stderr.puts("  https://gitlab.com/mjwhitta/ruaur/issues")
     $stderr.puts
-    $stderr.puts "    https://gitlab.com/mjwhitta/ruaur/issues"
+    $stderr.puts(
+        [
+            "Maybe the message below will help. If not, you can use",
+            "the --verbose flag to get a backtrace."
+        ].join(" ").wrap
+    )
     $stderr.puts
-    $stderr.puts "Maybe the message below will help. If not, you " \
-        "can use the --verbose flag to get"
-    $stderr.puts "a backtrace."
 
-    $stderr.puts e.message.white.on_red
+    $stderr.puts(e.message.white.on_red)
     if (options["verbose"])
         e.backtrace.each do |line|
-            $stderr.puts line.light_yellow
+            $stderr.puts(line.light_yellow)
         end
     end
     exit RuAURExit::EXCEPTION

data/lib/ruaur.rb

@@ -79,19 +79,19 @@ class RuAUR
         owns = options.include?(RuAUR::Options::Owns)
 
         if (owns)
-            puts @pacman.query_owns(pkg_names.join(" "))
+            puts(@pacman.query_owns(pkg_names.join(" ")))
         else
             pkg_names.each do |pkg_name|
                 results = @pacman.query(pkg_name, info)
                 results.each do |name, details|
                     print "#{name} " if (!info)
-                    puts details
+                    puts(details)
                     puts if (info)
                 end
                 results = @aur.query(pkg_name, info)
                 results.each do |name, details|
                     print "#{name} " if (!info)
-                    puts details
+                    puts(details)
                     puts if (info)
                 end
             end

data/lib/ruaur/aur.rb

@@ -9,20 +9,23 @@ require "zlib"
 
 class RuAUR::AUR
     def clean
-        puts hilight_status("Cleaning AUR cache...")
+        puts(hilight_status("Cleaning AUR cache..."))
         Dir.chdir(@cache) do
             FileUtils.rm_rf(Dir["*"])
         end
     end
 
-    def compile(package)
-        puts hilight_status("Compiling #{package.name}...")
+    def compile(package, noconfirm = false)
+        puts(hilight_status("Compiling #{package.name}..."))
+
+        cmd = "makepkg -rs"
+        cmd = "makepkg --noconfirm -rs" if (noconfirm)
 
         if (Process.uid == 0)
             system("chown -R nobody:nobody .")
-            system("su -s /bin/sh nobody -c \"makepkg -sr\"")
+            system("su -s /bin/sh nobody -c \"#{cmd}\"")
         else
-            system("makepkg -sr")
+            system(cmd)
         end
 
         tar = "#{package.name}*.pkg.tar"
@@ -41,7 +44,7 @@ class RuAUR::AUR
         FileUtils.rm_f(Dir["#{package.name}.tar.gz*"])
 
         if (status)
-            puts hilight_status("Downloading #{package.name}...")
+            puts(hilight_status("Downloading #{package.name}..."))
         end
 
         tarball(package.name, package.url, "#{package.name}.tar.gz")
@@ -94,7 +97,7 @@ class RuAUR::AUR
         FileUtils.rm_rf(package.name)
 
         if (status)
-            puts hilight_status("Extracting #{package.name}...")
+            puts(hilight_status("Extracting #{package.name}..."))
         end
 
         File.open("#{package.name}.tar.gz", "rb") do |tgz|
@@ -111,7 +114,7 @@ class RuAUR::AUR
     private :extract
 
     def find_upgrades
-        puts hilight_status("Checking for AUR updates...")
+        puts(hilight_status("Checking for AUR updates..."))
 
         upgrades = Hash.new
         multiinfo(@installed.keys).each do |package|
@@ -132,15 +135,19 @@ class RuAUR::AUR
 
     def get_dependencies(package)
         deps = Array.new
+        keep = false
         Dir.chdir("#{@cache}/#{package.name}") do
             system("chown -R nobody:nobody .") if (Process.uid == 0)
             cmd = "su -s /bin/sh nobody -c \"makepkg --printsrcinfo\""
             cmd = "makepkg --printsrcinfo" if (Process.uid != 0)
             %x(#{cmd}).each_line do |line|
+                line.match(/^\s*pkg(base|name)\s*\=\s*(.+)/) do |m|
+                    keep = (m[2] == package.name)
+                end
                 line.match(
                     /^\s*depends(_i686|_x86_64)?\s*\=\s*([^>=:]+)/
                 ) do |m|
-                    deps.push(m[2].strip)
+                    deps.push(m[2].strip) if (keep)
                 end
             end
         end
@@ -213,7 +220,7 @@ class RuAUR::AUR
             @installed.include?(pkg_name) &&
             !package.newer?(@installed[pkg_name])
         )
-            puts hilight_installed("Already installed: #{pkg_name}")
+            puts(hilight_installed("Already installed: #{pkg_name}"))
             return
         end
 
@@ -225,7 +232,7 @@ class RuAUR::AUR
         Dir.chdir("#{@cache}/#{package.name}") do
             return if (edit_pkgbuild(package, noconfirm))
             install_dependencies(package, noconfirm)
-            compiled = compile(package)
+            compiled = compile(package, noconfirm)
             @pacman.install_local(compiled, noconfirm)
         end
 
@@ -235,8 +242,10 @@ class RuAUR::AUR
     def install_dependencies(package, noconfirm)
         get_dependencies(package).each do |dep|
             if (!@installed.has_key?(dep))
-                puts hilight_dependency(
-                    "Installing dependency: #{dep}"
+                puts(
+                    hilight_dependency(
+                        "Installing dependency: #{dep}"
+                    )
                 )
                 if (@pacman.exist?(dep))
                     @pacman.install(dep, noconfirm)
@@ -379,8 +388,8 @@ class RuAUR::AUR
         find_upgrades.each do |pkg_name, versions|
             old, new = versions
 
-            puts hilight_status("Upgrading #{pkg_name}...")
-            puts hilight_upgrade(old, new)
+            puts(hilight_status("Upgrading #{pkg_name}..."))
+            puts(hilight_upgrade(old, new))
             install(pkg_name, noconfirm)
         end
     end

data/lib/ruaur/pacman.rb

@@ -4,13 +4,13 @@ require "shellwords"
 
 class RuAUR::Pacman
     def clean(noconfirm = false)
-        puts hilight_status("Cleaning pacman cache...")
+        puts(hilight_status("Cleaning pacman cache..."))
         system("sudo #{@pac_cmd} -Sc") if (!noconfirm)
         system("sudo #{@pac_cmd} -Sc --noconfirm") if (noconfirm)
     end
 
     def download(pkg_name, noconfirm = false)
-        puts hilight_status("Downloading #{pkg_name}...")
+        puts(hilight_status("Downloading #{pkg_name}..."))
         if (!noconfirm)
             system("sudo #{@pac_cmd} -Sw #{pkg_name}")
         else
@@ -50,11 +50,11 @@ class RuAUR::Pacman
 
     def install(pkg_name, noconfirm = false)
         if (@installed.include?(pkg_name))
-            puts hilight_installed("Already installed: #{pkg_name}")
+            puts(hilight_installed("Already installed: #{pkg_name}"))
             return
         end
 
-        puts hilight_status("Installing #{pkg_name}...")
+        puts(hilight_status("Installing #{pkg_name}..."))
         if (!noconfirm)
             system("sudo #{@pac_cmd} -S #{pkg_name} --needed")
         else
@@ -67,7 +67,7 @@ class RuAUR::Pacman
     end
 
     def install_local(pkgs, noconfirm = false)
-        puts hilight_status("Installing compiled packages...")
+        puts(hilight_status("Installing compiled packages..."))
         xzs = pkgs.join(" ")
         if (!noconfirm)
             system("sudo #{@pac_cmd} -U #{xzs}")
@@ -109,7 +109,7 @@ class RuAUR::Pacman
     end
 
     def remove(pkg_names, nosave = false)
-        puts hilight_status("Removing #{pkg_names.join(" ")}...")
+        puts(hilight_status("Removing #{pkg_names.join(" ")}..."))
         if (!nosave)
             system("sudo #{@pac_cmd} -Rs #{pkg_names.join(" ")}")
         else
@@ -158,7 +158,7 @@ class RuAUR::Pacman
     end
 
     def upgrade(noconfirm = false)
-        puts hilight_status("Updating...")
+        puts(hilight_status("Updating..."))
         system("sudo #{@pac_cmd} -Syyu") if (!noconfirm)
         system("sudo #{@pac_cmd} -Syyu --noconfirm") if (noconfirm)
     end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: ruaur
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: hilighter
   requirement: !ruby/object:Gem::Requirement
@@ -54,22 +54,22 @@ dependencies:
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: scoobydoo
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Can search and install packages for Arch Linux