showoff 0.6.0 → 0.7.0

data/Rakefile

@@ -1,3 +1,5 @@
+require 'rake/testtask'
+
 begin
   require 'mg'
 rescue LoadError
@@ -5,3 +7,21 @@ rescue LoadError
 end
 
 MG.new("showoff.gemspec")
+
+#
+# Tests
+#
+
+task :default => :test
+
+desc "Run tests"
+task :turn do
+  suffix = "-n #{ENV['TEST']}" if ENV['TEST']
+  sh "turn test/*_test.rb #{suffix}"
+end
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end

data/bin/showoff

@@ -24,6 +24,11 @@ command [:create,:init] do |c|
   c.action do |global_options,options,args|
     raise "dir_name is required" if args.empty?
     ShowOffUtils.create(args[0],!options[:n],options[:d])
+    if !options[:n]
+      puts "done. run 'showoff serve' in #{options[:d]}/ dir to see slideshow"
+    else
+      puts "done. add slides, modify #{ShowOffUtils.presentation_config_file} and then run 'showoff serve' in #{dirname}/ dir to see slideshow"
+    end
   end
 end
 
@@ -31,7 +36,13 @@ desc 'Puts your showoff presentation into a gh-pages branch'
 long_desc 'Generates a static version of your presentation into your gh-pages branch for publishing to GitHub Pages'
 command :github do |c|
   c.action do |global_options,options,args|
+    puts "Generating static content"
     ShowOffUtils.github
+    puts "I've updated your 'gh-pages' branch with the static version of your presentation."
+    puts "Push it to GitHub to publish it. Probably something like:"
+    puts
+    puts "  git push origin gh-pages"
+    puts
   end
 end
 
@@ -52,7 +63,25 @@ command :heroku do |c|
 
   c.action do |global_options,options,args|
     raise "heroku_name is required" if args.empty?
-    ShowOffUtils.heroku(args[0],options[:f],options[:p],options[:g])
+    if ShowOffUtils.heroku(args[0],options[:f],options[:p],options[:g])
+      puts "herokuized. run something like this to launch your heroku presentation:
+
+      heroku create #{args[0]}"
+
+      if options[:g]
+      puts "        git add .gems config.ru"
+      else
+      puts "      bundle install"
+      puts "      git add Gemfile Gemfile.lock config.ru"
+      end
+      puts "      git commit -m 'herokuized'
+      git push heroku master
+      "
+
+      if options[:p]
+        puts "CAREFUL: you are commiting your access password - anyone with read access to the repo can access the preso\n\n"
+      end
+    end
   end
 end
 
@@ -77,6 +106,20 @@ command :serve do |c|
   c.flag [:f, :pres_file]
 
   c.action do |global_options,options,args|
