ruaur 0.2.10 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a15df6a67e8bbef446044e61a83017126f90651
-  data.tar.gz: 38d2d1f8168469d5ae8abb3709bb047a4d92f261
+  metadata.gz: 48b2b7ed59ee0f2ec9ca9cdad118182873dca783
+  data.tar.gz: '083bc6bda5b920f151569330a9b2eb595edc834c'
 SHA512:
-  metadata.gz: e3c761ac9b3e76c6e5f54090907f6f15ded67b6dff6e55fee69e709ac67d3c76037e0026e180be41f30d75494e7b92cf5a7287466b1cc05706d8df60b047cb01
-  data.tar.gz: a31bca9de00135bcadd1bc5bd8a711005c7575078bcc5fdaa65c0fafb8e01d4c009b283c0b9d493743a27961d5ebdcf2d69e8ae2c00a9cdc416d28ea10f809b3
+  metadata.gz: 24b8185da260c21f6a6e6e5939f268761193efdb3d7ee6658cc48a1c9a2f5f6f0db5230f54accf13f5d6d7264ec550b73529549b2cd3bfb5096902b20115c203
+  data.tar.gz: 51b39ca6b34c8b12ed271bf8b93c959e504793e3d3650cf7396a24c9a6a0eac9703effd752e1981e8b88329b1b00b954f5e3a963e37b1e9a38c0210a7237a5ac

data/bin/ruaur

@@ -4,6 +4,27 @@ require "hilighter"
 require "optparse"
 require "ruaur"
 
+class Flags
+    # Query
+    INFO = 1
+
+    # Remove
+    NOSAVE = 2
+
+    # Sync
+    CLEAN = 3
+    NAMES_ONLY = 4
+    NOCONFIRM = 5
+    SEARCH = 6
+    UPGRADE = 7
+end
+
+class Operation
+    QUERY = 1
+    REMOVE = 2
+    SYNC = 3
+end
+
 class RuAURExit
     GOOD = 0
     INVALID_OPTION = 1
@@ -15,26 +36,12 @@ class RuAURExit
     AMBIGUOUS_ARGUMENT = 6
 end
 
-class Operation
-    REMOVE = 1
-    SYNC = 2
-end
-
 def parse(args)
     options = Hash.new
+    options["flags"] = Array.new
     options["operation"] = nil
     options["verbose"] = false
 
-    # Sync options
-    options["clean"] = false
-    options["names-only"] = false
-    options["noconfirm"] = false
-    options["search"] = false
-    options["upgrade"] = false
-
-    # Remove options
-    options["nosave"] = false
-
     parser = OptionParser.new do |opts|
         opts.summary_width = 17
 
@@ -60,9 +67,24 @@ def parse(args)
             options["verbose"] = true
         end
 
+        opts.on("--version", "Show version") do
+            __FILE__.match(/ruaur-(\d+\.\d+\.\d+)/) do |m|
+                puts m[1]
+            end
+            exit RuAURExit::GOOD
+        end
+
         opts.on("", "OPERATIONS")
 
-        opts.on("-R", "--remove", "Remove packages") do
+        opts.on("-Q", "--query", "Query the package database") do
+            if (options["operation"])
+                puts opts
+                exit RuAURExit::MULTIPLE_OPERATIONS
+            end
+            options["operation"] = Operation::QUERY
+        end
+
+        opts.on("-R", "--remove", "Remove package(s)") do
             if (options["operation"])
                 puts opts
                 exit RuAURExit::MULTIPLE_OPERATIONS
@@ -70,7 +92,7 @@ def parse(args)
             options["operation"] = Operation::REMOVE
         end
 
-        opts.on("-S", "--sync", "Synchronize packages") do
+        opts.on("-S", "--sync", "Synchronize package(s)") do
             if (options["operation"])
                 puts opts
                 exit RuAURExit::MULTIPLE_OPERATIONS
@@ -78,42 +100,52 @@ def parse(args)
             options["operation"] = Operation::SYNC
         end
 
