devcenter 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: d352eb839a6897d9f77d7a6c92e087226d4ebf52
-  data.tar.gz: e422574c967cb28606b259c0c0f279b0d4af6da4
+  metadata.gz: 7a1de6c52f42b4388b5cc465df6e2125d5979299
+  data.tar.gz: 93ea202ebe6e5542b6915c3652f055792c5a019f
 !binary "U0hBNTEy":
-  metadata.gz: 8364d4972ab68c3391e8fded0f65d240af897d61e274aeb4443c1a4de8f31a9ccdfc29a47fc7cf1693d8ccdf3ef0a67d403bcae418f7f3f60cc1e4fb9d8b15e4
-  data.tar.gz: 33ebc9d225132cdcfbc795f28f26c136b15a0c79c8d70b4c36bd243d0c7a7adb4d91603b1731a7b5d1b3ea61dc9104f1c31e39898c6a4da554697b6bed024bce
+  metadata.gz: 3a080acfe9a2fdc6fbc5697f4c260011feee27b5508afb1b2b800a67c7eaf7d33f3a30e509795b68446620bdf49f51af433f3767445f7b5bfe183071b2f58384
+  data.tar.gz: da72b5fac7361fde1ac96b761a9d1bcfd930197d8803915ee5e6fac644192526ec6ea6921e3b95e4a89ca2d1aa4633acc9efeb7771cee5c08dfb096e14dae080

data/devcenter.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = %w{ devcenter }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = %w{ lib }
-  gem.add_runtime_dependency('listen', '~> 0.7.2')
+  gem.add_runtime_dependency('listen', '~> 1.3.1')
   gem.add_runtime_dependency('commander', '~> 4.1.3')
   gem.add_runtime_dependency('json', '~>1.7.6')
   gem.add_runtime_dependency('excon', '~>0.15.4')

data/lib/devcenter/previewer.rb

@@ -4,33 +4,69 @@ require_relative 'previewer/web_server'
 require_relative 'previewer/file_listener'
 
 module Devcenter::Previewer
-
   extend self
 
   def preview(slug, md_path, host, port)
-    server = WebServer.new(host, port, WebApp)
-    file_listener_callback = Proc.new do |modified, added, removed|
-      modified.each{ |f| Devcenter::Logger.log "File modified: #{f}" }
-      WebApp.send_server_event
+    Runner.new(slug, md_path, host, port).run
+  end
+
+  class Runner
+    attr_reader :slug, :md_path, :host, :port, :url
+
+    def initialize(slug, md_path, host, port)
+      @slug = slug
+      @md_path = md_path
+      @host = host
+      @port = port
+      @url = "http://#{@host}:#{@port}/#{@slug}"
+      @listener = init_listener
+      @server = init_server
+    end
+
+    def run
+      start
+      @running = true
+      [:INT, :TERM].each do |signal|
+        trap(signal) do
+          stop
+          exit
+        end
+      end
+      sleep 1 while running?
+    end
+
+    private
+
+    def running?
+      @running
     end
 
-    listener = FileListener.new(md_path, file_listener_callback)
+    def init_server
+      WebServer.new(host, port, WebApp)
+    end
 
-    [:INT, :TERM].each do |signal|
-      trap(signal) do
-        listener.stop
-        server.stop
-        say "\nPreview finished."
-        exit
+    def init_listener
+      file_listener_callback = Proc.new do |modified, added, removed|
+        modified.each{ |f| Devcenter::Logger.log "File modified: #{f}" }
+        WebApp.send_server_event
       end
+      FileListener.new(md_path, file_listener_callback)
     end
-    listener.start
-    url = "http://#{host}:#{port}/#{slug}"
-    say "\nLive preview for #{slug} available in #{url}"
-    say "It will refresh when you save #{md_path}"
-    say "Press Ctrl+C to exit...\n"
-    Launchy.open(url)
-    server.start
-  end
 
+    def start
+      @server.start
+      @listener.start
+      say "\nLive preview for #{slug} available in #{url}"
+      say "It will refresh when you save #{md_path}"
+      say "Press Ctrl+C to exit...\n"
+      Launchy.open(url)
+    end
+
+    def stop
+      @server.stop
+      @listener.stop
+      say "\nPreview finished."
+      @running = false
+    end
+  end
 end

data/lib/devcenter/previewer/file_listener.rb

@@ -6,7 +6,7 @@ module Devcenter::Previewer
     def initialize(file_path, callback)
       dir = File.dirname(file_path)
       basename = File.basename(file_path)
-      @listener = Listen.to(dir, force_polling: true)
+      @listener = Listen.to(dir)
       @listener.filter(%r{#{basename}})
       @listener.change(&callback)
     end
@@ -16,7 +16,7 @@ module Devcenter::Previewer
     end
 
     def stop
-      @listener.stop
+      @listener.stop rescue ThreadError
       Thread.kill(@thread)
     end
   end

data/lib/devcenter/previewer/web_server.rb

@@ -10,11 +10,12 @@ module Devcenter::Previewer
     end
 
     def start
-      @server.start
+      @thread = Thread.new { @server.start }
     end
 
     def stop
       @server.stop
+      Thread.kill(@thread)
     end
   end
 

data/lib/devcenter/version.rb

@@ -1,3 +1,3 @@
 module Devcenter
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devcenter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Raul Murciano
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement