mspac 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e386cfbe02203907947ce154b857df82129832f8
-  data.tar.gz: 009078909806e303299d6d56691e2809edeecc4f
+  metadata.gz: aa634c685780667d55fcb7b238ab038b18c7ab55
+  data.tar.gz: 0df6dae9937571241798467cc4a36598fef8a5fe
 SHA512:
-  metadata.gz: c3709ae67232579bd1f033ebedc25b20693f90096330191a087fcf835494a0b8c1429f75c9dfd3608bb6927ad8f76f47deff1a566961411a3e889dd32d3160d6
-  data.tar.gz: 3d904d22450b07606bb3a7b96ce2502e38b0004deacaef08a321a217d1643915a2378aebd5cf255407a0576f4e4c32391f6b9eb92c994b5ec3befefa8cf6a2b1
+  metadata.gz: 4a93ebe91bc62e331ff39731547f06b8f0b9a57198db7cb3dc350dec939284f773ca295962a3adf2787871c0da1608f74cb91719575671309135cc45a421a69f
+  data.tar.gz: 692ece16964d0bc38ed5c8618aa6c0345a87acde1c8525dfaced15bbc6282702cb65742b2b117153cd2f2b513a3aa35406ed2f1418bb325f528cb466dd780b89

data/bin/mspac

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require "colorize"
+require "io/wait"
 require "mspac"
 require "optparse"
 
@@ -9,9 +10,10 @@ class MsPacExit
     INVALID_OPTION = 1
     INVALID_ARGUMENT = 2
     MISSING_ARGUMENT = 3
-    INVALID_OPERATION = 4
-    MULTIPLE_OPERATIONS = 5
-    EXCEPTION = 6
+    EXTRA_ARGUMENTS = 4
+    EXCEPTION = 5
+    INVALID_OPERATION = 6
+    MULTIPLE_OPERATIONS = 7
 end
 
 class Operation
@@ -27,6 +29,7 @@ end
 def parse(args)
     options = Hash.new
     options["operation"] = nil
+    options["verbose"] = false
 
     # Sync options
     options["clean"] = false
@@ -48,19 +51,7 @@ def parse(args)
 
         opts.on("-h", "--help", "Display this help message") do
             puts opts
-            exit
-        end
-
-        opts.on("--list-cached", "List cached pellets") do
-            options["operation"] = Operation::LIST_CACHED
-        end
-
-        opts.on("--list-installed", "List installed pellets") do
-            options["operation"] = Operation::LIST_INSTALLED
-        end
-
-        opts.on("--list-pellets", "List available pellets") do
-            options["operation"] = Operation::LIST_PELLETS
+            exit MsPacExit::GOOD
         end
 
         opts.on(
@@ -99,7 +90,7 @@ def parse(args)
             options["operation"] = Operation::UNLOCK
         end
 
-        opts.on("", "SYNC OPTIONS")
+        opts.on("", "SYNC_OPTIONS")
 
         opts.on(
             "-c",
@@ -135,11 +126,49 @@ def parse(args)
             options["refresh"] = true
         end
 
-        opts.on("", "REMOVE OPTIONS")
+        opts.on("", "REMOVE_OPTIONS")
 
         opts.on("-n", "--nosave", "Completely remove pellet") do
             options["nosave"] = true
         end
+
+        opts.on("", "MISC_OPTIONS")
+
+        opts.on("--list-cached", "List cached pellets") do
+            if (options["operation"])
+                puts opts
+                exit MsPacExit::MULTIPLE_OPERATIONS
+            end
+            options["operation"] = Operation::LIST_CACHED
+        end
+
+        opts.on("--list-installed", "List installed pellets") do
+            if (options["operation"])
+                puts opts
+                exit MsPacExit::MULTIPLE_OPERATIONS
+            end
+            options["operation"] = Operation::LIST_INSTALLED
+        end
+
+        opts.on("--list-pellets", "List available pellets") do
+            if (options["operation"])
+                puts opts
+                exit MsPacExit::MULTIPLE_OPERATIONS
+            end
+            options["operation"] = Operation::LIST_PELLETS
+        end
+
+        opts.on("--nocolor", "Disable colorized output") do
+            String.disable_colorization = true
+        end
+
+        opts.on(
+            "-v",
+            "--verbose",
+            "Show backtrace when error occurs"
+        ) do
+            options["verbose"] = true
+        end
     end
 
     begin
@@ -282,7 +311,7 @@ end
 options = parse(ARGV)
 
 begin
-    mspac = MsPac.new
+    mspac = MsPac.new(!String.disable_colorization)
 
     case options["operation"]
     when Operation::LIST_CACHED
@@ -315,11 +344,30 @@ begin
     when Operation::UNLOCK
         mspac.unlock(options["pellets"])
     end
-    exit MsPacExit::GOOD
+rescue Interrupt
+    # ^C
+    # Exit gracefully
+rescue Errno::EPIPE
+    # Do nothing. This can happen if piping to another program such as
+    # less. Usually if less is closed before we're done with STDOUT.
 rescue MsPac::Error => e
-    puts e.message.red
+    puts e.message
+    exit MsPacExit::EXCEPTION
+rescue Exception => e
+    $stderr.puts "Oops! Looks like an error has occured! If the " \
+        "error persists, file a bug at:".word_wrap
+    $stderr.puts
+    $stderr.puts "    https://gitlab.com/mjwhitta/mspac/issues"
+    $stderr.puts
+    $stderr.puts "Maybe the message below will help. If not, you " \
+        "can use the --verbose flag to get a backtrace.".word_wrap
+
+    $stderr.puts e.message.white.on_red
+    if (options["verbose"])
+        e.backtrace.each do |line|
+            $stderr.puts line.light_yellow
+        end
+    end
     exit MsPacExit::EXCEPTION
-rescue Interrupt => e
-    # ^C
-    puts
 end
+exit MsPacExit::GOOD

data/lib/mspac.rb

@@ -18,11 +18,23 @@ class MsPac
         # FIXME will miss pellets that get deleted by refresh
     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 "Installing MsPac dependencies...".white
+        puts colorize_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")
@@ -35,7 +47,8 @@ class MsPac
     end
     private :ensure_pellets_repo
 
-    def initialize
+    def initialize(colorize = false)
+        @colorize = colorize
         FileUtils.mkdir_p(Pathname.new("~/.mspac").expand_path)
         @mspac_dir = Pathname.new("~/.mspac").expand_path
         @pm = PackageManager.new
@@ -78,13 +91,16 @@ class MsPac
         @pellets = Hash.new
         Dir["#{@pellets_dir}/*.pellet"].each do |pellet|
             begin
-                p = Pellet.new(JSON.parse(File.read(pellet)))
+                p = Pellet.new(
+                    JSON.parse(File.read(pellet)),
+                    @colorize
+                )
                 @pellets[p.name] = p
             rescue JSON::ParserError => e
-                puts "#{pellet} is not valid JSON!".red
-                puts e.message.red
+                puts colorize_error("#{pellet} is not valid JSON!")
+                puts e.message.white.on_red
             rescue Exception => e
-                puts e.message.red
+                puts e.message.white.on_red
             end
         end
     end
@@ -109,7 +125,7 @@ class MsPac
     end
 
     def refresh
-        puts "Refreshing pellets...".white
+        puts colorize_status("Refreshing pellets...")
         Dir.chdir(@pellets_dir) do
             @vcs.update
         end
@@ -134,18 +150,7 @@ class MsPac
             pellet = @pellets[name]
             name_match = pellet.name.match(/#{regex}/)
             desc_match = pellet.desc.match(/#{regex}/)
-            if (name_match || desc_match)
-                print "#{pellet.name}".white
-                if (pellet.installed?)
-                    puts " [installed]".green
-                elsif (pellet.cached?)
-                    puts " [cached]".blue
-                else
-                    puts
-                end
-                puts "    #{pellet.repo}"
-                puts "    #{pellet.desc}"
-            end
+            puts pellet.to_s if (name_match || desc_match)
         end
     end
 

data/lib/mspac/pellet.rb

@@ -5,11 +5,50 @@ class MsPac::Pellet < Hash
     @@cache_dir = Pathname("~/.mspac/cache").expand_path
     @@install_dir = Pathname("~/.mspac/installed").expand_path
 
-    def initialize(json)
+    def colorize_cached(cached)
+        if (!@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 (!@colorize)
+        return error.light_red
+    end
+    private :colorize_error
+
+    def colorize_installed(installed)
+        if (!@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 (!@colorize)
+        return name.light_white
+    end
+    private :colorize_name
+
+    def colorize_status(status)
+        return status if (!@colorize)
+        return status.light_white
+    end
+    private :colorize_status
+
+    def initialize(json, colorize = false)
         json.keys.each do |key|
             self[key] = json[key]
         end
 
+        @colorize = colorize
         @pm = MsPac::PackageManager.new
         @vcs = MsPac::VersionControl.new(self["vcs"])
     end
@@ -20,7 +59,7 @@ class MsPac::Pellet < Hash
 
     def compile
         return if (self["compile"].empty?)
-        puts "Compiling #{name}...".white
+        puts colorize_status("Compiling #{name}...")
         execute("compile")
     end
     private :compile
@@ -42,7 +81,7 @@ class MsPac::Pellet < Hash
 
         get_deps
 
-        puts "Fetching #{name}...".white
+        puts colorize_status("Fetching #{name}...")
         if (Pathname.new("#{@@cache_dir}/#{name}").expand_path.exist?)
             Dir.chdir("#{@@cache_dir}/#{name}") do
                 @vcs.update
@@ -56,7 +95,7 @@ class MsPac::Pellet < Hash
     end
 
     def get_deps
-        puts "Installing dependencies...".white
+        puts colorize_status("Installing dependencies...")
         @pm.install([self["vcs"]].concat(self["deps"][@pm.pkgmgr]))
         @pm.install(self["deps"]["perl"], "perl")
         @pm.install(self["deps"]["python2"], "python2")
@@ -72,7 +111,7 @@ class MsPac::Pellet < Hash
         link if (!installed?)
         compile
 
-        puts "Installing #{name}...".white
+        puts colorize_status("Installing #{name}...")
         execute("install")
     end
 
@@ -85,7 +124,7 @@ class MsPac::Pellet < Hash
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts "Linking #{name}...".white
+        puts colorize_status("Linking #{name}...")
         FileUtils.ln_sf(
             "#{@@cache_dir}/#{name}",
             "#{@@install_dir}/#{name}"
@@ -97,7 +136,7 @@ class MsPac::Pellet < Hash
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts "Locking #{name}...".white
+        puts colorize_status("Locking #{name}...")
         FileUtils.touch("#{@@install_dir}/#{name}/.mspac_lock")
     end
 
@@ -110,7 +149,7 @@ class MsPac::Pellet < Hash
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts "Purging #{name}...".white
+        puts colorize_status("Purging #{name}...")
         FileUtils.rm_rf("#{@@cache_dir}/#{name}")
     end
 
@@ -119,7 +158,7 @@ class MsPac::Pellet < Hash
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts "Removing #{name}...".white
+        puts colorize_status("Removing #{name}...")
         execute("remove")
         unlink
         purge if (nosave)
@@ -129,12 +168,24 @@ class MsPac::Pellet < Hash
         return self["repo"]
     end
 
+    def to_s
+        header = [
+            colorize_name(name),
+            colorize_installed(installed?) || colorize_cached(cached?)
+        ].join(" ")
+        return [
+            header,
+            "    #{repo}",
+            "    #{desc}"
+        ].join("\n")
+    end
+
     def unlink
         if (!installed?)
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts "Unlinking #{name}...".white
+        puts colorize_status("Unlinking #{name}...")
         FileUtils.rm_f("#{@@install_dir}/#{name}")
     end
 
@@ -143,7 +194,7 @@ class MsPac::Pellet < Hash
             raise MsPac::Error::PelletNotInstalledError.new(name)
         end
 
-        puts "Unlocking #{name}...".white
+        puts colorize_status("Unlocking #{name}...")
         FileUtils.rm_f("#{@@install_dir}/#{name}/.mspac_lock")
     end
 
@@ -154,11 +205,11 @@ class MsPac::Pellet < Hash
 
         Dir.chdir("#{@@install_dir}/#{name}") do
             if (Pathname.new(".mspac_lock").expand_path.exist?)
-                puts "Locked: #{name}".red
+                puts colorize_error("Locked: #{name}")
                 return
             end
 
-            puts "Updating #{name}...".white
+            puts colorize_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.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize