jekyll-livereload 0.1.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b06478eab8b2303bef86d2bc601aa05f125954ed
-  data.tar.gz: ef7ac2618c98f6186fd8dedfc3375dba5e76b749
+  metadata.gz: c6f469fa6509fbfe79d18e5a36afba104cb19988
+  data.tar.gz: eaf978f93d4e1ab1a8195b5ebcb44e39d319f840
 SHA512:
-  metadata.gz: e2a5173d48a1fe632514f97c02e8da504b6fefcf08305b84bf360dc8b21ae4ebb9f9c06781211277945dff2599b80d00f96f9581894074e47e0d1c5bbc49dec3
-  data.tar.gz: 3263e143ce532d299d25a030bba1c894817be06fc906030370b76b78a36d59cbc9be29c89d4c315b74f6bc28ebaa7d8115d9665793a18317bd5a2ca953a19fbf
+  metadata.gz: c0f01b1743c6f10dd12ac896b3be7acf6c3b0802bf37b923f0b8d1e5d8a221e50d87470bc5ff69f4254867d9bc1014eb8b0173cdb78ae81263b719a8f054a614
+  data.tar.gz: 6fa26655f1916dd1d24f4dec83a019e11689230ab81ea3f9007725fd2954f51b6b67b43eca3bb2219e694b5e333083d37f7fc92409abc497a232b63b7cc589c4

data/lib/jekyll-livereload/build.rb

@@ -32,7 +32,8 @@ module Jekyll
 
       private
       def reload_script(opts)
-        "<script src=\"http://#{opts['host']}:#{opts['reload_port']}/livereload.js\"></script>"
+        protocol = opts[:secure] ? "https" : "http"
+        "<script src=\"#{protocol}://#{opts['host']}:#{opts['reload_port']}/livereload.js\"></script>"
       end
 
     end

data/lib/jekyll-livereload/configuration.rb

@@ -6,6 +6,15 @@ module Jekyll
         opts = configuration_from_options(opts)
         opts['host'] = 'localhost' unless opts.key?('host')
         opts['reload_port'] = Livereload::LIVERELOAD_PORT unless opts.key?('reload_port')
+
+        if opts['ssl_cert'] && opts['ssl_key']
+          opts[:tls_options] = {
+            :private_key_file => Jekyll.sanitized_path(opts['source'], opts['ssl_key']),
+            :cert_chain_file => Jekyll.sanitized_path(opts['source'], opts['ssl_cert']),
+          }
+          opts[:secure] = true
+        end
+
         return opts
       end
     end

data/lib/jekyll-livereload/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Livereload
-    VERSION = "0.1.1"
+    VERSION = "0.2.1"
   end
 end

data/lib/jekyll-livereload/websocket.rb

@@ -37,8 +37,8 @@ module Jekyll
       attr_reader :reload_file
 
       def initialize(opts)
-        super
         @reload_file = File.join(LIVERELOAD_DIR, "livereload.js")
+        super opts
       end
 
       def dispatch(data)
@@ -85,7 +85,6 @@ module Jekyll
         @thread = nil
         @websockets = []
         @connections_count = 0
-        trap("INT") { stop }
       end
 
       def stop
@@ -101,9 +100,9 @@ module Jekyll
         @thread = Thread.new do
           # Use epoll if the kernel supports it
           EM.epoll
-          # TODO enable SSL
           EM.run do
-            Jekyll.logger.info("LiveReload Server:", "#{@opts['host']}:#{@opts['reload_port']}")
+            protocol = @opts[:secure] ? "https" : "http"
+            Jekyll.logger.info("LiveReload Server:", "#{protocol}://#{@opts['host']}:#{@opts['reload_port']}")
             EM.start_server(@opts['host'], @opts['reload_port'], HttpAwareConnection, @opts) do |ws|
               ws.onopen do |handshake|
                 connect(ws, handshake)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-livereload
 version: !ruby/object:Gem::Version
-  version: 0.1.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Robert DeRose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -52,21 +52,15 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
-description: 
+description: |2
+      This is a plugin for Jekyll. It adds additional command line options to
+      the server command to provide Livereloading capabilities.
 email:
 - RobertDeRose@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- Gemfile
