capistrano-o2web-recipes 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9904d22fc53f831320b3f694dc6c87b22035421
-  data.tar.gz: abf945f754c347cebc8f68073e4f33801708f224
+  metadata.gz: b0e3597cb961fe40f1c5aa5341cc3af65c60d2fe
+  data.tar.gz: 14f87363001d4e0f30fbb84244412f6901d56252
 SHA512:
-  metadata.gz: fd271f0ac60af4a8b208452e63c821dcab3eff6a6aa840a7f0d302d9df5394c646d3e9ebede13ca67159de2461dcdaf4cb77cc01794060104d23fdb2a820e6c8
-  data.tar.gz: 66fb60aad3e5fc50bfe9aeb9e4eb0caefca05c7005114e6cd75aee6ba6463421ccb6ec66f6af6da73e48f116b6aea91f82aa6d824e8c4f0b5984282f1629cc50
+  metadata.gz: a19669eba1b9efdc809d7a8f05c111d63b79d2aa4a5032572cf343efa365edc519bf6d9b01453915f1a90e7e38ddb02361931fce8a19baea13ad3ae8d3520a68
+  data.tar.gz: 2dcf021595e88ae0d1ef3764c6dc2968a71a5e5348d14ce9ec3c016451894a71e0ff30971760bb61f688588defe4fb5bbf1d3ddc725535edd683879c4621e2b7

data/README.md

@@ -48,7 +48,6 @@ Configurations can be customized in your deploy file with:
 
 ```ruby
 set :server, 'example.com'
-set :admin_name, 'admin'
 set :deployer_name, 'deployer'
 # default to %W[system]
 set :files_public_dirs, fetch(:files_public_dirs, []).push(*%W[

data/capistrano-o2web-recipes.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activesupport', "~> #{Capistrano::O2webRecipes::RAILS_VERSION}", ">= #{Capistrano::O2webRecipes::RAILS_VERSION}.0"
   gem.add_dependency "capistrano", ">= 3.1"
   gem.add_dependency "yaml_db"
   gem.add_development_dependency "rake"

data/lib/capistrano/o2web_recipes/version.rb

@@ -1,6 +1,6 @@
 module Capistrano
   module O2webRecipes
-    VERSION = "0.0.4"
+    VERSION = "0.0.6"
     RAILS_VERSION = "4.2"
   end
 end

data/lib/capistrano/tasks/o2web_recipes.rake

@@ -1,5 +1,39 @@
 require 'erb'
-require 'active_support/all'
+
+Rake::Task["deploy:compile_assets"].clear
+
+namespace :deploy do
+  desc 'Compile assets'
+  task :compile_assets => [:set_rails_env] do
+    # invoke 'deploy:assets:precompile'
+    invoke 'deploy:assets:precompile_local'
+    invoke 'deploy:assets:backup_manifest'
+  end
+
+  namespace :assets do
+    desc "Precompile assets locally and then rsync to web servers"
+    task :precompile_local do
+      # compile assets locally
+      run_locally do
+        DB = YAML.load_file('config/database.yml')['development']
+        db_connection = "#{DB['adapter']}://#{DB['username']}:#{DB['password']}@#{DB['host']}/#{DB['database']}"
+        execute "RAILS_ENV=#{fetch(:stage)} DATABASE_URL=#{db_connection} bundle exec rake assets:precompile"
+      end
+
+      # rsync to each server
+      local_dir = "./public/assets/"
+      on roles( fetch(:assets_roles, [:web]) ) do
+        # this needs to be done outside run_locally in order for host to exist
+        remote_dir = "#{host.user}@#{host.hostname}:#{release_path}/public/assets/"
+
+        run_locally { execute "rsync -av --delete #{local_dir} #{remote_dir}" }
+      end
+
+      # clean up
+      run_locally { execute "rm -rf #{local_dir}" }
+    end
+  end
+end
 
 namespace :load do
   task :defaults do
@@ -120,9 +154,9 @@ end
 namespace :nginx do
   def upload(server, source, destination)
     File.open(source, 'w') do |f|
-      f.puts ERB.new(File.read("#{source}.erb")).result
+      f.puts ERB.new(File.read("#{source}.erb"), nil, '-').result
     end
-    system "rsync --rsync-path='sudo rsync' -avzO -e 'ssh -p #{fetch(:port)}' '#{source}' #{fetch(:admin_name)}@#{server.hostname}:#{destination}"
+    system "rsync --rsync-path='sudo rsync' -avzO -e 'ssh -p #{fetch(:port)}' '#{source}' #{fetch(:deployer_name)}@#{server.hostname}:#{destination}"
     FileUtils.rm_f source
   end
 

data/lib/generators/capistrano/o2web_recipes/install/templates/config/nginx.app.conf.erb

@@ -36,6 +36,11 @@ server {
   # listen 443 ssl;
   # ssl_certificate /etc/ssl/certs/<%= fetch(:server) %>.chained.crt;
   # ssl_certificate_key /etc/ssl/private/<%= fetch(:server) %>.key;
+  
+  # redirect https://www.server_name.com to https://server_name.com
+  #if ($host = www.$server_name) {
+  #  rewrite ^(.*) https://$server_name$request_uri? permanent;
+  #}
 <% end -%>
 
   client_max_body_size <%= fetch(:nginx_max_body_size) %>;

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-o2web-recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Patrice Lebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement