pptxt 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af8adcaf1ae4e8b2e76aaadff580d8d0ff48534f
-  data.tar.gz: 3324a84c53ff4ae4865a92530d62875c0a662492
+  metadata.gz: 0acefbb422ba5b2b9bc4c0aeac6e5fa00ec53a66
+  data.tar.gz: 833dcfaa4f1899be33af1eb5b39b3cbe6de64eaa
 SHA512:
-  metadata.gz: fabd38653a74ae682deb4e74e081cca977a50f3cb4186c5b3daba60e98f4f2ffda3e976ec54a003742732fa7f85c8c7a1060d0f06ed56a56b86c472933688469
-  data.tar.gz: 974f4152ce33df205b76afaa4fd669fb052de111e6ee6fe6f059dc1d01bcb5c025b77a4d3b95401b3cff7088c2cf83b1e081e2e12bffafecebd8f7bb455a6e7b
+  metadata.gz: 6911494c23daca9c3643a9848c4512149ea50462d3dc570e33029f329d239fae7dc0703010610c4d42a36c66324117e74829dca64b024683c6c07566fe80c34a
+  data.tar.gz: d23b98bb4331f8c086cfb3e9b153f4b41505da3491be7ef87cf3c1ec24094d53aef6e61a7154b7b0dbabe10d9af5cd02c8b726098aea273a58414ea774ff56c7

data/bin/pptxt

@@ -4,8 +4,16 @@ require "io/wait"
 require "optparse"
 require "pathname"
 require "pptxt"
-require "pptxt_exit_status"
-require "pptxt_slide"
+
+class PPtxtExit
+    GOOD = 0
+    INVALID_OPTION = 1
+    INVALID_ARGUMENT = 2
+    MISSING_ARGUMENT = 3
+    EXTRA_ARGUMENTS = 4
+    FILE_DOES_NOT_EXIST = 5
+    MISSING_UTILITY = 6
+end
 
 def parse(args)
     options = Hash.new
@@ -23,7 +31,7 @@ def parse(args)
             "Configure git repo to use pptxt"
         ) do
             PPtxt.configure_git
-            exit PPtxtExitStatus::GOOD
+            exit PPtxtExit::GOOD
         end
 
         opts.on("-d", "--detailed", "Display full xml") do
@@ -40,12 +48,12 @@ def parse(args)
             "Configure git to use pptxt globally"
         ) do
             PPtxt.configure_git(true)
-            exit PPtxtExitStatus::GOOD
+            exit PPtxtExit::GOOD
         end
 
         opts.on("-h", "--help", "Display this help message") do
             puts opts
-            exit PPtxtExitStatus::GOOD
+            exit PPtxtExit::GOOD
         end
 
         opts.on("-s", "--slideshow", "Display as slideshow") do
@@ -58,33 +66,33 @@ def parse(args)
     rescue OptionParser::InvalidOption => e
         puts e.message
         puts parser
-        exit PPtxtExitStatus::INVALID_OPTION
+        exit PPtxtExit::INVALID_OPTION
     rescue OptionParser::InvalidArgument => e
         puts e.message
         puts parser
-        exit PPtxtExitStatus::INVALID_ARGUMENT
+        exit PPtxtExit::INVALID_ARGUMENT
     rescue OptionParser::MissingArgument => e
         puts e.message
         puts parser
-        exit PPtxtExitStatus::MISSING_ARGUMENT
+        exit PPtxtExit::MISSING_ARGUMENT
     end
 
     if (args.empty?)
         puts parser
-        exit PPtxtExitStatus::MISSING_ARGUMENT
+        exit PPtxtExit::MISSING_ARGUMENT
     elsif (args.length > 1)
         puts parser
-        exit PPtxtExitStatus::EXTRA_ARGUMENTS
+        exit PPtxtExit::EXTRA_ARGUMENTS
     end
 
     if (!Pathname.new(args[0]).expand_path.exist?)
         puts "#{args[0]} does not exist!"
-        exit PPtxtExitStatus::FILE_DOES_NOT_EXIST
+        exit PPtxtExit::FILE_DOES_NOT_EXIST
     end
 
     options["pptx"] = args[0].strip
     if (options["pptx"] == "/dev/null")
-        exit PPtxtExitStatus::GOOD
+        exit PPtxtExit::GOOD
     end
 
     return options

data/lib/pptxt/error.rb

@@ -0,0 +1,2 @@
+class PPtxt::Error < RuntimeError
+end

data/lib/pptxt/missing_dependency.rb

@@ -0,0 +1,7 @@
+require "pptxt/error"
+
+class PPtxt::MissingDependency < PPtxt::Error
+    def initialize(tool)
+        super("Missing dependency: #{tool}")
+    end
+end

data/lib/{pptxt_slide.rb → pptxt/slide.rb}

