breakfast 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b12b97396b07486556ec5d2332c17d328794d430
-  data.tar.gz: 61fd4a2a085594668a2e4e7922c15271ad612f20
+  metadata.gz: 55fe92f6b48d4ee747f50fc3a831d0863723e6bd
+  data.tar.gz: 9a123637c58184758187ee44848f435a027d6910
 SHA512:
-  metadata.gz: 1567fbd110b9e21807a61302acf9fdd2f8a49b4de5063ee1c1ffab0a2df4f907727102873afee5542f0ede6dc983a5a48675fa9bc517042606cc3556c761f9e1
-  data.tar.gz: 15c45fba85e50e330f733fc4a0165d2653cc8694cd0ca4d148b43fd1d7248962f87ac0e8c00ab7a4847b497d12a9c1d9a1adeae638a8b29e60db544462f50f0d
+  metadata.gz: d361f652699abef3b4a145ff06370860c08552240830fb338e2fbfe399d769141de8a803c14859c91585cf15084ce92ca80c48ea2a70787a428bcf34e308ed68
+  data.tar.gz: 901bb0ece81ea661d5871ab62b8d2228fdfc68466faf99e66dbf1ab024f48196e7792a17d0fd1bf390573476b4755776f0be997347e47fd96e790c9f861c2b6d

data/.travis.yml

@@ -1,5 +1,11 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.3
-before_install: gem install bundler -v 1.12.5
+  - 2.3.1
+before_install:
+  - gem install bundler -v 1.12.5
+  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
+  - npm install
+
+env:
+  - TRAVIS_NODE_VERSION="6.1"

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGE LOG
 
+## 0.3.1 - 2016-10-19
+- Better support for determining if Server is running. Using puma, passneger,
+  etc. instead of the default rails server command now work.
+
 ## 0.3.0 - 2016-09-28
 
 ### Upgrading from `0.2.0`

data/README.md

@@ -15,6 +15,10 @@ See the official docs at
 
 View updates in the [CHANGELOG](https://github.com/devlocker/breakfast/blob/master/CHANGELOG.md)
 
+### Latest Patch `0.3.1`
+- Allows Breakfast to run when Rails is started outside of bin/rails server,
+  i.e. bundle exec puma, passenger, thin, etc.
+
 ### Latest Release `0.3.0`
 #### Added
 - New status bar that allows the user to switch reload strategies on the fly

data/lib/breakfast/compilation_listener.rb

@@ -10,10 +10,7 @@ module Breakfast
 
           ASSET_EXTENSIONS.each do |extension|
             if files.any? { |file| file.match(/\.#{extension}/) }
-              ActionCable.server.broadcast(
-                Breakfast::RELOAD_CHANNEL,
-                { extension: extension }
-              )
+              broadcast(Breakfast::RELOAD_CHANNEL, { extension: extension })
             end
           end
         end
@@ -25,17 +22,14 @@ module Breakfast
           SOURCE_CODE_EXTENSIONS.each do |extension|
             matched = files.select { |file| file.match(/\.#{extension}/) }
             if matched.present?
-              ActionCable.server.broadcast(
-                Breakfast::RELOAD_CHANNEL,
-                { extension: extension }
-              )
+              broadcast(Breakfast::RELOAD_CHANNEL, { extension: extension })
 
               file_names = matched
                 .map { |file| file.split("/").last }
                 .join(", ")
                 .truncate(60)
 
-              ActionCable.server.broadcast(Breakfast::STATUS_CHANNEL, {
+              broadcast(Breakfast::STATUS_CHANNEL, {
                 status: "success",
                 message: "saved: #{file_names}",
                 extension: extension
@@ -47,5 +41,9 @@ module Breakfast
       asset_listener.start
       rails_listener.start
     end
+
+    def self.broadcast(channel, data)
+      ActionCable.server.broadcast(channel, data)
+    end
   end
 end

data/lib/breakfast/railtie.rb

@@ -1,7 +1,7 @@
 require "rails"
 require "listen"
 
-module BrunchRails
+module Breakfast
   class Railtie < ::Rails::Railtie
     config.breakfast = ActiveSupport::OrderedOptions.new
 
@@ -24,7 +24,7 @@ module BrunchRails
     end
 
     config.after_initialize do |app|
-      if config.breakfast.environments.include?(Rails.env) && defined?(Rails::Server)
+      if config.breakfast.environments.include?(Rails.env) && LocalEnvironment.new.running_server?
         Thread.new do
           Breakfast::BrunchWatcher.spawn(log: Rails.logger)
         end
@@ -40,4 +40,56 @@ module BrunchRails
     ActionView::Helpers::AssetUrlHelper::ASSET_PUBLIC_DIRECTORIES[:image] = "/assets"
     ActionView::Helpers::AssetUrlHelper::ASSET_PUBLIC_DIRECTORIES[:stylesheet] = "/assets"
   end
+
+  class LocalEnvironment
+    def running_server?
+      possible_servers = %w[
+        rails
+        puma
+        passenger
+        unicorn
+        mongrel
+        webrick
+        rainbows
+      ]
+
+      possible_servers.any? do |server|
+        send "detect_#{server}"
+      end
+    end
+
+    private
+
+    def detect_rails
+      defined?(Rails::Server)
+    end
+
+    def detect_puma
+      defined?(::Puma) && File.basename($0) == "puma"
+    end
+
+    def detect_passenger
+      defined?(::PhusionPassenger)
+    end
+
+    def detect_thin
+      defined?(::Thin) && defined?(::Thin::Server)
+    end
+
+    def detect_unicorn
+      defined?(::Unicorn) && defined?(::Unicorn::HttpServer)
+    end
+
+    def detect_mongrel
+      defined?(::Mongrel) && defined?(::Mongrel::HttpServer)
+    end
+
+    def detect_webrick
+      defined?(::WEBrick) && defined?(::WEBrick::VERSION)
+    end
+
+    def detect_rainbows
+      defined?(::Rainbows) && defined?(::Rainbows::HttpServer)
+    end
+  end
 end

data/lib/breakfast/version.rb

@@ -1,3 +1,3 @@
 module Breakfast
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breakfast
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Patrick Koperwas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler