visionbundles 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53b40baa3049683b255ab464b4c2b20b7d20a521
-  data.tar.gz: 4d48932c6fd06fd1cdc1e984ac7a1de2ef6e8427
+  metadata.gz: 2ae47de699ad134f9191cbfd5de8c035644219bc
+  data.tar.gz: 671f5c4e28c64d66678cead85668a414049badec
 SHA512:
-  metadata.gz: 21bc85262c75ae61dc88fcdbfc748f4897f1761bb18a2a29c7725f2e484607be71cc7cc5eed2c963ffa66a6ac4c76af6fdf9e97415f14aa32715860bef3a314d
-  data.tar.gz: fc82c46c2225134070f7fb998f204674043c75c39a7f7f5b71f3c7a3f2e18cfaa5860b40fd6742dd7e54af53e5e61341223dc9800d93905d570c14383a165a38
+  metadata.gz: 6fc836a2cee8511bb7e7eb3981974aa1c4b6adda1f24abcf98761f4f19afcd8f4e905ba89214547138161c1491167f20f9cc8aa54159c79847954664253513cf
+  data.tar.gz: cf886aa2ce40c0fc24833c855bd4e00538b611ceb7065e32025da979f49b63fdae12c6015cfdc11eebcfd068b2321cb28e281a54c01a4b43629034d19e7cc35c

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.3.2
+
+* Refactor the secret, db tasks in recipes, preconfig instead.
+* Refactor and recipes file structure.
+* Add an executable shell script to "/init.d/#{application} start|stop|restart", when server boot will run app.
+
 0.3.1
 
 * Resolve wrong assets host when compile assets locally. dynamic get `Application.assets.version` from remote and set the same value in local for compile assets [sprockets-rails](https://github.com/rails/sprockets-rails/blob/53f640ed38a509253e869305eb4de7ce3d5cb776/lib/sprockets/railtie.rb#L74)

data/lib/tasks/assets.rake

@@ -1,12 +1,11 @@
 namespace :assets do
-  task :remote_assets_version => :environment do
-    puts Rails.application.assets.version
+  task :remote_assets_host => :environment do
+    puts Rails.application.config.action_controller.asset_host
   end
 
-  task :precompile_locally => :environment do
-    Rails.application.assets.instance_eval {
-      @version = ENV['remote_assets_version']
-    }
+  task :precompile_locally do
+    ENV['asset_host'] = ENV['remote_assets_host']
+    Rake::Task['environment'].invoke
     Rake::Task['assets:precompile'].invoke
   end
 end

data/lib/visionbundles/recipes/fast_assets.rb

@@ -26,9 +26,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Precompile assets locally"
       task :precompile, only: { primary: true }, on_no_matching_servers: :continue do
         server = find_servers(roles: :app, except: { no_release: true }).first
-        remote_assets_version = capture("cd #{release_path}; RAILS_ENV=#{precompile_env.to_s.shellescape} bundle exec rake assets:remote_assets_version", hosts: server.to_s).strip
-        puts remote_assets_version.inspect
-        run_locally "#{precompile_cmd} remote_assets_version=#{remote_assets_version}"
+        remote_assets_host = capture("cd #{release_path}; RAILS_ENV=#{precompile_env.to_s.shellescape} bundle exec rake assets:remote_assets_host", hosts: server.to_s).strip
+        run_locally "#{precompile_cmd} remote_assets_host=#{remote_assets_host}"
       end
 
       desc "Sync manifest on app servers"

data/lib/visionbundles/recipes/puma.rb

@@ -6,23 +6,41 @@ Capistrano::Configuration.instance(:must_exist).load do
   set_default(:puma_thread_max, 16)
   set_default(:puma_workers, 0)
   set_default(:puma_config_template) { "../templates/puma/config.erb" }
+  set_default(:service_template) { "../templates/puma/service.erb" }
   set_default(:puma_preload_app) { false }
   set_default(:puma_prune_bundler) { false }
   set_default(:puma_worker_timeout) { nil }
   set_default(:puma_on_boot_connection_to_activerecord) { nil }
+  set_default(:puma_reload_gem_when_restart) { true }
 
   namespace :puma do
     desc "Setup Puma Scripts"
     task :setup, roles: :app do
+      # Copy configuration template to remote server
       info '[Puma] copying the config'
       template puma_config_template, "#{shared_path}/puma", "config.rb"
+
+      # Copy service launcher to remote server "init.d/"
+      template service_template, "#{shared_path}/puma", "service"
+      service_remote_path = "#{shared_path}/puma/service"
+      run "chmod +x #{service_remote_path}"
+      sudo "rm -rf /etc/init.d/#{application}"
+      sudo "ln -s #{service_remote_path} /etc/init.d/#{application}"
+
+      # Setup app as a daemon
+      sudo "update-rc.d #{application} defaults"
     end
     after 'deploy:setup', 'puma:setup'
 
-    %w[start stop restart stats status phased-restart].each do |command|
+    desc "start puma"
+    task :start, roles: :app do
+      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec puma -C #{shared_path}/puma/config.rb start"
+    end
+
+    %w[stop restart stats status phased-restart].each do |command|
       desc "#{command} puma server"
       task command, roles: :app do
-        run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec pumactl -F #{shared_path}/puma/config.rb #{command}"
+        run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec pumactl -S #{shared_path}/pids/puma.state #{command}"
       end
     end
   end

data/lib/visionbundles/recipes/secret.rb

@@ -1,15 +1,18 @@
 Capistrano::Configuration.instance(:must_exist).load do
   begin
     require 'rails'
-    major, minor = Rails.gem_version.split(',').map(&:to_i)
-    if major == 4 && [0, 1].include?(minor)
-      source, desc = case minor
-      when 0 then; ['secret_token.rb', 'config/initializers/secret_token.rb']
-      when 1 then; ['secrets.yml', 'config/config/secrets.yml']
-      end
-      preconfig_files(source => desc)
-    else
-      raise 'Only support rails 4.1.x and 4.0.x'
+  rescue e
+    raise 'require rails faild'
+  end
+
+  major, minor = Rails::VERSION::STRING.split('.').map(&:to_i)
+  if major == 4 && [0, 1].include?(minor)
+    source, desc = case minor
+    when 0 then; ['secret_token.rb', 'config/initializers/secret_token.rb']
+    when 1 then; ['secrets.yml', 'config/secrets.yml']
     end
-  rescue; end
-end
+    preconfig_files(source => desc)
+  else
+    raise 'Only support rails 4.1.x and 4.0.x'
+  end
+end

data/lib/visionbundles/templates/nginx/nginx.conf.erb

@@ -22,7 +22,7 @@ server {
 
   root <%= "#{deploy_to}/current/public" %>;
 
-  location ^~ /assets/ {
+  location ^~ /assets/* {
     gzip_static on;
     expires max;
     add_header Cache-Control public;

data/lib/visionbundles/templates/puma/config.erb

@@ -20,13 +20,13 @@ directory '<%= app_root %>'
 #
 # The default is “config.ru”.
 #
-# rackup '/u/apps/lolcat/config.ru'
+rackup '<%= "#{app_root}/config.ru" %>'
 
 # Set the environment in which the rack's app will run. The value must be a string.
 #
 # The default is “development”.
 #
-# environment 'production'
+environment '<%= rails_env %>'
 
 # Daemonize the server into the background. Highly suggest that
 # this be combined with “pidfile” and “stdout_redirect”.
@@ -38,12 +38,12 @@ daemonize
 
 # Store the pid of the server in the file at “path”.
 #
-pidfile "<%= app_root %>/tmp/pids/puma.pid"
+pidfile "<%= shared_path %>/pids/puma.pid"
 
 # Use “path” as the file to store the server info state. This is
 # used by “pumactl” to query and control the server.
 #
-# state_path '/u/apps/lolcat/tmp/pids/puma.state'
+state_path "<%= shared_path %>/pids/puma.state"
 
 # Redirect STDOUT and STDERR to files specified. The 3rd parameter
 # (“append”) specifies whether the output is appended, the default is
@@ -98,9 +98,13 @@ threads <%= puma_thread_min %>, <%= puma_thread_max %>
 #
 # This can be called multiple times to add code each time.
 #
-# on_restart do
-#   puts 'On restart...'
-# end
+
+<% if puma_reload_gem_when_restart %> 
+  on_restart do
+    puts 'Refreshing Gemfile'
+    ENV["BUNDLE_GEMFILE"] = "<%= "#{current_path}/Gemfile" %>"
+  end
+<% end %>
 
 # Command to use to restart puma. This should be just how to
 # load puma itself (ie. 'ruby -Ilib bin/puma'), not the arguments

data/lib/visionbundles/templates/puma/service.erb

@@ -0,0 +1,19 @@
+#! /bin/sh
+
+case "$1" in
+  <% %w(stop restart).each do |command| %>
+  <%= command %>)
+    su -l -c "cd <%= current_path %> && RAILS_ENV=<%= rails_env %> bundle exec pumactl -S <%= shared_path %>/pids/puma.state <%= command %>" <%= user %>
+    ;;
+  <% end %>
+  start)
+    echo "Starting <%= application%> application"
+    su -l -c "cd <%= current_path %> && RAILS_ENV=<%= rails_env %> bundle exec puma -C <%= shared_path %>/puma/config.rb start" <%= user %>
+    ;;
+  *)
+    echo "Usage: /etc/init.d/<%= application %> {start|stop|restart}"
+    exit 1
+    ;;
+esac
+
+exit 0

data/lib/visionbundles/version.rb

@@ -1,3 +1,3 @@
 module Visionbundles
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visionbundles
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Eddie Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asset_sync
@@ -108,6 +108,7 @@ files:
 - lib/visionbundles/recipes/valid.rb
 - lib/visionbundles/templates/nginx/nginx.conf.erb
 - lib/visionbundles/templates/puma/config.erb
+- lib/visionbundles/templates/puma/service.erb
 - lib/visionbundles/version.rb
 - todo.md
 - visionbundles.gemspec