ruaur 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5e2fe6ac79c349b56d1d30959643b0704ca75b
-  data.tar.gz: a71a51dbe47e3be79e673a8f67effbac44e296cc
+  metadata.gz: 156d9ca872f9661a9ac52542812df31f5970be15
+  data.tar.gz: 4f867da65351851ffa63c6961681c1496d8642f5
 SHA512:
-  metadata.gz: de51f7ac7e26fa785e31b9ba8ce2970991eed9c9448c03965349bd4e6f635e788c9f3c3d80a047f289e3c5f35292b075cf13b3e1ad943b30f5f060572a6696f7
-  data.tar.gz: f41d0571e1eee1ad459c90b905b76c21046535a77d428e66538947b940f3366af7d054afc78c8fe4dd3ed26212c105ee20cece82109b5db088f0229767149213
+  metadata.gz: c1d958212921dcbf59082a148c746404d969b68e17f373ab38688870df2381acbe1016a927ee8192baaba209ad2dba2259c69f99512b8a2f10269b173e18ded8
+  data.tar.gz: b84723dbb888689f0df47db13133896863907875f98637d991608376fbab89d6c5f18f363498ea339b1418d6f099834f51c1d2e8e2aaf2a902c3b2341e47fc22

data/bin/ruaur

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require "colorize"
+require "hilighter"
 require "optparse"
 require "ruaur"
 
@@ -49,7 +49,7 @@ def parse(args)
         end
 
         opts.on("--nocolor", "Disable colorized output") do
-            String.disable_colorization = true
+            Hilighter.disable
         end
 
         opts.on(
@@ -192,7 +192,7 @@ end
 options = parse(ARGV)
 
 begin
-    ruaur = RuAUR.new(!String.disable_colorization)
+    ruaur = RuAUR.new(!Hilighter.disable?)
 
     case options["operation"]
     when Operation::REMOVE

data/lib/ruaur/aur.rb

@@ -1,6 +1,6 @@
 require "archive/tar/minitar"
-require "colorize"
 require "fileutils"
+require "hilighter"
 require "io/wait"
 require "json"
 require "scoobydoo"
@@ -9,38 +9,14 @@ require "zlib"
 
 class RuAUR::AUR
     def clean
-        puts colorize_status("Cleaning AUR cache...")
+        puts hilight_status("Cleaning AUR cache...")
         Dir.chdir(@cache) do
             FileUtils.rm_rf(Dir["*"])
         end
     end
 
-    def colorize_dependency(dependency)
-        return dependency if (!RuAUR.colorize?)
-        return dependency.light_magenta
-    end
-    private :colorize_dependency
-
-    def colorize_installed(installed)
-        return installed if (!RuAUR.colorize?)
-        return installed.light_yellow
-    end
-    private :colorize_installed
-
-    def colorize_status(status)
-        return status if (!RuAUR.colorize?)
-        return status.light_white
-    end
-    private :colorize_status
-
-    def colorize_upgrade(old, new)
-        return "#{old} -> #{new}" if (!RuAUR.colorize?)
-        return "#{old.light_red} -> #{new.light_green}"
-    end
-    private :colorize_upgrade
-
     def compile(package)
-        puts colorize_status("Compiling #{package.name}...")
+        puts hilight_status("Compiling #{package.name}...")
         if (Process.uid == 0)
             system("chown -R nobody:nobody .")
             system("su -s /bin/sh nobody -c \"makepkg -sr\"")
@@ -60,7 +36,7 @@ class RuAUR::AUR
     def download(package)
         FileUtils.rm_f(Dir["#{package.name}.tar.gz*"])
 
-        puts colorize_status("Downloading #{package.name}...")
+        puts hilight_status("Downloading #{package.name}...")
         tarball(package.name, package.url, "#{package.name}.tar.gz")
 
         tgz = Pathname.new("#{package.name}.tar.gz").expand_path
@@ -108,7 +84,7 @@ class RuAUR::AUR
     def extract(package)
         FileUtils.rm_rf(package.name)
 
-        puts colorize_status("Extracting #{package.name}...")
+        puts hilight_status("Extracting #{package.name}...")
         File.open("#{package.name}.tar.gz", "rb") do |tgz|
             tar = Zlib::GzipReader.new(tgz)
             Archive::Tar::Minitar.unpack(tar, ".")
@@ -123,7 +99,7 @@ class RuAUR::AUR
     private :extract
 
     def find_upgrades
-        puts colorize_status("Checking for AUR updates...")
+        puts hilight_status("Checking for AUR updates...")
 
         upgrades = Hash.new
         multiinfo(@installed.keys).each do |package|
@@ -142,6 +118,30 @@ class RuAUR::AUR
     end
     private :find_upgrades
 
+    def hilight_dependency(dependency)
+        return dependency if (!RuAUR.hilight?)
+        return dependency.light_magenta
+    end
+    private :hilight_dependency
+
+    def hilight_installed(installed)
+        return installed if (!RuAUR.hilight?)
+        return installed.light_yellow
+    end
+    private :hilight_installed
+
+    def hilight_status(status)
+        return status if (!RuAUR.hilight?)
+        return status.light_white
+    end
+    private :hilight_status
+
+    def hilight_upgrade(old, new)
+        return "#{old} -> #{new}" if (!RuAUR.hilight?)
+        return "#{old.light_red} -> #{new.light_green}"
+    end
+    private :hilight_upgrade
+
     def info(package)
         return nil if (package.nil? || package.empty?)
 
@@ -176,7 +176,7 @@ class RuAUR::AUR
             @installed.include?(pkg_name) &&
             !package.newer?(@installed[pkg_name])
         )
-            puts colorize_installed("Already installed: #{pkg_name}")
+            puts hilight_installed("Already installed: #{pkg_name}")
             return
         end
 
@@ -207,7 +207,7 @@ class RuAUR::AUR
                     next if (dep.start_with?("$"))
 
                     if (!@installed.has_key?(dep))
-                        puts colorize_dependency(
+                        puts hilight_dependency(
                             "Installing dependency: #{dep}"
                         )
                         if (@pacman.exist?(dep))
@@ -288,8 +288,8 @@ class RuAUR::AUR
         find_upgrades.each do |pkg_name, versions|
             old, new = versions
 
-            puts colorize_status("Upgrading #{pkg_name}...")
-            puts colorize_upgrade(old, new)
+            puts hilight_status("Upgrading #{pkg_name}...")
+            puts hilight_upgrade(old, new)
             install(pkg_name, noconfirm)
         end
     end

data/lib/ruaur/package.rb

@@ -1,4 +1,4 @@
-require "colorize"
+require "hilighter"
 
 class RuAUR::Package
     attr_accessor :description
@@ -23,10 +23,10 @@ class RuAUR::Package
         return (self.name.downcase <=> other.name.downcase)
     end
 
-    def colorize_header(repo, name, installed, version, votes)
+    def hilight_header(repo, name, installed, version, votes)
         header = Array.new
 
-        if (!RuAUR.colorize?)
+        if (!RuAUR.hilight?)
             header.push("#{repo}/#{name}")
             if (installed && newer?(installed))
                 header.push(installed)
@@ -54,7 +54,7 @@ class RuAUR::Package
 
         return header.join(" ")
     end
-    private :colorize_header
+    private :hilight_header
 
     def initialize(json, repo = "aur")
         @description = json["Description"]
@@ -109,7 +109,7 @@ class RuAUR::Package
     def to_s
         out = Array.new
         out.push(
-            colorize_header(
+            hilight_header(
                 @repo,
                 @name,
                 @installed,
@@ -119,7 +119,7 @@ class RuAUR::Package
         )
 
         # Wrap at default minus 4 spaces
-        @description.scan(/\S.{0,#{76}}\S(?=\s|$)|\S+/).each do |l|
+        @description.scan(/\S.{0,76}\S(?=\s|$)|\S+/).each do |l|
             out.push("    #{l.strip}")
         end
 

data/lib/ruaur/pacman.rb

@@ -1,28 +1,28 @@
-require "colorize"
+require "hilighter"
 require "pathname"
 
 class RuAUR::Pacman
     def clean(noconfirm = false)
-        puts colorize_status("Cleaning pacman cache...")
+        puts hilight_status("Cleaning pacman cache...")
         system("sudo #{@pac_cmd} -Sc") if (!noconfirm)
         system("sudo #{@pac_cmd} -Sc --noconfirm") if (noconfirm)
     end
 
-    def colorize_installed(installed)
-        return installed if (!RuAUR.colorize?)
-        return installed.light_yellow
+    def exist?(pkg_name)
+        return !%x(#{@pac_nocolor} -Ss "^#{pkg_name}$").empty?
     end
-    private :colorize_installed
 
-    def colorize_status(status)
-        return status if (!RuAUR.colorize?)
-        return status.light_white
+    def hilight_installed(installed)
+        return installed if (!RuAUR.hilight?)
+        return installed.light_yellow
     end
-    private :colorize_status
+    private :hilight_installed
 
-    def exist?(pkg_name)
-        return !%x(#{@pac_nocolor} -Ss "^#{pkg_name}$").empty?
+    def hilight_status(status)
+        return status if (!RuAUR.hilight?)
+        return status.light_white
     end
+    private :hilight_status
 
     def initialize
         if (ScoobyDoo.where_are_you("pacman").nil?)
@@ -32,17 +32,17 @@ class RuAUR::Pacman
         @pac_nocolor = "pacman --color=never"
         @pac_color = "pacman --color=always"
         @pac_cmd = @pac_color
-        @pac_cmd = @pac_nocolor if (!RuAUR.colorize?)
+        @pac_cmd = @pac_nocolor if (!RuAUR.hilight?)
         @installed = query
     end
 
     def install(pkg_name, noconfirm = false)
         if (@installed.include?(pkg_name))
-            puts colorize_installed("Already installed: #{pkg_name}")
+            puts hilight_installed("Already installed: #{pkg_name}")
             return
         end
 
-        puts colorize_status("Installing #{pkg_name}...")
+        puts hilight_status("Installing #{pkg_name}...")
         if (!noconfirm)
             system("sudo #{@pac_cmd} -S #{pkg_name} --needed")
         else
@@ -55,7 +55,7 @@ class RuAUR::Pacman
     end
 
     def install_local(pkgs, noconfirm = false)
-        puts colorize_status("Installing compiled packages...")
+        puts hilight_status("Installing compiled packages...")
         xzs = pkgs.join(" ")
         if (!noconfirm)
             system("sudo #{@pac_cmd} -U #{xzs}")
@@ -92,7 +92,7 @@ class RuAUR::Pacman
     end
 
     def remove(pkg_names, nosave = false)
-        puts colorize_status("Removing #{pkg_names.join(" ")}...")
+        puts hilight_status("Removing #{pkg_names.join(" ")}...")
         if (!nosave)
             system("sudo #{@pac_cmd} -R #{pkg_names.join(" ")}")
         else
@@ -141,7 +141,7 @@ class RuAUR::Pacman
     end
 
     def upgrade(noconfirm = false)
-        puts colorize_status("Updating...")
+        puts hilight_status("Updating...")
         system("sudo #{@pac_cmd} -Syyu") if (!noconfirm)
         system("sudo #{@pac_cmd} -Syyu --noconfirm") if (noconfirm)
     end

data/lib/ruaur.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruaur
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -51,25 +51,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: hilighter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: scoobydoo
   requirement: !ruby/object:Gem::Requirement