vimdeck 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72f4fd4a48a30aaeb1a3236e5170f4d9385042a9
-  data.tar.gz: f247b2d597380d5846e291eef7cc70779b5171fc
+  metadata.gz: 25182831f38569fe11b2d1291f7509d5be9fc111
+  data.tar.gz: 49feee428c5b31be720ebdae5d71267277a2b9ec
 SHA512:
-  metadata.gz: dfa538f688bfb571c5aa49ae4e3d6ab90e63166fe4cde93934838898eedd02dccbe3bc0d1e012ae4e531bc970e6c2c6d295535bd7bd73181dfc7fb06ccecef15
-  data.tar.gz: 2f4c0ad787bbf2e997aab250357ca6f861bf1835059da84a765189ef2936386720c428e3076fdf2b31fb44d8921c5b87180afbddaabe7ddfc2f31b9b3c46b431
+  metadata.gz: 26dda88c267bcf33d4d061f9f43214f9f1a8811240494551ae3ea15fbbaca25c2c0bc2ab04f51dd8434e5118ed9d606006f5ca40404a11540b1c32da1a4a3f03
+  data.tar.gz: 97ac85736f36eaf6744b53c13d6a2617a3ca0a68c55d97ef481bcfa13b443459352c7f7054573c1a2fde945a0833391da441ac2e126beb67af3b75d215717bd7

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'artii', '~>2.0.4'
-gem 'asciiart', '~>0.0.7'
+gem 'artii', '~>2.1.1'
+gem 'rasciiart', '~>0.0.9'
 gem 'redcarpet', '~>3.1.2'

data/Gemfile.lock

@@ -1,20 +1,20 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    artii (2.0.4)
-    asciiart (0.0.7)
-      rainbow
-      rmagick
+    artii (2.1.1)
     rainbow (2.0.0)
     rake (10.1.1)
+    rasciiart (0.0.9)
+      rainbow (= 2.0.0)
+      rmagick (= 2.15.4)
     redcarpet (3.1.2)
-    rmagick (2.13.2)
+    rmagick (2.15.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  artii (~> 2.0.4)
-  asciiart (~> 0.0.7)
+  artii (~> 2.1.1)
   rake
+  rasciiart (~> 0.0.9)
   redcarpet (~> 3.1.2)

data/README.md

@@ -21,7 +21,7 @@ Install the VIM plugin [SyntaxRange](https://github.com/vim-scripts/SyntaxRange)
 gem install vimdeck
 ```
 
-If you have problems getting RMagick to install, try installing [ImageMagick](http://www.imagemagick.org/) explicitly first.
+If you have problems getting RMagick to install, try installing [ImageMagick](http://www.imagemagick.org/) explicitly first. You may also need [MagickWand](http://www.imagemagick.org/script/magick-wand.php) and Ruby Development tools (libmagickwand-dev and ruby-dev respectively on Ubuntu).
 
 
 ## Usage
@@ -47,7 +47,7 @@ This is a tool meant for VIM users. In other words, it is not a VIM plugin
 
 The only hard dependency is [SyntaxRange](https://github.com/vim-scripts/SyntaxRange).
 
-Other than that you may need some syntax highlighting plugins to handle the code syntax highlighting.
+Other than that you may need some syntax highlighting plugins to handle the code syntax highlighting. [vim-scripts/ingo-library](https://github.com/vim-scripts/ingo-library) may be required for syntax highlighting.
 
 
 ## A Note About Markdown

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.3.0

data/bin/vimdeck-without-ascii-art

@@ -0,0 +1,110 @@
+#!/usr/bin/env ruby
+#> Usage: vimdeck [<command>] [<file>]
+#>
+#> Commands:
+#>
+#>   slideshow          generate and show slides (default)
+#>   generate           generate slides only
+#>   open               open slides in presentation folder (no file needed)
+#>
+#> Options:
+#>
+#>   --mouse, -m           mouse support for navigating slides
+#>   --no-indent, -I       skip indentation
+#>   --no-ascii, -A        skip ascii headers
+#>   --no-filetype, -n     use vim's plaintext syntax highlighting
+#>   --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"]
+  require_relative File.dirname(__FILE__)+"/../../lib/vimdeck.rb"
+else
+  require "vimdeck"
+end
+
+def usage
+  File.read(__FILE__).split("\n").grep(/^#>/).each do |line|
+    puts line[3..-1]
+  end
+end
+
+def check_file(file, opt_parser)
+  if !file || !File.exists?(file)
+    usage
+    puts "\nFile does not exist! #{file}"
+    exit 0
+  end
+end
+
+options = {}
+
+opt_parser = OptionParser.new do |opt|
+  opt.on("-A", "--no-ascii") do
+    options[:no_ascii] = true
+  end
+
+  opt.on("-I", "--no-indent") do
+    options[:no_indent] = true
+  end
+
+  opt.on("-h", "--header-font STRING", String) do |option|
+    options[:header_font] = option
+  end
+
+  opt.on("-m", "--mouse") do
+    options[:mouse_enabled] = true
+  end
+
+  opt.on("-n", "--no-filetype") do
+    options[:no_filetype] = true
+  end
+
+  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" || option == "nvim"
+      options[:editor] = option
+    else
+      raise "Not a valid editor: #{option}"
+    end
+  end
+end
+
+opt_parser.parse!
+
+file = ARGV.length > 1 ? ARGV[1] : ARGV[0]
+
+if !ARGV[0]
+  usage
+  exit 0
+end
+
+if ARGV[0] && ARGV[0] != "open"
+  check_file(file, opt_parser)
+end
+
+case ARGV[0]
+when "slideshow"
+  Vimdeck::Slideshow.start(file, options)
+when "generate"
+  Vimdeck::Slideshow.generate(file, options)
+when "open"
+  if ARGV.length == 2
+    puts "Vimdeck will open already existing slides"
+    puts "File name will be ignored"
+    sleep 3
+  end
+
+  Vimdeck::Slideshow.open
+else
+  Vimdeck::Slideshow.start(file, options)
+end

data/lib/vimdeck.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'artii'
 require 'asciiart'
+require 'artii'
 require 'erb'
 require 'redcarpet'
 

data/presentation/script.vim

@@ -1,4 +1,5 @@
 set nonumber
+set nofoldenable
 if exists('+relativenumber')
   set norelativenumber
 end
@@ -13,4 +14,54 @@ 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,91 +1,92 @@
-           _____ ___     __        ___
-          / ___// (_)___/ /__     <  /
-          \__ \/ / / __  / _ \    / / 
-         ___/ / / / /_/ /  __/   / /  
-        /____/_/_/\__,_/\___/   /_/   
-                                      
-        • has some
-        • really important
-        • information
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-slide 001
+         _    ________  _______  ______________ __
+        | |  / /  _/  |/  / __ \/ ____/ ____/ //_/
+        | | / // // /|_/ / / / / __/ / /   / ,<
+        | |/ // // /  / / /_/ / /___/ /___/ /| |
+        |___/___/_/  /_/_____/_____/\____/_/ |_|
+
+           ___  __  _____  ____  ___ _      ______________  __  _______
+          / _ \/ / / / _ \/ __/ / _ | | /| / / __/ __/ __ \/  |/  / __/
+         / ___/ /_/ / , _/ _/  / __ | |/ |/ / _/_\ \/ /_/ / /|_/ / _/
+        /_/   \____/_/|_/___/ /_/ |_|__/|__/___/___/\____/_/  /_/___/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+slide 001

data/presentation/slide002.md

@@ -1,89 +1,106 @@
-           _____ ___     __        ___ 
-          / ___// (_)___/ /__     |__ \
-          \__ \/ / / __  / _ \    __/ /
-         ___/ / / / /_/ /  __/   / __/ 
-        /____/_/_/\__,_/\___/   /____/ 
-                                       
-        Is less important
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-slide 002
+         _    ________  ___   ____  ____  ________ _______ __
+        | |  / /  _/  |/  /  / __ \/ __ \/ ____/ //_/ ___// /
+        | | / // // /|_/ /  / /_/ / / / / /   / ,<  \__ \/ /
+        | |/ // // /  / /  / _, _/ /_/ / /___/ /| |___/ /_/
+        |___/___/_/  /_/  /_/ |_|\____/\____/_/ |_/____(_)
+
+        +------------------------------+
+        |~~~~~~~~~~~~~~~.~~~~~~~~~~~~~~|
+        |~~~+~ :~~:..::~~~~~ :==.:~~:.~|
+        |~~~+::++:::::~~~ .::++++~~::+~|
+        |~~~~ :++::::....  .:++++~~. +~|
+        |~~~~~+++++::.   .:+++++:~~+~~~|
+        |~~~~.++++++:  .:+++++::.+=~~~~|
+        |~~.~~++++++:~:+++++::.  :~~~+~|
+        |+~~~~:+++++:+++++::.  ..~.. ~+|
+        |~+~~.+++:++++++::~     .  .~~~|
+        |~~~~~+++++++++~~~       .~+~~~|
+        |~~~~++++++++:. :~ :::::~:+:.~~|
+        |~~~~+++++::.  :~ .+~ ::~~::~~~|
+        |~~~~++++::.  :+.:++ ~::~~:.~~~|
+        |~~~~~+ ++~~+~.. ::~~+.. ~  ~~~|
+        |~~~~~~~~~~~~~~+ ~~~~~~~~~~~~~~|
+        +------------------------------+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+slide 002