flammarion 0.1.1 → 0.1.2

data/LICENSE

@@ -91,3 +91,15 @@ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRU
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## Rubame
+
+(The MIT License)
+
+Copyright © 2013 Mark Saward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/flammarion.rb

@@ -1,10 +1,10 @@
 require 'open3'
 require 'ostruct'
-require 'em-websocket'
 require 'json'
 require 'colorize'
 require 'filewatcher'
 require 'rbconfig'
+require_relative 'rubame/rubame.rb'
 
 begin
   # Optional Requires

data/lib/flammarion/engraving.rb

@@ -155,11 +155,6 @@ module Flammarion
     # @api private
     def server; @@server; end;
 
-    # @api private
-    def wait_for_a_connection
-      sleep 0.5 while @sockets.empty?
-    end
-
     # @api private
     def send_json(val)
       if @sockets.empty? then

data/lib/flammarion/revelator.rb

@@ -1,3 +1,7 @@
+require 'ostruct'
+require 'launchy'
+require 'timeout'
+
 module Flammarion
   # Raised when flammarion cannot find any way to display an engraving.
   # On Linux, Flammarion will first try to launch Electron using the command
@@ -14,40 +18,83 @@ module Flammarion
   # @todo This all needs a lot of clean up
   module Revelator
     CHROME_PATH = ENV["FLAMMARION_REVELATOR_PATH"] || 'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe'
-    def open_a_window_on_windows(options)
+
+    def open_a_window(options = {})
+      if RbConfig::CONFIG["host_os"] =~ /cygwin|mswin|mingw/
+        development_mode = ENV["FLAMMARION_DEVELOPMENT"] == "true"
+      else
+        development_mode = system("lsof -i:#{4567}", out: '/dev/null') and File.exist?("#{File.dirname(__FILE__)}/../html/source/index.html.slim")
+      end
+      host = "file://#{File.dirname(File.absolute_path(__FILE__))}/../html/build/index.html"
+      host = "http://localhost:4567/" if development_mode
+
+      @expect_title = options[:title] || "Flammarion-#{rand.to_s[2..-1]}"
+      url = "#{host}?path=#{@window_id}&port=#{server.port}&title=#{@expect_title}"
+      @browser_options = options.merge({url: url, development_mode: development_mode})
+      @requested_browser = ENV["FLAMMARION_BROWSER"] || options[:browser]
+
+      @browser = @@browsers.find do |browser|
+        next if @requested_browser and browser.name.to_s != @requested_browser
+        begin
+          __send__(browser.name, @browser_options)
+        rescue Exception
+          next
+        end
+      end
+
+      raise SetupError.new("You must have either electron or google-chrome installed and accesible via your path.") unless @browser
+    end
+
+    # @api private
+    def wait_for_a_connection
+       Timeout.timeout(20) { sleep 0.5 while @sockets.empty? }
+     rescue Timeout::Error
+       raise SetupError.new("Timed out while waiting for a connecting using #{@browser.name}.")
+    end
+
+    private
+    @@browsers = []
+    def self.browser(name, &block)
+      @@browsers << OpenStruct.new(name: name, method:define_method(name, block))
+    end
+
+    browser :chrome_windows do |options|
+      return false unless RbConfig::CONFIG["host_os"] =~ /cygwin|mswin|mingw/
       file_path = File.absolute_path(File.join(File.dirname(__FILE__), ".."))
       file_path = `cygpath -w '#{file_path}'`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
       resource = %[file\://#{file_path}/html/build/index.html]
-      resource = "http://localhost:4567/" if ENV["FLAMMARION_DEVELOPMENT"] == "true"
+      resource = "http://localhost:4567/" if options[:development_mode]
       chrome_path = CHROME_PATH
       chrome_path = `cygpath -u '#{CHROME_PATH}'`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
-      raise SetupError.new("Cannot find #{chrome_path}. You need to install Google Chrome or set the environment variable FLAMMARION_REVELATOR_PATH to point to chrome.exe") unless File.exist?(chrome_path)
+      return false unless File.exist?(chrome_path)
       Process.detach(spawn(chrome_path, %[--app=#{resource}?path=#{@window_id}&port=#{server.port}&title="#{options[:title] || "Flammarion%20Engraving"}"]))
     end
 
-    def open_a_window(options = {})
-      return open_a_window_on_windows(options) if RbConfig::CONFIG["host_os"] =~ /cygwin|mswin|mingw/
-      developmentMode = system("lsof -i:#{4567}", out: '/dev/null') and File.exist?("#{File.dirname(__FILE__)}/../html/source/index.html.slim")
-      host = "file://#{File.dirname(File.absolute_path(__FILE__))}/../html/build/index.html"
-      host = "http://localhost:4567/" if developmentMode
-
-      @expect_title = options[:title] || "Flammarion-#{rand.to_s[2..-1]}"
-
+    browser :electron do |options|
       if which('electron') then
-        Process.detach(spawn("electron #{File.dirname(File.absolute_path(__FILE__))}/../../electron '#{host}?path=#{@window_id}&port=#{server.port}&title=#{@expect_title}'"))
-        return
+        Process.detach(spawn("electron #{File.dirname(File.absolute_path(__FILE__))}/../../electron '#{options[:url]}'"))
+        return true
       end
+      false
+    end
 
+    browser :chrome do |options|
       %w[google-chrome google-chrome-stable chromium chromium-browser chrome].each do |executable|
         next unless which(executable)
-        @chrome.in, @chrome.out, @chrome.err, @chrome.thread = Open3.popen3("#{executable} --app='#{host}?path=#{@window_id}&port=#{server.port}&title=#{@expect_title}'")
-        break if @chrome.in
+        @chrome.in, @chrome.out, @chrome.err, @chrome.thread = Open3.popen3("#{executable} --app='#{options[:url]}'")
+        return true if @chrome.in
       end
+      return false
+    end
 
-      raise SetupError.new("You must have either electron or google-chrome installed and accesible via your path.") unless @chrome.in
+    browser :www do |options|
+      # Last ditch effort to display something
+      Launchy.open(options[:url].gsub(/\s/, "%20")) do |error|
+        return false
+      end
+      return true
     end
 
-    private
     def which(cmd)
       exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
       ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|

data/lib/flammarion/server.rb

@@ -26,52 +26,47 @@ module Flammarion
       at_exit { sleep 0.1 }
     end
     def start_server_internal
-      EM.run {
       @port = 7870
       @port = rand(65000 - 1024) + 1024 if Gem.win_platform?
       begin
-        EM::WebSocket.run(:host => "0.0.0.0", :port => @port) do |ws|
-          ws.onopen { |handshake|
-            log "WebSocket connection open"
-            if @windows.include?(handshake.path)
-              @windows[handshake.path].sockets << ws
-              @windows[handshake.path].on_connect.call() if @windows[handshake.path].on_connect
-              @socket_paths[ws] = handshake.path
-            else
-              log "No such window: #{handshake.path}"
-            end
-          }
+        @server = Rubame::Server.new("0.0.0.0", @port)
+        while true do
+          @started = true
+          @server.run do |ws|
+            ws.onopen {
+              log "WebSocket connection open"
+              if @windows.include?(ws.handshake.path)
+                @windows[ws.handshake.path].sockets << ws
+                @windows[ws.handshake.path].on_connect.call() if @windows[ws.handshake.path].on_connect
+                @socket_paths[ws] = ws.handshake.path
+              else
+                log "No such window: #{handshake.path}"
+              end
+            }
 
-          ws.onclose do
-            log "Connection closed";
-            @windows[@socket_paths[ws]].disconnect(ws) if @windows[@socket_paths[ws]]
-          end
+            ws.onclose do
+              log "Connection closed";
+              @windows[@socket_paths[ws]].disconnect(ws) if @windows[@socket_paths[ws]]
+            end
 
-          ws.onmessage { |msg|
-            Thread.new do
-              begin
-                @windows[@socket_paths[ws]].process_message(msg)
-              rescue Exception => e
-                Kernel.puts "#{e.message.to_s.red}\n#{e.backtrace.join("\n").light_red}"
-                if binding.respond_to? :pry
-                  binding.pry
-                else
-                  raise
+            ws.onmessage { |msg|
+              Thread.new do
+                begin
+                  @windows[@socket_paths[ws]].process_message(msg)
+                rescue Exception => e
+                  Kernel.puts "#{e.message.to_s.red}\n#{e.backtrace.join("\n").light_red}"
+                  if binding.respond_to? :pry
+                    binding.pry
+                  else
+                    raise
+                  end
                 end
               end
-            end
-          }
-
-          ws.onerror { |err|
-            if binding.respond_to? :pry
-              binding.pry
-            else
-              raise
-            end
-          }
+            }
+          end
         end
-      rescue RuntimeError => e
-        if e.message == "no acceptor (port is in use or requires root privileges)"
+      rescue RuntimeError, Errno::EADDRINUSE
+        if $!.message == "no acceptor (port is in use or requires root privileges)" or $!.is_a? Errno::EADDRINUSE
           @port = rand(65000 - 1024) + 1024
           retry
         else
@@ -79,9 +74,8 @@ module Flammarion
         end
       end
       @started = true
-      }
     rescue Exception => e
-      unless e.is_a? SystemExit
+      unless e.is_a? SystemExit or e.is_a? Interrupt
         Kernel.puts "Error in server:"
         binding.pry if binding.respond_to? :pry
         Kernel.puts e.message

data/lib/flammarion/version.rb

@@ -1,3 +1,3 @@
   module Flammarion
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end

data/lib/html/build/stylesheets/all.css

@@ -175,7 +175,7 @@
 .full-button {
   background-color: #eee;
   color: #333;
-  font-family: Monospace;
+  font-family: monospace;
   border: 1px solid #242424;
   padding: 1em;
   text-decoration: none;
@@ -224,7 +224,7 @@
 .inline-dropdown {
   background-color: #eee;
   color: #333;
-  font-family: Monospace;
+  font-family: monospace;
   border: 1px solid #242424;
   padding: 1em;
   text-decoration: none;
@@ -282,6 +282,8 @@ input:focus::-webkit-input-placeholder {
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  font-family: monospace;
+  min-height: 1.4em;
 }
 .inline-checkbox > span {
   vertical-align: middle;
@@ -322,7 +324,7 @@ input:focus::-webkit-input-placeholder {
 #toolbar {
   background-color: #000;
   margin: 0px;
-  font-family: Monospace;
+  font-family: monospace;
   height: calc(2% + 15px);
 }
 .tool-button {
@@ -377,7 +379,7 @@ input:focus::-webkit-input-placeholder {
 .inline-button {
   background-color: #eee;
   color: #333;
-  font-family: Monospace;
+  font-family: monospace;
   border: 1px solid #242424;
   padding: 1em;
   text-decoration: none;
@@ -408,7 +410,7 @@ input:focus::-webkit-input-placeholder {
 .floating-button {
   background-color: #eee;
   color: #333;
-  font-family: Monospace;
+  font-family: monospace;
   border: 1px solid #242424;
   padding: 1em;
   text-decoration: none;
@@ -699,6 +701,7 @@ p a:hover {
   -moz-user-select: text;
   -ms-user-select: text;
   user-select: text;
+  font-family: monospace;
 }
 .pane > .pane {
   width: calc(100% + 16px);

data/lib/html/build/stylesheets/buttons.css

@@ -1,7 +1,7 @@
 .full-button {
   background-color: #eee;
   color: #333;
-  font-family: Monospace;
+  font-family: monospace;
   border: 1px solid #242424;
   padding: 1em;
   text-decoration: none;
@@ -50,7 +50,7 @@
 .inline-dropdown {
   background-color: #eee;
   color: #333;
-  font-family: Monospace;
+  font-family: monospace;
   border: 1px solid #242424;
   padding: 1em;
   text-decoration: none;
@@ -108,6 +108,8 @@ input:focus::-webkit-input-placeholder {
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  font-family: monospace;
+  min-height: 1.4em;
 }
 .inline-checkbox > span {
   vertical-align: middle;
@@ -148,7 +150,7 @@ input:focus::-webkit-input-placeholder {
 #toolbar {
   background-color: #000;
   margin: 0px;
-  font-family: Monospace;
+  font-family: monospace;
   height: calc(2% + 15px);
 }
 .tool-button {
@@ -203,7 +205,7 @@ input:focus::-webkit-input-placeholder {
 .inline-button {
   background-color: #eee;
   color: #333;
-  font-family: Monospace;
+  font-family: monospace;
   border: 1px solid #242424;
   padding: 1em;
   text-decoration: none;
@@ -234,7 +236,7 @@ input:focus::-webkit-input-placeholder {
 .floating-button {
   background-color: #eee;
   color: #333;
-  font-family: Monospace;
+  font-family: monospace;
   border: 1px solid #242424;
   padding: 1em;
   text-decoration: none;

data/lib/html/build/stylesheets/engraving.css

@@ -53,6 +53,7 @@ p a:hover {
   -moz-user-select: text;
   -ms-user-select: text;
   user-select: text;
+  font-family: monospace;
 }
 .pane > .pane {
   width: calc(100% + 16px);

data/lib/html/source/stylesheets/buttons.styl

@@ -4,7 +4,7 @@
 buttony(raised = false)
   background-color lighten($bg-color, 0%)
   color darken($fg-color, 0%)
-  font-family Monospace
+  font-family $main-font
   border $normal-border
   padding 1em
   text-decoration none
@@ -54,6 +54,8 @@ input:focus::-webkit-input-placeholder
   padding 0.2em
   -webkit-user-select none
   user-select none
+  font-family $main-font
+  min-height 1.4em
   & > span
     vertical-align middle
   & input[type=checkbox]
@@ -81,7 +83,7 @@ input:focus::-webkit-input-placeholder
 #toolbar
   background-color #000
   margin 0px
-  font-family Monospace
+  font-family $main-font
   height calc(2% + 15px)
 
 .tool-button

data/lib/html/source/stylesheets/colors.styl

@@ -32,3 +32,4 @@ $fg-highlight = mix($fg-color, $highlight, 50%)
 $fg-active-highlight = mix($fg-color, $active-highlight, 50%)
 
 $enable-gradients = true
+$main-font = monospace

data/lib/html/source/stylesheets/engraving.styl

@@ -46,11 +46,13 @@ a
   word-wrap: break-word;
   position relative
   user-select text
+  font-family $main-font
 
 .pane > .pane
   width calc(100% + 16px)
   height initial
   margin -8px
+
   &.subpane-fill
     height calc(100% + 16px)
 

data/lib/rubame/rubame.rb

@@ -0,0 +1,223 @@
+require 'websocket'
+require 'socket'
+require 'fiber'
+
+module Rubame
+  class Server
+    def initialize(host, port)
+      Socket.do_not_reverse_lookup
+      @hostname = host
+      @port = port
+
+      @reading = []
+      @writing = []
+
+      @clients = {} # Socket as key, and Client as value
+
+      @socket = TCPServer.new(@hostname, @port)
+      @reading.push @socket
+    end
+
+    def accept
+      socket = @socket.accept_nonblock
+      @reading.push socket
+      handshake = WebSocket::Handshake::Server.new
+      client = Rubame::Client.new(socket, handshake, self)
+
+      while line = socket.gets
+        client.handshake << line
+        break if client.handshake.finished?
+      end
+      if client.handshake.valid?
+        @clients[socket] = client
+        client.write handshake.to_s
+        client.opened = true
+        return client
+      else
+        close(client)
+      end
+      return nil
+    end
+
+    def read(client)
+
+      pairs = client.socket.recvfrom(2000)
+      messages = []
+
+      if pairs[0].length == 0
+        close(client)
+      else
+        client.frame << pairs[0]
+
+        while f = client.frame.next
+          if (f.type == :close)
+            close(client)
+            return messages
+          else
+            messages.push f
+          end
+        end
+
+      end
+
+      return messages
+
+    end
+
+    def close(client)
+      @reading.delete client.socket
+      @clients.delete client.socket
+      begin
+        client.socket.close
+      rescue
+      end
+      client.closed = true
+    end
+
+    def run(time = 0, &blk)
+      readable, writable = IO.select(@reading, @writing, nil, 0)
+
+      if readable
+        readable.each do |socket|
+          client = @clients[socket]
+          if socket == @socket
+            client = accept
+          else
+            msg = read(client)
+            client.messaged = msg
+          end
+
+          blk.call(client) if client and blk
+        end
+      end
+
+      # Check for lazy send items
+      timer_start = Time.now
+      time_passed = 0
+      begin
+        @clients.each do |s, c|
+          c.send_some_lazy(5)
+        end
+        time_passed = Time.now - timer_start
+      end while time_passed < time
+    end
+
+    def stop
+      @socket.close
+    end
+  end
+
+  class Client
+    attr_accessor :socket, :handshake, :frame, :opened, :messaged, :closed
+
+    def initialize(socket, handshake, server)
+      @socket = socket
+      @handshake = handshake
+      @frame = WebSocket::Frame::Incoming::Server.new(:version => @handshake.version)
+      @opened = false
+      @messaged = []
+      @lazy_queue = []
+      @lazy_current_queue = nil
+      @closed = false
+      @server = server
+    end
+
+    def write(data)
+      @socket.write data
+    end
+
+    def send(data)
+      frame = WebSocket::Frame::Outgoing::Server.new(:version => @handshake.version, :data => data, :type => :text)
+      begin
+        @socket.write frame
+        @socket.flush
+      rescue
+        @server.close(self) unless @closed
+      end
+    end
+
+    def lazy_send(data)
+      @lazy_queue.push data
+    end
+
+    def get_lazy_fiber
+      # Create the fiber if needed
+      if @lazy_fiber == nil or !@lazy_fiber.alive?
+        @lazy_fiber = Fiber.new do
+          @lazy_current_queue.each do |data|
+            send(data)
+            Fiber.yield unless @lazy_current_queue[-1] == data
+          end
+        end
+      end
+
+      return @lazy_fiber
+    end
+
+    def send_some_lazy(count)
+      # To save on cpu cycles, we don't want to be chopping and changing arrays, which could get quite large.  Instead,
+      # we iterate over an array which we are sure won't change out from underneath us.
+      unless @lazy_current_queue
+        @lazy_current_queue = @lazy_queue
+        @lazy_queue = []
+      end
+
+      completed = 0
+      begin
+        get_lazy_fiber.resume
+        completed += 1
+      end while (@lazy_queue.count > 0 or @lazy_current_queue.count > 0) and completed < count
+
+    end
+
+    def onopen(&blk)
+      if @opened
+        begin
+          blk.call
+        ensure
+          @opened = false
+        end
+      end
+    end
+
+    def onmessage(&blk)
+      if @messaged.size > 0
+        begin
+          @messaged.each do |x|
+            blk.call(x.to_s)
+          end
+        ensure
+          @messaged = []
+        end
+      end
+    end
+
+    def onclose(&blk)
+      if @closed
+        begin
+          blk.call
+        ensure
+        end
+      end
+    end
+  end
+
+  line = 0
+end
+
+if __FILE__==$0
+  server = Rubame::Server.new("0.0.0.0", 25222)
+  while (!$quit)
+    server.run do |client|
+      client.onopen do
+        puts "Server reports:  client open"
+      end
+      client.onmessage do |mess|
+        puts "Server reports:  message received: #{mess}"
+      end
+      client.onclose do
+        puts "Server reports:  client closed"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: em-websocket
+  name: rubame
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +194,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/rubame/rubame.rb
 - lib/html/Gemfile.lock
 - lib/html/source/index.html.slim
 - lib/html/source/layouts/layout.erb