mspac 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68d3bc9b0f4e6fd4e31ee3d6b334b082f0ac3a37
-  data.tar.gz: 13e9e7ae08b1d1336dfba11de98e17f4313a3266
+  metadata.gz: fd85c273127efca3674b8440996e51704f7f1017
+  data.tar.gz: 02083f99e2bfabe2bd7ed8dfae1bbc4a2039bdda
 SHA512:
-  metadata.gz: 9594ef6cf56747e0a6e9326873ae68b4903163e1bac560776933bf02d17ddc8ef4b4180ab185b084c6adb5090adeb04ee68003e780640520b7618b45b14a51e4
-  data.tar.gz: e99ee455bd5af80225435048d76b9f657da6fe8ff241e0cc5ce31210d632f9c7df06df388be0fdeacfa592b620deb2b09e2ec7532e1559944a0f3b8493f4b416
+  metadata.gz: 72df8f765c5fae7c24ec73fef9a4c509319ae877bcf124d70ba99c6acbb8d1e3a8228e7d2ef1715183184df2135ad64ae6343aa795b3e8f8cec6a004b5f964e6
+  data.tar.gz: 195ca26eb07ef495fcb0f035055f1834d9fc2b4d4eb0bf1a64bc26cb8ab3d4d5ddc85e0863884eb849cd030c976edc5651bc4ffa5c389fc95763ca6fbd723490

data/lib/mspac/pellet.rb

@@ -6,7 +6,7 @@ class MsPac::Pellet < Hash
     @@install_dir = Pathname("~/.mspac/installed").expand_path
 
     def colorize_cached(cached)
-        if (!@colorize)
+        if (!MsPac.colorize?)
             return "[cached]" if (cached)
         else
             return "[cached]".light_blue if (cached)
@@ -16,13 +16,13 @@ class MsPac::Pellet < Hash
     private :colorize_cached
 
     def colorize_error(error)
-        return error if (!@colorize)
+        return error if (!MsPac.colorize?)
         return error.light_red
     end
     private :colorize_error
 
     def colorize_installed(installed)
-        if (!@colorize)
+        if (!MsPac.colorize?)
             return "[installed]" if (installed)
         else
             return "[installed]".light_green if (installed)
@@ -32,23 +32,22 @@ class MsPac::Pellet < Hash
     private :colorize_installed
 
     def colorize_name(name = @name)
-        return name if (!@colorize)
+        return name if (!MsPac.colorize?)
         return name.light_white
     end
     private :colorize_name
 
     def colorize_status(status)
-        return status if (!@colorize)
+        return status if (!MsPac.colorize?)
         return status.light_white
     end
     private :colorize_status
 
-    def initialize(json, colorize = false)
+    def initialize(json)
         json.keys.each do |key|
             self[key] = json[key]
         end
 
-        @colorize = colorize
         @pm = MsPac::PackageManager.new
         @vcs = MsPac::VersionControl.new(self["vcs"])
     end

data/lib/mspac.rb

@@ -18,14 +18,19 @@ 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 if (!@@colorize)
         return error.light_red
     end
     private :colorize_error
 
     def colorize_status(status)
-        return status if (!@colorize)
+        return status if (!@@colorize)
         return status.light_white
     end
     private :colorize_status
@@ -48,7 +53,7 @@ class MsPac
     private :ensure_pellets_repo
 
     def initialize(colorize = false)
-        @colorize = colorize
+        @@colorize = colorize
         FileUtils.mkdir_p(Pathname.new("~/.mspac").expand_path)
         @mspac_dir = Pathname.new("~/.mspac").expand_path
         @pm = PackageManager.new
@@ -91,10 +96,7 @@ class MsPac
         @pellets = Hash.new
         Dir["#{@pellets_dir}/*.pellet"].each do |pellet|
             begin
-                p = Pellet.new(
-                    JSON.parse(File.read(pellet)),
-                    @colorize
-                )
+                p = Pellet.new(JSON.parse(File.read(pellet)))
                 @pellets[p.name] = p
             rescue JSON::ParserError => e
                 puts colorize_error("#{pellet} is not valid JSON!")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mspac
 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