munge 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24e988722288862121d7457950447fbab2c86f92
-  data.tar.gz: 17714169a9382dfc2ff42b966c3f4650409d0aba
+  metadata.gz: 21f94ee6721dd5a6248f8cc682e7c20b25e37c3c
+  data.tar.gz: 4bc2576726939c6ec80482b94fdb05d700dfeab2
 SHA512:
-  metadata.gz: d0661b313d6ec45bd7f3b762d31706d9c44b83dc2d29bd1b88792aba609e94073f0d617d2456d0ae2d30de77622a195c813dcfb933e20c8af7e3848e98fa143d
-  data.tar.gz: f2b2b49dd321267749c44c88963ebe92dfe57e64f70e9069579b87fab7774e02670897f1830095ecdbe96e618930e7987a7c07eb8e8abf8bf93daba68cf71465
+  metadata.gz: b5953027d4225360dfe10436c2c65956cdffe57657e766709b753948f6a212295bcf6aeb198127719749c15db09cdb19fd27cce7eb7b16887cf47a7d75e36d8b
+  data.tar.gz: 38649c10faff0d936d49b72f2f72a2a05e2fd134f599030f6d7ac589b05758699b9098e3cce14c2035d069333290cdb9145690d6c134236d96277db674863231

data/lib/munge/cli/commands/build.rb

@@ -25,6 +25,7 @@ module Munge
             )
         end
 
+        # @return [Array<String>] list of updated items routes
         def call
           @runner.write
         end

data/lib/munge/cli/commands/server.rb

@@ -2,15 +2,26 @@ module Munge
   module Cli
     module Commands
       class Server
-        def initialize(bootloader)
+        def initialize(bootloader, livereload:)
           @bootloader = bootloader
-          @listener   = listener
+          @listener = listener
+          @livereload =
+            if livereload
+              if Gem.loaded_specs.key?("reel")
+                Munge::Extras::Livereload::Main.new(true)
+              else
+                STDERR.puts "Gem `reel` is not installed. Check that your Ruby version is compatible"
+                Munge::Extras::Livereload::Main.new(false)
+              end
+            else
+              Munge::Extras::Livereload::Main.new(false)
+            end
         end
 
         def call
           @listener.start
 
-          system("munge build")
+          munge_build
 
           system("munge view")
         rescue Interrupt
@@ -23,9 +34,14 @@ module Munge
           require "listen"
 
           listen = Listen.to(@bootloader.root_path) do
-            system("munge build")
+            built_files = munge_build
+
+            @livereload.notify_changes(files: built_files)
+
+            GC.start
           end
 
+          ignore(listen, ".sass-cache")
           ignore(listen, ENV["BUILD_ROOT"])
           ignore(listen, @bootloader.config[:output_path])
 
@@ -34,9 +50,25 @@ module Munge
 
         def ignore(listener, pattern)
           if pattern
-            listener.ignore(/^#{pattern}/)
+            listener.ignore(/^#{Regexp.escape(pattern)}/)
           end
         end
+
+        def munge_build
+          bootloader =
+            Munge::Bootloader.new(root_path: @bootloader.root_path)
+
+          build_command =
+            Munge::Cli::Commands::Build.new(
+              bootloader,
+              dry_run: false,
+              reporter: "Default",
+              verbosity: "written",
+              build_root: ENV["BUILD_ROOT"]
+            )
+
+          build_command.call
+        end
       end
     end
   end

data/lib/munge/cli/dispatch.rb

@@ -27,11 +27,12 @@ module Munge
       end
 
       desc "server", "Run the development server"
+      method_option :livereload, desc: "Reload browser on update", default: Gem.loaded_specs.key?("reel"), type: :boolean
       def server
         ENV["MUNGE_ENV"]  ||= "development"
         ENV["BUILD_ROOT"] ||= "tmp/development-build"
 
-        Commands::Server.new(bootloader).call
+        Commands::Server.new(bootloader, **symbolized_options).call
       end
 
       desc "update", "Use with caution: override local configs with pristine version (useful after bumping version in Gemfile)"

data/lib/munge/config.rb

@@ -27,6 +27,8 @@ module Munge
         self[key_from_setter(method_name)] = arguments.first
       elsif key?(method_name)
         self[method_name]
+      else
+        super
       end
     end
 

data/lib/munge/extras/livereload/messaging.rb

@@ -0,0 +1,40 @@
+module Munge
+  module Extras
+    module Livereload
+      class Messaging
+        def hello
+          JSON.generate(
+            command: "hello",
+            protocols: [the_protocol],
+            serverName: "munge-livereload"
+          )
+        end
+
+        def reload(changed_file)
+          JSON.generate(
+            command: "reload",
+            path: changed_file,
+            liveCSS: "false"
+          )
+        end
+
+        def valid_handshake?(socket_data)
+          client_handshake = JSON.parse(socket_data)
+
+          return false if client_handshake["command"] != "hello"
+          return false if !client_handshake["protocols"].include?(the_protocol)
+
+          true
+        rescue
+          false
+        end
+
+        private
+
+        def the_protocol
+          "http://livereload.com/protocols/official-7".freeze
+        end
+      end
+    end
+  end
+end

data/lib/munge/extras/livereload/server.rb

@@ -0,0 +1,57 @@
+module Munge
+  module Extras
+    module Livereload
+      class Server < Reel::Server::HTTP
+        def initialize(host = "127.0.0.1", port = 35729)
+          super(host, port, &method(:on_connection))
+          @update_client = UpdateClient.new(self)
+          @messaging = Messaging.new
+          @sockets = []
+        end
+
+        def notify_reload(changed_files)
+          @sockets.each do |socket|
+            begin
+              changed_files.each do |file|
+                socket << @messaging.reload(file)
+              end
+            rescue Reel::SocketError
+            end
+          end
+        end
+
+        def on_connection(connection)
+          connection.each_request do |request|
+            if request.websocket?
+              handle_websocket(connection, request)
+            else
+              handle_request(request)
+            end
+          end
+        end
+
+        def handle_websocket(_connection, request)
+          socket = request.websocket
+          if socket.url == "/livereload"
+            # Ordering of handshake doesn't seem to matter
+            socket << @messaging.hello
+
+            if @messaging.valid_handshake?(socket.read)
+              @sockets.push(socket)
+            end
+          end
+        rescue Reel::SocketError
+        end
+
+        def handle_request(request)
+          if request.path == "/livereload.js"
+            livejs = File.expand_path("vendor/livereload.js", File.dirname(__FILE__))
+            request.respond(:ok, File.read(livejs))
+          else
+            request.respond(:not_found, "not found")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/munge/extras/livereload/update_client.rb

@@ -0,0 +1,19 @@
+module Munge
+  module Extras
+    module Livereload
+      class UpdateClient
+        include Celluloid
+        include Celluloid::Notifications
+
+        def initialize(webserver)
+          @webserver = webserver
+          subscribe("changed_files", :notify_reload)
+        end
+
+        def notify_reload(_topic, changed_files)
+          @webserver.notify_reload(changed_files)
+        end
+      end
+    end
+  end
+end

data/lib/munge/extras/livereload/update_server.rb

@@ -0,0 +1,14 @@
+module Munge
+  module Extras
+    module Livereload
+      class UpdateServer
+        include Celluloid
+        include Celluloid::Notifications
+
+        def notify(files = [])
+          publish("changed_files", files)
+        end
+      end
+    end
+  end
+end