capistrano-laravel 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee0bf90a7ab76849e5fff0041f634edd9af8c4ca
-  data.tar.gz: f6a48eb6e13f4db01ef2e5893fc754bbfba8e066
+  metadata.gz: 57361f1218c72a8688d1ea371db0bfe54f623b11
+  data.tar.gz: 890442201a4da38920b92499ecd834c19944add2
 SHA512:
-  metadata.gz: 969abed753e724cd4647d719f9c40af8a04465fe0ceb8d20a2c6a4c927b9ad121b29e1c184c9981f491f526641548b2b3c38e4b1fd0147ede5da4ed8f9cf46d5
-  data.tar.gz: 1a4ec1e40ac6a1626f13357fa47339468a712072999349da5dcb6b4f1a6fdc41144a3a7eb997644d0c7f042e22843e5d5c84438fd52353f313004a34a460a2c9
+  metadata.gz: ac6d6633fc5775870b924db24a641ae518e1624d5d8f9eb26d77312e1108debf3a9e3612a3aff586148320f68b584129655accd8101af65df9dbc0d4cf88b505
+  data.tar.gz: f921771e5647e2c368437499def0972b1b6fa4ee5e2a232fb24fff35baef7e25771732c34a11757001a6749981c116ecf62f2b216add54044867ea3d99abe828

data/.editorconfig

@@ -0,0 +1,18 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.rake]
+indent_size = 2
+
+[*.rb]
+indent_size = 2

data/.gitignore

@@ -1 +1,9 @@
-*.gem
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.3.1
+before_install: gem install bundler -v 1.13.2

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in capistrano-bundler.gemspec
+# Specify your gem's dependencies in capistrano-laravel.gemspec
 gemspec

data/LICENSE

@@ -1,20 +1,21 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Peter Mitchell (peterjmit@gmail.com)
+Copyright (c) 2016 Peter Mitchell (peterjmit@gmail.com)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,10 +1,10 @@
-# Capistrano::laravel
+# Capistrano::Laravel
 
 Deploy Laravel applications with Capistrano v3.*
 
 ## Installation
 
-Add this line to your application's Gemfile:
+If managing your Capistrano deploy as a ruby project, add this line to your application's Gemfile:
 
 ```ruby
 gem 'capistrano', '~> 3.0.0'
@@ -13,11 +13,36 @@ gem 'capistrano-laravel'
 
 And then execute:
 
-    $ bundle
+```shell
+bundle
+```
 
 Or install it yourself as:
 
-    $ gem install capistrano-laravel
+```shell
+gem install capistrano-laravel
+```
+
+## Setting up Capistrano
+
+After installing Capistrano, you can use it to initialize a skeleton configuration. To setup Capistrano, please follow the documentation provided on their website:
+
+http://capistranorb.com/documentation/getting-started/preparing-your-application/
+
+This will generate the following files:
+
+```
+.
+├── Capfile                # Used to manage Capistrano and its dependencies
+├── config
+│   ├── deploy
+│   │   ├── production.rb  # Configuration for production environment
+│   │   └── staging.rb     # Configuration for staging environment
+│   └── deploy.rb          # Common configuration for all environments
+└── lib
+    └── capistrano
+        └── tasks          # Customized Capistrano tasks for your project
+```
 
 ## Usage
 
@@ -32,76 +57,140 @@ require 'capistrano/laravel'
 The gem makes the following configuration variables available (shown with defaults).
 
 ```ruby
-# Which roles to execute commands on.
+# Which roles to consider as laravel roles
 set :laravel_roles, :all
 
-# Determines which operations to perform based on which version
-# of the Laravel framework your project is using.
-set :laravel_version, 5.1
+# The artisan flags to include on artisan commands by default
+set :laravel_artisan_flags, "--env=#{fetch(:stage)}"
+
+# Which roles to use for running migrations
+set :laravel_migration_roles, :all
 
-# If using Laravel 5+, a dotenv file is used for environment configuration.
-# This variable uploads the given file from the the host to the guest.
+# The artisan flags to include on artisan commands by default when running migrations
+set :laravel_migration_artisan_flags, "--force --env=#{fetch(:stage)}"
+
+# The version of laravel being deployed
+set :laravel_version, 5.3
+
+# Which dotenv file to transfer to the server
 set :laravel_dotenv_file, './.env'
 
-# Flags to add to artisan calls.
-set :laravel_artisan_flags, "--env=production"
+# The user that the server is running under (used for ACLs)
+set :laravel_server_user, 'www-data'
+
+# Ensure the dirs in :linked_dirs exist?
+set :laravel_ensure_linked_dirs_exist, true
 
-# Will set linked folders based on your Laravel version
-set :laravel_set_linked_dirs, false
+# Link the directores in laravel_linked_dirs?
+set :laravel_set_linked_dirs, true
 
-# Will set ACL paths based on your Laravel version
+# Linked directories for a standard Laravel 4 application
+set :laravel_4_linked_dirs, [
+  'app/storage'
+]
+
+# Linked directories for a standard Laravel 5 application
+set :laravel_5_linked_dirs, [
+  'storage'
+]
+
+# Ensure the paths in :file_permissions_paths exist?
+set :laravel_ensure_acl_paths_exist, true
+
+# Set ACLs for the paths in laravel_acl_paths?
 set :laravel_set_acl_paths, true
 
-# Which user to set ACL permissions for.
-set :laravel_server_user, "www-data"
+# Paths that should have ACLs set for a standard Laravel 4 application
+set :laravel_4_acl_paths, [
+  'app/storage',
+  'app/storage/public',
+  'app/storage/cache',
+  'app/storage/logs',
+  'app/storage/meta',
+  'app/storage/sessions',
+  'app/storage/views'
+]
+
+# Paths that should have ACLs set for a standard Laravel 5 application
+set :laravel_5_acl_paths, [
+  'bootstrap/cache',
+  'storage',
+  'storage/app',
+  'storage/app/public',
+  'storage/framework',
+  'storage/framework/cache',
+  'storage/framework/sessions',
+  'storage/framework/views',
+  'storage/logs'
+]
 ```
 
 ### Tasks
 
-The tasks are more or less automatic and are executed as follows:
+The following tasks are added to your deploy automagically when adding capistrano/laravel to your deploy.
 
 ```ruby
-  before "deploy:starting", :prepare_laravel do
-    invoke "laravel:configure_folders"
-  end
-
-  before "deploy:updated", :laravel_tasks do
-    invoke "laravel:upload_dotenv_file"
-    invoke "laravel:optimize_release"
-    invoke "laravel:create_acl_paths"
-    invoke "deploy:set_permissions:acl"
-  end
+before 'deploy:starting', 'laravel:resolve_linked_dirs'
+before 'deploy:starting', 'laravel:resolve_acl_paths'
+after  'deploy:starting', 'laravel:ensure_linked_dirs_exist'
+after  'deploy:starting', 'laravel:ensure_acl_paths_exist'
+after  'deploy:updating', 'deploy:set_permissions:acl'
+before 'composer:run',    'laravel:upload_dotenv_file'
+after  'composer:run',    'laravel:storage_link'
+after  'composer:run',    'laravel:optimize'
 ```
 
 #### Task Descriptions
 
 ```ruby
-# Execute an artisan command
-invoke "laravel:artisan", "command"
+# Determine which folders, if any, to use for linked directories.
+invoke 'laravel:resolve_linked_dirs'
+
+# Determine which paths, if any, to have ACL permissions set.
+invoke 'laravel:resolve_acl_paths'
+
+# Ensure that linked dirs exist.
+invoke 'laravel:ensure_linked_dirs_exist'
+
+# Ensure that ACL paths exist.
+invoke 'laravel:ensure_acl_paths_exist'
+
+# Upload dotenv file for release.
+invoke 'laravel:upload_dotenv_file'
 
-# Run any optimization commands
-invoke "laravel:optimize_release"
+# Execute a provided artisan command.
+# Replace :command_name with the command to execute
+invoke 'laravel:artisan[:command_name]'
 
-# Configure linked dirs/acl dirs
-invoke "laravel:configure_folders"
+# Create a cache file for faster configuration loading
+invoke 'laravel:config_cache'
 
-# Upload the dotenv file from local to remote
-invoke "laravel:upload_dotenv_file"
+# Create a route cache file for faster route registration
+invoke 'laravel:route_cache'
 
-# Seed the database
-invoke "laravel:seed_db"
+# Optimize the framework for better performance.
+invoke 'laravel:optimize'
 
-# Create any missing folders for ACL
-invoke "laravel:create_acl_paths"
+# Create a symbolic link from "public/storage" to "storage/app/public"
+invoke 'laravel:storage_link'
 
-# Run migrations for the database
-invoke "laravel:migrate_db"
+# Run the database migrations.
+invoke 'laravel:migrate'
+
+# Rollback the last database migration.
+invoke 'laravel:migrate_rollback'
 ```
 
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+Bug reports and pull requests are welcome on GitHub at https://github.com/capistrano/laravel.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -1 +1,6 @@
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "capistrano/laravel"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/capistrano-laravel.gemspec

@@ -1,26 +1,31 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'capistrano/laravel/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'capistrano-laravel'
-  spec.version       = '0.0.4'
-  spec.authors       = ['Peter Mitchell', 'Andrew Miller']
-  spec.email         = ['peterjmit@gmail.com', 'ikari7789@yahoo.com']
-  spec.description   = %q{Laravel specific deployment options for Capistrano 3.x}
-  spec.summary       = %q{Laravel deployment for Capistrano 3.x}
-  spec.homepage      = 'https://github.com/capistrano/laravel'
-  spec.license       = 'MIT'
+  spec.name          = "capistrano-laravel"
+  spec.version       = Capistrano::Laravel::VERSION
+  spec.authors       = ["Peter Mitchell", "Andrew Miller"]
+  spec.email         = ["peterjmit@gmail.com", "ikari7789@yahoo.com"]
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.summary       = %q{Laravel specific deployment options for Capistrano 3.x}
+  spec.description   = %q{Laravel deployment for Capistrano 3.x}
+  spec.homepage      = "https://github.com/capistrano/laravel"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
   spec.add_dependency 'capistrano', '~> 3.0'
   spec.add_dependency 'capistrano-composer', '~> 0.0.6'
   spec.add_dependency 'capistrano-file-permissions', '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 10.4'
+  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/capistrano/laravel.rb

@@ -1,4 +1,5 @@
 require "capistrano/composer"
 require "capistrano/file-permissions"
+require "capistrano/laravel/version"
 
 load File.expand_path("../tasks/laravel.rake", __FILE__)

data/lib/capistrano/laravel/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Laravel
-    VERSION = "0.0.4"
+    VERSION = "1.0.0"
   end
 end

data/lib/capistrano/tasks/laravel.rake

@@ -1,54 +1,67 @@
-require 'capistrano/laravel/helpers'
-
 include Comparable
-include Capistrano::Laravel::Helpers
 
 namespace :load do
   task :defaults do
+    # Which roles to consider as laravel roles
     set :laravel_roles, :all
-    set :laravel_migrate_roles, :all
-    set :laravel_version, 5.1
-    set :laravel_dotenv_file, './.env'
-    set :laravel_artisan_flags, '--env=production'
-    set :laravel_artisan_migrate_flags, '--env=production'
-    set :laravel_set_linked_dirs, true
-    set :laravel_set_acl_paths, true
-    set :laravel_create_linked_acl_paths, true
+
+    # The artisan flags to include on artisan commands by default
+    set :laravel_artisan_flags, "--env=#{fetch(:stage)}"
+
+    # Which roles to use for running migrations
+    set :laravel_migration_roles, :all
+
+    # The artisan flags to include on artisan commands by default when running migrations
+    set :laravel_migration_artisan_flags, "--force --env=#{fetch(:stage)}"
+
+    # The version of laravel being deployed
+    set :laravel_version, 5.3
+
+    # Which dotenv file to transfer to the server
+    set :laravel_dotenv_file, '.env'
+
+    # The user that the server is running under (used for ACLs)
     set :laravel_server_user, 'www-data'
 
-    # Folders to link between releases
+    # Ensure the dirs in :linked_dirs exist?
+    set :laravel_ensure_linked_dirs_exist, true
+
+    # Link the directores in laravel_linked_dirs?
+    set :laravel_set_linked_dirs, true
+
+    # Linked directories for a standard Laravel 4 application
     set :laravel_4_linked_dirs, [
       'app/storage'
     ]
+
+    # Linked directories for a standard Laravel 5 application
     set :laravel_5_linked_dirs, [
       'storage'
     ]
-    set :laravel_5_1_linked_dirs, [
-      'storage'
-    ]
 
-    # Folders to set permissions on based on laravel version
+    # Ensure the paths in :file_permissions_paths exist?
+    set :laravel_ensure_acl_paths_exist, true
+
+    # Set ACLs for the paths in laravel_acl_paths?
+    set :laravel_set_acl_paths, true
+
+    # Paths that should have ACLs set for a standard Laravel 4 application
     set :laravel_4_acl_paths, [
       'app/storage',
+      'app/storage/public',
       'app/storage/cache',
       'app/storage/logs',
       'app/storage/meta',
       'app/storage/sessions',
       'app/storage/views'
     ]
+
+    # Paths that should have ACLs set for a standard Laravel 5 application
     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/app/public',
       'storage/framework',
       'storage/framework/cache',
       'storage/framework/sessions',
@@ -59,51 +72,58 @@ namespace :load do
 end
 
 namespace :laravel do
-  desc 'Set the ACL for the web user based on Laravel version.'
-  task :configure_folders do
+  desc 'Determine which folders, if any, to use for linked directories.'
+  task :resolve_linked_dirs do
     laravel_version = fetch(:laravel_version)
-    laravel_linked_dirs = []
-    laravel_acl_paths = []
+
+    # Use Laravel 5 linked dirs by default
+    laravel_linked_dirs = fetch(:laravel_5_linked_dirs)
     if laravel_version < 5 # Laravel 4
       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)
-    else # Laravel 5.1 or greater
-      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)
       set :linked_dirs, fetch(:linked_dirs, []).push(*laravel_linked_dirs)
     end
+  end
+
+  desc 'Determine which paths, if any, to have ACL permissions set.'
+  task :resolve_acl_paths do
+    laravel_version = fetch(:laravel_version)
+
+    # Use Laravel 5 ACL paths by default
+    laravel_acl_paths = fetch(:laravel_5_acl_paths)
+    if laravel_version < 5 # Laravel 4
+      laravel_acl_paths = fetch(:laravel_4_acl_paths)
+    end
 
     if fetch(:laravel_set_acl_paths)
-      set :file_permissions_paths, fetch(:file_permissions_paths, []).push(*laravel_acl_paths)
-      set :file_permissions_users, [fetch(:laravel_server_user)]
+      set :file_permissions_paths, fetch(:file_permissions_paths, []).push(*laravel_acl_paths).uniq
+      set :file_permissions_users, fetch(:file_permissions_users, []).push(fetch(:laravel_server_user)).uniq
     end
   end
 
-  desc 'Create missing directories.'
-  task :create_linked_acl_paths do
-    if fetch(:laravel_create_linked_acl_paths)
-      if fetch(:laravel_version) < 5
-        laravel_acl_paths = fetch(:laravel_4_acl_paths)
-      elsif fetch(:laravel_version) < 5.1
-        laravel_acl_paths = fetch(:laravel_5_acl_paths)
-      else
-        laravel_acl_paths = fetch(:laravel_5_1_acl_paths)
+  desc 'Ensure that linked dirs exist.'
+  task :ensure_linked_dirs_exist do
+    next unless fetch(:laravel_ensure_linked_dirs_exist)
+
+    on roles fetch(:laravel_roles) do
+      fetch(:linked_dirs).each do |path|
+        within release_path do
+          execute :mkdir, '-p', path
+        end
       end
+    end
+  end
+
+  desc 'Ensure that ACL paths exist.'
+  task :ensure_acl_paths_exist do
+    next unless fetch(:laravel_ensure_acl_paths_exist)
 
-      on roles fetch(:laravel_roles) do
-        laravel_acl_paths.each do |path|
-          acl_path = release_path.join(path)
-          if test("[ ! -e '#{acl_path}' ]")
-            execute :mkdir, '-vp', acl_path
-          else
-            info "#{acl_path} already exists."
-          end
+    on roles fetch(:laravel_roles) do
+      fetch(:file_permissions_paths).each do |path|
+        within release_path do
+          execute :mkdir, '-p', path
         end
       end
     end
@@ -111,19 +131,25 @@ namespace :laravel do
 
   desc 'Upload dotenv file for release.'
   task :upload_dotenv_file do
-    if fetch(:laravel_version) >= 5
-      on roles fetch(:laravel_roles) do
-        unless fetch(:laravel_dotenv_file).empty?
-          upload! fetch(:laravel_dotenv_file), "#{release_path}/.env"
-        end
+    # Dotenv was introduced in Laravel 5
+    next if fetch(:laravel_version) < 5
+
+    dotenv_file = fetch(:laravel_dotenv_file)
+
+    run_locally do
+      if dotenv_file.empty? || test("[ ! -e #{dotenv_file} ]")
+        raise Capistrano::ValidationError, "Must prepare dotenv file [#{dotenv_file}] locally before deploy!"
       end
     end
+
+    on roles fetch(:laravel_roles) do
+      upload! dotenv_file, "#{release_path}/.env"
+    end
   end
 
-  desc 'Execute a provided artisan command'
-  task :artisan, :command_name do |_t, args|
-    # ask only runs if argument is not provided
-    ask(:cmd, 'list')
+  desc 'Execute a provided artisan command.'
+  task :artisan, [:command_name] do |_t, args|
+    ask(:cmd, 'list') # Ask only runs if argument is not provided
     command = args[:command_name] || fetch(:cmd)
 
     on roles fetch(:laravel_roles) do
@@ -131,47 +157,68 @@ namespace :laravel do
         execute :php, :artisan, command, *args.extras, fetch(:laravel_artisan_flags)
       end
     end
-    
-    # enable task artisan to be ran twice
+
+    # Enable task artisan to be ran more than once
     Rake::Task['laravel:artisan'].reenable
   end
 
-  desc 'Optimize the configuration'
-  task :optimize_config do
-    invoke 'laravel:artisan', 'config:cache' if fetch(:laravel_version) >= 5
+  desc 'Create a cache file for faster configuration loading.'
+  task :config_cache do
+    next if fetch(:laravel_version) < 5
+    Rake::Task['laravel:artisan'].invoke('config:cache')
   end
 
-  desc 'Optimize the routing file'
-  task :optimize_route do
-    invoke 'laravel:artisan', 'route:cache' if fetch(:laravel_version) >= 5
+  desc 'Create a route cache file for faster route registration.'
+  task :route_cache do
+    next if fetch(:laravel_version) < 5
+    Rake::Task['laravel:artisan'].invoke('route:cache')
   end
 
-  desc 'Optimize a Laravel installation for optimimum performance in production.'
-  task :optimize_release do
-    invoke 'laravel:artisan', :optimize, :'--force'
+  desc 'Optimize the framework for better performance.'
+  task :optimize do
+    Rake::Task['laravel:artisan'].invoke(:optimize, '--force')
   end
 
-  desc 'Run migrations against the database using Artisan.'
-  task :migrate_db do |_t, args|
-    on roles fetch(:laravel_migrate_roles) do
-      within release_path do
-        execute :php, :artisan, :migrate, *args.extras, fetch(:laravel_artisan_migrate_flags)
-      end
-    end
+  desc 'Create a symbolic link from "public/storage" to "storage/app/public."'
+  task :storage_link do
+    next if fetch(:laravel_version) < 5
+    Rake::Task['laravel:artisan'].invoke('storage:link')
   end
 
-  desc 'Rollback migrations against the database using Artisan.'
-  task :rollback_db do
-    on roles fetch(:laravel_roles) do
-      within release_path do
-        execute :php, :artisan, 'migrate:rollback', *args.extras, fetch(:laravel_artisan_migrate_flags)
-      end
-    end
+  desc 'Run the database migrations.'
+  task :migrate do
+    laravel_roles = fetch(:laravel_roles)
+    laravel_artisan_flags = fetch(:laravel_artisan_flags)
+
+    set(:laravel_roles, fetch(:laravel_migration_roles))
+    set(:laravel_artisan_flags, fetch(:laravel_migration_artisan_flags))
+
+    Rake::Task['laravel:artisan'].invoke(:migrate)
+
+    set(:laravel_roles, laravel_roles)
+    set(:laravel_artisan_flags, laravel_artisan_flags)
+  end
+
+  desc 'Rollback the last database migration.'
+  task :migrate_rollback do
+    laravel_roles = fetch(:laravel_roles)
+    laravel_artisan_flags = fetch(:laravel_artisan_flags)
+
+    set(:laravel_roles, fetch(:laravel_migration_roles))
+    set(:laravel_artisan_flags, fetch(:laravel_migration_artisan_flags))
+
+    Rake::Task['laravel:artisan'].invoke('migrate:rollback')
+
+    set(:laravel_roles, laravel_roles)
+    set(:laravel_artisan_flags, laravel_artisan_flags)
   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:optimize_release'
+  before 'deploy:starting', 'laravel:resolve_linked_dirs'
+  before 'deploy:starting', 'laravel:resolve_acl_paths'
+  after  'deploy:starting', 'laravel:ensure_linked_dirs_exist'
+  after  'deploy:starting', 'laravel:ensure_acl_paths_exist'
+  after  'deploy:updating', 'deploy:set_permissions:acl'
+  before 'composer:run',    'laravel:upload_dotenv_file'
+  after  'composer:run',    'laravel:storage_link'
+  after  'composer:run',    'laravel:optimize'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-laravel
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Peter Mitchell
 - Andrew Miller
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -59,29 +59,43 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
-description: Laravel specific deployment options for Capistrano 3.x
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: Laravel deployment for Capistrano 3.x
 email:
 - peterjmit@gmail.com
 - ikari7789@yahoo.com
@@ -89,15 +103,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - capistrano-laravel.gemspec
 - lib/capistrano-laravel.rb
 - lib/capistrano/laravel.rb
-- lib/capistrano/laravel/helpers.rb
 - lib/capistrano/laravel/version.rb
 - lib/capistrano/tasks/laravel.rake
 homepage: https://github.com/capistrano/laravel
@@ -123,5 +141,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Laravel deployment for Capistrano 3.x
+summary: Laravel specific deployment options for Capistrano 3.x
 test_files: []

data/lib/capistrano/laravel/helpers.rb

@@ -1,6 +0,0 @@
-module Capistrano
-  module Laravel
-    module Helpers
-    end
-  end
-end