+        opts.on("", "QUERY_OPTIONS")
+
+        opts.on(
+            "-i",
+            "--info",
+            "Display information for given package(s)"
+        ) do
+            options["flags"].push(Flags::INFO)
+        end
+
+        opts.on("", "REMOVE_OPTIONS")
+
+        opts.on("-n", "--nosave", "Completely remove package") do
+            options["flags"].push(Flags::NOSAVE)
+        end
+
         opts.on("", "SYNC_OPTIONS")
 
         opts.on("-c", "--clean", "Remove packages from the cache") do
-            options["clean"] = true
+            options["flags"].push(Flags::CLEAN)
         end
 
         opts.on(
             "--names-only",
             "Only show package names (useful for tab-completion)",
         ) do
-            options["names-only"] = true
+            options["flags"].push(Flags::NAMES_ONLY)
         end
 
         opts.on(
             "--noconfirm",
             "Bypass any and all \"Are you sure?\" messages"
         ) do
-            options["noconfirm"] = true
+            options["flags"].push(Flags::NOCONFIRM)
         end
 
         opts.on(
             "-s",
             "--search",
-            "Search the sync database and AUR for packages"
+            "Search the sync database and AUR for package(s)"
         ) do
-            options["search"] = true
+            options["flags"].push(Flags::SEARCH)
         end
 
         opts.on("-u", "--sysupgrade", "Upgrade all packages") do
-            options["upgrade"] = true
-        end
-
-        opts.on("", "REMOVE_OPTIONS")
-
-        opts.on("-n", "--nosave", "Completely remove package") do
-            options["nosave"] = true
+            options["flags"].push(Flags::UPGRADE)
         end
     end
 
@@ -149,34 +181,45 @@ end
 
 def validate(options)
     case options["operation"]
+    when Operation::QUERY
+        flags = options["flags"].select do |flag|
+            flag != Flags::INFO
+        end
+        return false if (!flags.empty?)
     when Operation::REMOVE
-        if (
-            options["clean"] ||
-            options["names-only"] ||
-            options["noconfirm"] ||
-            options["search"] ||
-            options["upgrade"]
-        )
-            return false
+        flags = options["flags"].select do |flag|
+            flag != Flags::NOSAVE
         end
+        return false if (!flags.empty?)
     when Operation::SYNC
-        return false if (options["nosave"])
+        flags = options["flags"].select do |flag|
+            (flag != Flags::CLEAN) &&
+            (flag != Flags::NAMES_ONLY) &&
+            (flag != Flags::NOCONFIRM) &&
+            (flag != Flags::SEARCH) &&
+            (flag != Flags::UPGRADE)
+        end
+        return false if (!flags.empty?)
 
-        if (options["clean"])
+        if (options["flags"].include?(Flags::CLEAN))
             if (
-                options["names-only"] ||
-                options["search"] ||
-                options["upgrade"]
+                options["flags"].include?(Flags::NAMES_ONLY) ||
+                options["flags"].include?(Flags::SEARCH) ||
+                options["flags"].include?(Flags::UPGRADE)
             )
                 return false
             end
-        elsif (options["search"])
-            return false if (options["clean"] || options["upgrade"])
-        elsif (options["upgrade"])
+        elsif (options["flags"].include?(Flags::SEARCH))
             if (
-                options["clean"] ||
-                options["names-only"] ||
-                options["search"]
+                options["flags"].include?(Flags::CLEAN) || options["flags"].include?(Flags::UPGRADE)
+            )
+                return false
+            end
+        elsif (options["flags"].include?(Flags::UPGRADE))
+            if (
+                options["flags"].include?(Flags::CLEAN) ||
+                options["flags"].include?(Flags::NAMES_ONLY) ||
+                options["flags"].include?(Flags::SEARCH)
             )
                 return false
             end
@@ -195,20 +238,33 @@ begin
     ruaur = RuAUR.new(!Hilighter.disable?)
 
     case options["operation"]
+    when Operation::QUERY
+        ruaur.query(
+            options["packages"],
+            options["flags"].include?(Flags::INFO)
+        )
     when Operation::REMOVE
-        ruaur.remove(options["packages"], options["nosave"])
+        ruaur.remove(
+            options["packages"],
+            options["flags"].include?(Flags::NOSAVE)
+        )
     when Operation::SYNC
-        if (options["clean"])
-            ruaur.clean(options["noconfirm"])
-        elsif (options["search"])
+        if (options["flags"].include?(Flags::CLEAN))
+            ruaur.clean(options["flags"].include?(Flags::NOCONFIRM))
+        elsif (options["flags"].include?(Flags::SEARCH))
             puts ruaur.search(
                 options["packages"].join(" "),
-                options["names-only"]
+                options["flags"].include?(Flags::NAMES_ONLY)
+            )
+        elsif (options["flags"].include?(Flags::UPGRADE))
+            ruaur.upgrade(
+                options["flags"].include?(Flags::NOCONFIRM)
             )
-        elsif (options["upgrade"])
-            ruaur.upgrade(options["noconfirm"])
         else
-            ruaur.install(options["packages"], options["noconfirm"])
+            ruaur.install(
+                options["packages"],
+                options["flags"].include?(Flags::NOCONFIRM)
+            )
         end
     end
 rescue Interrupt

data/lib/ruaur/aur.rb

@@ -17,6 +17,7 @@ class RuAUR::AUR
 
     def compile(package)
         puts hilight_status("Compiling #{package.name}...")
+
         if (Process.uid == 0)
             system("chown -R nobody:nobody .")
             system("su -s /bin/sh nobody -c \"makepkg -sr\"")
@@ -25,8 +26,11 @@ class RuAUR::AUR
         end
 
         compiled = Dir["#{package.name}*.pkg.tar.xz"]
+
         if (compiled.empty?)
-            raise RuAUR::Error::FailedToCompileError.new(package.name)
+            raise RuAUR::Error::FailedToCompileError.new(
+                package.name
+            )
         end
 
         return compiled
@@ -142,11 +146,19 @@ class RuAUR::AUR
     end
     private :hilight_upgrade
 
-    def info(package)
-        return nil if (package.nil? || package.empty?)
+    def info(pkg_name)
+        return nil if (pkg_name.nil? || pkg_name.empty?)
+
+        query = "type=info&arg=#{pkg_name}"
+        response = Typhoeus.get("#{@rpc_url}?#{query}", timeout: 5)
 
-        query = "type=info&arg=#{package}"
-        body = JSON.parse(Typhoeus.get("#{@rpc_url}?#{query}").body)
+        if (response.timed_out?)
+            raise RuAUR::Error::AURError.new(
+                "Check your internet connection!"
+            )
+        end
+
+        body = JSON.parse(response.body)
 
         if (body["type"] == "error")
             raise RuAUR::Error::AURError.new(body["results"])
@@ -167,7 +179,6 @@ class RuAUR::AUR
 
     def install(pkg_name, noconfirm = false)
         package = info(pkg_name)
-
         if (package.nil?)
             raise RuAUR::Error::PackageNotFoundError.new(pkg_name)
         end
@@ -184,6 +195,7 @@ class RuAUR::AUR
             download(package)
             extract(package)
         end
+
         Dir.chdir("#{@cache}/#{package.name}") do
             return if (edit_pkgbuild(package, noconfirm))
             install_dependencies(package, noconfirm)
@@ -196,7 +208,6 @@ class RuAUR::AUR
 
     def install_dependencies(package, noconfirm)
         pkgbuild = File.read("PKGBUILD")
