middleman-livereload 0.2.2 → 3.0.0

data/Gemfile

@@ -1,4 +1,23 @@
-source "http://rubygems.org"
+source :rubygems
 
-# Specify your gem's dependencies in middleman-livereload.gemspec
+git "git://github.com/middleman/middleman.git" do
+  # gem "middleman"
+  gem "middleman-core"
+  # gem "middleman-more"
+end
+
+# Specify your gem's dependencies in middleman-blog.gemspec
 gemspec
+
+group :development do
+  gem "rake",     "~> 0.9.2"
+  gem "rdoc",     "~> 3.9"
+  gem "yard",     "~> 0.8.0"
+end
+
+group :test do
+  gem "cucumber", "~> 1.2.0"
+  gem "fivemat"
+  gem "aruba",    "~> 0.4.11"
+  gem "rspec",    "~> 2.7"
+end

data/README.md

@@ -0,0 +1,37 @@
+# middleman-livereload
+
+middleman-livereload is an extension for the [Middleman](http://middlemanapp.com) static site generator that adds livereloading functionality.
+
+# Install
+If you're just getting started, install the `middleman` and `middleman-livereload` gems and generate a new project:
+
+```
+gem install middleman
+gem install middleman-livereload
+middleman init MY_PROJECT
+```
+
+If you already have a Middleman project:
+Add `middleman-livereload` to your `Gemfile`, and open your `config.rb` and add:
+
+```
+activate :livereload
+```
+
+# Community
+
+The official community forum is available at:
+
+  http://forum.middlemanapp.com/
+
+# Bug Reports
+
+GitHub Issues are used for managing bug reports and feature requests. If you run into issues, please search the issues and submit new problems:
+
+https://github.com/middleman/middleman-livereload/issues
+
+The best way to get quick responses to your issues and swift fixes to your bugs is to submit detailed bug reports, include test cases and respond to developer questions in a timely manner. Even better, if you know Ruby, you can submit Pull Requests containing Cucumber Features which describe how your feature should work or exploit the bug you are submitting.
+
+# Donate
+
+[![Click here to lend your support to Middleman](https://www.pledgie.com/campaigns/15807.png)](http://www.pledgie.com/campaigns/15807)

data/Rakefile

@@ -1,2 +1,22 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
+  ENV["TEST"] = "true"
+
+  exempt_tags = ""
+  exempt_tags << "--tags ~@nojava" if RUBY_PLATFORM == "java"
+
+  t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+end
+
+require 'rake/clean'
+
+task :test => ["cucumber"]
+
+desc "Build HTML documentation"
+task :doc do
+  sh 'bundle exec yard'
+end

data/lib/middleman-livereload.rb

@@ -1,21 +1,7 @@
-require "middleman/guard"
-require "guard/livereload"
-
-Middleman::Guard.add_guard do |options, livereload|
-  if livereload
-    livereload_options_hash = ""
-    
-    livereload.each do |k,v|
-      livereload_options_hash << ", :#{k} => "
-      livereload_options_hash << ((v.kind_of?(String)) ? "'#{v}'" : "#{v.to_s}")
-    end
-    
-    %Q{
-      guard 'livereload'#{livereload_options_hash} do 
-        watch(%r{^source/([^\.].*)$})
-      end
-    }
-  else
-    nil
-  end
+require "middleman-core"
+require "middleman-livereload/version"
+  
+::Middleman::Extensions.register(:livereload) do
+  require "middleman-livereload/extension"
+  ::Middleman::LiveReload
 end

data/lib/middleman-livereload/extension.rb

@@ -0,0 +1,90 @@
+require 'rack/livereload'
+require 'em-websocket'
+require 'multi_json'
+
+module Middleman
+  module LiveReload
+    class << self
+      def registered(app, options={})
+        options = {
+          :api_version => '1.6',
+          :host => '0.0.0.0',
+          :port => '35729',
+          :apply_js_live => true,
+          :apply_css_live => true,
+          :grace_period => 0
+        }.merge(options)
+
+        app.ready do
+          # Doesn't make sense in build
+          if environment != :build
+            reactor = Reactor.new(options)
+
+            files.changed { |file| reactor.reload_browser(file) }
+            files.deleted { |file| reactor.reload_browser(file) }
+
+            use ::Rack::LiveReload
+          end
+        end
+      end
+      alias :included :registered
+    end
+
+    class Reactor
+      attr_reader :thread, :web_sockets
+
+      def initialize(options)
+        @web_sockets = []
+        @options     = options
+        @thread      = start_threaded_reactor(options)
+      end
+
+      def stop
+        thread.kill
+      end
+
+      def reload_browser(paths = [])
+        paths = Array(paths)
+        puts "Reloading browser: #{paths.join(' ')}"
+        paths.each do |path|
+          data = MultiJson.encode(['refresh', {
+            :path           => "#{Dir.pwd}/#{path}",
+            :apply_js_live  => @options[:apply_js_live],
+            :apply_css_live => @options[:apply_css_live]
+          }])
+          # UI.debug data
+          @web_sockets.each { |ws| ws.send(data) }
+        end
+      end
+
+      def start_threaded_reactor(options)
+        Thread.new do
+          EventMachine.run do
+            puts "LiveReload #{options[:api_version]} is waiting for a browser to connect."
+            EventMachine.start_server(options[:host], options[:port], EventMachine::WebSocket::Connection, {}) do |ws|
+              ws.onopen do
+                begin
+                  ws.send "!!ver:#{options[:api_version]}"
+                  @web_sockets << ws
+                  puts "Browser connected."
+                rescue
+                  $stderr.puts $!
+                  $stderr.puts $!.backtrace
+                end
+              end
+
+              ws.onmessage do |msg|
+                puts "Browser URL: #{msg}"
+              end
+
+              ws.onclose do
+                @web_sockets.delete ws
+                puts "Browser disconnected."
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/middleman-livereload/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module LiveReload
-    VERSION = "0.2.2"
+    VERSION = "3.0.0"
   end
 end

data/middleman-livereload.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "middleman-livereload"
 
-  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.files         = `git ls-files -z`.split("\0")
+  s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
   
-  # s.add_runtime_dependency("middleman", ["~> 2.0.6"])
-  s.add_runtime_dependency("guard-livereload", ["~> 1.0"])
-  s.add_development_dependency("rake")
+  s.add_dependency("middleman-core", ["~> 3.0.0"])
+  s.add_runtime_dependency('rack-livereload')
+  s.add_runtime_dependency('em-websocket', ['>= 0.2.0'])
+  s.add_runtime_dependency('multi_json', ['~> 1.0'])
 end

metadata

@@ -1,80 +1,126 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: middleman-livereload
-version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 3
+  - 0
+  - 0
+  version: 3.0.0
 platform: ruby
-authors:
+authors: 
 - Thomas Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: guard-livereload
-  requirement: &70148725068240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+
+date: 2012-08-09 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  name: middleman-core
+  requirement: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  name: rack-livereload
+  requirement: *id002
   prerelease: false
-  version_requirements: *70148725068240
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70148725067820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  name: em-websocket
+  requirement: *id003
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  name: multi_json
+  requirement: *id004
   prerelease: false
-  version_requirements: *70148725067820
 description: Adds LiveReload to Middleman
-email:
+email: 
 - me@tdreyno.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
+- README.md
 - Rakefile
+- features/.gitkeep
+- fixtures/.gitkeep
 - lib/middleman-livereload.rb
+- lib/middleman-livereload/extension.rb
 - lib/middleman-livereload/version.rb
-- lib/middleman_init.rb
+- lib/middleman_extension.rb
 - middleman-livereload.gemspec
+has_rdoc: true
 homepage: https://github.com/tdreyno/middleman-livereload
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
       - 0
-      hash: -3112455916319069585
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
       - 0
-      hash: -3112455916319069585
+      version: "0"
 requirements: []
+
 rubyforge_project: middleman-livereload
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Adds LiveReload to Middleman
-test_files: []
+test_files: 
+- features/.gitkeep
+- fixtures/.gitkeep