ruaur 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48b2b7ed59ee0f2ec9ca9cdad118182873dca783
-  data.tar.gz: '083bc6bda5b920f151569330a9b2eb595edc834c'
+  metadata.gz: 33778e9a175425e6693fc707f094213f91d18b2e
+  data.tar.gz: 0727ea32f56645ce63872907fa80bc05c894b94d
 SHA512:
-  metadata.gz: 24b8185da260c21f6a6e6e5939f268761193efdb3d7ee6658cc48a1c9a2f5f6f0db5230f54accf13f5d6d7264ec550b73529549b2cd3bfb5096902b20115c203
-  data.tar.gz: 51b39ca6b34c8b12ed271bf8b93c959e504793e3d3650cf7396a24c9a6a0eac9703effd752e1981e8b88329b1b00b954f5e3a963e37b1e9a38c0210a7237a5ac
+  metadata.gz: 23d06561f9a60c22976dc0624b1b1a628d62b0a06359759994c5d5a4135e3f282bcf593c95188ffdbd3c922931bf1899a3f493a25090945e38c8926e8184e04a
+  data.tar.gz: f18bc12a12834c74aec99b00d9f990085bdd3a9eb0beefe1ed1c52bc312f02e1809a20ff51e25544dc04c038673b1757fbf9d0dda2e1cfd1d60ad891840142bf

data/lib/ruaur/aur.rb

@@ -37,10 +37,13 @@ class RuAUR::AUR
     end
     private :compile
 
-    def download(package)
+    def download(package, status = true)
         FileUtils.rm_f(Dir["#{package.name}.tar.gz*"])
 
-        puts hilight_status("Downloading #{package.name}...")
+        if (status)
+            puts hilight_status("Downloading #{package.name}...")
+        end
+
         tarball(package.name, package.url, "#{package.name}.tar.gz")
 
         tgz = Pathname.new("#{package.name}.tar.gz").expand_path
@@ -85,10 +88,13 @@ class RuAUR::AUR
     end
     private :edit_pkgbuild
 
-    def extract(package)
+    def extract(package, status = true)
         FileUtils.rm_rf(package.name)
 
-        puts hilight_status("Extracting #{package.name}...")
+        if (status)
+            puts hilight_status("Extracting #{package.name}...")
+        end
+
         File.open("#{package.name}.tar.gz", "rb") do |tgz|
             tar = Zlib::GzipReader.new(tgz)
             Minitar.unpack(tar, ".")
@@ -122,6 +128,27 @@ class RuAUR::AUR
     end
     private :find_upgrades
 
+    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
+                end
+            end
+        end
+        return deps
+    end
+
     def hilight_dependency(dependency)
         return dependency if (!RuAUR.hilight?)
         return dependency.light_magenta
@@ -207,26 +234,15 @@ class RuAUR::AUR
     end
 
     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|
-                    dep = scan.gsub(/(\<|\=|\>).*$/, "")
-
-                    # Skip any deps that are variables, for now
-                    # FIXME maybe find way to evaluate variable value
-                    next if (dep.start_with?("$"))
-
-                    if (!@installed.has_key?(dep))
-                        puts hilight_dependency(
-                            "Installing dependency: #{dep}"
-                        )
-                        if (@pacman.exist?(dep))
-                            @pacman.install(dep, noconfirm)
-                        else
-                            install(dep, noconfirm)
-                        end
-                    end
+        get_dependencies(package).each do |dep|
+            if (!@installed.has_key?(dep))
+                puts hilight_dependency(
+                    "Installing dependency: #{dep}"
+                )
+                if (@pacman.exist?(dep))
+                    @pacman.install(dep, noconfirm)
+                else
+                    install(dep, noconfirm)
                 end
             end
         end
@@ -269,7 +285,7 @@ class RuAUR::AUR
         if (!json.empty?)
             results[pkg_name] = json["Version"]
             if (info)
-                max = 0
+                max = 12 # Length of "Dependencies"
                 json.each do |k, v|
                     max = k.length if (max < k.length)
                 end
@@ -279,10 +295,25 @@ class RuAUR::AUR
                     filler = Array.new(max - k.length + 2, " ").join
                     out.push("#{k}#{filler}: #{v}")
                 end
+
+                Dir.chdir(@cache) do
+                    download(package, false)
+                    extract(package, false)
+                end
+
+                deps = get_dependencies(package)
+                filler = Array.new(max - 10, " ").join
+                out.push("Dependencies#{filler}: #{deps.join("  ")}")
+
                 results[pkg_name] = out.join("\n")
             end
         end
 
+        # Clean up
+        Dir.chdir(@cache) do
+            FileUtils.rm_rf(Dir["#{package.name}*"])
+        end
+
         return results
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruaur
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Miles Whittaker