pptxt 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9094d1beceb39792aa47ec1c66d936e6a183284b
-  data.tar.gz: 6ad4dbc734f1d2a6f5819a7a1a17590583aadc07
+  metadata.gz: 99b2795bb271e491d3bbb26302ef6b341703d10e
+  data.tar.gz: 60446a3049884f34f742a4af348a1b740db8e791
 SHA512:
-  metadata.gz: bae0e59541f0ce05895dbb03c3058a44954cd3b03cca63c06d98cd82e84bc5f43bf936c2d1388173554281db25bd6480a6a970dd36697224dc7f555dcd65a8cd
-  data.tar.gz: 5e1a79703ec7ea72d86f96966c2aaeb796ec53146c9a3a795969e7711f2161697dae4d53fae0c6a6b1ded27319a8b03ec64a6b500fcb389df6ec6e970d541872
+  metadata.gz: b6d16dedcbd36c8879a90f462edd1f1cc47680b6b292ec504ce7b7f6d05f85e0fc8067cc33effb2b0c63d23e104e38a907e35582aae42fb577b961c11b82adf1
+  data.tar.gz: e39933584b5a43c330218589bfbd6b94755ba3e374f5385fc1373793f8da9cccc0e226ca7d52092b9f0585051d4efd2227fc498e1fe1c42e094dc894c819d11e

data/bin/pptxt

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require "colorize"
 require "io/wait"
 require "optparse"
 require "pathname"
@@ -11,7 +12,7 @@ class PPtxtExit
     INVALID_ARGUMENT = 2
     MISSING_ARGUMENT = 3
     EXTRA_ARGUMENTS = 4
-    FILE_DOES_NOT_EXIST = 5
+    EXCEPTION = 5
 end
 
 def parse(args)
@@ -20,6 +21,7 @@ def parse(args)
     options["git"] = false
     options["pptx"] = nil
     options["slideshow"] = false
+    options["verbose"] = false
 
     parser = OptionParser.new do |opts|
         opts.banner = "Usage: #{File.basename($0)} [OPTIONS] <pptx>"
@@ -58,6 +60,14 @@ def parse(args)
         opts.on("-s", "--slideshow", "Display as slideshow") do
             options["slideshow"] = true
         end
+
+        opts.on(
+            "-v",
+            "--verbose",
+            "Show backtrace when error occurs"
+        ) do
+            options["verbose"] = true
+        end
     end
 
     begin
@@ -84,15 +94,8 @@ def parse(args)
         exit PPtxtExit::EXTRA_ARGUMENTS
     end
 
-    if (!Pathname.new(args[0]).expand_path.exist?)
-        puts "#{args[0]} does not exist!"
-        exit PPtxtExit::FILE_DOES_NOT_EXIST
-    end
-
     options["pptx"] = args[0].strip
-    if (options["pptx"] == "/dev/null")
-        exit PPtxtExit::GOOD
-    end
+    exit PPtxtExit::GOOD if (options["pptx"] == "/dev/null")
 
     return options
 end
@@ -100,59 +103,83 @@ end
 # Parse CLI args
 options = parse(ARGV)
 
-# Get slides
-slides = PPtxt.new(options["pptx"]).slides
+begin
+    # Get slides
+    slides = PPtxt.new(options["pptx"]).slides
+
+    if (!options["slideshow"])
+        # Loop through slides
+        slides.each do |slide|
+            if (options["detailed"])
+                puts slide.detailed
+            elsif (options["git"])
+                puts slide.diffable
+                puts
+            else
+                puts slide
+                puts
+            end
+        end
+    else
+        quit = false
+        count = 0
+
+        while (!quit)
+            slide = slides[count]
 
-if (!options["slideshow"])
-    # Loop through slides
-    slides.each do |slide|
-        if (options["detailed"])
-            puts slide.detailed
-        elsif (options["git"])
-            puts slide.diffable
+            # Make it human readable and parse
+            system("clear")
             puts
-        else
             puts slide
             puts
-        end
-    end
-else
-    quit = false
-    count = 0
-
-    while (!quit)
-        slide = slides[count]
-
-        # Make it human readable and parse
-        system("clear")
-        puts
-        puts slide
-        puts
-        puts "j:Next k:Previous q:Quit"
-
-        answer = nil
-        while (!answer)
-            begin
-                system("stty raw -echo")
-                if $stdin.ready?
-                    answer = $stdin.getc.chr
-                else
-                    sleep 0.1
+            puts "j:Next k:Previous q:Quit"
+
+            answer = nil
+            while (!answer)
+                begin
+                    system("stty raw -echo")
+                    if $stdin.ready?
+                        answer = $stdin.getc.chr
+                    else
+                        sleep 0.1
+                    end
+                ensure
+                    system("stty -raw echo")
                 end
-            ensure
-                system("stty -raw echo")
+            end
+            puts
+
+            case answer
+            when "j", "J"
+                count += 1 if (count < (slides.length - 1))
+            when "k", "K"
+                count -= 1 if (count > 0)
+            when "q", "Q", "\x03"
+                # Quit or ^C
+                quit = true
             end
         end
-        puts
-
-        case answer
-        when "j", "J"
-            count += 1 if (count < (slides.length - 1))
-        when "k", "K"
-            count -= 1 if (count > 0)
-        when "q", "Q", "\x03"
-            # Quit or ^C
-            quit = true
+    end
+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 PPtxt::Error => e
+    puts e.message
+    exit PPtxtExit::EXCEPTION
+rescue Exception => e
+    $stderr.puts "Oops! Looks like an error has occured! 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 PPtxtExit::EXCEPTION
 end
+exit PPtxtExit::GOOD

data/lib/pptxt/error/file_not_found.rb

@@ -0,0 +1,7 @@
+require "pptxt/error"
+
+class PPtxt::Error::FileNotFound < PPtxt::Error
+    def initialize(file)
+        super("File not found: #{file}")
+    end
+end

data/lib/pptxt/error.rb

@@ -1,5 +1,6 @@
 class PPtxt::Error < RuntimeError
 end
 
-require "pptxt/error/missing_dependency_error"
-require "pptxt/error/unknown_xml_error"
+require "pptxt/error/file_not_found"
+require "pptxt/error/missing_dependency"
+require "pptxt/error/unknown_xml"

data/lib/pptxt/slide.rb

@@ -1,5 +1,3 @@
-require "pptxt/error/unknown_xml_error"
-
 class PPtxt::PPtxtSlide
     def detailed
         ret = Array.new

data/lib/pptxt.rb

@@ -47,13 +47,15 @@ class PPtxt
     end
 
     def create_slides
-        slides = %x(
-            unzip -l "#{@pptx}" | \grep -E "ppt/slides/[^_]" |
-            awk '{print $4}' | sort -k 1.17n
-        ).split("\n")
+        if (ScoobyDoo.where_are_you("unzip").nil?)
+            raise PPtxt::Error::MissingDependency.new("unzip")
+        end
 
         count = 0
-        slides.each do |slide|
+        %x(
+            unzip -l "#{@pptx}" | \grep -E "ppt/slides/[^_]" |
+            awk '{print $4}' | sort -k 1.17n
+        ).split("\n").each do |slide|
             xml = %x(unzip -qc "#{@pptx}" #{slide}).gsub("<", "\n<")
             count += 1
             @slides.push(PPtxtSlide.new(xml, count))
@@ -62,13 +64,12 @@ class PPtxt
     private :create_slides
 
     def initialize(pptx)
-        @pptx = pptx
-        @slides = Array.new
-
-        if (ScoobyDoo.where_are_you("unzip").nil?)
-            raise PPtxt::Error::MissingDependency.new("unzip")
+        if (!Pathname.new(pptx).expand_path.exist?)
+            raise PPtxt::Error::FileNotFound.new(pptx)
         end
 
+        @pptx = pptx
+        @slides = Array.new
         create_slides
     end
 end

data/lib/string.rb

@@ -0,0 +1,12 @@
+# Modify String class to allow for rsplit and word wrap
+class String
+    def rsplit(pattern)
+        ret = rpartition(pattern)
+        ret.delete_at(1)
+        return ret
+    end
+
+    def word_wrap(width = 80)
+        return scan(/\S.{0,#{width}}\S(?=\s|$)|\S+/).join("\n")
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pptxt
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -62,9 +62,11 @@ files:
 - bin/pptxt
 - lib/pptxt.rb
 - lib/pptxt/error.rb
-- lib/pptxt/error/missing_dependency_error.rb
-- lib/pptxt/error/unknown_xml_error.rb
+- lib/pptxt/error/file_not_found.rb
+- lib/pptxt/error/missing_dependency.rb
+- lib/pptxt/error/unknown_xml.rb
 - lib/pptxt/slide.rb
+- lib/string.rb
 homepage: https://mjwhitta.github.io/pptxt
 licenses:
 - GPL-3.0