@@ -1,4 +1,4 @@
-class PPtxtSlide
+class PPtxt::PPtxtSlide
     def detailed
         ret = Array.new
         num_indents = 0
@@ -23,7 +23,7 @@ class PPtxtSlide
                 indents = Array.new(num_indents, "  ").join
                 ret.push("#{indents}#{line}")
             else
-                raise PPtxtError::UnknownXML.new(line)
+                raise PPtxt::UnknownXML.new(line)
             end
         end
 
@@ -40,11 +40,12 @@ class PPtxtSlide
     end
 
     def handle_format(str, format, lvl, list_index)
+        filler = Array.new(lvl, "  ").join
         case format
         when "bullet"
-            return "#{Array.new(lvl, "  ").join}- #{str}"
+            return "#{filler}- #{str}"
         when "number"
-            return "#{Array.new(lvl, "  ").join}#{list_index}. #{str}"
+            return "#{filler}#{list_index}. #{str}"
         else
             return str
         end
@@ -103,7 +104,9 @@ class PPtxtSlide
                     @title += "  " if (!first_time && was_newline)
                     @title += line[5..-1]
                 elsif (in_subtitle)
-                    @subtitle += "   " if (!first_time && was_newline)
+                    if (!first_time && was_newline)
+                        @subtitle += "   "
+                    end
                     @subtitle += line[5..-1]
                 elsif(ignore)
                     break

data/lib/pptxt/unknown_xml.rb

@@ -0,0 +1,7 @@
+require "pptxt/error"
+
+class PPtxt::UnknownXML < PPtxt::Error
+    def initialize(line)
+        super("Unknown line in xml: #{line}")
+    end
+end

data/lib/pptxt.rb

@@ -1,5 +1,3 @@
-require "pptxt_error"
-require "pptxt_slide"
 require "scoobydoo"
 
 class PPtxt
@@ -7,7 +5,7 @@ class PPtxt
 
     def self.configure_git(global = false)
         if (ScoobyDoo.where_are_you("git").nil?)
-            raise PPtxtError::MissingDependency.new("git")
+            raise PPtxt::MissingDependency.new("git")
         end
 
         # Configure git
@@ -50,13 +48,15 @@ class PPtxt
 
     def create_slides
         slides = %x(
-        unzip -l "#{@pptx}" | \grep -E "ppt/slides/[^_]" |
-                awk '{print $4}' | sort -k 1.17n
+            unzip -l "#{@pptx}" | \grep -E "ppt/slides/[^_]" |
+            awk '{print $4}' | sort -k 1.17n
         ).split("\n")
 
         count = 0
         slides.each do |slide|
-            xml = %x(unzip -qc "#{@pptx}" #{slide}).gsub("<", "\n<")
+            xml = %x(
+                unzip -qc "#{@pptx}" #{slide}).gsub("<", "\n<"
+            )
             count += 1
             @slides.push(PPtxtSlide.new(xml, count))
         end
@@ -68,9 +68,14 @@ class PPtxt
         @slides = Array.new
 
         if (ScoobyDoo.where_are_you("unzip").nil?)
-            raise PPtxtError::MissingDependency.new("unzip")
+            raise PPtxt::MissingDependency.new("unzip")
         end
 
         create_slides
     end
 end
+
+require "pptxt/error"
+require "pptxt/missing_dependency"
+require "pptxt/slide"
+require "pptxt/unknown_xml"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pptxt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -39,7 +39,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 description: This gem can extract the xml info from a pptx and convert to human-readable
   text. It was intended to be used with git for seeing changes between revisions.
 email: mjwhitta@gmail.com
@@ -60,9 +60,10 @@ extra_rdoc_files: []
 files:
 - bin/pptxt
 - lib/pptxt.rb
-- lib/pptxt_error.rb
-- lib/pptxt_exit_status.rb
-- lib/pptxt_slide.rb
+- lib/pptxt/error.rb
+- lib/pptxt/missing_dependency.rb
+- lib/pptxt/slide.rb
+- lib/pptxt/unknown_xml.rb
 homepage: http://mjwhitta.github.io/pptxt
 licenses:
 - GPL-3.0

data/lib/pptxt_error.rb

@@ -1,16 +0,0 @@
-module PPtxtError
-    class Error < RuntimeError
-    end
-
-    class MissingDependency < Error
-        def initialize(tool)
-            super("Missing dependency: #{tool}")
-        end
-    end
-
-    class UnknownXML < Error
-        def initialize(line)
-            super("Unknown line in xml: #{line}")
-        end
-    end
-end

data/lib/pptxt_exit_status.rb

@@ -1,9 +0,0 @@
-class PPtxtExitStatus
-    GOOD = 0
-    INVALID_OPTION = 1
-    INVALID_ARGUMENT = 2
-    MISSING_ARGUMENT = 3
-    EXTRA_ARGUMENTS = 4
-    FILE_DOES_NOT_EXIST = 5
-    MISSING_UTILITY = 6
-end