rhet-butler 0.9.0 → 0.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWU1ZjE0YzljN2FkM2YxZjk4NjA3NGQwYmY1YzkzOTFkOWRlZGNhNA==
+    MTRlYmMzNmVkMTA3NDQxMmJhODMyZmM2YTQ3Nzg2NzVjZTc2M2Q1MA==
   data.tar.gz: !binary |-
-    M2VmZDJkOTdjNDBiZmJlNDE0ZjQ5NDZjODZkNTM4NTczNTM4MmMxZA==
-SHA512:
+    OGU3NWMzYzEyOTUyZjc0MDM1M2EwZjkzYzYyNTIwZjEzOTMxYWIzMA==
+!binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWQ3NzlhZGFiNzNkM2Q5YTUwNTgwYzFlNTA3MGNhMTYxNmRiYzQxNjcyYTU0
-    MzUwNTY0OTUwYWQ4YjZiZGJmOGQxNWVjZTQ0MDA3NzM4YzhlYTg2Mjg3NDIy
-    MTg3Y2Q4ZmI3ZjBkNmQ4Nzg5OGZlOGM2NjYzMTI0YjUwN2I0NTk=
+    Y2Y4NWVjY2RiZjJiZTcyNGE4MDljZDVlZDIwZWRjMDE5NGU0NTJmODBhMGIz
+    YzdmMTJjN2U5OWQ0Y2ViMDYyM2FlNzg3YTY1NDdmY2ExNzEyYTQ1NjJlOGMz
+    NzNhZWVjOTJmNTY3NzkzOWZjM2NlODBjYzZkYWE5NDc0MmI3OGY=
   data.tar.gz: !binary |-
-    YTYxZDA3ZTcyODE2MTRiZTYzYzdiMTc3OGNkZjI0MmFmYTIyMTM1YzJkNTU2
-    YmM3NDYxYjM2MTE3N2NiY2EwYzkzOWZlMDE0NTAzYjMwY2EwYmJlMTA5OWIz
-    OTZkNDNiMGRiMDgwZmY0N2JiN2Y1OGJkYmQ3YmIzMThmNmRiNTk=
+    OGM3OTIwM2MwODBmZTYxZjA3NTEyZjU3YzZmMTYyNDhiNWVhY2NkMTNiNDQ4
+    OGZkZjc0MDY5ZDJiYzY2NmI3NmQ4ZjRkYjdhZDc5ZTA2NDhmNzBhMTI3ZmQ5
+    NzUxNmNkMzBkNTViY2UyYzBjYjNiYzRhNTQxMTUwMmEyOWI3OWY=

data/default-configuration/assets/stylesheets/rhet.css.sass

@@ -61,8 +61,14 @@ body
 
   display: none
 
+
   &.current,&.next,&.previous
-    display: block
+    display: table
+    > *
+      display: table-cell
+      vertical-align: middle
+      position: relative
+      top: -10vh
 
   &.previous
     z-index: 10
@@ -103,19 +109,34 @@ body
     max-width: 100%
     max-height: 100%
 
-  pre
-    font-family: 'Droid Sans Mono', monospace
-    text-align: initial
-    font-size: 6vh
-    line-height: 1em
-    code
+  em
+    font-style: italic
+
+  &.code
+    padding: 0
+    > pre
+      position: static
+      width: 100%
+      overflow: hidden
+      height: 100%
+      display: table
+
+
+      font-family: 'Droid Sans Mono', monospace
+      text-align: initial
+      font-size: 6vh
+      line-height: 1em
       border-radius: 10px
       +box-shadow(-2px -2px 8px 2px rgb(140,140,140) inset, 2px 2px 8px 2px rgb(40, 40, 40) inset)
 
-  li
-    opacity: 0
+      code
+        display: table-cell
+        vertical-align: middle
 
   @for $i from 1 through 10
+    li.cue-#{$i}
+      opacity: 0
+
     &.current-cue-#{$i}
       code span.cue-#{$i}
         border-radius: 5px

data/default-configuration/assets/stylesheets/solarized.sass

