ruaur 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1bdabfd2cdae698b999b724bcf0f7f1fd23dde9
-  data.tar.gz: fcd7b7e15817922e7e732732807d65202b9bbe75
+  metadata.gz: 385df0164ad380f5530a4dd147bf6313bf0106f5
+  data.tar.gz: 2e76d2a1c45fbce79a4732602bbf492509fe5b33
 SHA512:
-  metadata.gz: 0108b011228ca900ead439b67b0458b99ca4cec879d5187736c0ae17fd33c500a8468eb7d4b8900cf1da6da540cdbc0b8d09cd474a8b5b80a276bab7aba45861
-  data.tar.gz: 2544836d3ae6f6ec6032f8f4ed93b959779dba4133781877b818aa5013f1bc42778d510cb1c81c54cfaa1e3cc2be34441bca8070aa00e86fceec04355c952329
+  metadata.gz: 8f530c6ad792184e83509aef0692fad65a4e021ead80ea7d80cd661619be209994d2cdae4f5c6cc45f5d311d9597a5b6873acbc790b0029d4e5dbb8cd5682ec6
+  data.tar.gz: 32a09f5facbfcf304e7f19808ca234f49666bc68702de83da6f55e43c1d8974e8396d31dee6c0e2028c4ae0f5daacbd5e9495fed69bd9b25e81641aa408bffbd

data/lib/ruaur/aur.rb

@@ -16,25 +16,25 @@ class RuAUR::AUR
     end
 
     def colorize_dependency(dependency)
-        return dependency if (!@colorize)
+        return dependency if (!RuAUR.colorize?)
         return dependency.light_magenta
     end
     private :colorize_dependency
 
     def colorize_installed(installed)
-        return installed if (!@colorize)
+        return installed if (!RuAUR.colorize?)
         return installed.light_yellow
     end
     private :colorize_installed
 
     def colorize_status(status)
-        return status if (!@colorize)
+        return status if (!RuAUR.colorize?)
         return status.light_white
     end
     private :colorize_status
 
     def colorize_upgrade(old, new)
-        return "#{old} -> #{new}" if (!@colorize)
+        return "#{old} -> #{new}" if (!RuAUR.colorize?)
         return "#{old.light_red} -> #{new.light_green}"
     end
     private :colorize_upgrade
@@ -153,18 +153,13 @@ class RuAUR::AUR
         end
 
         return nil if (body["results"].empty?)
-        return RuAUR::Package.new(body["results"], "aur", @colorize)
+        return RuAUR::Package.new(body["results"], "aur")
     end
 
-    def initialize(
-        pacman,
-        cache = "/tmp/ruaur-#{ENV["USER"]}",
-        colorize = false
-    )
+    def initialize(pacman, cache = "/tmp/ruaur-#{ENV["USER"]}")
         cache = "/tmp/ruaur-#{ENV["USER"]}" if (cache.nil?)
         @cache = Pathname.new(cache).expand_path
         FileUtils.mkdir_p(@cache)
-        @colorize = colorize
         @installed = pacman.query_aur
         @pacman = pacman
         @rpc_url = "https://aur.archlinux.org/rpc.php"
@@ -239,7 +234,7 @@ class RuAUR::AUR
         end
 
         body["results"].each do |result|
-            results.push(RuAUR::Package.new(result, "aur", @colorize))
+            results.push(RuAUR::Package.new(result, "aur"))
         end
         return results.sort
     end
@@ -256,7 +251,7 @@ class RuAUR::AUR
         end
 
         body["results"].each do |result|
-            results.push(RuAUR::Package.new(result, "aur", @colorize))
+            results.push(RuAUR::Package.new(result, "aur"))
         end
 
         results.each do |package|

data/lib/ruaur/package.rb

@@ -27,7 +27,7 @@ class RuAUR::Package
     def colorize_header(repo, name, installed, version, votes)
         header = Array.new
 
-        if (!@colorize)
+        if (!RuAUR.colorize?)
             header.push("#{repo}/#{name}")
             if (installed && newer?(installed))
                 header.push(installed)
@@ -57,8 +57,7 @@ class RuAUR::Package
     end
     private :colorize_header
 
-    def initialize(json, repo = "aur", colorize = false)
-        @colorize = colorize
+    def initialize(json, repo = "aur")
         @description = json["Description"]
         @description ||= ""
         @installed = nil

data/lib/ruaur/pacman.rb

@@ -9,13 +9,13 @@ class RuAUR::Pacman
     end
 
     def colorize_installed(installed)
-        return installed if (!@colorize)
+        return installed if (!RuAUR.colorize?)
         return installed.light_yellow
     end
     private :colorize_installed
 
     def colorize_status(status)
-        return status if (!@colorize)
+        return status if (!RuAUR.colorize?)
         return status.light_white
     end
     private :colorize_status
@@ -24,16 +24,15 @@ class RuAUR::Pacman
         return !%x(#{@pac_nocolor} -Ss "^#{pkg_name}$").empty?
     end
 
-    def initialize(colorize = false)
+    def initialize
         if (ScoobyDoo.where_are_you("pacman").nil?)
             raise RuAUR::Error::MissingDependencyError.new("pacman")
         end
 
-        @colorize = colorize
         @pac_nocolor = "pacman --color=never"
         @pac_color = "pacman --color=always"
         @pac_cmd = @pac_color
-        @pac_cmd = @pac_nocolor if (!@colorize)
+        @pac_cmd = @pac_nocolor if (!RuAUR.colorize?)
         @installed = query
     end
 
@@ -127,8 +126,7 @@ class RuAUR::Pacman
                             "URLPath" => nil,
                             "Version" => version
                         },
-                        repo,
-                        @colorize
+                        repo
                     )
                 )
                 if (trailing.include?("[installed]"))

data/lib/ruaur.rb

@@ -16,6 +16,11 @@ class RuAUR
         @aur.clean
     end
 
+    def self.colorize?
+        @@colorize ||= false
+        return @@colorize
+    end
+
     def initialize(colorize = false)
         [
             "makepkg",
@@ -28,9 +33,9 @@ class RuAUR
             end
         end
 
-        @colorize = colorize
-        @pacman = RuAUR::Pacman.new(@colorize)
-        @aur = RuAUR::AUR.new(@pacman, nil, @colorize)
+        @@colorize = colorize
+        @pacman = RuAUR::Pacman.new
+        @aur = RuAUR::AUR.new(@pacman, nil)
         @lock = Pathname.new("/tmp/ruaur.lock").expand_path
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruaur
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake