Merge branch 'master' of github.com:ruby-hyperloop/rails-clone-and-go

catmando · catmando · commit 1415ca03c203 · 2017-06-05T21:14:16.000Z
diff --git a/.c9/project.settings b/.c9/project.settings
@@ -86,4 +86,4 @@
         "@preview": false,
         "@useOwnerSettings": false
     }
-}
+}
diff --git a/Gemfile b/Gemfile
@@ -52,7 +52,7 @@ group :development do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
-  gem 'opal_hot_reloader', git: 'https://github.com/catmando/opal-hot-reloader.git'
+  gem 'opal_hot_reloader', git: 'https://github.com/fkchang/opal-hot-reloader.git'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
-  remote: https://github.com/catmando/opal-hot-reloader.git
-  revision: 87d85ac0e3d4be44a8a3fe3eda97ea898c05034b
+  remote: https://github.com/fkchang/opal-hot-reloader.git
+  revision: 3438a1cf49c3f5b3d0936b08b6c594c8458a651c
   specs:
     opal_hot_reloader (0.1.4)
       listen (~> 3.0)
@@ -353,4 +353,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   1.15.0
+   1.15.1
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -15,4 +15,4 @@
 //= require 'jquery'
 //= require_tree .
 //= require hyperloop-loader
-Opal.OpalHotReloader.$listen(8081)
+Opal.OpalHotReloader.$listen() // optional (port, false, poll_seconds) i.e. (8081, false, 1)
diff --git a/bin/setup b/bin/setup
@@ -33,7 +33,11 @@ chdir APP_ROOT do
   application_path = File.join(APP_ROOT, 'config', 'application.rb')
   IO.write(application_path, File.open(application_path) {|f| f.read.gsub(/HyperloopCloneAndGo/, "#{APP_CLASS}")})
   
-  unless ENV['C9_PROJECT']
+  if ENV['C9_PROJECT']
+    puts "== Updating Hot Reloader Settings =="
+    application_path = File.join(APP_ROOT, 'app', 'assets', 'javascripts', 'application.js')
+    IO.write(application_path, File.open(application_path) {|f| f.read.gsub(/\$listen\(\)/, '$listen(8081, false, 1)')})
+  else
     puts "== Updating Procfile ports =="
     application_path = File.join(APP_ROOT, 'Procfile')
     IO.write(application_path, File.open(application_path) {|f| f.read.gsub(/ -p 808\d/, '')})

Original file line number	Diff line number	Diff line change
`@@ -86,4 +86,4 @@`
`86`	`86`	`"@preview": false,`
`87`	`87`	`"@useOwnerSettings": false`
`88`	`88`	`}`
`89`		`-}`
	`89`	`+}`