ruaur 0.3.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f53abf0e780651b0812a01891e932a1d838d8405816c517e639eacb7fde261b7
-  data.tar.gz: 7e9fac6807b77aa3a452913decfa70e839349e740899d74c00e72325efb1ab4c
+  metadata.gz: b01098013dd9ed59fccce23da82483847e996f0bb1a7c97f628bbc9f9dcacaf8
+  data.tar.gz: 31c06195d3623e8e9dbe1c0bb81474541f3a827c058cc26d2482883f58f61c78
 SHA512:
-  metadata.gz: e7e38ec385c2e13696913548716a7f022225cb1bcecee212934f0b4d2b08316a81f4e769cbf4e2517681a0df9adefb3ce4c5e1b500d16690937a8034b1852c63
-  data.tar.gz: d3d1bf51e7117a0f51bc32e663c6ea63cf85fe342082a4b283efe05d8c9cb030e4c3733d43356ad4a80e80d3def336c6b1cfdc47db2ce2a7b3713115d62f03f4
+  metadata.gz: d67993b378e92f3ce5722202bd0f314922b89b71032700679f6053cc35acf8582ca9c3d018043323eded941deed8021bb0d5da25d3fe3ccc211a79aeef4ae614
+  data.tar.gz: ac9a1bbe13af4575d50fcea0ae677fbf4ce98cacd767b61a5b308846cd7fc43985692019aa5c6764d1bf9d73b6942955f045a6bcb441af0a6cf35a44104153aa

data/bin/ruaur

@@ -4,28 +4,6 @@ require "hilighter"
 require "optparse"
 require "ruaur"
 
-class Flags
-    # Query
-    INFO = 1
-    OWNS = 2
-
-    # Remove
-    NOSAVE = 3
-
-    # Sync
-    CLEAN = 4
-    NAMES_ONLY = 5
-    NOCONFIRM = 6
-    SEARCH = 7
-    UPGRADE = 8
-end
-
-class Operation
-    QUERY = 1
-    REMOVE = 2
-    SYNC = 3
-end
-
 class RuAURExit
     GOOD = 0
     INVALID_OPTION = 1
@@ -39,12 +17,12 @@ end
 
 def parse(args)
     options = Hash.new
-    options["flags"] = Array.new
     options["operation"] = nil
+    options["options"] = Array.new
     options["verbose"] = false
 
     parser = OptionParser.new do |opts|
-        opts.summary_width = 17
+        opts.summary_width = 19
 
         opts.banner =
             "Usage: #{File.basename($0)} <operation> [OPTIONS] [pkgs]"
@@ -82,7 +60,7 @@ def parse(args)
                 puts opts
                 exit RuAURExit::MULTIPLE_OPERATIONS
             end
-            options["operation"] = Operation::QUERY
+            options["operation"] = RuAUR::Operation::Query
         end
 
         opts.on("-R", "--remove", "Remove package(s)") do
@@ -90,7 +68,7 @@ def parse(args)
                 puts opts
                 exit RuAURExit::MULTIPLE_OPERATIONS
             end
-            options["operation"] = Operation::REMOVE
+            options["operation"] = RuAUR::Operation::Remove
         end
 
         opts.on("-S", "--sync", "Synchronize package(s)") do
@@ -98,7 +76,7 @@ def parse(args)
                 puts opts
                 exit RuAURExit::MULTIPLE_OPERATIONS
             end
-            options["operation"] = Operation::SYNC
+            options["operation"] = RuAUR::Operation::Sync
         end
 
         opts.on("", "QUERY_OPTIONS")
@@ -108,7 +86,7 @@ def parse(args)
             "--info",
             "Display information for given package(s)"
         ) do
-            options["flags"].push(Flags::INFO)
+            options["options"].push(RuAUR::Options::Info)
         end
 
         opts.on(
@@ -116,33 +94,33 @@ def parse(args)
             "--owns",
             "Search for packages that own the specified file(s)"
         ) do
-            options["flags"].push(Flags::OWNS)
+            options["options"].push(RuAUR::Options::Owns)
         end
 
         opts.on("", "REMOVE_OPTIONS")
 
         opts.on("-n", "--nosave", "Completely remove package") do
-            options["flags"].push(Flags::NOSAVE)
+            options["options"].push(RuAUR::Options::NoSave)
         end
 
         opts.on("", "SYNC_OPTIONS")
 
         opts.on("-c", "--clean", "Remove packages from the cache") do
-            options["flags"].push(Flags::CLEAN)
+            options["options"].push(RuAUR::Options::Clean)
         end
 
         opts.on(
             "--names-only",
             "Only show package names (useful for tab-completion)",
         ) do
-            options["flags"].push(Flags::NAMES_ONLY)
+            options["options"].push(RuAUR::Options::NamesOnly)
         end
 
         opts.on(
             "--noconfirm",
             "Bypass any and all \"Are you sure?\" messages"
         ) do
-            options["flags"].push(Flags::NOCONFIRM)
+            options["options"].push(RuAUR::Options::NoConfirm)
         end
 
         opts.on(
@@ -150,11 +128,19 @@ def parse(args)
             "--search",
             "Search the sync database and AUR for package(s)"
         ) do
-            options["flags"].push(Flags::SEARCH)
+            options["options"].push(RuAUR::Options::Search)
         end
 
         opts.on("-u", "--sysupgrade", "Upgrade all packages") do
-            options["flags"].push(Flags::UPGRADE)
+            options["options"].push(RuAUR::Options::Upgrade)
+        end
+
+        opts.on(
+            "-w",
+            "--downloadonly",
+            "Retrieve packages from the server, but do not install"
+        ) do
+            options["options"].push(RuAUR::Options::Download)
         end
     end
 
@@ -178,7 +164,7 @@ def parse(args)
         exit RuAURExit::AMBIGUOUS_ARGUMENT
     end
 
-    if (!validate(options))
+    if (!RuAUR::validate_options(options))
         puts parser
         exit RuAURExit::INVALID_OPERATION
     end
@@ -188,95 +174,19 @@ def parse(args)
     return options
 end
 
-def validate(options)
-    case options["operation"]
-    when Operation::QUERY
-        flags = options["flags"].select do |flag|
-            (flag != Flags::INFO) &&
-            (flag != Flags::OWNS)
-        end
-        return false if (!flags.empty?)
-    when Operation::REMOVE
-        flags = options["flags"].select do |flag|
-            flag != Flags::NOSAVE
-        end
-        return false if (!flags.empty?)
-    when Operation::SYNC
-        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["flags"].include?(Flags::CLEAN))
-            if (
-                options["flags"].include?(Flags::NAMES_ONLY) ||
-                options["flags"].include?(Flags::SEARCH) ||
-                options["flags"].include?(Flags::UPGRADE)
-            )
-                return false
-            end
-        elsif (options["flags"].include?(Flags::SEARCH))
-            if (
-                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
-        end
-    else
-        return false
-    end
-
-    return true
-end
-
 # Parse CLI args
 options = parse(ARGV)
 
 begin
     ruaur = RuAUR.new(!Hilighter.disable?)
-
     case options["operation"]
-    when Operation::QUERY
-        ruaur.query(
-            options["packages"],
-            options["flags"].include?(Flags::INFO),
-            options["flags"].include?(Flags::OWNS)
-        )
-    when Operation::REMOVE
-        ruaur.remove(
-            options["packages"],
-            options["flags"].include?(Flags::NOSAVE)
-        )
-    when Operation::SYNC
-        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["flags"].include?(Flags::NAMES_ONLY)
-            )
-        elsif (options["flags"].include?(Flags::UPGRADE))
-            ruaur.upgrade(
-                options["flags"].include?(Flags::NOCONFIRM)
-            )
-        else
-            ruaur.install(
-                options["packages"],
-                options["flags"].include?(Flags::NOCONFIRM)
-            )
-        end
+    when RuAUR::Operation::Query
+        ruaur.query(options["packages"], options["options"])
+    when RuAUR::Operation::Remove
+        ruaur.remove(options["packages"], options["options"])
+    when RuAUR::Operation::Sync
+        ret = ruaur.sync(options["packages"], options["options"])
+        puts ret if (ret)
     end
 rescue Interrupt
     # ^C

data/lib/ruaur/aur.rb

@@ -53,7 +53,6 @@ class RuAUR::AUR
             )
         end
     end
-    private :download
 
     def edit_pkgbuild(package, noconfirm = false)
         return false if (noconfirm)
@@ -134,18 +133,9 @@ class RuAUR::AUR
     def get_dependencies(package)
         deps = Array.new
         Dir.chdir("#{@cache}/#{package.name}") do
-            pkgbuild = File.read("PKGBUILD")
-            pkgbuild.match(/^depends\=\(([^\)]+)\)/m) do |match|
-                match.captures.each do |cap|
-                    cap.gsub(/\n/, " ").scan(/[^' ]+/) do |scan|
-                        # Strip version info and skip any deps that
-                        # are variables, for now
-                        # FIXME maybe find way to evaluate variable
-                        # value
-                        dep = scan.gsub(/(\<|\=|\>).*$/, "")
-                        next if (dep.start_with?("$"))
-                        deps.push(dep)
-                    end
+            %x(makepkg --printsrcinfo).each_line do |line|
+                line.match(/depends\s*\=\s*([^>=:\n]+)/) do |m|
+                    deps.push(m[1])
                 end
             end
         end

data/lib/ruaur/operation.rb

@@ -0,0 +1,5 @@
+class RuAUR::Operation
+    Query = 1
+    Remove = 2
+    Sync = 3
+end

data/lib/ruaur/options.rb

@@ -0,0 +1,16 @@
+class RuAUR::Options
+    # Query
+    Info = 1
+    Owns = 2
+
+    # Remove
+    NoSave = 3
+
+    # Sync
+    Clean = 4
+    Download = 5
+    NamesOnly = 6
+    NoConfirm = 7
+    Search = 8
+    Upgrade = 9
+end

data/lib/ruaur/pacman.rb

@@ -8,6 +8,15 @@ class RuAUR::Pacman
         system("sudo #{@pac_cmd} -Sc --noconfirm") if (noconfirm)
     end
 
+    def download(pkg_name, noconfirm = false)
+        puts hilight_status("Downloading #{pkg_name}...")
+        if (!noconfirm)
+            system("sudo #{@pac_cmd} -Sw #{pkg_name}")
+        else
+            system("sudo #{@pac_cmd} -Sw #{pkg_name} --noconfirm")
+        end
+    end
+
     def exist?(pkg_name)
         return !%x(#{@pac_nocolor} -Ss "^#{pkg_name}$").empty?
     end
@@ -82,17 +91,10 @@ class RuAUR::Pacman
     end
 
     def query_aur(pkg_name = "")
-        community = Pathname.new(
-            "/var/lib/pacman/sync/community"
-        ).expand_path
-
         results = Hash.new
         %x(
-            #{@pac_nocolor} -Qm #{pkg_name}
-        ).split("\n").delete_if do |p|
-            # Skip packages in community
-            Dir["#{community}/#{p.split.join("-")}"].any?
-        end.each do |line|
+            #{@pac_nocolor} -Qm #{pkg_name} 2>/dev/null
+        ).each_line do |line|
             line = line.split
             results[line[0]] = line[1]
         end

data/lib/ruaur.rb

@@ -12,8 +12,25 @@ class RuAUR
     private :check_and_lock
 
     def clean(noconfirm)
+        check_and_lock
         @pacman.clean(noconfirm)
         @aur.clean
+    ensure
+        unlock
+    end
+
+    def download(pkg_names, noconfirm = false)
+        pkg_names.each do |pkg_name|
+            if (@pacman.exist?(pkg_name))
+                @pacman.download(pkg_name, noconfirm)
+                system(
+                    "cp /var/cache/pacman/pkg/#{pkg_name}-[0-9]*.xz ."
+                )
+            else
+                package = @aur.info(pkg_name)
+                @aur.download(package)
+            end
+        end
     end
 
     def self.hilight?
@@ -57,7 +74,10 @@ class RuAUR
         unlock
     end
 
-    def query(pkg_names, info = false, owns = false)
+    def query(pkg_names, options = [])
+        info = options.include?(RuAUR::Options::Info)
+        owns = options.include?(RuAUR::Options::Owns)
+
         if (owns)
             puts @pacman.query_owns(pkg_names.join(" "))
         else
@@ -78,8 +98,9 @@ class RuAUR
         end
     end
 
-    def remove(pkg_names, nosave = false)
+    def remove(pkg_names, options = [])
         check_and_lock
+        nosave = options.include?(RuAUR::Options::NoSave)
         @pacman.remove(pkg_names, nosave)
     ensure
         unlock
@@ -95,6 +116,30 @@ class RuAUR
         return names
     end
 
+    def sync(packages = [], options = [])
+        if (options.include?(RuAUR::Options::Clean))
+            clean(options.include?(RuAUR::Options::NoConfirm))
+        elsif (options.include?(RuAUR::Options::Download))
+            download(
+                packages,
+                options.include?(RuAUR::Options::NoConfirm)
+            )
+        elsif (options.include?(RuAUR::Options::Search))
+            return search(
+                packages.join(" "),
+                options.include?(RuAUR::Options::NamesOnly)
+            )
+        elsif (options.include?(RuAUR::Options::Upgrade))
+            upgrade(options.include?(RuAUR::Options::NoConfirm))
+        else
+            install(
+                packages,
+                options.include?(RuAUR::Options::NoConfirm)
+            )
+        end
+        return nil
+    end
+
     def unlock
         FileUtils.rm_f(@lock)
     end
@@ -107,9 +152,66 @@ class RuAUR
     ensure
         unlock
     end
+
+    def self.validate_options(options)
+        valid = {
+            RuAUR::Operation::Query => {
+                "valid" => [
+                    RuAUR::Options::Info,
+                    RuAUR::Options::Owns
+                ]
+            },
+            RuAUR::Operation::Remove => {
+                "valid" => [
+                    RuAUR::Options::NoSave
+                ]
+            },
+            RuAUR::Operation::Sync => {
+                "valid" => [
+                    RuAUR::Options::Clean,
+                    RuAUR::Options::Download,
+                    RuAUR::Options::NamesOnly,
+                    RuAUR::Options::NoConfirm,
+                    RuAUR::Options::Search,
+                    RuAUR::Options::Upgrade
+                ],
+                RuAUR::Options::Clean => [
+                    RuAUR::Options::Clean,
+                    RuAUR::Options::NoConfirm
+                ],
+                RuAUR::Options::Download => [
+                    RuAUR::Options::Download,
+                    RuAUR::Options::NoConfirm
+                ],
+                RuAUR::Options::Search => [
+                    RuAUR::Options::NamesOnly,
+                    RuAUR::Options::NoConfirm,
+                    RuAUR::Options::Search
+                ],
+                RuAUR::Options::Upgrade => [
+                    RuAUR::Options::NoConfirm,
+                    RuAUR::Options::Upgrade
+                ]
+            }
+        }
+
+        return false if (valid[options["operation"]].nil?)
+
+        valid[options["operation"]].each do |k, v|
+            if ((k == "valid") || options["options"].include?(k))
+                options["options"].each do |o|
+                    return false if (!v.include?(o))
+                end
+            end
+        end
+
+        return true
+    end
 end
 
 require "ruaur/aur"
 require "ruaur/error"
+require "ruaur/operation"
+require "ruaur/options"
 require "ruaur/package"
 require "ruaur/pacman"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruaur
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -130,6 +130,8 @@ files:
 - lib/ruaur/error/package_not_found_error.rb
 - lib/ruaur/error/package_not_installed_error.rb
 - lib/ruaur/error/ruaur_already_running_error.rb
+- lib/ruaur/operation.rb
+- lib/ruaur/options.rb
 - lib/ruaur/package.rb
 - lib/ruaur/pacman.rb
 homepage: https://mjwhitta.github.io/ruaur