plezi 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b816b64c0253a8cc724c6a65b74b3a4cf4373e5f
-  data.tar.gz: 8cb2f0ae9079365b974359edd41fbee38e825b1f
+  metadata.gz: fd6066ad34f74ff29d617a7e1a535b07dfc0608c
+  data.tar.gz: 16ee892e498e466a8b11dabc484f053729b11f81
 SHA512:
-  metadata.gz: bf2cb30f5e04bf28a923f814a0feb6e1ac9d31d65f41fe5e37a8a2ef9064fa4a92d14c3a4fca12a3efd915251fde6a917bf0c340e12eec663f7b7022ca79f681
-  data.tar.gz: 01e4dea1f3f911d55b60947de7a4d7952825a4909f7b59f6544c5afe0c9b6d07a22b491c199144ccb8f2a142b511764acfbfe3cd5f0667c995a57b4e108f46d4
+  metadata.gz: e7f514c042d6c7e20c54948b3343765a68a71c2485155de4e14dbb7f2337daf5990a877e37b8e1c0aa65e609d4bfa4859cff221a9e1cdd962df2ee93352d16e5
+  data.tar.gz: 18e245d1ba234960b72ba5ab5a65ecb05843a96097fb30d4480884d1532f79b84ca16bced7f650898fbe2f6b9c8e474d64a823e739b2286f5cc621f0a3693de6

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ***
 
+Change log v.0.12.6
+
+**Template Fix**: Heroku would load the `environment.rb` file while deploying the application. This would cause Plezi's server to kick in and hang deployment. This issue was circumvented by renaming the `environment.rb` file to `initialize.rb`. Thanks to Adrian Gomez for exposing the issue (issue#9)
+
+***
+
 Change log v.0.12.5
 
 **Fix**: Placebo's older Rack recognition required that Rack be required within the gemfile of the application. This is no longer the case. Now `start_placebo` can also be used in a non-Rack environment (i.e. when disabling the server using: `Plezi.protocol = :placebo`). This allows writing Plezi based "worker" scripts that aren't web servers but can send and receive messages from the main application.

data/lib/plezi/builders/app_builder.rb

@@ -59,7 +59,7 @@ module Plezi
 			app_tree["assets"]["welcome.html"] ||= IO.read(File.join(@root,"resources" ,"welcome_page.html")).gsub('appname', app_name)
 
 			# app core files.
-			app_tree["environment.rb"] ||= IO.read File.join(@root,"resources" ,"environment.rb")
+			app_tree["initialize.rb"] ||= IO.read File.join(@root,"resources" ,"initialize.rb").gsub('appname', app_name)
 			app_tree["routes.rb"] ||= IO.read File.join(@root,"resources" ,"routes.rb")
 			app_tree["rakefile"] ||= IO.read File.join(@root,"resources" ,"rakefile")
 			app_tree["Procfile"] ||= ""
@@ -70,15 +70,15 @@ module Plezi
 			app_tree["Gemfile"] << "\n\n\nruby '#{RUBY_VERSION}'\n"
 
 			# set up config files
-			app_tree["config"] ||= {}
-			app_tree["config"]["oauth.rb"] ||= IO.read(File.join(@root,"resources" ,"oauth_config.rb"))
-			app_tree["config"]["active_record.rb"] ||= IO.read(File.join(@root,"resources" ,"db_ac_config.rb"))
-			app_tree["config"]["sequel.rb"] ||= IO.read(File.join(@root,"resources" ,"db_sequel_config.rb"))
-			app_tree["config"]["datamapper.rb"] ||= IO.read(File.join(@root,"resources" ,"db_dm_config.rb"))
-			app_tree["config"]["haml.rb"] ||= IO.read(File.join(@root,"resources" ,"haml_config.rb"))
-			app_tree["config"]["slim.rb"] ||= IO.read(File.join(@root,"resources" ,"slim_config.rb"))
-			app_tree["config"]["i18n.rb"] ||= IO.read(File.join(@root,"resources" ,"i18n_config.rb"))
-			app_tree["config"]["redis.rb"] ||= (IO.read(File.join(@root,"resources" ,"redis_config.rb"))).gsub('appsecret', "#{app_name}_#{SecureRandom.hex}")
+			app_tree["initialize"] ||= {}
+			app_tree["initialize"]["oauth.rb"] ||= IO.read(File.join(@root,"resources" ,"oauth_config.rb"))
+			app_tree["initialize"]["active_record.rb"] ||= IO.read(File.join(@root,"resources" ,"db_ac_config.rb"))
+			app_tree["initialize"]["sequel.rb"] ||= IO.read(File.join(@root,"resources" ,"db_sequel_config.rb"))
+			app_tree["initialize"]["datamapper.rb"] ||= IO.read(File.join(@root,"resources" ,"db_dm_config.rb"))
+			app_tree["initialize"]["haml.rb"] ||= IO.read(File.join(@root,"resources" ,"haml_config.rb"))
+			app_tree["initialize"]["slim.rb"] ||= IO.read(File.join(@root,"resources" ,"slim_config.rb"))
+			app_tree["initialize"]["i18n.rb"] ||= IO.read(File.join(@root,"resources" ,"i18n_config.rb"))
+			app_tree["initialize"]["redis.rb"] ||= (IO.read(File.join(@root,"resources" ,"redis_config.rb"))).gsub('appsecret', "#{app_name}_#{SecureRandom.hex}")
 
 			#set up database stub folders
 			app_tree["db"] ||= {}

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-    VERSION = "0.12.5"
+    VERSION = "0.12.6"
 end

data/plezi.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "iodine", "~> 0.1.8"
+  spec.add_dependency "iodine", "~> 0.1.9"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 

data/resources/code.rb

@@ -2,7 +2,7 @@
 # encoding: UTF-8
 
 # load all framework and gems
-load ::File.expand_path(File.join("..", "environment.rb"),  __FILE__)
+load ::File.expand_path(File.join("..", "initialize.rb"),  __FILE__)
 
 # set up the routes
 load ::File.expand_path(File.join("..", "routes.rb"),  __FILE__)

data/resources/{environment.rb → initialize.rb}

@@ -23,17 +23,17 @@ Bundler.require(:default, ENV['ENV'].to_s.to_sym)
 # require tilt/sass in a thread safe way (before multi-threading cycle begins)
 require 'tilt/sass' if defined?(::Slim) && defined?(::Sass)
 
-# set up Plezi's logs - Heroku logs to STDOUT, this machine logs to log file
-Iodine.logger = Logger.new(File.expand_path(File.join 'logs','server.log'))
+# # set up Plezi's logs to a log file?
+# Iodine.logger = Logger.new(File.expand_path(File.join 'logs','server.log')) unless ENV["DYNO"]
 
-# set the session token name
+# set the session token name?
 Iodine::Http.session_token = 'appname_uui'
 
 ## Allow forking? ONLY if your code is fully scalable across processes.
 # Iodine.processes = 4
 
 # load all config files
-Dir[File.join "{config}", "**" , "*.rb"].each {|file| load File.expand_path(file)}
+Dir[File.join "{initialize}", "**" , "*.rb"].each {|file| load File.expand_path(file)}
 
 # load all library files
 Dir[File.join "{lib}", "**" , "*.rb"].each {|file| load File.expand_path(file)}

data/resources/rakefile

@@ -1,8 +1,8 @@
 # load all framework and gems
-load ::File.expand_path(File.join("..", "environment.rb"),  __FILE__)
+load ::File.expand_path(File.join("..", "initialize.rb"),  __FILE__)
 
 # Make sure the server doesn't start
-NO_PLEZI_AUTO_START = true
+Iodine.protocol = false
 
 # create a default task
 desc "The default task will simply remind you to call 'rake -T'."

data/test/plezi_tests.rb

@@ -492,8 +492,8 @@ end
 # mem_print_proc.call
 # Plezi.run_every 30, &mem_print_proc
 
-require 'redis'
-ENV['PL_REDIS_URL'] ||= ENV['REDIS_URL'] || ENV['REDISCLOUD_URL'] || ENV['REDISTOGO_URL'] || "redis://test:1234@pub-redis-11008.us-east-1-4.5.ec2.garantiadata.com:11008"
+# require 'redis'
+# ENV['PL_REDIS_URL'] ||= ENV['REDIS_URL'] || ENV['REDISCLOUD_URL'] || ENV['REDISTOGO_URL'] || "redis://test:1234@pub-redis-11008.us-east-1-4.5.ec2.garantiadata.com:11008"
 # Plezi.processes = 3
 
 Plezi.threads = 9

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iodine
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -118,9 +118,9 @@ files:
 - resources/db_dm_config.rb
 - resources/db_sequel_config.rb
 - resources/en.yml
-- resources/environment.rb
 - resources/haml_config.rb
 - resources/i18n_config.rb
+- resources/initialize.rb
 - resources/mini_app.rb
 - resources/mini_exec.rb
 - resources/mini_welcome_page.html