showoff 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a500763400a9b53499d748a5128aad932228638
-  data.tar.gz: 34570d4eb7bbd84cbccac8d61b7fd44ebf1b47ee
+  metadata.gz: 5ea96eb5e4bf1886cb16471125acfb7750c50425
+  data.tar.gz: 617dde95b0f92b1029a267f354941a34d8d6a411
 SHA512:
-  metadata.gz: 706412e299a95a4d67d6de1ae9f5c9f66042c073905f237a1bb6bb33c392e14e5bc6664066a22743309401e83ad5e02cd346f788555edb884412e807557503d3
-  data.tar.gz: 50f32ce8a733aa0f7866671f4c05c4273f050161be8a4836ee58eaacef5af53a618da3c0f3eadaec3924e676682351c15b36ddc842b333eedb32228caa8fabf3
+  metadata.gz: 23a7ba04e6ff1456a986799fe5fdbf50f161752fed18c2998975e47b81d3edb61777fe3509bea3bb3f80a33772c2a1a3ea4b56817b0660fcab27ac0c2f064f44
+  data.tar.gz: 8bce9a117fe1097e54071daefad9cc5be3d25a3775d60c43e7e12df4d5e6ec6fbbc4ba494ee66ee6158cf48ef590e7afd25a052ecde11b60e68374660f1bb6a7

data/Rakefile

@@ -1,11 +1,38 @@
+require 'fileutils'
+
 task :default do
   system("rake -T")
 end
 
+def version
+  `git describe --tags  --abbrev=0`.chomp.sub('v','')
+end
+
+def next_version(type = :patch)
+  section = [:major,:minor,:patch].index type
+
+  n = version.split '.'
+  n[section] = n[section].to_i + 1
+  n.join '.'
+end
+
+desc "Build Docker image"
+task 'docker' do
+  Dir.chdir('build') do
+    system("docker build -t binford2k/showoff:#{version} -t binford2k/showoff:latest .")
+  end
+  puts
+  puts 'Start container with: docker run -p 9090:9090 binford2k/showoff'
+end
+
+desc "Upload image to Docker Hub"
+task 'docker:push' => ['docker'] do
+  system("docker push binford2k/showoff:#{version}")
+  system("docker push binford2k/showoff:latest")
+end
+
 desc "Build HTML documentation"
 task :doc do
-  require 'fileutils'
-
   FileUtils.rm_rf('doc')
   Dir.chdir('documentation') do
     system("rdoc --main -HOME.rdoc /*.rdoc --op ../doc")
@@ -14,8 +41,6 @@ end
 
 desc "Update docs for webpage"
 task 'doc:website' => [:doc] do
-  require 'fileutils'
-
   if system('git checkout gh-pages')
     FileUtils.rm_rf('documentation')
     FileUtils.mv('doc', 'documentation')

data/bin/showoff

@@ -146,7 +146,7 @@ command :serve do |c|
   c.switch [:r, :review]
 
   c.desc 'Enable remote code execution'
-  c.switch [:x, :executecode]
+  c.switch [:x, :execute, :executecode]
 
   c.desc 'Run in standalone mode, with no audience interaction'
   c.switch [:S, :standalone]
@@ -175,6 +175,9 @@ command :serve do |c|
   c.default_value "showoff.json"
   c.flag [:f, :file, :pres_file]
 
+  c.desc 'Git URL to a repository containing the presentation'
+  c.flag [:u, :url]
+
   c.action do |global_options,options,args|
 
     # This is gross. A serious revamp in config file parsing is due.
@@ -190,6 +193,15 @@ command :serve do |c|
     options[:ssl_private_key] ||= config['ssl_private_key']
     options[:standalone]      ||= config['standalone']
 
+    options[:pres_dir]          = args[0]
+    options[:port]              = options[:port].to_i
+
+    ssl_options = {
+      :cert_chain_file  => options[:ssl_certificate],
+      :private_key_file => options[:ssl_private_key],
+      :verify_peer      => false,
+    }
+
     protocol = options[:ssl] ? 'https' : 'http'
     host     = options[:host] == '0.0.0.0' ? 'localhost' : options[:host]
     url      = "#{protocol}://#{host}:#{options[:p].to_i}"
@@ -206,26 +218,22 @@ To run it from presenter view, go to: [ #{url}/presenter ]
 
 "
 
-    ShowOff.run!( :host       => options[:host],
-                  :port       => options[:port].to_i,
-                  :pres_file  => options[:file],
-                  :pres_dir   => args[0],
-                  :verbose    => options[:verbose],
-                  :review     => options[:review],
-                  :execute    => options[:executecode],
-                  :nocache    => options[:nocache],
-                  :bind       => options[:host],
-                  :standalone => options[:standalone],
-    ) do |server|
-      if options[:ssl]
-        ssl_options = {
-          :cert_chain_file  => options[:ssl_certificate],
-          :private_key_file => options[:ssl_private_key],
-          :verify_peer      => false,
-        }
-
-        server.ssl = true
-        server.ssl_options = ssl_options
+    if options[:url]
+      ShowOffUtils.clone(options[:url], options[:verbose]) do
+        ShowOff.run!(options) do |server|
+          if options[:ssl]
+            server.ssl         = true
+            server.ssl_options = ssl_options
+          end
+        end
+      end
+
+    else
+      ShowOff.run!(options) do |server|
+        if options[:ssl]
+          server.ssl         = true
+          server.ssl_options = ssl_options
+        end
       end
     end
 

data/lib/showoff/version.rb

@@ -1,3 +1,3 @@
 # No namespace here since ShowOff is a class and I'd have to inherit from
 # Sinatra::Application (which we don't want to load here)
-SHOWOFF_VERSION = '0.13.1'
+SHOWOFF_VERSION = '0.13.2'

data/lib/showoff.rb

@@ -88,8 +88,8 @@ class ShowOff < Sinatra::Application
       settings.showoff_config = showoff_json
 
       # Set options for encoding, template and page size
-      settings.encoding = showoff_json["encoding"]
-      settings.page_size = showoff_json["page-size"] || "Letter"
+      settings.encoding      = showoff_json["encoding"]  || 'UTF-8'
+      settings.page_size     = showoff_json["page-size"] || "Letter"
       settings.pres_template = showoff_json["templates"]
     end
 

data/lib/showoff_utils.rb

@@ -204,6 +204,20 @@ class ShowOffUtils
     `git update-ref refs/heads/gh-pages #{commit_sha}`
   end
 
+  # clone a repo url, then run a provided block
+  def self.clone(url, verbose=false)
+    require 'tmpdir'
+    Dir.mktmpdir do |dir|
+      Dir.chdir dir do
+        puts "Cloning presentation repository to #{dir}..." if verbose
+        system('git', 'clone', '--depth', '1', url, '.')
+
+        yield if block_given?
+      end
+    end
+
+  end
+
   # Makes a slide as a string.
   # [title] title of the slide
   # [classes] any "classes" to include, such as 'smaller', 'transition', etc.

data/public/css/showoff.css

@@ -543,7 +543,40 @@ img#disconnected {
   padding: 0;
 }
 
-/* Add a Shell "code highlighting" style to resemble the look of a terminal window. */
+/* Add Console "code highlighting" styles to resemble the look of a terminal window. */
+pre.highlight code.language-console {
+  background: #222;
+  background: url(titlebar/left.png) left top no-repeat, url(titlebar/right.png) right top no-repeat, url(titlebar/center.png) center top repeat-x #222;
+  color: #63de00;
+  padding: 30px 0.5em 0.5em;
+  border: 1px solid #acacac;
+  border-radius: 6px;
+  border-top-left-radius: 12px;
+  border-top-right-radius: 12px;
+  box-shadow: 0px 0px 10px #acacac;
+  overflow: hidden;
+}
+
+pre.highlight code.language-powershellconsole {
+  background: rgb(1, 36, 86);
+  background: url(titlebar/powershell-controls.png) right top no-repeat, url(titlebar/powershell.png) left top repeat-x rgb(1, 36, 86);
+  color: rgb(238, 237, 240);
+  padding: 32px 0.5em 0.5em;
+  border: 6px solid rgb(102, 202, 234);
+  border-top: 2px solid rgb(102, 202, 234);
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+pre.highlight code.language-console.nochrome,
+pre.highlight code.language-powershellconsole.nochrome {
+  background-image: none;
+  border-width: 1px;
+  padding: 0.5em;
+  border-radius: 4px;
+}
+
+/* to avoid breaking changes */
 .highlight .language-shell {
   display: block;
   background-color: #222;
@@ -553,6 +586,8 @@ img#disconnected {
   overflow: hidden;
 }
 
+
+
 /**********************************
  ***       code execution       ***
  **********************************/

data/public/js/presenter.js

@@ -138,6 +138,9 @@ function openSlave()
       slaveWindow.presenterView = window;
       slaveWindow.mode = { track: false, slave: true, follow: false };
 
+      // Add a class to differentiate from the audience view
+      slaveWindow.document.getElementById("preso").className = 'display';
+
       $('#slaveWindow').addClass('enabled');
     }
     catch(e) {

data/public/js/showoff.js

@@ -1148,6 +1148,7 @@ function toggleDebug () {
 
 function reloadSlides () {
   if (confirm('Are you sure you want to reload the slides?')) {
+    location.reload(true);
     loadSlides(loadSlidesBool, loadSlidesPrefix, true);
     showSlide();
   }

data/views/header.erb

@@ -39,6 +39,7 @@
       setupPreso(<%= @slides.nil? ? "true" : "false"%>, '<%= @asset_path %>');
     });
 
+    editUrl     = "<%= @edit %>";
     interactive = <%= @interactive %>;
 
     keymap               = <%= JSON.pretty_generate @keymap %>;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -319,6 +319,11 @@ files:
 - public/css/presenter.css
 - public/css/showoff.css
 - public/css/spinner_bar.gif
+- public/css/titlebar/center.png
+- public/css/titlebar/left.png
+- public/css/titlebar/powershell-controls.png
+- public/css/titlebar/powershell.png
+- public/css/titlebar/right.png
 - public/favicon.ico
 - public/js/TimeCircles.js
 - public/js/coffee-script.js
@@ -332,7 +337,7 @@ files:
 - public/js/jquery.parsequery.min.js
 - public/js/presenter.js
 - public/js/showoff.js
-homepage: http://github.com/puppetlabs/showoff
+homepage: https://puppetlabs.github.io/showoff
 licenses:
 - MIT
 metadata: {}