vimdeck 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecfcbef00057585172595461eb3a2b60b69331f7
-  data.tar.gz: c21d7b0e63853a5c6329ba06d0cda463a390cf6a
+  metadata.gz: b1928c2614e2144900d0176c064d1a749ad1edbd
+  data.tar.gz: 4b081ef26e29bbaa53143f25a94e9eca3ddf7152
 SHA512:
-  metadata.gz: 5d3b4acc152f6e68449a14357e46130bf55cab1071cbf36e41e4cd12b5d163de60b9f4b876ae889db49323e55ccfcd0a8174495e2a3c33ea6ebbfa3fc0c21a20
-  data.tar.gz: 67b5cd7a406a5dc6e34027d606de33e30261a7bfffe33626470a2e4d2aa9af59e1b4ad1c3c7bff1852a3ee8b82a5f80d0eac2181b8801cec094a4e8c7632769e
+  metadata.gz: c80c2fdbe180753d2ed06b845cc68cada53776fc95c7c6bfae7636e4c2233a42e6a9dac14b45c6a05eafe93255dbbc9b26b057499282aba8b3c0907e4a10e382
+  data.tar.gz: bd14cc85cece40b02268d301ebec04b9e91ea4b3eef2c5f780a9b18df092c0588c018293945cb18b5885a8dfe50517fa1118279d444c8d8b36d9c1793e3ca0bf

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/bin/vimdeck

@@ -16,6 +16,7 @@
 #>   --header-margin, -m   bottom margin for headers. default: 1
 #>   --header-font, -h     specify header font (http://www.figlet.org/fontdb.cgi)
 #>                         foregoes the ability to have small and large headers
+#>   --editor, -e          specify editor to use (e.g., vim, mvim)
 
 require "optparse"
 if ENV["VIMDECK_DEBUG"]
@@ -64,6 +65,18 @@ opt_parser = OptionParser.new do |opt|
   opt.on("-m", "--header-margin NUMBER", Numeric) do |option|
     options[:header_margin] = option
   end
+
+  opt.on("-d", "--dos-newlines") do
+    options[:dos_newlines] = true
+  end
+
+  opt.on("-e", "--editor EDITOR", String) do |option|
+    if option == "vim" || option == "mvim"
+      options[:editor] = option
+    else
+      raise "Not a valid editor: #{option}"
+    end
+  end
 end
 
 opt_parser.parse!

data/lib/vimdeck.rb

@@ -5,6 +5,8 @@ require 'asciiart'
 require 'erb'
 require 'redcarpet'
 
+$nl = "\n"
+
 module Vimdeck
   # Helper methods for ascii art conversion
   class Ascii
@@ -78,34 +80,34 @@ module Vimdeck
 
     def list(content, type)
       if type == :unordered
-        "<!~#{content}~!>\n\n"
+        "<!~#{content}~!>#{$nl}#{$nl}"
       else
-        "<@~#{content}~@>\n\n"
+        "<@~#{content}~@>#{$nl}#{$nl}"
       end
     end
 
     def header(title, level)
       margin = Vimdeck::Slideshow.options[:header_margin]
-      linebreak = margin ? "\n" * margin : "\n"
+      linebreak = margin ? "#{$nl}" * margin : "#{$nl}"
       if !Vimdeck::Slideshow.options[:no_ascii]
         case level
         when 1
           heading = Vimdeck::Ascii.header(title, "large")
           if Vimdeck::Slideshow.options[:no_indent]
-            heading = "    " + heading.gsub( /\n/, "\n    " ) + linebreak
+            heading = "    " + heading.gsub( /\r\n?|\n/, "#{$nl}    " ) + linebreak
           else
             heading + linebreak
           end
         when 2
           heading = Vimdeck::Ascii.header(title, "small")
           if Vimdeck::Slideshow.options[:no_indent]
-            heading = "    " + heading.gsub( /\n/, "\n    " ) + linebreak
+            heading = "    " + heading.gsub( /\r\n?|\n/, "#{$nl}    " ) + linebreak
           else
             heading + linebreak
           end
         end
       else
-        title + "\n\n"
+        title + "#{$nl}#{$nl}"
       end
     end
 
@@ -114,11 +116,11 @@ module Vimdeck
     end
 
     def paragraph(text)
-      text + "\n\n"
+      text + "#{$nl}#{$nl}"
     end
 
     def block_code(code, language)
-      "```#{language}\n#{code}\n```"
+      "```#{language}#{$nl}#{code}#{$nl}```"
     end
 
     def image(image, title, alt_text)
@@ -145,6 +147,9 @@ module Vimdeck
     def self.generate(filename, options)
       @options = options
       extension = options[:no_filetype] ? ".txt" : ".md"
+      if options[:dos_newlines]
+        $nl = "\r\n"
+      end
       slides = File.read(filename)
 
       renderer = Redcarpet::Markdown.new(Vimdeck::Render, :fenced_code_blocks => true)
@@ -152,7 +157,7 @@ module Vimdeck
       @buffers = []
 
       # Slide separator is 3 newlines
-      slides = slides.split("\n\n\n")
+      slides = slides.split(/(?:\r\n?|\n)(?:\r\n?|\n)(?:\r\n?|\n)/)
       i = 0
       slides.each do |slide|
         # Pad file names with zeros. e.g. slide001.md, slide023.md, etc.
@@ -162,24 +167,24 @@ module Vimdeck
         regex = /\<\@\~(.*?)\~\@\>/m
         match = slide.match(regex)
         while match && match[1] && match.post_match do
-          list = match[1].split("\n")
+          list = match[1].split(/\r\n?|\n/)
           j = 0
           list = list.map do |li|
             j += 1
             "#{j}. #{li}"
           end
-          slide.sub!(regex, list.join("\n"))
+          slide.sub!(regex, list.join($nl))
           match = match.post_match.match(regex)
         end
 
         regex = /\<\!\~(.*?)\~\!\>/m
         match = slide.match(regex)
         while match && match[1] && match.post_match do
-          list = match[1].split("\n")
+          list = match[1].split(/\r\n?|\n/)
           list = list.map do |li|
             "\u2022 #{li}"
           end
-          slide.sub!(regex, list.join("\n"))
+          slide.sub!(regex, list.join($nl))
           match = match.post_match.match(regex)
         end
 
@@ -189,17 +194,17 @@ module Vimdeck
         buffer = {:num => i + 1}
         code_height = 0
         code = nil
-        code = slide.match( /```([^\n]*)\n.*\n```/m )
+        code = slide.match( /```([^\r\n]*)(\r\n?|\n).*(\r\n?|\n)```/m )
         if code
           buffer[:code] = []
           code_hash = { :language => code[1] }
-          code_height = code[0].split("\n").length - 2
-          code = code[0].gsub( /```[^\n]*\n/, '' ).gsub( /\n```/, '' )
-          slide = slide.gsub( /```[^\n]*\n/, '' ).gsub( /\n```/, '' )
+          code_height = code[0].split(/\r\n?|\n/).length - 2
+          code = code[0].gsub( /```[^\r\n]*(\r\n?|\n)/, '' ).gsub( /(\r\n?|\n)```/, '' )
+          slide = slide.gsub( /```[^\r\n]*(\r\n?|\n)/, '' ).gsub( /(\r\n?|\n)```/, '' )
 
           if code_height > 0
             start = slide.index(code)
-            start = slide[0..start].split("\n").length
+            start = slide[0..start].split(/\r\n?|\n/).length
             code_hash[:end] = code_height + start - 1
             code_hash[:start] = start
           end
@@ -209,7 +214,7 @@ module Vimdeck
         # Prepending each line with slide_padding
         # Removing trailing spaces
         # Add newlines at end of the file to hide the slide identifier
-        slide = slide_padding + slide.gsub( /\n/, "\n#{slide_padding}" ).gsub( / *$/, "" ) + ("\n" * 80) + "slide #{slide_num}"
+        slide = slide_padding + slide.gsub( /\r\n?|\n/, "#{$nl}#{slide_padding}" ).gsub( / *$/, "" ) + ($nl * 80) + "slide #{slide_num}"
 
         # Buffers comments refers to items that need to be less focused/"unhighlighted"
         # We add a regex to the vimscript for each slide with "comments"
@@ -220,12 +225,12 @@ module Vimdeck
         while match && match[1] && match.post_match do
           slide.sub!(regex, match[1])
           pattern = match[1] + "||(||_.*slide #{slide_num}||)||@="
-          buffer[:comments] << pattern.gsub(/\n/, "||n").gsub(/\[/, "||[").gsub(/\]/, "||]").gsub(/\|/, "\\").gsub(/\"/, "\\\"")
+          buffer[:comments] << pattern.gsub(/\r\n?|\n/, "||n").gsub(/\[/, "||[").gsub(/\]/, "||]").gsub(/\|/, "\\").gsub(/\"/, "\\\"")
           match = match.post_match.match(regex)
         end
 
         File.open("presentation/slide#{slide_num}#{extension}", "w") do |file|
-          file.write(slide + "\n")
+          file.write("#{slide}#{$nl}")
         end
 
         @buffers << buffer
@@ -239,7 +244,8 @@ module Vimdeck
 
     def self.open
       extension = @options[:no_filetype] ? ".txt" : ".md"
-      exec "vim presentation/*#{extension} -S presentation/script.vim"
+      editor = options[:editor] || "vim"
+      exec "#{editor} presentation/*#{extension} -S presentation/script.vim"
     end
 
     def self.start(filename, options)

data/presentation/script.vim

@@ -13,54 +13,4 @@ noremap Q :q<CR>
 
 b 1
 b 2
-b 3
-b 4
-b 5
-call matchadd("Comment", "\\n        • Second\\n        • Third\\(\\_.*slide 005\\)\\@=")
-b 6
-call matchadd("Comment", "• First\\(\\_.*slide 006\\)\\@=")
-call matchadd("Comment", "\\n        • Third\\(\\_.*slide 006\\)\\@=")
-b 7
-call matchadd("Comment", "• First\\n        • Second\\(\\_.*slide 007\\)\\@=")
-b 8
-6,17SyntaxInclude ruby
-b 9
-6,17SyntaxInclude ruby
-call matchadd("Comment", "module Parts\\n          class foo\\n            def slide\\n             \"of a\"\\n            end\\n\\n            def can\\n              highlight = \\(\\_.*slide 009\\)\\@=")
-call matchadd("Comment", "\\n            end\\n          end\\n        end\\(\\_.*slide 009\\)\\@=")
-b 10
-6,17SyntaxInclude ruby
-call matchadd("Comment", "module Parts\\n          class foo\\n            def slide\\n             \"of a\"\\n            end\\n\\n            def\\(\\_.*slide 010\\)\\@=")
-call matchadd("Comment", "highlight = \"vimdeck\"\\n            end\\n          end\\n        end\\(\\_.*slide 010\\)\\@=")
-b 11
-6,17SyntaxInclude ruby
-call matchadd("Comment", "module Parts\\n          class foo\\n            def slide\\n             \"of a\"\\n            end\\n\\n            def can\\(\\_.*slide 011\\)\\@=")
-call matchadd("Comment", "= \"vimdeck\"\\n            end\\n          end\\n        end\\(\\_.*slide 011\\)\\@=")
-b 12
-6,17SyntaxInclude ruby
-call matchadd("Comment", "module\\(\\_.*slide 012\\)\\@=")
-call matchadd("Comment", "class foo\\n            def slide\\n             \"of a\"\\n            end\\n\\n            def can\\n              highlight = \"vimdeck\"\\n            end\\n          end\\n        end\\(\\_.*slide 012\\)\\@=")
-b 13
-6,17SyntaxInclude ruby
-call matchadd("Comment", "module Parts\\n          class foo\\n            def slide\\(\\_.*slide 013\\)\\@=")
-call matchadd("Comment", "end\\n\\n            def can\\n              highlight = \"vimdeck\"\\n            end\\n          end\\n        end\\(\\_.*slide 013\\)\\@=")
-b 14
-6,17SyntaxInclude ruby
-call matchadd("Comment", "module Parts\\n          class foo\\n            def\\(\\_.*slide 014\\)\\@=")
-call matchadd("Comment", "\"of a\"\\n            end\\n\\n            def can\\n              highlight = \"vimdeck\"\\n            end\\n          end\\n        end\\(\\_.*slide 014\\)\\@=")
-b 15
-6,16SyntaxInclude javascript
-b 16
-6,16SyntaxInclude javascript
-call matchadd("Comment", "(function( window, $, undefined ) {\\n            $( '.hello' ).on( 'click', function sayHello() {\\(\\_.*slide 016\\)\\@=")
-call matchadd("Comment", "\\n            });\\n        })( window, jQuery );\\(\\_.*slide 016\\)\\@=")
-b 17
-6,16SyntaxInclude javascript
-call matchadd("Comment", "<body>\\(\\_.*slide 017\\)\\@=")
-call matchadd("Comment", "</body>\\(\\_.*slide 017\\)\\@=")
-b 18
-6,16SyntaxInclude javascript
-call matchadd("Comment", "(function( window, $, undefined ) {\\n            $( '.hello' ).on( 'click', function sayHello() {\\(\\_.*slide 018\\)\\@=")
-call matchadd("Comment", "\\n            });\\n        })( window, jQuery );\\n\\n        <body>\\n            <a href=\"#\" class=\"hello\">Hello!</a>\\n        </body>\\(\\_.*slide 018\\)\\@=")
-b 19
 b 1

data/presentation/slide001.md

@@ -1,92 +1,91 @@
-         _    ________  _______  ______________ __
-        | |  / /  _/  |/  / __ \/ ____/ ____/ //_/
-        | | / // // /|_/ / / / / __/ / /   / ,<
-        | |/ // // /  / / /_/ / /___/ /___/ /| |
-        |___/___/_/  /_/_____/_____/\____/_/ |_|
-
-           ___  __  _____  ____  ___ _      ______________  __  _______
-          / _ \/ / / / _ \/ __/ / _ | | /| / / __/ __/ __ \/  |/  / __/
-         / ___/ /_/ / , _/ _/  / __ | |/ |/ / _/_\ \/ /_/ / /|_/ / _/
-        /_/   \____/_/|_/___/ /_/ |_|__/|__/___/___/\____/_/  /_/___/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-slide 001
+           _____ ___     __        ___
+          / ___// (_)___/ /__     <  /
+          \__ \/ / / __  / _ \    / / 
+         ___/ / / / /_/ /  __/   / /  
+        /____/_/_/\__,_/\___/   /_/   
+                                      
+        • has some
+        • really important
+        • information
+        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+slide 001

data/presentation/slide002.md

@@ -1,106 +1,89 @@
-         _    ________  ___   ____  ____  ________ _______ __
-        | |  / /  _/  |/  /  / __ \/ __ \/ ____/ //_/ ___// /
-        | | / // // /|_/ /  / /_/ / / / / /   / ,<  \__ \/ /
-        | |/ // // /  / /  / _, _/ /_/ / /___/ /| |___/ /_/
-        |___/___/_/  /_/  /_/ |_|\____/\____/_/ |_/____(_)
-
-        +------------------------------+
-        |             ..:.             |
-        |   ~+~========~+~.:=========: |
-        |   =o=oooooo=~~~~~+=oooooooo~ |
-        |    .+oooooo~~~~~~~=oooooo+.. |
-        |    .oooooo=~~~~~+ooooo=+:.   |
-        |    :ooooo==~~~+ooooo=+~~:.   |
-        | .:~~=ooooo=++ooooo=+~~~~~~:. |
-        |.:~~~=oooooooooooo+~~~~~~~~~~.|
-        |   :~oooooooooo==~~~~~~~~~.   |
-        |     ooooooooo+++~~~~~~~:..   |
-        |     ooooooo+~~+~~+=++==~++:  |
-        |     =ooo=+~~~++~~=+~+=..o+.  |
-        |    .=oo+~ .~+=~~o+.+o= =+~   |
-        |     .~~.   .~~~~=~..+~~..~   |
-        |              . .             |
-        +------------------------------+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-slide 002
+           _____ ___     __        ___ 
+          / ___// (_)___/ /__     |__ \
+          \__ \/ / / __  / _ \    __/ /
+         ___/ / / / /_/ /  __/   / __/ 
+        /____/_/_/\__,_/\___/   /____/ 
+                                       
+        Is less important
+        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+slide 002

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vimdeck
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Tyler Benziger
@@ -76,23 +76,6 @@ files:
 - presentation/script.vim
 - presentation/slide001.md
 - presentation/slide002.md
-- presentation/slide003.md
-- presentation/slide004.md
-- presentation/slide005.md
-- presentation/slide006.md
-- presentation/slide007.md
-- presentation/slide008.md
-- presentation/slide009.md
-- presentation/slide010.md
-- presentation/slide011.md
-- presentation/slide012.md
-- presentation/slide013.md
-- presentation/slide014.md
-- presentation/slide015.md
-- presentation/slide016.md
-- presentation/slide017.md
-- presentation/slide018.md
-- presentation/slide019.md
 - slides.md
 - vimdeck.gemspec
 homepage: http://github.com/tybenz/vimdeck