ruaur 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f30ee3547cf8f289a463fb44b65c0301b61fa9cc1e03cebd305842c7c8fbdf8
-  data.tar.gz: cb7cd6303985596af02d528f82b4174286671b922d3bf650224c069c8340835c
+  metadata.gz: 3f309e539238f5b09c165e1f33ec6ab925bd60318122c5d2d2acb1e58eadf6a1
+  data.tar.gz: 7cf6e42fe094284f512b0b026a011407fc6cde2e88ea36ec2f321ecc31f6ceef
 SHA512:
-  metadata.gz: 479c0e1c0fed696eef6dd3e52351fd365f26e561f0cf890b2f908cc856625c26b352e09a7d61e0da3ce5968d70ba6aa5ba512c4a17a3fce69c29621032c8d851
-  data.tar.gz: d8dcb6eab55ec4a9598af8e241532514825416f68b41e44dad729359d93a5d6d5ac313a52cf094a72d85f03fcec670ce206ff2d53e7cf138ae72c1f523804dd4
+  metadata.gz: e7c79f9a130e1f6dc6d2eb3ff72f5471217ff11cd0d487054e2b2b129942a620757f78af2a1aed78545afa593d83bbc02f971f7600b726ff0988a2dd03f9d542
+  data.tar.gz: 0e30cc94bd5c1a73f4a3fd9a64da08a35f94a86ac1c28f7359330e909aed5a3edc7033b17ac9e93542598cdd0c7b32fe2698d089ac43773f77ccf52ea449930d

data/lib/ruaur.rb

@@ -4,7 +4,7 @@ require "scoobydoo"
 class RuAUR
     def check_and_lock
         if (@lock.exist?)
-            raise RuAUR::Error::RuAURAlreadyRunningError.new
+            raise RuAUR::Error::RuAURAlreadyRunning.new
         end
 
         FileUtils.touch(@lock)
@@ -46,7 +46,7 @@ class RuAUR
             "sudo"
         ].each do |dep|
             if (ScoobyDoo.where_are_you(dep).nil?)
-                raise RuAUR::Error::MissingDependencyError.new(dep)
+                raise RuAUR::Error::MissingDependency.new(dep)
             end
         end
 
@@ -58,7 +58,7 @@ class RuAUR
 
     def install(pkg_names, noconfirm = false)
         if (pkg_names.nil? || pkg_names.empty?)
-            raise RuAUR::Error::PackageNotFoundError.new
+            raise RuAUR::Error::PackageNotFound.new
         end
 
         check_and_lock

data/lib/ruaur/aur.rb

@@ -28,7 +28,7 @@ class RuAUR::AUR
         compiled = Dir["#{package.name}*.pkg.tar.xz"]
 
         if (compiled.empty?)
-            raise RuAUR::Error::FailedToCompileError.new(
+            raise RuAUR::Error::FailedToCompile.new(
                 package.name
             )
         end
@@ -48,7 +48,7 @@ class RuAUR::AUR
 
         tgz = Pathname.new("#{package.name}.tar.gz").expand_path
         if (!tgz.exist?)
-            raise RuAUR::Error::FailedToDownloadError.new(
+            raise RuAUR::Error::FailedToDownload.new(
                 package.name
             )
         end
@@ -105,7 +105,7 @@ class RuAUR::AUR
 
         dir = Pathname.new(package.name).expand_path
         if (!dir.exist? || !dir.directory?)
-            raise RuAUR::Error::FailedToExtractError.new(package.name)
+            raise RuAUR::Error::FailedToExtract.new(package.name)
         end
     end
     private :extract
@@ -178,7 +178,7 @@ class RuAUR::AUR
         response = Typhoeus.get("#{@rpc_url}?#{query}", timeout: 5)
 
         if (response.timed_out?)
-            raise RuAUR::Error::AURError.new(
+            raise RuAUR::Error::AUR.new(
                 "Check your internet connection!"
             )
         end
@@ -187,7 +187,7 @@ class RuAUR::AUR
         body = JSON.parse(response.body)
 
         if (body["type"] == "error")
-            raise RuAUR::Error::AURError.new(body["results"])
+            raise RuAUR::Error::AUR.new(body["results"])
         end
 
         return nil if (body["results"].empty?)
@@ -206,7 +206,7 @@ class RuAUR::AUR
     def install(pkg_name, noconfirm = false)
         package = info(pkg_name)
         if (package.nil?)
-            raise RuAUR::Error::PackageNotFoundError.new(pkg_name)
+            raise RuAUR::Error::PackageNotFound.new(pkg_name)
         end
 
         if (
@@ -256,7 +256,7 @@ class RuAUR::AUR
         response = Typhoeus.get("#{@rpc_url}?#{query}", timeout: 5)
 
         if (response.timed_out?)
-            raise RuAUR::Error::AURError.new(
+            raise RuAUR::Error::AUR.new(
                 "Check your internet connection!"
             )
         end
@@ -265,7 +265,7 @@ class RuAUR::AUR
         body = JSON.parse(response.body)
 
         if (body["type"] == "error")
-            raise RuAUR::Error::AURError.new(body["results"])
+            raise RuAUR::Error::AUR.new(body["results"])
         end
 
         body["results"].each do |result|
@@ -325,7 +325,7 @@ class RuAUR::AUR
         response = Typhoeus.get("#{@rpc_url}?#{query}", timeout: 5)
 
         if (response.timed_out?)
-            raise RuAUR::Error::AURError.new(
+            raise RuAUR::Error::AUR.new(
                 "Check your internet connection!"
             )
         end
@@ -334,7 +334,7 @@ class RuAUR::AUR
         body = JSON.parse(response.body)
 
         if (body["type"] == "error")
-            raise RuAUR::Error::AURError.new(body["results"])
+            raise RuAUR::Error::AUR.new(body["results"])
         end
 
         body["results"].each do |result|
@@ -359,7 +359,7 @@ class RuAUR::AUR
 
         request.on_headers do |response|
             if (response.code != 200)
-                raise RuAUR::Error::FailedToDownloadError.new(name)
+                raise RuAUR::Error::FailedToDownload.new(name)
             end
         end
 

data/lib/ruaur/error.rb

@@ -1,11 +1,11 @@
 class RuAUR::Error < RuntimeError
 end
 
-require "ruaur/error/aur_error"
-require "ruaur/error/failed_to_compile_error"
-require "ruaur/error/failed_to_download_error"
-require "ruaur/error/failed_to_extract_error"
-require "ruaur/error/missing_dependency_error"
-require "ruaur/error/package_not_found_error"
-require "ruaur/error/package_not_installed_error"
-require "ruaur/error/ruaur_already_running_error"
+require "ruaur/error/aur"
+require "ruaur/error/failed_to_compile"
+require "ruaur/error/failed_to_download"
+require "ruaur/error/failed_to_extract"
+require "ruaur/error/missing_dependency"
+require "ruaur/error/package_not_found"
+require "ruaur/error/package_not_installed"
+require "ruaur/error/ruaur_already_running"

data/lib/ruaur/error/{aur_error.rb → aur.rb}

@@ -1,4 +1,4 @@
-class RuAUR::Error::AURError < RuAUR::Error
+class RuAUR::Error::AUR < RuAUR::Error
     def initialize(msg)
         super(msg)
     end

data/lib/ruaur/error/{failed_to_compile_error.rb → failed_to_compile.rb}

@@ -1,4 +1,4 @@
-class RuAUR::Error::FailedToCompileError < RuAUR::Error
+class RuAUR::Error::FailedToCompile < RuAUR::Error
     def initialize(package = nil)
         super("Failed to compile: #{package}") if (package)
         super("Failed to compile") if (package.nil?)

data/lib/ruaur/error/{failed_to_download_error.rb → failed_to_download.rb}

@@ -1,4 +1,4 @@
-class RuAUR::Error::FailedToDownloadError < RuAUR::Error
+class RuAUR::Error::FailedToDownload < RuAUR::Error
     def initialize(package = nil)
         super("Failed to download: #{package}") if (package)
         super("Failed to download") if (package.nil?)

data/lib/ruaur/error/{failed_to_extract_error.rb → failed_to_extract.rb}

@@ -1,4 +1,4 @@
-class RuAUR::Error::FailedToExtractError < RuAUR::Error
+class RuAUR::Error::FailedToExtract < RuAUR::Error
     def initialize(package = nil)
         super("Failed to extract: #{package}") if (package)
         super("Failed to extract") if (package.nil?)

data/lib/ruaur/error/{missing_dependency_error.rb → missing_dependency.rb}

@@ -1,4 +1,4 @@
-class RuAUR::Error::MissingDependencyError < RuAUR::Error
+class RuAUR::Error::MissingDependency < RuAUR::Error
     def initialize(dep = nil)
         super("Dependency not found: #{dep}") if (dep)
         super("Dependency not found") if (dep.nil?)

data/lib/ruaur/error/{package_not_found_error.rb → package_not_found.rb}

@@ -1,4 +1,4 @@
-class RuAUR::Error::PackageNotFoundError < RuAUR::Error
+class RuAUR::Error::PackageNotFound < RuAUR::Error
     def initialize(package = nil)
         super("Package not found: #{package}") if (package)
         super("No package was specified") if (package.nil?)

data/lib/ruaur/error/{package_not_installed_error.rb → package_not_installed.rb}

@@ -1,4 +1,4 @@
-class RuAUR::Error::PackageNotInstalledError < RuAUR::Error
+class RuAUR::Error::PackageNotInstalled < RuAUR::Error
     def initialize(package = nil)
         super("Package not installed: #{package}") if (package)
         super("Package not installed") if (package.nil?)

data/lib/ruaur/error/{ruaur_already_running_error.rb → ruaur_already_running.rb}

@@ -1,4 +1,4 @@
-class RuAUR::Error::RuAURAlreadyRunningError < RuAUR::Error
+class RuAUR::Error::RuAURAlreadyRunning < RuAUR::Error
     def initialize
         super("RuAUR is already running")
     end

data/lib/ruaur/pacman.rb

@@ -1,5 +1,6 @@
 require "hilighter"
 require "pathname"
+require "shellwords"
 
 class RuAUR::Pacman
     def clean(noconfirm = false)
@@ -18,7 +19,9 @@ class RuAUR::Pacman
     end
 
     def exist?(pkg_name)
-        return !%x(#{@pac_nocolor} -Ss "^#{pkg_name}$").empty?
+        return !%x(
+            #{@pac_nocolor} -Ss "^#{pkg_name.shellescape}$"
+        ).empty?
     end
 
     def hilight_installed(installed)
@@ -35,7 +38,7 @@ class RuAUR::Pacman
 
     def initialize
         if (ScoobyDoo.where_are_you("pacman").nil?)
-            raise RuAUR::Error::MissingDependencyError.new("pacman")
+            raise RuAUR::Error::MissingDependency.new("pacman")
         end
 
         @pac_nocolor = "pacman --color=never"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruaur
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,14 +122,14 @@ files:
 - lib/ruaur.rb
 - lib/ruaur/aur.rb
 - lib/ruaur/error.rb
-- lib/ruaur/error/aur_error.rb
-- lib/ruaur/error/failed_to_compile_error.rb
-- lib/ruaur/error/failed_to_download_error.rb
-- lib/ruaur/error/failed_to_extract_error.rb
-- lib/ruaur/error/missing_dependency_error.rb
-- 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/error/aur.rb
+- lib/ruaur/error/failed_to_compile.rb
+- lib/ruaur/error/failed_to_download.rb
+- lib/ruaur/error/failed_to_extract.rb
+- lib/ruaur/error/missing_dependency.rb
+- lib/ruaur/error/package_not_found.rb
+- lib/ruaur/error/package_not_installed.rb
+- lib/ruaur/error/ruaur_already_running.rb
 - lib/ruaur/operation.rb
 - lib/ruaur/options.rb
 - lib/ruaur/package.rb