mspac 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0d3d32b85f604c9b5b5c88b68fc27eae2638a26
-  data.tar.gz: 22a18b13b4009e0f956d362d2c230feb76a4929e
+  metadata.gz: 505169a560cee6762ad4d33918457e7e7b0fe3ee
+  data.tar.gz: fc80f7d307db2fcd808a5422a0ee1605da4388ca
 SHA512:
-  metadata.gz: 001260a16b1ebcb733837d0e49d11207c3d99adeab458671d38e491bb1539177338baedf82a75dcc88d8903fcdaf6a2ad6bd7836bfb681e7ea9aed44c2035e6f
-  data.tar.gz: 42892fb29b313a1144efe021dc9e643551bad6322b821b7db9cb238f2355f94a9702696c801d86eac48b32684fd7c32c1082c8746e31faa1366713fdeb961e84
+  metadata.gz: 90ed333ff3a3422630f0193d418f9442d2acfd44945722ef14f7fd0237d4e1f2f79209dadb64790cd3ebbeeba67a2c736faedf10fc47e12433120f156195a893
+  data.tar.gz: 976dcc5a5aa886186cf278cb5a1895621bfe18be1c2d5300abe80036c8ec8b24af05090483a69bab2f3bd0fcbe75e8f3e5fa3cd6b5f48d7def2b6d1255170189

data/bin/mspac

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

data/lib/mspac.rb

@@ -1,4 +1,4 @@
-require "colorize"
+require "hilighter"
 require "fileutils"
 require "json"
 require "pathname"
@@ -18,28 +18,11 @@ class MsPac
         # FIXME will miss pellets that get deleted by refresh
     end
 
-    def self.colorize?
-        @@colorize ||= false
-        return @@colorize
-    end
-
-    def colorize_error(error)
-        return error if (!@@colorize)
-        return error.light_red
-    end
-    private :colorize_error
-
-    def colorize_status(status)
-        return status if (!@@colorize)
-        return status.light_white
-    end
-    private :colorize_status
-
     def ensure_pellets_repo
         @pellets_dir = Pathname.new("~/.mspac/pellets").expand_path
         return if (@pellets_dir && @pellets_dir.exist?)
 
-        puts colorize_status("Installing MsPac dependencies...")
+        puts hilight_status("Installing MsPac dependencies...")
         @pm.install(["git"]) if (ScoobyDoo.where_are_you("git").nil?)
         Dir.chdir(@mspac_dir) do
             @vcs.clone("https://gitlab.com/mjwhitta/pellets.git")
@@ -52,8 +35,25 @@ class MsPac
     end
     private :ensure_pellets_repo
 
-    def initialize(colorize = false)
-        @@colorize = colorize
+    def self.hilight?
+        @@hilight ||= false
+        return @@hilight
+    end
+
+    def hilight_error(error)
+        return error if (!@@hilight)
+        return error.light_red
+    end
+    private :hilight_error
+
+    def hilight_status(status)
+        return status if (!@@hilight)
+        return status.light_white
+    end
+    private :hilight_status
+
+    def initialize(hilight = false)
+        @@hilight = hilight
         FileUtils.mkdir_p(Pathname.new("~/.mspac").expand_path)
         @mspac_dir = Pathname.new("~/.mspac").expand_path
         @pm = PackageManager.new
@@ -99,7 +99,7 @@ class MsPac
                 p = Pellet.new(JSON.parse(File.read(pellet)))
                 @pellets[p.name] = p
             rescue JSON::ParserError => e
-                puts colorize_error("#{pellet} is not valid JSON!")
+                puts hilight_error("#{pellet} is not valid JSON!")
                 puts e.message.white.on_red
             rescue Exception => e
                 puts e.message.white.on_red
@@ -127,7 +127,7 @@ class MsPac
     end
 
     def refresh
-        puts colorize_status("Refreshing pellets...")
+        puts hilight_status("Refreshing pellets...")
         Dir.chdir(@pellets_dir) do
             @vcs.update
         end

data/lib/mspac/pellet.rb

@@ -1,64 +1,17 @@
-require "colorize"
+require "hilighter"
 require "fileutils"
 
 class MsPac::Pellet < Hash
     @@cache_dir = Pathname("~/.mspac/cache").expand_path
     @@install_dir = Pathname("~/.mspac/installed").expand_path
 
-    def colorize_cached(cached)
-        if (!MsPac.colorize?)
-            return "[cached]" if (cached)
-        else
-            return "[cached]".light_blue if (cached)
-        end
-        return ""
-    end
-    private :colorize_cached
-
-    def colorize_error(error)
-        return error if (!MsPac.colorize?)
-        return error.light_red
-    end
-    private :colorize_error
-
-    def colorize_installed(installed)
-        if (!MsPac.colorize?)
-            return "[installed]" if (installed)
-        else
-            return "[installed]".light_green if (installed)
-        end
-        return ""
-    end
-    private :colorize_installed
-
-    def colorize_name(name = @name)
-        return name if (!MsPac.colorize?)
-        return name.light_white
-    end
-    private :colorize_name
-
-    def colorize_status(status)
-        return status if (!MsPac.colorize?)
-        return status.light_white
-    end
-    private :colorize_status
-
-    def initialize(json)
-        json.keys.each do |key|
-            self[key] = json[key]
-        end
-
-        @pm = MsPac::PackageManager.new
-        @vcs = MsPac::VersionControl.new(self["vcs"])
-    end
-
     def cached?
         Pathname.new("#{@@cache_dir}/#{name}").expand_path.exist?
     end
 
     def compile
         return if (self["compile"].empty?)
