capistrano-laravel-lazy 0.0.3 → 0.0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b441d61f122b8718af54a5e3add2b942dc73c2b
-  data.tar.gz: 1ba75866b5bf3280972f03df3b4f9af0574c1fd0
+  metadata.gz: 78a03e34abf0a91788a16a1e87da828558bae481
+  data.tar.gz: 477fded8b29ddb6ac042f7864fa9e5668a80a283
 SHA512:
-  metadata.gz: 477c2a3fb627e4682492e5a9dcb7fe6c9794fb62bf68b78fc0b3ead7b5ee0f25477224e1564a7a9a0a98c52e0eb088bb568bd747934806e923ab551e12335b6c
-  data.tar.gz: f691ac7154afa74909803784ba8270ff8ffc43e93b523fc0e3176abcf66e7dff823b2498007613c3d8b2779d030eb19c0bb44f420563b7a18ed0cf38c68e774d
+  metadata.gz: afce59e034121783f392c3cf7dd03a1e3abc6a005e12e296bca24ceb8a35f48f8b2b1083004c371cfb7172671899f8792df0bde1ccf506e2c98481c2e2e34966
+  data.tar.gz: 8d412ac87d5332ed648f9862d03c3bf9ec4e125d20bd5418f622280072626c99dc59df055512080b5791d58e2179c874c3be6bc988f785759a83ee7dff5b7ae1

data/capistrano-laravel.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-laravel-lazy'
-  spec.version       = '0.0.3'
+  spec.version       = '0.0.3.2'
   spec.authors       = ['Ivan Chou', 'Peter Mitchell', 'Andrew Miller']
   spec.email         = ['yiichou@gmail.com', 'peterjmit@gmail.com', 'ikari7789@yahoo.com']
   spec.description   = %q{Laravel specific deployment options for Capistrano 3.x}

data/lib/capistrano/laravel.rb

@@ -1,6 +1,4 @@
 require "capistrano/composer"
 require "capistrano/file-permissions"
 
-load File.expand_path("../tasks/laravel.rake", __FILE__)
-load File.expand_path("../tasks/php_fpm.rake", __FILE__)
-load File.expand_path("../tasks/setup_config.rake", __FILE__)
+Dir[File.expand_path('../tasks/*.rake', __FILE__)].each { |file| load file }

data/lib/capistrano/tasks/composer.rake

@@ -0,0 +1,9 @@
+namespace :composer do
+  desc 'Change the packagist repo to speed composer up'
+  task :set_repo do
+    unless fetch(:packagist_repo, '').empty?
+      invoke 'composer:run', :config, '-g', 'repo.packagist', :composer, fetch(:packagist_repo)
+    end
+  end
+
+end

data/lib/capistrano/tasks/laravel.rake

@@ -15,7 +15,6 @@ namespace :load do
     set :laravel_set_acl_paths, true
     set :laravel_create_linked_acl_paths, true
     set :laravel_server_user, 'www-data'
-    set :laravel_phplint, false
 
     # Folders to link between releases
     set :laravel_4_linked_dirs, [
@@ -29,33 +28,33 @@ namespace :load do
     ]
 
     # Folders to set permissions on based on laravel version
-    set :laravel_4_acl_paths, [
-      'app/storage',
-      'app/storage/cache',
-      'app/storage/logs',
-      'app/storage/meta',
-      'app/storage/sessions',
-      'app/storage/views'
-    ]
-    set :laravel_5_acl_paths, [
-      'storage',
-      'storage/app',
-      'storage/framework',
-      'storage/framework/cache',
-      'storage/framework/sessions',
-      'storage/framework/views',
-      'storage/logs'
-    ]
-    set :laravel_5_1_acl_paths, [
-      'bootstrap/cache',
-      'storage',
-      'storage/app',
-      'storage/framework',
-      'storage/framework/cache',
-      'storage/framework/sessions',
-      'storage/framework/views',
-      'storage/logs'
-    ]
+    set :laravel_4_acl_paths, %w(
+      app/storage
+      app/storage/cache
+      app/storage/logs
+      app/storage/meta
+      app/storage/sessions
+      app/storage/views
+    )
+    set :laravel_5_acl_paths, %w(
+      storage
+      storage/app
+      storage/framework
+      storage/framework/cache
+      storage/framework/sessions
+      storage/framework/views
+      storage/logs
+     )
+    set :laravel_5_1_acl_paths, %w(
+      bootstrap/cache
+      storage
+      storage/app
+      storage/framework
+      storage/framework/cache
+      storage/framework/sessions
+      storage/framework/views
+      storage/logs
+    )
   end
 end
 
@@ -63,17 +62,15 @@ namespace :laravel do
   desc 'Set the ACL for the web user based on Laravel version.'
   task :configure_folders do
     laravel_version = fetch(:laravel_version)
-    laravel_linked_dirs = []
-    laravel_acl_paths = []
     if laravel_version < 5 # Laravel 4
-      laravel_linked_dirs = fetch(:laravel_4_linked_dirs)
-      laravel_acl_paths   = fetch(:laravel_4_acl_paths)
+      laravel_linked_dirs = fetch(:laravel_4_linked_dirs, [])
+      laravel_acl_paths   = fetch(:laravel_4_acl_paths, [])
     elsif laravel_version < 5.1 # Laravel 5
-      laravel_linked_dirs = fetch(:laravel_5_linked_dirs)
-      laravel_acl_paths   = fetch(:laravel_5_acl_paths)
+      laravel_linked_dirs = fetch(:laravel_5_linked_dirs, [])
+      laravel_acl_paths   = fetch(:laravel_5_acl_paths, [])
     else # Laravel 5.1 or greater
-      laravel_linked_dirs = fetch(:laravel_5_1_linked_dirs)
-      laravel_acl_paths   = fetch(:laravel_5_1_acl_paths)
+      laravel_linked_dirs = fetch(:laravel_5_1_linked_dirs, [])
+      laravel_acl_paths   = fetch(:laravel_5_1_acl_paths, [])
     end
 
     if fetch(:laravel_set_linked_dirs)
@@ -170,16 +167,10 @@ namespace :laravel do
     end
   end
 
-  desc 'Check syntax error with PHPLint.'
-  task :phplint do
-    invoke 'laravel:artisan', :phplint if fetch(:laravel_phplint)
-  end
-
   before 'deploy:starting', 'laravel:configure_folders'
   after 'deploy:symlink:shared', 'laravel:create_linked_acl_paths'
   after 'deploy:symlink:shared', 'deploy:set_permissions:acl'
   # after 'deploy:symlink:shared', 'laravel:upload_dotenv_file'
-  before 'deploy:updated', 'laravel:phplint'
   after 'deploy:updated', 'laravel:optimize_release'
 
 end

data/lib/capistrano/tasks/phplint.rake

@@ -0,0 +1,26 @@
+namespace :test do
+
+  desc 'Check syntax error with PHPLint.'
+  task :phplint do
+    on release_roles :all do
+      within release_path do
+        next unless fetch(:enable_phplint, false)
+
+        if test('[ -f ./vendor/bin/phplint ]')
+          phplint_exec = './vendor/bin/phplint'
+        elsif test('[ -f ~/.composer/vendor/bin/phplint ]')
+          phplint_exec = '~/.composer/vendor/bin/phplint'
+        else
+          warn 'command not found: phplint, please install phplint first'
+          info '  How to install phplint:'
+          info '  composer [global] require overtrue/phplint'
+          next
+        end
+
+        execute phplint_exec, './', '--exclude=vendor'
+      end
+    end
+  end
+
+  before 'deploy:updated', 'test:phplint'
+end

data/lib/capistrano/tasks/setup_config.rake

@@ -2,7 +2,7 @@ namespace :load do
   task :defaults do
     set :server_name, 'localhost'
     set :nginx_user, 'nginx'
-    set :bind, "unix:/run/php/#{fetch(:php_fpm, 'php5-fpm')}.sock"
+    set :bind, "unix:/run/php/#{fetch(:full_app_name)}.sock"
   end
 end
 
@@ -14,6 +14,7 @@ namespace :deploy do
   
   def upload_shared
     local_shared_path = 'config/deploy/shared'
+    return unless File.exist? local_shared_path
     
     files = Dir.entries local_shared_path
     files.shift(2)
@@ -42,38 +43,50 @@ namespace :deploy do
   end
 
   def upload_config(conf, path)
-    if File.exist? "config/templates/#{conf}.erb"
-      conf_file = render_template "config/templates/#{conf}.erb"
-    elsif File.exist? "config/templates/#{conf}"
-      conf_file = "config/templates/#{conf}"
+    return if path.to_s.empty?
+
+    if File.exist? "config/deploy/templates/#{conf}.erb"
+      conf_file = render_template "config/deploy/templates/#{conf}.erb"
+    elsif File.exist? "config/deploy/templates/#{conf}"
+      conf_file = "config/deploy/templates/#{conf}"
     else
       conf_file = render_template File.expand_path("../../templates/#{conf}.erb", __FILE__)
     end
 
-    tmp_target = "/tmp/#{fetch(:application)}/#{fetch(:full_app_name)}.#{conf}"
+    execute :mkdir, '-p', "#{fetch(:tmp_dir)}/#{fetch(:application)}/"
+    tmp_target = "#{fetch(:tmp_dir)}/#{fetch(:application)}/#{fetch(:full_app_name)}.#{conf}"
     target = File.join(path, "#{fetch(:full_app_name)}.conf")
     upload! conf_file, tmp_target
     execute :sudo, :mv, "-n #{tmp_target} #{target}"
     info "Compile & upload #{conf} to: #{target}"
   end
 
+  def install_phplint
+    execute :composer, :global, :require, 'overtrue/phplint'
+  end
+
   desc 'setup config to prepare deploying project.'
   task :setup_config do
     on release_roles :all do
       execute :mkdir, "-p #{shared_path}"
 
       # compile & upload all the config files
-      upload_shared if File.exist? 'config/deploy/shared'
+      upload_shared
 
       # Compile & upload nginx config
-      upload_config 'nginx.conf', fetch(:nginx_server_path) unless fetch(:nginx_server_path).to_s.empty?
+      upload_config 'nginx.conf', fetch(:nginx_server_path)
 
       # Compile & upload php-fpm config
-      upload_config 'fpm.conf', fetch(:fpm_pool_path) unless fetch(:fpm_pool_path).to_s.empty?
+      upload_config 'fpm.conf', fetch(:fpm_pool_path)
+
+      # Change composer packagist repo
+      invoke 'composer:set_repo'
+
+      install_phplint if fetch(:enable_phplint)
 
       # Upload dotenv file to shared path
-      if fetch(:laravel_version) >= 5
-        unless fetch(:laravel_dotenv_file).empty?
+      if fetch(:laravel_version) >= 5 && fetch(:laravel_dotenv_file, '') != ''
+        unless test("[ -e #{shared_path}/.env ]")
           upload! fetch(:laravel_dotenv_file), "#{shared_path}/.env"
         end
       end

data/lib/capistrano/templates/deploy.rb.erb

@@ -20,7 +20,7 @@ set :repo_url, 'git@example.com:me/my_repo.git'
 # set :log_level, :debug
 
 # Default value for :pty is false
-set :pty, true
+# set :pty, false
 
 # Default value for :linked_files is []
 set :linked_files, ['.env']
@@ -48,8 +48,11 @@ set :laravel_version, 5.2
 # Default value for :laravel_server_user is true
 # set :laravel_server_user, 'www-data'
 
-# Default value for :laravel_phplint is false
-# set :laravel_phplint, false
+# Default value for :enable_phplint is false
+# set :enable_phplint, false
+
+# Default value for :packagist_repo is empty
+# set :packagist_repo, 'https://packagist.phpcomposer.com'
 
 # See more configuration at https://github.com/capistrano/laravel.
 

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

@@ -16,12 +16,11 @@ server {
     access_log   /data/logs/nginx/<%= fetch(:application) %>.log   customized_<%= fetch(:application) %>;
     error_log    /data/logs/nginx/<%= fetch(:application) %>.error.log warn;
 
-    # 修改为 Laravel 转发规则
     location / {
         try_files $uri $uri/ /index.php?$query_string;
     }
 
-    # PHP 支持
+    # To PHP-FPM
     location ~ \.php$ {
         try_files  $uri  /index.php  =404;
         fastcgi_split_path_info  ^(.+\.php)(/.+)$;

data/lib/capistrano/templates/stage.rb.erb

@@ -26,7 +26,7 @@ set :enable_ssl, false
 # Which user to run nginx, default: nginx
 # set :nginx_user, 'nginx'
 
-# Bind for php-fpm, default: unix:/run/php/#{fetch(:php_fpm)}.sock
+# Bind for php-fpm, default: unix:/run/php/#{fetch(:full_app_name)}.sock
 # set :bind, '127.0.0.1:8080'
 
 # Where to set fpm pool config, default: nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-laravel-lazy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.3.2
 platform: ruby
 authors:
 - Ivan Chou
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -103,8 +103,10 @@ files:
 - lib/capistrano/laravel.rb
 - lib/capistrano/laravel/helpers.rb
 - lib/capistrano/laravel/version.rb
+- lib/capistrano/tasks/composer.rake
 - lib/capistrano/tasks/laravel.rake
 - lib/capistrano/tasks/php_fpm.rake
+- lib/capistrano/tasks/phplint.rake
 - lib/capistrano/tasks/setup_config.rake
 - lib/capistrano/templates/Capfile
 - lib/capistrano/templates/deploy.rb.erb