linner 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 632ba0af08197976ece2c8920e3991868d0c5000
-  data.tar.gz: d1fe25a52c0a8af4edd46451b7cdbca1753530e2
+  metadata.gz: 59bef00386f78c40d3d65b73210508c6655fa56d
+  data.tar.gz: b64d9317df2b2c194bd9706d180df5fb10bfd0f6
 SHA512:
-  metadata.gz: 2a5be3981994798ce60ca8b94af752b9bcbe13c2735dd99bc61416fc2e80544d63682628870cf53c90be190491cb9536869262b86e6995fe8d47ce4f7ea0afdb
-  data.tar.gz: 9c1eee6c25c28942848e0d9ca44b27d28e38b1c3e8986a379b0ee9fb4b30632af3abe8010414f44044e12a567957d2871e4086615ae3fdf61bd66fb807ad220d
+  metadata.gz: d603e4a09eb95a9216a2bbb45053b8b793a269217ccc4c1d0fc4170d0806145fbf5505abbbc0114e1fe71194c3c58a769f83c241237bfe86b8e3e62c0309c360
+  data.tar.gz: 4f7dc261117e786f902800ee729668eefb9b428abf4d25f4ec48a10cabffb68efbb5ce868798920136c5b5e32bb795ee7351e5190dba206137b50fd0cf52e692

data/lib/linner.rb

@@ -2,7 +2,6 @@ require "linner/version"
 require "linner/command"
 require "linner/asset"
 require "linner/helper"
-require "linner/reactor"
 require "linner/wrapper"
 require "linner/template"
 require "linner/notifier"

data/lib/linner/command.rb

@@ -18,7 +18,10 @@ module Linner
 
     desc "watch", "watch assets"
     def watch
-      @reactor = Reactor.new
+      trap :INT do
+        Notifier.exit
+        exit!
+      end
 
       @proc = Proc.new do |modified, added, removed|
         begin
@@ -29,22 +32,9 @@ module Linner
       end
       @proc.call
 
-      Listen.to env.app_folder, env.vendor_folder, env.test_folder do |modified, added, removed|
+      Listen.to! env.app_folder, env.vendor_folder, env.test_folder do |modified, added, removed|
         @proc.call
       end
-
-      Listen.to env.public_folder, :relative_paths => true do |modified, added, removed|
-        paths = [].push(modified, added, removed).flatten.compact
-        @reactor.reload_browser(paths)
-      end
-
-      trap :INT do
-        Notifier.exit
-        @reactor.stop
-        exit!
-      end
-
-      sleep
     end
 
     desc "clean", "clean assets"

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/linner.gemspec

@@ -24,8 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "listen", "~> 1.2"
   spec.add_dependency "uglifier", "~> 2.1"
   spec.add_dependency "multi_json", "~> 1.7"
-  spec.add_dependency "em-websocket", "~> 0.5"
-  spec.add_dependency "eventmachine", "~> 1.0.3"
   spec.add_dependency "coffee-script", "~> 2.2"
   spec.add_dependency "yui-compressor", "~> 0.9.6"
   spec.add_dependency "terminal-notifier", "~> 1.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linner
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,34 +94,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: em-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -229,7 +201,6 @@ files:
 - lib/linner/environment.rb
 - lib/linner/helper.rb
 - lib/linner/notifier.rb
-- lib/linner/reactor.rb
 - lib/linner/template.rb
 - lib/linner/templates/app/images/.gitkeep
 - lib/linner/templates/app/scripts/app.coffee

data/lib/linner/reactor.rb

@@ -1,101 +0,0 @@
-require "eventmachine"
-require "em-websocket"
-require "http/parser"
-
-module Linner
-  # Steal from guard livereload
-  # https://github.com/guard/guard-livereload/blob/master/lib/guard/livereload/reactor.rb
-  class Reactor
-    OPTIONS = {
-      :host => '0.0.0.0',
-      :port => '35729',
-      :apply_css_live => true,
-      :override_url => false,
-      :grace_period => 0
-    }
-
-    attr_reader :web_sockets, :thread, :options
-
-    def initialize
-      @web_sockets = []
-      @options     = OPTIONS
-      @thread      = start_threaded_reactor(OPTIONS)
-    end
-
-    def stop
-      thread.kill
-    end
-
-    def reload_browser(paths = [])
-      paths.each do |path|
-        data = {
-          :command  => 'reload',
-          :path     => "/#{path}",
-          :liveCSS  => @options[:apply_css_live]
-        }
-        web_sockets.each { |ws| ws.send(MultiJson.encode(data)) }
-      end
-    end
-
-  private
-
-    def start_threaded_reactor(options)
-      Thread.new do
-        EventMachine.epoll
-        EventMachine.run do
-          EventMachine.start_server(options[:host], options[:port], Connection, {}) do |ws|
-            ws.onopen do
-              begin
-                ws.send MultiJson.encode({
-                  :command    => 'hello',
-                  :protocols  => ['http://livereload.com/protocols/official-7'],
-                  :serverName => 'guard-livereload'
-                })
-                @web_sockets << ws
-              rescue
-                Notifier.error $!
-              end
-            end
-
-            ws.onclose do
-              @web_sockets.delete(ws)
-            end
-          end
-        end
-      end
-    end
-
-
-
-    class Connection < EventMachine::WebSocket::Connection
-      def dispatch data
-        parser = Http::Parser.new
-        parser << data
-        if parser.http_method != 'GET' || parser.upgrade?
-          super #pass the request to websocket
-        elsif parser.request_path == '/livereload.js'
-          serve_file File.join(File.dirname(__FILE__), "../../vendor", "livereload.js")
-        elsif File.exist?(parser.request_path[1..-1])
-          serve_file parser.request_path[1..-1] # Strip leading slash
-        else
-          send_data "HTTP/1.1 404 Not Found\r\nContent-Type: text/plain\r\nContent-Length: 13\r\n\r\n404 Not Found"
-          close_connection_after_writing
-        end
-      end
-
-      def serve_file path
-        content_type = case File.extname(path)
-        when '.css' then 'text/css'
-        when '.js' then 'application/ecmascript'
-        when '.gif' then 'image/gif'
-        when '.jpeg', '.jpg' then 'image/jpeg'
-        when '.png' then 'image/png'
-        else; 'text/plain'
-        end
-        send_data "HTTP/1.1 200 OK\r\nContent-Type: #{content_type}\r\nContent-Length: #{File.size path}\r\n\r\n"
-        stream_file_data(path).callback { close_connection_after_writing }
-      end
-    end
-
-  end
-end