-        puts colorize_status("Compiling #{name}...")
+        puts hilight_status("Compiling #{name}...")
         execute("compile")
     end
     private :compile
@@ -80,7 +33,7 @@ class MsPac::Pellet < Hash
 
         get_deps
 
-        puts colorize_status("Fetching #{name}...")
+        puts hilight_status("Fetching #{name}...")
         if (Pathname.new("#{@@cache_dir}/#{name}").expand_path.exist?)
             Dir.chdir("#{@@cache_dir}/#{name}") do
                 @vcs.update
@@ -94,7 +47,7 @@ class MsPac::Pellet < Hash
     end
 
     def get_deps
-        puts colorize_status("Installing dependencies...")
+        puts hilight_status("Installing dependencies...")
         @pm.install([self["vcs"]].concat(self["deps"][@pm.pkgmgr]))
         @pm.install(self["deps"]["perl"], "perl")
         @pm.install(self["deps"]["python2"], "python2")
@@ -102,6 +55,53 @@ class MsPac::Pellet < Hash
     end
     private :get_deps
 
+    def hilight_cached(cached)
+        if (!MsPac.hilight?)
+            return "[cached]" if (cached)
+        else
+            return "[cached]".light_blue if (cached)
+        end
+        return ""
+    end
+    private :hilight_cached
+
+    def hilight_error(error)
+        return error if (!MsPac.hilight?)
+        return error.light_red
+    end
+    private :hilight_error
+
+    def hilight_installed(installed)
+        if (!MsPac.hilight?)
+            return "[installed]" if (installed)
+        else
+            return "[installed]".light_green if (installed)
+        end
+        return ""
+    end
+    private :hilight_installed
+
+    def hilight_name(name = @name)
+        return name if (!MsPac.hilight?)
+        return name.light_white
+    end
+    private :hilight_name
+
+    def hilight_status(status)
+        return status if (!MsPac.hilight?)
+        return status.light_white
+    end
+    private :hilight_status
+
+    def initialize(json)
+        json.keys.each do |key|
+            self[key] = json[key]
+        end
+
+        @pm = MsPac::PackageManager.new
+        @vcs = MsPac::VersionControl.new(self["vcs"])
+    end
+
     def install
         if (!cached?)
             raise MsPac::Error::PelletNotInstalledError.new(name)
@@ -110,7 +110,7 @@ class MsPac::Pellet < Hash
         link if (!installed?)
         compile
 
-        puts colorize_status("Installing #{name}...")
+        puts hilight_status("Installing #{name}...")
         execute("install")
     end
 
@@ -123,7 +123,7 @@ class MsPac::Pellet < Hash
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts colorize_status("Linking #{name}...")
+        puts hilight_status("Linking #{name}...")
         FileUtils.ln_sf(
             "#{@@cache_dir}/#{name}",
             "#{@@install_dir}/#{name}"
@@ -135,7 +135,7 @@ class MsPac::Pellet < Hash
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts colorize_status("Locking #{name}...")
+        puts hilight_status("Locking #{name}...")
         FileUtils.touch("#{@@install_dir}/#{name}/.mspac_lock")
     end
 
@@ -148,7 +148,7 @@ class MsPac::Pellet < Hash
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts colorize_status("Purging #{name}...")
+        puts hilight_status("Purging #{name}...")
         FileUtils.rm_rf("#{@@cache_dir}/#{name}")
     end
 
@@ -157,7 +157,7 @@ class MsPac::Pellet < Hash
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts colorize_status("Removing #{name}...")
+        puts hilight_status("Removing #{name}...")
         execute("remove")
         unlink
         purge if (nosave)
@@ -169,8 +169,8 @@ class MsPac::Pellet < Hash
 
     def to_s
         header = [
-            colorize_name(name),
-            colorize_installed(installed?) || colorize_cached(cached?)
+            hilight_name(name),
+            hilight_installed(installed?) || hilight_cached(cached?)
         ].join(" ")
         return [
             header,
@@ -184,7 +184,7 @@ class MsPac::Pellet < Hash
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts colorize_status("Unlinking #{name}...")
+        puts hilight_status("Unlinking #{name}...")
         FileUtils.rm_f("#{@@install_dir}/#{name}")
     end
 
@@ -193,7 +193,7 @@ class MsPac::Pellet < Hash
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts colorize_status("Unlocking #{name}...")
+        puts hilight_status("Unlocking #{name}...")
         FileUtils.rm_f("#{@@install_dir}/#{name}/.mspac_lock")
     end
 
@@ -204,11 +204,11 @@ class MsPac::Pellet < Hash
 
         Dir.chdir("#{@@install_dir}/#{name}") do
             if (Pathname.new(".mspac_lock").expand_path.exist?)
-                puts colorize_error("Locked: #{name}")
+                puts hilight_error("Locked: #{name}")
                 return
             end
 
-            puts colorize_status("Updating #{name}...")
+            puts hilight_status("Updating #{name}...")
             tip = @vcs.revision
             @vcs.update
             new_tip = @vcs.revision

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mspac
 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-26 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -31,25 +31,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.5.0
 - !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