-
         pkgbuild.match(/^depends\=\(([^\)]+)\)/m) do |match|
             match.captures.each do |cap|
                 cap.gsub(/\n/, " ").scan(/[^' ]+/) do |scan|
@@ -223,11 +234,19 @@ class RuAUR::AUR
     private :install_dependencies
 
     def multiinfo(pkgs)
-        results = Array.new
-        return results if (pkgs.nil? || pkgs.empty?)
+        return Array.new if (pkgs.nil? || pkgs.empty?)
 
+        results = Array.new
         query = "type=multiinfo&arg[]=#{pkgs.join("&arg[]=")}"
-        body = JSON.parse(Typhoeus.get("#{@rpc_url}?#{query}").body)
+        response = Typhoeus.get("#{@rpc_url}?#{query}", timeout: 5)
+
+        if (response.timed_out?)
+            raise RuAUR::Error::AURError.new(
+                "Check your internet connection!"
+            )
+        end
+
+        body = JSON.parse(response.body)
 
         if (body["type"] == "error")
             raise RuAUR::Error::AURError.new(body["results"])
@@ -236,15 +255,51 @@ class RuAUR::AUR
         body["results"].each do |result|
             results.push(RuAUR::Package.new(result, "aur"))
         end
+
         return results.sort
     end
 
+    def query(pkg_name, info = false)
+        package = info(pkg_name)
+        return Hash.new if (package.nil?)
+
+        results = Hash.new
+        json = package.json
+
+        if (!json.empty?)
+            results[pkg_name] = json["Version"]
+            if (info)
+                max = 0
+                json.each do |k, v|
+                    max = k.length if (max < k.length)
+                end
+
+                out = Array.new
+                json.each do |k, v|
+                    filler = Array.new(max - k.length + 2, " ").join
+                    out.push("#{k}#{filler}: #{v}")
+                end
+                results[pkg_name] = out.join("\n")
+            end
+        end
+
+        return results
+    end
+
     def search(string)
         results = Array.new
         return results if (string.nil? || string.empty?)
 
         query = "type=search&arg=#{string}"
-        body = JSON.parse(Typhoeus.get("#{@rpc_url}?#{query}").body)
+        response = Typhoeus.get("#{@rpc_url}?#{query}", timeout: 5)
+
+        if (response.timed_out?)
+            raise RuAUR::Error::AURError.new(
+                "Check your internet connection!"
+            )
+        end
+
+        body = JSON.parse(response.body)
 
         if (body["type"] == "error")
             raise RuAUR::Error::AURError.new(body["results"])
@@ -269,17 +324,21 @@ class RuAUR::AUR
 
         tgz = File.open(file, "wb")
         request = Typhoeus::Request.new(url)
+
         request.on_headers do |response|
             if (response.code != 200)
                 raise RuAUR::Error::FailedToDownloadError.new(name)
             end
         end
+
         request.on_body do |chunk|
             tgz.write(chunk)
         end
+
         request.on_complete do
             tgz.close
         end
+
         request.run
     end
     private :tarball

data/lib/ruaur/pacman.rb

@@ -64,11 +64,19 @@ class RuAUR::Pacman
         end
     end
 
-    def query(pkg_name = "")
+    def query(pkg_name = "", info = false)
         results = Hash.new
-        %x(#{@pac_nocolor} -Q #{pkg_name}).split("\n").each do |line|
-            line = line.split
-            results[line[0]] = line[1]
+        if (info)
+            result = %x(#{@pac_nocolor} -Qi #{pkg_name} 2>/dev/null)
+            result.strip!
+            results[pkg_name] = result if (!result.empty?)
+        else
+            result = %x(#{@pac_nocolor} -Q #{pkg_name} 2>/dev/null)
+            result.strip!
+            result.split("\n").each do |l|
+                name, version = l.split
+                results[name] = version
+            end
         end
         return results
     end

data/lib/ruaur.rb

@@ -57,6 +57,23 @@ class RuAUR
         unlock
     end
 
+    def query(pkg_names, info = false)
+        pkg_names.each do |pkg_name|
+            results = @pacman.query(pkg_name, info)
+            results.each do |name, details|
+                print "#{name} " if (!info)
+                puts details
+                puts if (info)
+            end
+            results = @aur.query(pkg_name, info)
+            results.each do |name, details|
+                print "#{name} " if (!info)
+                puts details
+                puts if (info)
+            end
+        end
+    end
+
     def remove(pkg_names, nosave = false)
         check_and_lock
         @pacman.remove(pkg_names, nosave)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruaur
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.3.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '12.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 12.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '12.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 12.1.0
 - !ruby/object:Gem::Dependency
   name: hilighter
   requirement: !ruby/object:Gem::Requirement
@@ -96,20 +96,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.3.0
 description: RuAUR is a Ruby gem that allows searching and installing packages from
   the Pacman sync database as well as the Arch User Repository (AUR).
 email: mjwhitta@gmail.com
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Can search and install packages for Arch Linux