o2webappizer 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02c23ef3fc19af92e7f285d73711543a87d22517
-  data.tar.gz: d174985c6804c1abb195abf2bc3e04e70dc19492
+  metadata.gz: 8458a9177ac1fde2b14481d8cdb15fb586186696
+  data.tar.gz: 76cafc2f6c00c10ed83a7093b6fcf2e1d139aa6b
 SHA512:
-  metadata.gz: b0a4875badbb9648858038147c76488341180f35a89758effe39cac4fee6f6bec1d2a0344b0cc4f925ccb06125ab850dc689feaeb5d820c17c3e9285a2877c80
-  data.tar.gz: c45d79daaa1dc620883d1733ca463f5cc49f886ee8173db23a681c108f9eed8f4460d5c0e466b175002bbb269947da75373466e1d9e9d49f4b9999c9420a5540
+  metadata.gz: 958c9232628423cf9f00805b5dfe4c093a92ded22fb1512725d2c2847bca025d09f92eac05f6a433c1d7597e04570552b66b509998137f864c63a420185ca129
+  data.tar.gz: 6c1c59f94d3b2d387df5d67d358b9beb9d05226cae937e3d4d86bafb0fb8c5c49f62fd8c439c3998fa448ea529745855fe00062fcf793d688c672ac0ac637e25

data/lib/o2webappizer/app_builder.rb

@@ -155,12 +155,17 @@ module O2webappizer
     def db_directory
       template  'db/seeds.rb'
       rake 'railties:install:migrations'
-      Dir['db/migrate/*.rb'].sort.last =~ /(\d{14})_/
-      next_timestamp = $1.to_i + 1
       copy_file 'db/migrate/001_add_mail_interceptors_to_settings.rb',
         "db/migrate/#{next_timestamp}_add_mail_interceptors_to_settings.rb"
     end
 
+    def next_timestamp
+      return @next_timestamp + 1 if @next_timestamp
+
+      Dir['db/migrate/*.rb'].sort.last =~ /(\d{14})_/
+      @next_timestamp = $1.to_i + 1
+    end
+
     def duplicate_locale(locale, name = nil)
       src_name = name ? "#{name}.en.yml" : "en.yml"
       dst_name = name ? "#{name}.#{locale}.yml" : "#{locale}.yml"

data/lib/o2webappizer/version.rb

@@ -1,5 +1,5 @@
 module O2webappizer
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
   RAILS_VERSION = "4.2"
 end

data/templates/Capfile

@@ -12,7 +12,6 @@ require 'capistrano/rails/migrations'
 require 'capistrano/o2web_recipes'
 require 'capistrano/nginx'
 require 'capistrano/passenger'
-require 'capistrano/faster_assets'
 require 'whenever/capistrano'
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined

data/templates/Gemfile.tt

@@ -7,8 +7,8 @@ gem 'rake', '~> 10.4'
 # Use postgresql as the database for Active Record
 gem 'pg', '~> 0.15'
 # Use SCSS for stylesheets
-gem 'sassc-rails', github: 'Shopify/sassc-rails', branch: 'sprockets-rails-3'
-gem 'sprockets-derailleur', github: 'bonobos/sprockets-derailleur'
+gem 'sassc-rails', github: 'sass/sassc-rails'
+gem 'sprockets-derailleur', github: 'o2web/sprockets-derailleur'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
@@ -35,7 +35,6 @@ group :development, :test do
   gem 'capistrano3-nginx', '~> 2.0'
   gem 'capistrano-passenger'
   gem 'capistrano-o2web-recipes', github: 'o2web/capistrano-o2web-recipes', branch: 'master'
-  gem 'capistrano-faster-assets', '~> 1.0'
   # TODO: gem 'capistrano-maintenance', '~> 1.0'
 
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring

data/templates/Vagrantfile.tt

@@ -69,6 +69,6 @@ Vagrant.configure(2) do |config|
   #   sudo apt-get update
   #   sudo apt-get install -y apache2
   # SHELL
-  config.vm.hostname = "<%= app_name.dasherize %>.dev"
+  config.vm.hostname = "<%= app_name.gsub('_', '-') %>.dev"
   # config.vm.synced_folders
 end

data/templates/config/deploy.rb.tt

@@ -17,31 +17,20 @@ set :rbenv_map_bins, %w{rake gem bundle ruby rails}
 set :passenger_restart_with_sudo, false
 set :passenger_restart_command, 'rbenv sudo passenger-config restart-app'
 