-- History.md
-- LICENSE.txt
-- README.md
-- Rakefile
-- jekyll-livereload.gemspec
 - js/livereload.js
 - lib/jekyll-livereload.rb
 - lib/jekyll-livereload/build.rb
@@ -86,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.gitignore

@@ -1,16 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-spec/dest
-tmp

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in jekyll-paginate.gemspec
-gemspec

data/History.md

@@ -1,12 +0,0 @@
-## 0.1.1 / 2016-05-09
-
-### Minor fixes and improvements
-
-  * Don't start Websocket unless --livereload is included
-  * Support configuration through `_config.yml` file
-
-## 0.1.0 / 2016-05-09
-
-### Initial Release
-
-  * First release of Jekyll-Livereload

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Parker Moore
-
-MIT License
-
-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/README.md

@@ -1,77 +0,0 @@
-# Jekyll::Livereload
-
-[![Gem Version](https://badge.fury.io/rb/jekyll-livereload.svg)](https://badge.fury.io/rb/jekyll-livereload)
-
-Adds Livereloading support to Jekyll
-
-## Installation
-
-Add this line to your site's Gemfile in the Jekyll Plugin Group:
-
-```ruby
-group :jekyll_plugins do
-    gem 'jekyll-livereload'
-end
-```
-
-And then execute:
-
-```bash
-bundle
-```
-
-## Usage
-
-This plugin was designed to work with both 3.0.5 and 3.1.3 of Jekyll.
-
-To enable Livereload support you need to add an addition command line switch to the
-`jekyll serve` command: `--livereload`.
-
-If you call `jekyll serve --help` for all supported serve options, you will notice
-that two new options have been added.
-
-```bash
--L, --livereload   Inject Livereload.js and run a WebSocket Server
--R, --reload_port [PORT]  Port to serve Livereload on
-```
-
-These options have been added by this plugin.
-
-## Making Livereload the default
-
-Jekyll::Livereload supports readings configuration values from your local `_config.yml`
-file. If you always what to use Livereload, and why wouldn't you, you can add it to 
-your config like so:
-
-```yaml
-# Server Config optiosn
-livereload: true    # You no longer need to include --livereload
-reload_port: 5678    # If you don't want to use the default port
-```
-
-## Caveats
-
-This plugin is dependent on the way Jekyll loads plugins.
-Jekyll will load anything in the `Gemfile` plugin group immediately after it
-includes `jekyll` and `mercenary`, both of which need to be modified before
-Jekyll initializes it's command line options.
-
-If you attempt to use this plugin by installing it in the `_plugin` directory
-or by adding it to your `_config.yml` file, it will not work.
-
-This plugin will break if Jekyll upstream every changes the placement of the call
-`Jekyll::PluginManager.require_from_bundler` in it's `binary` command `jekyll` to
-be after the initialization it's command line options.
-
-This is the reason this plugin only works if you include it in the `Gemfile`
-
-## Thanks
-
-A big thanks to [Alex Wood](https://github.com/awood)! This plugin was
-inspired by his [Hawkins](https://github.com/awood/hawkins) plugin for Jekyll.
-The reason I made this plugin was because his method did not work with the
-Github-Pages Gem version of Jekyll, which still uses version 3.0.5.
-His websocket server was used with very little modification and credit given.
-
-Also thanks to the [Livereload Team](https://github.com/livereload), a copy of
-their awesome opensource livereload.js is included with this plugin.

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/jekyll-livereload.gemspec

@@ -1,24 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jekyll-livereload/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "jekyll-livereload"
-  spec.version       = "#{Jekyll::Livereload::VERSION}.1"
-  spec.authors       = ["Robert DeRose"]
-  spec.email         = ["RobertDeRose@gmail.com"]
-  spec.summary       = "Adds LiveReload support to Jekyll's included Server"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.homepage      = 'https://github.com/RobertDeRose/jekyll-livereload'
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "jekyll", "~> 3.0"
-  spec.add_runtime_dependency "em-websocket", "~> 0.5"
-
-  spec.add_development_dependency "bundler", "~> 1.12"
-end