+
+    url = "http://#{options[:h]}:#{options[:p].to_i}"
+    puts "
+-------------------------
+
+Your ShowOff presentation is now starting up.
+
+To view it plainly, visit [ #{url} ]
+
+To run it from presenter view, go to: [ #{url}/presenter ]
+
+-------------------------
+
+"
     ShowOff.run! :host => options[:h], :port => options[:p].to_i, :pres_file => options[:f], :pres_dir => args[0], :verbose => options[:verbose]
   end
 end

data/lib/showoff.rb

@@ -7,7 +7,6 @@ require 'logger'
 
 here = File.expand_path(File.dirname(__FILE__))
 require "#{here}/showoff_utils"
-require "#{here}/princely"
 require "#{here}/commandline_parser"
 
 begin
@@ -32,13 +31,17 @@ end
 
 class ShowOff < Sinatra::Application
 
-  Version = VERSION = '0.6.0'
+  Version = VERSION = '0.7.0'
 
   attr_reader :cached_image_size
 
   set :views, File.dirname(__FILE__) + '/../views'
   set :public, File.dirname(__FILE__) + '/../public'
 
+  set :verbose, false
+  set :pres_dir, '.'
+  set :pres_file, 'showoff.json'
+
   def initialize(app=nil)
     super(app)
     @logger = Logger.new(STDOUT)
@@ -49,25 +52,24 @@ class ShowOff < Sinatra::Application
     @logger.debug(dir)
 
     showoff_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-    if Dir.pwd == showoff_dir
-      options.pres_dir = "#{showoff_dir}/example"
-      @root_path = "."
-    else
-      options.pres_dir ||= Dir.pwd
-      @root_path = ".."
-    end
+    options.pres_dir ||= Dir.pwd
+    @root_path = "."
+
     options.pres_dir = File.expand_path(options.pres_dir)
     if (options.pres_file)
-      puts "Using #{options.pres_file}"
       ShowOffUtils.presentation_config_file = options.pres_file
     end
-    puts "Serving presentation from #{options.pres_dir}"
     @cached_image_size = {}
     @logger.debug options.pres_dir
     @pres_name = options.pres_dir.split('/').pop
     require_ruby_files
   end
 
+  def self.pres_dir_current
+    opt = {:pres_dir => Dir.pwd}
+    ShowOff.set opt
+  end
+
   def require_ruby_files
     Dir.glob("#{options.pres_dir}/*.rb").map { |path| require path }
   end
@@ -123,7 +125,7 @@ class ShowOff < Sinatra::Application
 
       # todo: unit test
       lines = content.split("\n")
-      puts "#{name}: #{lines.length} lines"
+      @logger.debug "#{name}: #{lines.length} lines"
       slides = []
       slides << (slide = Slide.new)
       until lines.empty?
@@ -327,6 +329,10 @@ class ShowOff < Sinatra::Application
       erb :index
     end
 
+    def presenter
+      erb :presenter
+    end
+
     def clean_link(href)
       if href && href[0, 1] == '/'
         href = href[1, href.size]
@@ -404,7 +410,7 @@ class ShowOff < Sinatra::Application
       if data.is_a?(File)
         FileUtils.cp(data.path, "#{name}.pdf")
       else
-        out  = "#{path}/#{name}/static"
+        out = File.expand_path("#{path}/static")
         # First make a directory
         FileUtils.makedirs(out)
         # Then write the html

data/lib/showoff_utils.rb

@@ -25,12 +25,6 @@ class ShowOffUtils
       File.open(ShowOffUtils.presentation_config_file, 'w+') do |f|
         f.puts "{ \"name\": \"My Preso\", \"sections\": [ {\"section\":\"#{dir}\"} ]}"
       end
-
-      if create_samples
-        puts "done. run 'showoff serve' in #{dirname}/ dir to see slideshow"
-      else
-        puts "done. add slides, modify #{ShowOffUtils.presentation_config_file} and then run 'showoff serve' in #{dirname}/ dir to see slideshow"
-      end
     end
   end
 
@@ -43,13 +37,8 @@ class ShowOffUtils
   # name         - String containing heroku name
   # force        - boolean if .gems/Gemfile and config.ru should be overwritten if they don't exist
   # password     - String containing password to protect your heroku site; nil means no password protection
-  # use_dot_gems - boolea that, if true, indicates we should use the old, deprecated .gems file instead of Bundler
-  def self.heroku(name,force,password,use_dot_gems)
-    if !File.exists?(ShowOffUtils.presentation_config_file)
-      puts "fail. not a showoff directory"
-      return false
-    end
-
+  # use_dot_gems - boolean that, if true, indicates we should use the old, deprecated .gems file instead of Bundler
+  def self.heroku(name, force = false, password = nil, use_dot_gems = false)
     modified_something = false
 
     if use_dot_gems
@@ -80,26 +69,11 @@ class ShowOffUtils
       end
     end
 
-    if modified_something
-      puts "herokuized. run something like this to launch your heroku presentation:
-
-      heroku create #{name}"
-
-      if use_dot_gems
-      puts "        git add #{HEROKU_GEMS_FILE} #{HEROKU_CONFIG_FILE}"
-      else
-      puts "      bundle install
-      git add Gemfile.lock #{HEROKU_GEMS_FILE} #{HEROKU_CONFIG_FILE}"
-      end
-      puts "      git commit -m 'herokuized'
-      git push heroku master
-      "
-    end
+    modified_something
   end
 
   # generate a static version of the site into the gh-pages branch
   def self.github
-    puts "Generating static content"
     ShowOff.do_static(nil)
     `git add static`
     sha = `git write-tree`.chomp
@@ -109,11 +83,6 @@ class ShowOffUtils
     extra = ghp_sha != 'gh-pages' ? "-p #{ghp_sha}" : ''
     commit_sha = `echo 'static presentation' | git commit-tree #{tree_sha} #{extra}`.chomp
     `git update-ref refs/heads/gh-pages #{commit_sha}`
-    puts "I've updated your 'gh-pages' branch with the static version of your presentation."
-    puts "Push it to GitHub to publish it. Probably something like:"
-    puts
-    puts "  git push origin gh-pages"
-    puts
   end
 
   # Makes a slide as a string.
@@ -325,7 +294,7 @@ class ShowOffUtils
     EXTENSIONS[ext] || ext
   end
 
-  REQUIRED_GEMS = %w(bluecloth nokogiri showoff gli)
+  REQUIRED_GEMS = %w(bluecloth nokogiri showoff gli heroku)
 
   # Creates the file that lists the gems for heroku
   #

data/public/css/960.css

@@ -0,0 +1,653 @@
+/*
+  960 Grid System ~ Core CSS.
+  Learn more ~ http://960.gs/
+
+  Licensed under GPL and MIT.
+*/
+
+/*
+  Forces backgrounds to span full width,
+  even if there is horizontal scrolling.
+  Increase this if your layout is wider.
+
+  Note: IE6 works fine without this fix.
+*/
+
+body {
+  min-width: 960px;
+}
+
+/* `Container
+----------------------------------------------------------------------------------------------------*/
+
+.container_12,
+.container_16 {
+  margin-left: auto;
+  margin-right: auto;
+  width: 960px;
+}
+
+/* `Grid >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.grid_1,
+.grid_2,
+.grid_3,
+.grid_4,
+.grid_5,
+.grid_6,
+.grid_7,
+.grid_8,
+.grid_9,
+.grid_10,
+.grid_11,
+.grid_12,
+.grid_13,
+.grid_14,
+.grid_15,
+.grid_16 {
+  display: inline;
+  float: left;
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+.push_1, .pull_1,
+.push_2, .pull_2,
+.push_3, .pull_3,
+.push_4, .pull_4,
+.push_5, .pull_5,
+.push_6, .pull_6,
+.push_7, .pull_7,
+.push_8, .pull_8,
+.push_9, .pull_9,
+.push_10, .pull_10,
+.push_11, .pull_11,
+.push_12, .pull_12,
+.push_13, .pull_13,
+.push_14, .pull_14,
+.push_15, .pull_15 {
+  position: relative;
+}
+
+.container_12 .grid_3,
+.container_16 .grid_4 {
+  width: 220px;
+}
+
+.container_12 .grid_6,
+.container_16 .grid_8 {
+  width: 460px;
+}
+
+.container_12 .grid_9,
+.container_16 .grid_12 {
+  width: 700px;
+}
+
+.container_12 .grid_12,
+.container_16 .grid_16 {
+  width: 940px;
+}
+
+/* `Grid >> Children (Alpha ~ First, Omega ~ Last)
+----------------------------------------------------------------------------------------------------*/
+
+.alpha {
+  margin-left: 0;
+}
+
+.omega {
+  margin-right: 0;
+}
+
+/* `Grid >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .grid_1 {
+  width: 60px;
+}
+
+.container_12 .grid_2 {
+  width: 140px;
+}
+
+.container_12 .grid_4 {
+  width: 300px;
+}
+
+.container_12 .grid_5 {
+  width: 380px;
+}
+
+.container_12 .grid_7 {
+  width: 540px;
+}
+
+.container_12 .grid_8 {
+  width: 620px;
+}
+
+.container_12 .grid_10 {
+  width: 780px;
+}
+
+.container_12 .grid_11 {
+  width: 860px;
+}
+
+/* `Grid >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .grid_1 {
+  width: 40px;
+}
+
+.container_16 .grid_2 {
+  width: 100px;
+}
+
+.container_16 .grid_3 {
+  width: 160px;
+}
+
+.container_16 .grid_5 {
+  width: 280px;
+}
+
+.container_16 .grid_6 {
+  width: 340px;
+}
+
+.container_16 .grid_7 {
+  width: 400px;
+}
+
+.container_16 .grid_9 {
+  width: 520px;
+}
+
+.container_16 .grid_10 {
+  width: 580px;
+}
+
+.container_16 .grid_11 {
+  width: 640px;
+}
+
+.container_16 .grid_13 {
+  width: 760px;
+}
+
+.container_16 .grid_14 {
+  width: 820px;
+}
+
+.container_16 .grid_15 {
+  width: 880px;
+}
+
+/* `Prefix Extra Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .prefix_3,
+.container_16 .prefix_4 {
+  padding-left: 240px;
+}
+
+.container_12 .prefix_6,
+.container_16 .prefix_8 {
+  padding-left: 480px;
+}
+
+.container_12 .prefix_9,
+.container_16 .prefix_12 {
+  padding-left: 720px;
+}
+
+/* `Prefix Extra Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .prefix_1 {
+  padding-left: 80px;
+}
+
+.container_12 .prefix_2 {
+  padding-left: 160px;
+}
+
+.container_12 .prefix_4 {
+  padding-left: 320px;
+}
+
+.container_12 .prefix_5 {
+  padding-left: 400px;
+}
+
+.container_12 .prefix_7 {
+  padding-left: 560px;
+}
+
+.container_12 .prefix_8 {
+  padding-left: 640px;
+}
+
+.container_12 .prefix_10 {
+  padding-left: 800px;
+}
+
+.container_12 .prefix_11 {
+  padding-left: 880px;
+}
+
+/* `Prefix Extra Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .prefix_1 {
+  padding-left: 60px;
+}
+
+.container_16 .prefix_2 {
+  padding-left: 120px;
+}
+
+.container_16 .prefix_3 {
+  padding-left: 180px;
+}
+
+.container_16 .prefix_5 {
+  padding-left: 300px;
+}
+
+.container_16 .prefix_6 {
+  padding-left: 360px;
+}
+
+.container_16 .prefix_7 {
+  padding-left: 420px;
+}
+
+.container_16 .prefix_9 {
+  padding-left: 540px;
+}
+
+.container_16 .prefix_10 {
+  padding-left: 600px;
+}
+
+.container_16 .prefix_11 {
+  padding-left: 660px;
+}
+
+.container_16 .prefix_13 {
+  padding-left: 780px;
+}
+
+.container_16 .prefix_14 {
+  padding-left: 840px;
+}
+
+.container_16 .prefix_15 {
+  padding-left: 900px;
+}
+
+/* `Suffix Extra Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .suffix_3,
+.container_16 .suffix_4 {
+  padding-right: 240px;
+}
+
+.container_12 .suffix_6,
+.container_16 .suffix_8 {
+  padding-right: 480px;
+}
+
+.container_12 .suffix_9,
+.container_16 .suffix_12 {
+  padding-right: 720px;
+}
+
+/* `Suffix Extra Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .suffix_1 {
+  padding-right: 80px;
+}
+
+.container_12 .suffix_2 {
+  padding-right: 160px;
+}
+
+.container_12 .suffix_4 {
+  padding-right: 320px;
+}
+
+.container_12 .suffix_5 {
+  padding-right: 400px;
+}
+
+.container_12 .suffix_7 {
+  padding-right: 560px;
+}
+
+.container_12 .suffix_8 {
+  padding-right: 640px;
+}
+
+.container_12 .suffix_10 {
+  padding-right: 800px;
+}
+
+.container_12 .suffix_11 {
+  padding-right: 880px;
+}
+
+/* `Suffix Extra Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .suffix_1 {
+  padding-right: 60px;
+}
+
+.container_16 .suffix_2 {
+  padding-right: 120px;
+}
+
+.container_16 .suffix_3 {
+  padding-right: 180px;
+}
+
+.container_16 .suffix_5 {
+  padding-right: 300px;
+}
+
+.container_16 .suffix_6 {
+  padding-right: 360px;
+}
+
+.container_16 .suffix_7 {
+  padding-right: 420px;
+}
+
+.container_16 .suffix_9 {
+  padding-right: 540px;
+}
+
+.container_16 .suffix_10 {
+  padding-right: 600px;
+}
+
+.container_16 .suffix_11 {
+  padding-right: 660px;
+}
+
+.container_16 .suffix_13 {
+  padding-right: 780px;
+}
+
+.container_16 .suffix_14 {
+  padding-right: 840px;
+}
+
+.container_16 .suffix_15 {
+  padding-right: 900px;
+}
+
+/* `Push Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .push_3,
+.container_16 .push_4 {
+  left: 240px;
+}
+
+.container_12 .push_6,
+.container_16 .push_8 {
+  left: 480px;
+}
+
+.container_12 .push_9,
+.container_16 .push_12 {
+  left: 720px;
+}
+
+/* `Push Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .push_1 {
+  left: 80px;
+}
+
+.container_12 .push_2 {
+  left: 160px;
+}
+
+.container_12 .push_4 {
+  left: 320px;
+}
+
+.container_12 .push_5 {
+  left: 400px;
+}
+
+.container_12 .push_7 {
+  left: 560px;
+}
+
+.container_12 .push_8 {
+  left: 640px;
+}
+
+.container_12 .push_10 {
+  left: 800px;
+}
+
+.container_12 .push_11 {
+  left: 880px;
+}
+
+/* `Push Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .push_1 {
+  left: 60px;
+}
+
+.container_16 .push_2 {
+  left: 120px;
+}
+
+.container_16 .push_3 {
+  left: 180px;
+}
+
+.container_16 .push_5 {
+  left: 300px;
+}
+
+.container_16 .push_6 {
+  left: 360px;
+}
+
+.container_16 .push_7 {
+  left: 420px;
+}
+
+.container_16 .push_9 {
+  left: 540px;
+}
+
+.container_16 .push_10 {
+  left: 600px;
+}
+
+.container_16 .push_11 {
+  left: 660px;
+}
+
+.container_16 .push_13 {
+  left: 780px;
+}
+
+.container_16 .push_14 {
+  left: 840px;
+}
+
+.container_16 .push_15 {
+  left: 900px;
+}
+
+/* `Pull Space >> Global
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .pull_3,
+.container_16 .pull_4 {
+  left: -240px;
+}
+
+.container_12 .pull_6,
+.container_16 .pull_8 {
+  left: -480px;
+}
+
+.container_12 .pull_9,
+.container_16 .pull_12 {
+  left: -720px;
+}
+
+/* `Pull Space >> 12 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_12 .pull_1 {
+  left: -80px;
+}
+
+.container_12 .pull_2 {
+  left: -160px;
+}
+
+.container_12 .pull_4 {
+  left: -320px;
+}
+
+.container_12 .pull_5 {
+  left: -400px;
+}
+
+.container_12 .pull_7 {
+  left: -560px;
+}
+
+.container_12 .pull_8 {
+  left: -640px;
+}
+
+.container_12 .pull_10 {
+  left: -800px;
+}
+
+.container_12 .pull_11 {
+  left: -880px;
+}
+
+/* `Pull Space >> 16 Columns
+----------------------------------------------------------------------------------------------------*/
+
+.container_16 .pull_1 {
+  left: -60px;
+}
+
+.container_16 .pull_2 {
+  left: -120px;
+}
+
+.container_16 .pull_3 {
+  left: -180px;
+}
+
+.container_16 .pull_5 {
+  left: -300px;
+}
+
+.container_16 .pull_6 {
+  left: -360px;
+}
+
+.container_16 .pull_7 {
+  left: -420px;
+}
+
+.container_16 .pull_9 {
+  left: -540px;
+}
+
+.container_16 .pull_10 {
+  left: -600px;
+}
+
+.container_16 .pull_11 {
+  left: -660px;
+}
+
+.container_16 .pull_13 {
+  left: -780px;
+}
+
+.container_16 .pull_14 {
+  left: -840px;
+}
+
+.container_16 .pull_15 {
+  left: -900px;
+}
+
+/* `Clear Floated Elements
+----------------------------------------------------------------------------------------------------*/
+
+/* http://sonspring.com/journal/clearing-floats */
+
+.clear {
+  clear: both;
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  width: 0;
+  height: 0;
+}
+
+/* http://www.yuiblog.com/blog/2010/09/27/clearfix-reloaded-overflowhidden-demystified */
+
+.clearfix:before,
+.clearfix:after,
+.container_12:before,
+.container_12:after,
+.container_16:before,
+.container_16:after {
+  content: '.';
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  font-size: 0;
+  line-height: 0;
+  width: 0;
+  height: 0;
+}
+
+.clearfix:after,
+.container_12:after,
+.container_16:after {
+  clear: both;
+}
+
+/*
+  The following zoom:1 rule is specifically for IE6 + IE7.
+  Move to separate stylesheet if invalid CSS is a problem.
+*/
+
+.clearfix,
+.container_12,
+.container_16 {
+  zoom: 1;
+}