-# default to %W[system]
 <% if options.solidus? -%>
 set :files_public_dirs, fetch(:files_public_dirs, []).push(*%W[
   spree
 ])
 <% else -%>
 # set :files_public_dirs, fetch(:files_public_dirs, []).push(*%W[
-#   spree
 # ])
 <% end -%>
-# default to []
 # set :files_private_dirs, fetch(:files_private_dirs, []).push(*%W[
 # ])
 
 # set :nginx_workers, 1
-# default to %W[assets system]
-<% if options.solidus? -%>
-set :nginx_assets_dirs, fetch(:nginx_assets_dirs, []).push(*%W[
-  spree
-])
-<% else -%>
 # set :nginx_assets_dirs, fetch(:nginx_assets_dirs, []).push(*%W[
-#   spree
 # ])
-<% end -%>
 # set :nginx_max_body_size, '10m'
 
 set :pty, true
@@ -81,12 +70,4 @@ namespace :deploy do
       # end
     end
   end
-
-  after :deploy, :touch_cron_log do
-    on roles :app do
-      within shared_path do
-        execute :touch, 'log/cron.log'
-      end
-    end
-  end
 end

data/templates/config/deploy/vagrant.rb

@@ -11,7 +11,7 @@ set :admin_name, 'vagrant'
 # server 'example.com', user: 'deploy', roles: %w{app db web}, my_property: :my_value
 # server 'example.com', user: 'deploy', roles: %w{app web}, other_property: :other_value
 # server 'db.example.com', user: 'deploy', roles: %w{db}
-set :server, "#{fetch(:application).dasherize}.dev"
+set :server, "#{fetch(:application).gsub('_', '-')}.dev"
 server fetch(:server), user: fetch(:deployer_name), roles: %w[app web db]
 
 # role-based syntax

data/templates/config/nginx.app.conf.erb

@@ -17,49 +17,46 @@ server {
   listen 80 default_server;
   listen [::]:80 default_server ipv6only=on;
 
+  server_name <%= fetch(:server) %>;
+  passenger_enabled on;
+  rails_env <%= fetch(:stage) %>;
+  root <%= fetch(:deploy_to) %>/current/public;
+
+<% if fetch(:stage) == :production %>
   # SSL configuration
   #
   # listen 443 ssl default_server;
   # listen [::]:443 ssl default_server;
   #
+  # ssl_certificate /etc/ssl/certs/$server_name.chained.crt;
+  # ssl_certificate_key /etc/ssl/private/$server_name.key;
+  #
   # Self signed certs generated by the ssl-cert package
   # Don't use them in a production server!
   #
   # include snippets/snakeoil.conf;
-
-  server_name <%= fetch(:server) %>;
-  passenger_enabled on;
-  rails_env <%= fetch(:stage) %>;
-  root <%= fetch(:deploy_to) %>/current/public;
-
-<% if fetch(:stage) == :production %>
-  # listen 443 ssl;
-  # ssl_certificate /etc/ssl/certs/<%= fetch(:server) %>.chained.crt;
-  # ssl_certificate_key /etc/ssl/private/<%= fetch(:server) %>.key;
 <% end %>
 
   client_max_body_size <%= fetch(:nginx_max_body_size) %>;
 
-  error_page 500 502 503 504 /50x.html;
-  location = /50x.html {
-    root html;
-  }
+  error_page 404 /404.html;
+  error_page 422 /422.html;
+  error_page 500 502 503 504 /500.html;
 
-  # TODO: it doesn't work
-#  location ~ ^/(<%= fetch(:nginx_assets_dirs).join('|') %>)/  {
-#    root <%= fetch(:deploy_to) %>/current/public;
-#    gzip_static on;
-#    expires max;
-#    add_header Cache-Control public;
-#    break;
-#  }
-}
-
-server {
-  listen 80;
+  if ($host = www.$server_name) {
+    return 301 $scheme://$server_name$request_uri;
+  }
 
-  server_name www.<%= fetch(:server) %>;
-  return 301 $scheme://<%= fetch(:server) %>$request_uri;
+<% fetch(:nginx_assets_dirs).each do |dir| %>
+  location /<%= dir %>/ {
+    gzip_static on;
+    expires 1M;
+    add_header Cache-Control public;
+    add_header Last-Modified "";
+    add_header ETag "";
+    break;
+  }
+<% end %>
 }
 
 # Virtual Host configuration for example.com

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: o2webappizer
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Patrice Lebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -207,3 +207,4 @@ signing_key:
 specification_version: 4
 summary: Project Boilerplate Builder used by O2Web
 test_files: []
+has_rdoc: