flammarion 0.1.8 → 0.1.9

data/lib/flammarion/revelator.rb

@@ -70,6 +70,13 @@ module Flammarion
       Process.detach(spawn(chrome_path, %[--app=#{resource}?path=#{@window_id}&port=#{server.port}&title="#{options[:title] || "Flammarion%20Engraving"}"]))
     end
 
+    browser :osx do |options|
+      return false unless RbConfig::CONFIG["host_os"] =~ /darwin|mac os/
+      executable = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+      @chrome.in, @chrome.out, @chrome.err, @chrome.thread = Open3.popen3("'#{executable}' --app='#{options[:url]}'")
+      return true if @chrome.in
+    end
+
     browser :electron do |options|
       if which('electron') then
         Process.detach(spawn("electron #{File.dirname(File.absolute_path(__FILE__))}/../../electron '#{options[:url]}' #{options[:width]} #{options[:height]}"))

data/lib/flammarion/server.rb

@@ -1,30 +1,22 @@
 module Flammarion
   # @api private
   class Server
-    attr_reader :port
+    attr_reader :port, :server_thread
     def initialize
       @windows = {}
       @socket_paths = {}
       @started = false
-      Thread.new do
+      @launch_thread = Thread.current
+      @server_thread = Thread.new do
         begin
           start_server_internal
-        rescue SystemExit
-          raise
-        rescue Exception => e
-          if binding.respond_to? :pry
-            binding.pry
-          else
-            raise
-          end
+        rescue StandardError
+          handle_exception($!)
         end
       end
       sleep 0.5 while not @started
-
-      # This is a hack. For some reason, you need to wait a bit for everything
-      # to get written.
-      at_exit { sleep 0.1 }
     end
+
     def start_server_internal
       @port = 7870
       @port = rand(65000 - 1024) + 1024 if Gem.win_platform?
@@ -53,13 +45,8 @@ module Flammarion
               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
+                rescue StandardError => e
+                  handle_exception($!)
                 end
               end
             }
@@ -74,14 +61,6 @@ module Flammarion
         end
       end
       @started = true
-    rescue Exception => e
-      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
-        Kernel.puts e.backtrace.inspect
-      end
-      raise
     end
 
     def stop
@@ -91,6 +70,10 @@ module Flammarion
       # Kernel.puts str
     end
 
+    def handle_exception(e)
+      @launch_thread.raise(e)
+    end
+
     def register_window(window)
       @new_path ||= 0
       @new_path += 1

data/lib/flammarion/version.rb

@@ -1,3 +1,3 @@
   module Flammarion
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end

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

@@ -256,6 +256,7 @@ input:focus::-webkit-input-placeholder {
   user-select: none;
   font-family: monospace;
   min-height: 1.4em;
+  display: inline-block;
 }
 .inline-checkbox > span {
   vertical-align: middle;

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

@@ -112,6 +112,7 @@ input:focus::-webkit-input-placeholder {
   user-select: none;
   font-family: monospace;
   min-height: 1.4em;
+  display: inline-block;
 }
 .inline-checkbox > span {
   vertical-align: middle;

data/lib/rubame/rubame.rb

@@ -74,7 +74,7 @@ module Rubame
     end
 
     def run(&blk)
-      readable, writable = IO.select(@reading, @writing, nil)
+      readable, writable = IO.select(@reading, @writing, nil, 5)
 
       if readable
         readable.each do |socket|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubame