highcarb 0.1 → 0.2

data/.gitignore

@@ -1,2 +1,3 @@
 *.swp
+highcarb*.gem
 tmp

data/README.md

@@ -6,15 +6,8 @@ The presentation is based on Deck.js
 
 ## Installation
 
-I have to create a gem (or event a .deb package). Right now, the easiest way to install it
-is clone the repository and add an alias.
-
 ```
-  $ cd /somewhere/
-  $ git clone git://github.com/ayosec/highcarb.git
-  $ cd highcarb
-  $ bundle install
-  $ alias highcarb="ruby /somewhere/highcarb/bin/highcarb"
+  $ gem install highcarb
 ```
 
 ### Dependencies
@@ -28,6 +21,12 @@ In Debian (and derived) everything can be installed with
   $ sudo apt-get install nodejs python-pygments
 ```
 
+Mac OSX
+
+```
+  $ brew install node.js
+  $ sudo easy_install Pygments
+```
 ## Generate a presentation project
 
 The `-g` flag generate a new tree with the base for the presentation

data/highcarb.gemspec

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "highcarb/version"
+
+Gem::Specification.new do |s|
+  # Metadata
+  s.name        = "highcarb"
+  s.version     = HighCarb::Version
+  s.authors     = ["Ayose Cazorla"]
+  s.email       = ["ayosec@gmail.com"]
+  s.homepage    = "https://github.com/ayosec/highcarb"
+  s.summary     = %q{Slides manager based on Deck.js }
+  s.description = %q{HighCarb can build a presentation based on HAML, Markdown or raw HTML, and let to control them from another browser, via WebSockets.}
+
+  # Manifest
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency "thin"
+  s.add_runtime_dependency "mime-types"
+  s.add_runtime_dependency "em-websocket"
+  s.add_runtime_dependency "trollop"
+  s.add_runtime_dependency "nokogiri"
+  s.add_runtime_dependency "haml"
+  s.add_runtime_dependency "sass"
+  s.add_runtime_dependency "kramdown"
+  s.add_runtime_dependency "coffee-script"
+end
+

data/lib/highcarb/command.rb

@@ -1,6 +1,7 @@
 
 require "trollop"
 require "logger"
+require "io/console"
 
 require "highcarb"
 require "highcarb/generator"
@@ -31,6 +32,8 @@ module HighCarb
         opt "skip-libs", "Don't download vendor libraries, like Deck.js and jQuery"
 
         opt "verbose", "Be verbose"
+
+        opt "auth", "Require auth to access", default: ""
       end
 
       if @options["verbose"]
@@ -51,7 +54,19 @@ module HighCarb
         # Generate a new project
         HighCarb::Generator.new(self, args.first).run!
       else
-        HighCarb::Services.start!(self, @logger)
+        auth = nil
+        if not options["auth"].empty?
+          user, password = options["auth"].split(":", 2)
+          if password.nil?
+            print "Type the password for #{user}: "
+            $stdout.flush
+            password = $stdin.noecho { $stdin.readline.chomp }
+          end
+
+          auth = [ user, password ]
+        end
+
+        HighCarb::Services.start!(self, @logger, auth)
       end
 
     rescue HighCarb::Error => error

data/lib/highcarb/generator.rb

@@ -35,9 +35,17 @@ module HighCarb
       create_file path.join("assets/base.scss"),
         "/*\n * Write here your own styles.\n" +
         " * Compass modules are available\n */\n\n\n" +
+        "@import url('/assets/vendor/deck.js/core/deck.core.scss');\n" +
+        "@import url('/assets/vendor/deck.js/extensions/goto/deck.goto.scss');\n" +
+        "@import url('/assets/vendor/deck.js/extensions/menu/deck.menu.scss');\n" +
+        "@import url('/assets/vendor/deck.js/extensions/navigation/deck.navigation.scss');\n" +
+        "@import url('/assets/vendor/deck.js/extensions/status/deck.status.scss');\n" +
+        "@import url('/assets/vendor/deck.js/extensions/hash/deck.hash.scss');\n" +
+        "\n\n/* Choose your favourite deck.js theme */\n" +
         "@import url('/assets/vendor/deck.js/themes/style/swiss.css');\n" +
         "@import url('/assets/vendor/deck.js/themes/transition/horizontal-slide.css');\n"
 
+
       create_file path.join("assets/remote.scss"), "/* Add here your styles for the /remote view */"
       create_file path.join("assets/custom-remote.coffee"), "# Add here your own code for the /remote view"
       create_file path.join("assets/custom.coffee"), "# Add here your own code for the views"

data/lib/highcarb/services.rb

@@ -9,7 +9,7 @@ module HighCarb
   module Services
     extend self
 
-    def start!(command, logger)
+    def start!(command, logger, auth)
       EM.run do
         EM::WebSocket.start(host: '0.0.0.0', port: command.options["ws-port"] ) do |websocket|
           WSConnection.new websocket, logger
@@ -18,7 +18,14 @@ module HighCarb
         Thin::Server.start(
           '0.0.0.0',
           command.options["http-port"],
-          Rack::Builder.new { run RackApp.new(command) }
+          Rack::Builder.new do
+            if auth
+              use Rack::Auth::Basic, "HighCarb" do |username, password|
+                username == auth[0] && password == auth[1]
+              end
+            end
+            run RackApp.new(command)
+          end
         )
       end
     end

data/lib/highcarb/version.rb

@@ -0,0 +1,3 @@
+module HighCarb
+  Version = "0.2"
+end

data/resources/views/index.coffee

@@ -4,9 +4,10 @@ window.WebSocket = MozWebSocket if MozWebSocket?
 $ ->
 
   # Load slides and initialize Deck.js
-  $(".deck-container").load "/slides",
-    ->
-      $(".deck-container").find(".note").remove()
+  $.get "/slides",
+    (data) ->
+      $(".slides").replaceWith data
+      $(".slides").find(".note").remove()
       $.deck ".slide"
 
   # Open a permanent connection to the server. With this channel

data/resources/views/index.haml

@@ -3,8 +3,8 @@
   %head
     %link{rel: "stylesheet", href: "/assets/base.scss"}
 
-  %body.presenter
-    .deck-container Loading...
+  %body.presenter.deck-container
+    .slides Loading...
 
     %script{ src: "/assets/vendor/deck.js/jquery-1.7.min.js" }
     %script{ src: "/assets/vendor/deck.js/modernizr.custom.js" }

data/resources/views/remote.haml

@@ -44,7 +44,6 @@
           padding: 0.5ex;
         }
 
-    %link{rel: "stylesheet", href: "/assets/base.scss"}
     %link{rel: "stylesheet", href: "/assets/remote.scss"}
 
   %body.remote

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highcarb
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &4114200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4114200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &4109560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4109560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &4104920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4104920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &4103380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4103380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &4102700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4102700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &4100660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4100660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &4100060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4100060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &4099460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4099460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &4098560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4098560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: HighCarb can build a presentation based on HAML, Markdown or raw HTML,
   and let to control them from another browser, via WebSockets.
 email:
@@ -125,6 +170,7 @@ files:
 - Gemfile.lock
 - README.md
 - bin/highcarb
+- highcarb.gemspec
 - lib/highcarb.rb
 - lib/highcarb/assets_controller.rb
 - lib/highcarb/command.rb
@@ -133,6 +179,7 @@ files:
 - lib/highcarb/services.rb
 - lib/highcarb/slides_controller.rb
 - lib/highcarb/sockets.rb
+- lib/highcarb/version.rb
 - lib/highcarb/views_controller.rb
 - resources/views/index.coffee
 - resources/views/index.haml
@@ -158,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Slides manager based on Deck.js