@@ -0,0 +1,31 @@
+/**
+ * Include this file early in your Sass project to
+ * get access to Solarized colors and functions.
+ *
+ * Adapted from the outstanding work by Ethan Schoonover:
+ * http://ethanschoonover.com/solarized
+
+$base03: rgb(0, 43, 54)
+$base02: rgb(7, 54, 66)
+$base01: rgb(88, 110, 117)
+$base00: rgb(101, 123, 131)
+$base0: rgb(131, 148, 150)
+$base1: rgb(147, 161, 161)
+$base2: rgb(238, 232, 213)
+$base3: rgb(253, 246, 227)
+$yellow: rgb(181, 137, 0)
+$orange: rgb(203, 75, 22)
+$red: rgb(220, 50, 47)
+$magenta: rgb(211, 54, 130)
+$violet: rgb(108, 113, 196)
+$blue: rgb(38, 139, 210)
+$cyan: rgb(42, 161, 152)
+$green: rgb(133, 153, 0)
+
+=solarized-dark
+  background-color: $base03
+  color: $base0
+
+=solarized-light
+  background-color: $base3
+  color: $base00

data/default-configuration/assets/stylesheets/solarized.scss

@@ -0,0 +1,33 @@
+/**
+ * Include this file early in your Sass project to
+ * get access to Solarized colors and functions.
+ *
+ * Adapted from the outstanding work by Ethan Schoonover:
+ * http://ethanschoonover.com/solarized
+*/
+
+$base03:    rgb(0, 43, 54);
+$base02:    rgb(7, 54, 66);
+$base01:    rgb(88, 110, 117);
+$base00:    rgb(101, 123, 131);
+$base0:     rgb(131, 148, 150);
+$base1:     rgb(147, 161, 161);
+$base2:     rgb(238, 232, 213);
+$base3:     rgb(253, 246, 227);
+$yellow:    rgb(181, 137, 0);
+$orange:    rgb(203, 75, 22);
+$red:       rgb(220, 50, 47);
+$magenta:   rgb(211, 54, 130);
+$violet:    rgb(108, 113, 196);
+$blue:      rgb(38, 139, 210);
+$cyan:      rgb(42, 161, 152);
+$green:     rgb(133, 153, 0);
+
+@mixin solarized-dark() {
+    background-color: $base03;
+    color: $base0;
+}
+@mixin solarized-light() {
+    background-color: $base3;
+    color: $base00;
+}

data/default-configuration/common/templates/stylesheets.html.erb

@@ -1,3 +1,4 @@
 <link href="/stylesheets/google-open-sans.css" rel="stylesheet" />
 <link href="/stylesheets/rhet.css" rel="stylesheet" />
+<link href="/stylesheets/prez-local.css" rel="stylesheet" />
 <link href="/stylesheets/highlight/solarized_dark.css" rel="stylesheet" />

data/default-configuration/skels/slides.yaml

@@ -1,6 +1,7 @@
-!slide An awesome presentation
-!group
-  !include whoami.yaml
-!group
-  !slide |
+---
+- !slide An awesome presentation
+- !group
+  - !include whoami.yaml
+- !group
+  - !slide |
     contents: It'll knock your socks off!

data/lib/rhet-butler/file-loading.rb

@@ -22,7 +22,13 @@ module RhetButler
         @loaded_paths[file.full_path] = true
       end
 
-      return YAML.load_stream(file.contents).flatten
+      begin
+        return YAML.load_stream(file.contents).flatten
+      rescue => ex
+        puts "While processing `#{file.full_path}`"
+        puts ex.class
+        raise
+      end
     end
   end
 end

data/lib/rhet-butler/filter-resolver.rb

@@ -40,6 +40,9 @@ module RhetButler
       slide.html_classes += slide.content_filters.map do |filter|
         "note-" + filter.html_class unless filter.html_class.nil?
       end
+    rescue => ex
+      puts "While processing #{slide}:"
+      raise
     end
   end
 end

data/lib/rhet-butler/slide-renderers/code.rb

@@ -11,6 +11,10 @@ module RhetButler
         %w{class}
       end
 
+      def html_class
+        "code"
+      end
+
       def process(string)
         "<pre><code#{@config_hash ? " class='#{@config_hash['class']}'" : ""}>#{string}</code></pre>"
       end

data/lib/rhet-butler/slide.rb

@@ -133,6 +133,9 @@ module RhetButler
 
       value_from_config("filters") do |value|
         @content_filters = value
+        @html_classes += [*value].map do |filter|
+          filter.html_class
+        end.compact
       end
 
       value_from_config("note-filters") do |value|
@@ -149,6 +152,10 @@ module RhetButler
     attr_accessor :scale
     attr_reader :template_name
 
+    def to_s
+      "Slide: #{content[0..20]}"
+    end
+
     def id_attr
       if @html_id.nil?
         return ""

data/lib/rhet-butler/web/main-app.rb

@@ -136,12 +136,15 @@ module RhetButler
           puts "  http://#{interface[:inet_addr].to_s}:#{configuration.serve_port}/"
           puts "  http://#{interface[:inet_addr].to_s}:#{configuration.serve_port}/qr"
         end
-        EM.run do
-          thin = Rack::Handler.get("thin")
-          thin.run(builder.to_app, :Host => "0.0.0.0", :Port => configuration.serve_port) do |server|
-            server.threaded = true
-          end
-        end
+        server = Thin::Server.new(builder.to_app, configuration.serve_port)
+        server.threaded = true
+        server.start
+#        EM.run do
+#          thin = Rack::Handler.get("thin")
+#          thin.run(builder.to_app, :Host => "0.0.0.0", :Port => configuration.serve_port) do |server|
+#            server.threaded = true
+#          end
+#        end
       end
     end
   end

data/lib/rhet-butler/yaml-type.rb

@@ -41,6 +41,9 @@ module RhetButler
       check_config_hash(@config_hash)
 
       configure
+    rescue => ex
+      puts "Processing #{coder.inspect}"
+      raise
     end
   end
 end

metadata

@@ -1,211 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: rhet-butler
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: compass-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0.alpha
+  type: :runtime
   prerelease: false
-  name: compass-core
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0.alpha
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  prerelease: false
   name: compass-import-once
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
   prerelease: false
-  name: tilt
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
-  name: thor
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
-  name: rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
-  name: thin
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: sockjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.1
+  type: :runtime
   prerelease: false
-  name: sockjs
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.1
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: valise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
+  type: :runtime
   prerelease: false
-  name: valise
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
-  name: nokogiri
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: crass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
-  name: crass
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
-  name: addressable
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: system-getifaddrs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
+  type: :runtime
   prerelease: false
-  name: system-getifaddrs
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: rqrcode
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.2
+  type: :runtime
   prerelease: false
-  name: rqrcode
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.2
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.9
+  type: :runtime
   prerelease: false
-  name: RedCloth
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.9
-  type: :runtime
 description: ! "  Rhet Butler is a presentation assistant. Build a slide deck in simple
   YAML,\n  design it in CSS, run the presentation with your smartphone over Websockets.\n"
 email:
@@ -285,6 +285,9 @@ files:
 - default-configuration/assets/themes.googleusercontent.com/static/fonts/arimo/v5/K-bXE71xZHgbUS_UdQjugvesZW2xOQ-xsNqO47m55DA.ttf
 - default-configuration/assets/themes.googleusercontent.com/static/fonts/slackey/v3/bJZDrYrGx8atJRHR9DVdqg.ttf
 - default-configuration/assets/themes.googleusercontent.com/static/fonts/droidsansmono/v4/ns-m2xQYezAtqh7ai59hJYW_AySPyikQrZReizgrnuw.ttf
+- default-configuration/assets/stylesheets/prez-local.css
+- default-configuration/assets/stylesheets/solarized.sass
+- default-configuration/assets/stylesheets/solarized.scss
 - default-configuration/assets/stylesheets/google-open-sans.css
 - default-configuration/assets/stylesheets/rhet.css.sass
 - default-configuration/assets/stylesheets/font.css
@@ -391,7 +394,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- rhet-butler-0.9.0 Documentation
+- rhet-butler-0.10.0 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -406,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rhet-butler
-rubygems_version: 2.1.10
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A web tech presentation system