mina 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67b4c29c103a5a281be9c76e900b060da586a293
-  data.tar.gz: 9580cbbd7dd3c27313b35a7457a9578e5fc87e32
+  metadata.gz: 4f9c9b88688f477223d4b4577352b3441a198af7
+  data.tar.gz: c7d171c49d110f4c2ee46807f55984a85e26cb1c
 SHA512:
-  metadata.gz: 8fe517b01c18aaf896fb487dae32d7ac3f5ed1c4524ede2847e76a1f92c5bb879050ded1a53a91e9df7a58e15c9e2bce489723398874e3fea9f4b1a824a61b00
-  data.tar.gz: 22c0cfe800c09189c70970b3ae168df494ff6532ba0d381c9c11c00717e11135c16e4dbbc55e2e6ecae84ae439c4401c5b80c76653221c9ef00e7daff89d3524
+  metadata.gz: ae78879652cf2772c088ecbe03cd894ad1beaea25fc6d55a0cb077d7bc6fa5af6e086a2fc3a2cac0934aa21050181f5a3742865fdcf186cbe7d42705c30150f5
+  data.tar.gz: d194d278203c87d51c086dbdb6c4ad9fde980fb3fb268bb92283696b582b04760a6d43025b37c5fed6b40c10f0bdc42ebb2bd339264bb707ddc5d892fcf434b9

data/CHANGELOG.md

@@ -1,8 +1,7 @@
 # Change Log
 
-## [Unreleased](https://github.com/mina-deploy/mina/tree/HEAD)
-
-[Full Changelog](https://github.com/mina-deploy/mina/compare/v1.0.6...HEAD)
+## [v1.0.7](https://github.com/mina-deploy/mina/tree/v1.0.7) (2017-09-08)
+[Full Changelog](https://github.com/mina-deploy/mina/compare/v1.0.6...v1.0.7)
 
 **Closed issues:**
 

data/Readme.md

@@ -5,7 +5,7 @@
 [![Build Status](https://semaphoreci.com/api/v1/d4be4st/mina/branches/master/shields_badge.svg)](https://semaphoreci.com/d4be4st/mina)
 [![Gem Version](https://badge.fury.io/rb/mina.svg)](https://badge.fury.io/rb/mina)
 
-![mina](https://assets.infinum.co/attachments/ad98b5e667facece8bb0b790f3cafe5bcb2dc469/store/limit/1000/1000/291724d19624f688957cebb5a0549abb6ea07113bdac11026ad2d5a6d29f/Mina_Icon.png)
+![mina](https://photos.infinum.co/store/5273935c5deeabda0e98c943db2a7ade)
 
 Really fast deployer and server automation tool.
 
@@ -51,4 +51,4 @@ Mina is maintained and sponsored by [Infinum](https://infinum.co).
 
 You can reach us on twitter [Stef](https://twitter.com/_Beast_) & [Infinum](https://twitter.com/infinumco)
 
-![](https://assets.infinum.co/assets/brand-logo-9e079bfa1875e17c8c1f71d1fee49cf0.svg) © 2016 Infinum.  
+![](https://assets.infinum.co/assets/brand-logo-9e079bfa1875e17c8c1f71d1fee49cf0.svg) © 2016 Infinum.

data/data/deploy.rb

@@ -20,8 +20,10 @@ set :branch, 'master'
 #   set :port, '30000'           # SSH port number.
 #   set :forward_agent, true     # SSH forward_agent.
 
-# shared dirs and files will be symlinked into the app-folder by the 'deploy:link_shared_paths' step.
-# set :shared_dirs, fetch(:shared_dirs, []).push('somedir')
+# Shared dirs and files will be symlinked into the app-folder by the 'deploy:link_shared_paths' step.
+# Some plugins already add folders to shared_dirs like `mina/rails` add `public/assets`, `vendor/bundle` and many more
+# run `mina -d` to see all folders and files already included in `shared_dirs` and `shared_files`
+# set :shared_dirs, fetch(:shared_dirs, []).push('public/assets')
 # set :shared_files, fetch(:shared_files, []).push('config/database.yml', 'config/secrets.yml')
 
 # This task is the environment that is loaded for all remote run commands, such as
@@ -38,7 +40,7 @@ end
 # Put any custom commands you need to run at setup
 # All paths in `shared_dirs` and `shared_paths` will be created on their own.
 task :setup do
-  # command %{rbenv install 2.3.0}
+  # command %{rbenv install 2.3.0 --skip-existing}
 end
 
 desc "Deploys the current version to the server."

data/docs/3rd_party_plugins.md

@@ -1,5 +1,4 @@
-3rd party modules
-------
+# 3rd party modules
 
 **Many are not updated to mina 1.x**
 
@@ -34,4 +33,4 @@
 * [mina-tail](https://github.com/modomoto/mina-tail)
 * [mina-unicorn](https://github.com/openteam/mina-unicorn)
 * [mina-whenever](https://github.com/mina-deploy/mina-whenever)
-* [mina-lock] (https://github.com/lorenzosinisi/mina-lock)
+* [mina-lock](https://github.com/lorenzosinisi/mina-lock)

data/docs/Readme.md

@@ -1,10 +1,13 @@
 # Mina Documentations
 
+Mina is a tool that exstends rake (think ruby's make) in order to create bash scripts which are then run on your servers.
+
 * [Getting started](getting_started.md)
+* [How Mina Works](how_mina_works.md)
 * [Migrating from 0.3.x to 1.0](migrating.md)
+* [Default Plugins](default_plugins.md)
 * [Deploying](deploying.md)
 * [Writing your own tasks](writing_your_own_tasks.md)
-* [Command line options](command_line_options.md)
 * [FAQ](faq.md)
 * [Cookbook](cookbook.md)
 * [3rd party plugins](3rd_party_plugins.md)

data/docs/cookbook.md

@@ -1,7 +1,6 @@
-Cookbook
---------------------
+# Cookbook
 
-# Multi environment deploy
+## Multi environment deploy
 
 ``` ruby
 # deploy.rb
@@ -30,6 +29,38 @@ $ mina staging deploy
 $ mina production deploy
 ```
 
+## Copy `config/application.yml` to your server
 
+```
+task :deploy do
+  run(:local) do
+    comamnd "scp config/application.yml #{fetch(:user)}@#{fetch(:domain)}:#{fetch(:shared_path)}/config/application.yml"
+  end
+
+  deploy do
+    invoke ...
+  end
+end
+```
+
+## Deploy plain HTML websites
+```
+require 'mina/git'
+require 'mina/deploy'
+...
+desc "Deploys the current version to the server."
+task :deploy do
+  deploy do
+    invoke :'git:clone'
+    invoke :'deploy:cleanup'
+
+    on :launch do
+      in_path(fetch(:current_path)) do
+        command %{npm install}
+      end
+    end
+  end
+end
+```
 -------------------------------
 \* *feel free to add your own recipes*

data/docs/default_plugins.md

@@ -0,0 +1,190 @@
+# Default Plugins
+
+`mina` comes with a variaty of plugins for you to use out of the box. As `mina` is primarely written in ruby and for rails, it has
+ruby plugins, but it can be used to deploy any other application (static, js, php, etc)
+
+To use a plugin you only need to require it in your `deploy.rb`. Most of the plugins come with a set of their
+own variables which are usable, chengable and overwritable.
+
+Example:
+
+``` ruby
+require 'mina/rails'
+
+set :rails_env, 'staging'
+```
+
+You can also override a variable from command line like:
+
+``` sh
+$ mina deploy rails_env=development
+```
+
+## Default
+
+``` ruby
+require 'mina/default'
+```
+
+### Variables
+``` ruby
+  :repository             #=> nil
+  :domain                 #=> nil
+  :port                   #=> 22
+  :deploy_to              #=> nil
+  :execution_mode         #=> :pretty ## Can be [:exec, :pretty, :pritner, :system]
+```
+
+### Execution mode
+See [Execution mode](how_mina_works.md#execution-modes-runners)
+
+### Tasks
+``` ruby
+  local_environment       #=> Task to be run before all local tasks
+  remote_environment      #=> Task to be run before all remote tasks
+  ssh_keyscan_domain      #=> Adds repository host to the known hosts
+  ssh_keyscan_repo        #=> Adds domain to the known hosts
+  run                     #=> Runs a command on the server; Example: `$ mina 'run[rake db:migrate]'`
+  ssh                     #=> Open an ssh session to the server and cd to deploy_to folder
+```
+
+## Deploy
+``` ruby
+require 'mina/deploy'
+```
+
+loads:
+- `mina/default`
+
+### Variables
+
+``` ruby
+  :releases_path          #=> "#{fetch(:deploy_to)}/releases"
+  :shared_path            #=> "#{fetch(:deploy_to)}/shared"
+  :current_path           #=> "#{fetch(:deploy_to)}/current"
+  :lock_file              #=> 'deploy.lock'
+  :deploy_script          #=> 'data/deploy.sh.erb'
+  :keep_releases          #=> 5
+  :version_scheme         #=> :sequence ## Can be [:sequence, :datetime]
+  :shared_dirs            #=> []
+  :shared_fiels           #=> []
+```
+
+### Tasks
+``` ruby
+  # deploy:* tasks are not meant to be run outside `deploy do` block
+  deploy:force_unlock      #=> Removes .force_unlock file
+  deploy:link_shared_paths #=> Link paths set in `:shared_dirs` and `:shared_files`
+  deploy:cleanup           #=> Cleans up old releases
+
+  rollback                 #=> Rollbacks the latest release; does not rollback database
+  setup                    #=> Sets up the site
+```
+
+#### Version scheme
+
+`:version_scheme` variable sets the naming for your release folders.
+
+``` sh
+# :sequence
+.
+├── releases
+│   ├── 87
+│   ├── 88
+│   ├── 89
+│   ├── 90
+│   ├── 91
+│   └── 92
+
+# :datetime
+.
+├── releases
+│   ├── 20170701123242
+│   ├── 20170704131253
+│   ├── 20170708032142
+│   ├── 20170710082353
+│   └── 20170720012031
+```
+
+## Git
+``` ruby
+require 'mina/git'
+```
+loads:
+- `mina/default`
+
+### Variables
+``` ruby
+  :branch                 #=> 'master'
+  :remove_git_dir         #=> true
+  :remote                 #=> 'origin'
+  :git_not_pushed_message #=> "Your branch #{fetch(:branch)} needs to be pushed to #{fetch(:remote)} before deploying"
+```
+
+### Tasks
+``` ruby
+  # git:clone is not meant to be run outside `deploy do` block
+  git:clone               #=> Clones the Gir repository to the current path
+  git:revision            #=> Prints out current revision
+  git:ensure_pushed       #=> Ensures local repository is pushed to remote
+```
+
+## Bunlder
+``` ruby
+require 'mina/bunlder'
+```
+loads:
+- `mina/default`
+
+### Variables
+``` ruby
+  :bundle_bin             #=> 'bundle'
+  :bundle_path            #=> 'vendor/bundle'
+  :bundle_withouts        #=> 'development test'
+  :bundle_options         #=> "--without #{fetch(:bundle_withouts)} --path "#{fetch(:bundle_path)}" --deployment"
+  :shared_dirs            #=> fetch(:shared_dirs, []).push(fetch(:bundle_path)) ## Add `bundle_path` to `shared_dirs`
+```
+
+### Tasks
+
+``` ruby
+  bundle:install          #=> Install gem dependencies using Bundler
+  bundle:clean            #=> Cleans up unused gems in your bundler directory
+```
+
+## Rails
+``` ruby
+require 'mina/rails'
+```
+loads:
+- `mina/deploy`
+- `mina/bundler`
+
+### Variables
+``` ruby
+  :rails_env              #=> 'production'
+  :bundle_prefix          #=> %{RAILS_ENV="#{fetch(:rails_env)}" #{fetch(:bundle_bin)} exec}
+  :rake                   #=> "#{fetch(:bundle_prefix)} rake"
+  :rails                  #=> "#{fetch(:bundle_prefix)} rails"
+  :compiled_asset_path    #=> 'public/assets'
+  :asset_dirs             #=> ['vendor/assets/', 'app/assets/']
+  :migration_dirs         #=> ['db/migrate']
+  :force_migrate          #=> false
+  :force_asset_precompile #=> false
+```
+
+### Tasks
+``` ruby
+  console                 #=> Starts and interactive console
+  log                     #=> Tail log from server
+  rails[command]          #=> Runs rails command; example `$ mina 'rails[console]'`
+  rake[command]           #=> Runs rake command; example `$ mina 'rake[db:migrate]'`
+
+  # rails:* tasks are not meant to be run outside of `deploy do` block. Please use the tasks above.
+  rails:db_migrate        #=> Checks for changes in `:migration_dirs` and runs `db:migrate` if needed. Can be forced with `:force_migrate` variable
+  rails:assets_precompile #=> Checks for changes in `:asset_dirs` and runs `assets:precomile` if needed. Can be fored with `:force_asset_precompile` variable
+  rails:db_create         #=> Runs `db:create`
+  rails:db_rollback       #=> Runs `db:rollback`
+  rails:assets_clean      #=> Runs `assets:clean`
+  rails:db_schema_load    #=> Runs `db:schema:load`
+```

data/docs/deploying.md

@@ -1,5 +1,4 @@
-Deploying
---------------------
+# Deploying
 
 Mina provides the `deploy` command which runs your commands on remote backend.
 

data/docs/faq.md

@@ -1,5 +1,4 @@
-Frequently Asked Questions
---------------------
+# Frequently Asked Questions
 
 ## - `command not found: bundle`
 
@@ -7,13 +6,22 @@ You need to setup your server correctly [getting started](getting_started.md#ste
 
     gem install bundler
 
-## - ruby version not found, but is already installed
+## - `my_program` not found, but is already installed
 
 Mina is running in a non-interactive ssh mode. That means that your full profile will not be loaded:  ![ssh](http://capistranorb.com/images/BashStartupFiles1.png)
 
-if you setup your server correctly and you are using a ruby environment manager please ensure that:
-  - you are using a mina plugin for that manager or
-  - the lines that load up your manager are at the top of your .bashrc file: http://stackoverflow.com/a/216204/1339894
+There is a line at the top in most `.bashrc` files:
+```
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+```
+this means that all lines below this will not be executed when using mina.
+
+The easiest way to fix this is to move all your `export` and `source` lines to the top of your `.bashrc` file.
+More info at: http://stackoverflow.com/a/216204/1339894
 
 ## - Mina hangs after i type my password in
 

data/docs/getting_started.md

@@ -1,9 +1,8 @@
-Setting up a project
---------------------
+# Setting up a project
 
 Let's deploy a project using Mina.
 
-### Step 0: Configure server
+## Step 0: Configure server
 
 Your server needs to be properly configured for mina to work. Requirements for mina 1.0 to work:
 - SSH public/private key pair set up
@@ -12,7 +11,7 @@ Your server needs to be properly configured for mina to work. Requirements for m
 - installed ruby (some ruby manager recommended rbenv/rvm/chruby)
 - installed bundler
 
-### Step 1: Create a config/deploy.rb
+## Step 1: Create a config/deploy.rb
 
 In your project, type `mina init` to create a sample of this file.
 
@@ -53,7 +52,7 @@ end
 ...
 ```
 
-### Step 2: Run 'mina setup'
+## Step 2: Run 'mina setup'
 
 Back at your computer, do `mina setup` to set up the folder structure in `deploy_to` path.
 This will connect to your server via SSH and create the right directories.
@@ -61,9 +60,7 @@ This will connect to your server via SSH and create the right directories.
     $ mina setup
     -----> Creating folders... done.
 
-See [directory structure](https://github.com/mina-deploy/mina/wiki/Directory-structure) for more info.
-
-### Step 3: Deploy!
+## Step 3: Deploy!
 
 Use `mina deploy` to run the `deploy` task defined in *config/deploy.rb*.
 
@@ -73,3 +70,7 @@ Use `mina deploy` to run the `deploy` task defined in *config/deploy.rb*.
            Lots of things happening...
            ...
     -----> Done.
+
+## Step 4: Considerations after first deploy
+
+If you changed `shared_files` and `shared_dirs` in your `deploy.rb` you have to run `mina setup` again. This ensures all needed folders are created.

data/docs/how_mina_works.md

@@ -0,0 +1,193 @@
+# How Mina Works?
+
+## The Idea
+
+The idea behind `mina` is to have one (or more) config file which contains all the information about your server. Domain info, deploy user info, where will your application live, etc.
+With that information `mina` creates a bash script that deploys your application. `mina` connects to your server over ssh and runs the generated bash script.
+
+Example of generated deploy script
+
+``` sh
+$ mina deploy
+#!/usr/bin/env bash
+# Executing the following via 'ssh deploy@example.com -p 22 -tt':
+#
+#!/usr/bin/env bash
+
+# Go to the deploy path
+...
+
+# Checks
+...
+
+# Bootstrap script (in deployer)
+  echo "-----> Creating a temporary build path"
+  touch "deploy.lock" &&
+  mkdir -p "$build_path" &&
+  cd "$build_path" &&
+  ...
+  echo "-----> Deploy finished"
+#
+# Build
+  echo "-----> Building"
+  ...
+#
+# Launching
+# Rename to the real release path, then symlink 'current'
+  echo "-----> Launching"
+  ...
+
+# ============================
+# === Start up server => (in deployer)
+  ...
+
+# ============================
+# === Complete & unlock
+  rm -f "deploy.lock"
+  echo "-----> Done. Deployed version $version"
+
+# ============================
+# === Failed deployment
+  echo "! ERROR: Deploy failed."
+  ...
+
+# Unlock
+  rm -f "deploy.lock"
+  echo "OK"
+  exit 19
+)
+
+
+Elapsed time: 0.00 seconds
+
+```
+
+This script is then run on your server over ssh. Example:
+
+```
+ssh deploy@example.com -p 22 -tt --- "#!/usr/bin/env/bash\n #Go to the deploy path\n ...."
+```
+
+## The CLI
+
+Basic usage:
+
+    $ mina [OPTIONS] [TASKS] [VAR1=val VAR2=val ...]
+
+### Options
+
+Beside normal rake options mina added some of its own:
+
+* `-v` / `--verbose` - This will show commands being done on the server. Off by
+  default.
+
+* `-s` / `--simulate` - This will not run any commands; instead, it will simply output the script it builds.
+
+* `-V` / `--version` - Shows the current version.
+
+* `-AT` / `--all --tasks` - Show all tasks mina can run.
+
+* `-d` / `--debug-configuration-variables` - Display the defined config variables before runnig the tasks.
+
+### Tasks
+
+A cool feautre of rake is that you run multiple tasks from one command:
+
+```
+  $ mina setup deploy
+```
+
+This command will run both `setup` and `deploy` task consecutively.
+
+### Variables
+
+You may specify additional variables in the `KEY=value` style, just like any other command line tools.
+You can add as many variables as needed.
+
+    $ mina restart on=staging
+
+    # This sets the ENV['on'] variable to 'staging'.
+
+
+## Folder Structure
+
+After `mina setup` is run, you can see this structure on your server:
+
+``` sh
+.
+├── current -> /home/deploy/www/example.com/releases/91
+├── releases
+│   ├── 86
+│   ├── 87
+│   ├── 88
+│   ├── 89
+│   ├── 90
+│   └── 91
+├── scm
+├── shared
+│   ├── bundle
+│   ├── config
+│   ├── log
+│   ├── public
+│   ├── tmp
+│   └── vendor
+└── tmp
+```
+
+Folder | Description
+-------|------
+`current` | folders is a symbolic link to the current release (does not have to be the lastest one)
+`releases` | folder conains your last `keep_releases` releases
+`scm` | folder contains information about your version controll (git, svn, ...)
+`shared` | folder cotinas folders and files that are kept between releaes (logs, uploads, configs, ...)
+`tmp` | folder contains temporary build folders
+
+## Features
+
+### Execution modes (Runners)
+
+With `set :execution_mode` you can change how your tasks are run. There are currently 4 modes:
+
+Mode | Description
+-----|------------
+`:exec` | It uses [Kernel#exec](http://ruby-doc.org/core-2.4.2/Kernel.html#method-i-exec) to run your script. This means that it will execute and exit and won't run any other tasks. This is useful for tasks such as [`mina console`](https://github.com/mina-deploy/mina/blob/master/tasks/mina/rails.rb#L15)
+`:system` | It uses [Kernel#system](http://ruby-doc.org/core-2.4.2/Kernel.html#method-i-system) to run your script.
+`:pretty` | It uses [Open4#popen4](https://github.com/ahoward/open4/blob/master/lib/open4.rb#L33) to run your script. This mode pretty prints stdout and stderr and colors it. This the default mode for most of the default tasks.
+`:printer` | It uses [Kernel#puts](http://ruby-doc.org/core-2.4.2/Kernel.html#method-i-puts) to run your script. This is used when `simulate` flag is set so it only prints out the generated script
+
+#### WARNING
+`:pretty` mode is using Popen4. In this mode STDIN is efectivly disabled. This means that any kind of inputs won't be forwarded to remote host. If you have a need for password input please use `:system` mode
+
+### Backends
+
+When writing your tasks you can choose on which backend you want your scripts to run. Currently there are 2 backends:
+
+Backend | Description
+--------|---------
+`:remote` | Run on your server over SSH
+`:local` | Run on your machine
+
+Choosing on which backend a particular block is ran is defined in [`run(backend) do` block](writing_your_own_tasks.rb#run)
+These `run` blocks can be used however you want, you can mixandmatch them anywhich way. Only restriction is thay you can't use a `run` block inside another `run` block.
+
+Example:
+
+```
+task :example do
+  run(:local) do
+    comamnd "scp config/application.yml #{fetch(:user)}@#{fetch(:domain)}:#{fetch(:shared_path)}/config/application.yml"
+  end
+
+  run(:remote) do
+    command "passenger-configure restart-app"
+  end
+
+  run(:local) do
+    command 'say "Done!"'
+  end
+end
+```
+
+`deploy do` block is a wrapper around `run(:backend) do` block.
+
+

data/docs/migrating.md

@@ -1,31 +1,40 @@
-Migrating from 0.3.x to 1.0
---------------------
-# DSL
+# Migrating from 0.3.x to 1.0
 
-## old
+## DSL
+
+### old
 * `queue`         -> `command`  # adds command to queue
 * `queue!`        -> `command`  # it will output the command if verbose is true
 * `to`            -> `on`       # changes queue name
 * `in_directory`  -> `in_path`  # wraps commands to be run in specified path
 * `invoke :'task[param]'` -> `invoke :task, param`  # passes params to the task
 
-## new
+### new
 * `run`                         # runs commands on a specified backend, this has replaced old before and after hooks
 * `comment`                     # adds a 'echo -----> #{command}' to queue
 
 **Other commands have been removed!**
 
-# Setting variables
+Remove `:environment` dependency on all your tasks!
+```
+task deploy: :environment do
+  ...
+--->
+task :deploy do
+  ...
+```
+
+## Setting variables
 
-## same
+### same
 * `set`                         # remained for setting variables
 
-## new
+### new
 * `fetch`                       # **ALL** variables now need to be fetched with `fetch`. Removed `method_missing`
 * `set?`
 * `ensure!`
 
-# Deploy variables
+## Deploy variables
 
 * `shared_paths` -> separated into `shared_dirs` & `shared_files`
 
@@ -39,7 +48,7 @@ set :shared_files, fetch(:shared_files, []).push('config/database.yml', 'config/
 All `*_path` variables (`:current_path`, `:shared_path`, ...) now include `:deploy_to`
 * `#{fetch(:deploy_to)}/#{fetch(:current_path)}` -> `fetch(:current_path)`
 
-# Using new mina on old projects
+## Using new mina on old projects
 
 * run `mina setup`
 * if you do not want for bundle to install gems copy `current/vendor/bundle` to `/shared/vendor/bundle`

data/docs/writing_your_own_tasks.md

@@ -1,13 +1,12 @@
-Writing your own tasks
---------------------
+# Writing your own tasks
 
-# Defining tasks
+## Defining tasks
 
 The file `deploy.rb` is simply a Rakefile invoked by Rake. In fact, `mina` is
 mostly an alias that invokes Rake to load `deploy.rb`.
 
 ``` ruby
-# Sample config/deploy.rb
+## Sample config/deploy.rb
 set :domain, 'your.server.com'
 
 task :restart do
@@ -25,11 +24,11 @@ The `command` command queues up Bash commands to be run on the remote server.
 If you invoke `mina restart`, it will invoke the task above and run the queued
 commands on the remote server `your.server.com` via SSH.
 
-# DSL
+## DSL
 
-## Helpers
+### Helpers
 
-### invoke
+#### invoke
 Invokes another Rake task.
 
 ``` ruby
@@ -37,7 +36,7 @@ invoke :'git:clone'
 invoke :restart
 ```
 
-### command
+#### command
 Adds a command to the command queue.
 
 This queues code to be run on the current queue name (defaults to `:default`).
@@ -48,14 +47,14 @@ By default, whitespace is stripped from the beginning and end of the command.
 command %{ls -al} # => [ls -al]
 ```
 
-### comment
+#### comment
 Adds a comment to the command queue.
 
 ``` ruby
 comment %{ls -al} # => [echo "-----> ls -al"]
 ```
 
-### run
+#### run
 Runs the given block on the defined backend (remote or local)
 
 ``` ruby
@@ -64,7 +63,7 @@ run :remote do
 end
 ```
 
-### on
+#### on
 Change the queue name for the given block. Use this if you have multiple places where commands need to end up. Mainly used in `deploy` task.
 
 ``` ruby
@@ -73,7 +72,7 @@ on :launch do
 end
 ```
 
-### in_path
+#### in_path
 Change the path the commands in the given block is run.
 
 ``` ruby
@@ -82,16 +81,16 @@ in_path('some/new/path') do
 end
 ```
 
-## Configuration
+### Configuration
 
-### set
+#### set
 Sets configuration variable. Can a value or a proc/lambda.
 
 ``` ruby
 set :deploy_to -> '/path/to/deploy'
 ```
 
-### fetch
+#### fetch
 Gets configuration variable. Runs `.call` if callable.
 Returns nil if not set. If default parameter is passed returns default if not set.
 
@@ -100,14 +99,14 @@ fetch(:deploy_to)
 fetch(:deploy_to, 'some_default')
 ```
 
-### set?
+#### set?
 Checks if a variable is set.
 
 ``` ruby
 set?(:deploy_to)
 ```
 
-### ensure!
+#### ensure!
 Raises an error if variable is not set
 
 ``` ruby

data/lib/mina/application.rb

@@ -22,7 +22,7 @@ module Mina
         switch =~ /--#{Regexp.union(not_applicable_to_mina)}/
       end
 
-      super.push(version, verbose, simulate, debug_configuration_variables)
+      super.push(version, verbose, simulate, debug_configuration_variables, no_report_time)
     end
 
     def top_level_tasks
@@ -73,5 +73,14 @@ module Mina
        end
       ]
     end
+
+    def no_report_time
+      ['--no-report-time', nil,
+       'Skip time reporting',
+       lambda do |_value|
+         set(:skip_report_time, true)
+       end
+      ]
+    end
   end
 end

data/lib/mina/configuration.rb

@@ -36,8 +36,10 @@ module Mina
       ENV.has_key?(key.to_s) || !variables.fetch(key, nil).nil?
     end
 
-    def ensure!(key)
-      error! "#{key} must be defined!" unless set?(key)
+    def ensure!(key, message: nil)
+      return if set?(key)
+      message ||= "#{key} must be defined!"
+      error! message
     end
 
     def reset!

data/lib/mina/dsl.rb

@@ -24,11 +24,13 @@ module Mina
     end
 
     def run(backend)
-      # @commands = Commands.new
-      invoke :environment if backend == :remote
+      error! "Can't use run block inside another run block. #{caller[2]}" if set?(:run_bock)
+      set(:run_bock, true)
+      invoke :"#{backend}_environment"
       yield
       commands.run(backend)
       @commands = Commands.new
+      set(:run_bock, nil)
     end
 
     def on(stage)
@@ -47,7 +49,9 @@ module Mina
 
     def deploy(&block)
       run :remote do
+        set(:deploy, true)
         command deploy_script(&block), quiet: true
+        set(:deploy, false)
       end
     end
   end

data/lib/mina/helpers/internal.rb

@@ -37,7 +37,7 @@ module Mina
       def report_time
         time_start = Time.now
         output = yield
-        print_info "Elapsed time: %.2f seconds" % [Time.now - time_start]
+        print_info "Elapsed time: %.2f seconds" % [Time.now - time_start] unless fetch(:skip_report_time)
         output
       end
 

data/lib/mina/version.rb

@@ -1,3 +1,3 @@
 module Mina
-  VERSION = '1.0.7'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/spec/tasks/rails_spec.rb

@@ -15,7 +15,9 @@ RSpec.describe 'rails', type: :rake do
 
   describe 'rails:db_migrate' do
     it 'rails db migrate' do
+      Mina::Configuration.instance.set(:deploy_block, true)
       expect { invoke_all }.to output(output_file('rails_db_migrate')).to_stdout
+      Mina::Configuration.instance.set(:deploy_block, false)
     end
   end
 
@@ -33,7 +35,9 @@ RSpec.describe 'rails', type: :rake do
 
   describe 'rails:assets_precompile' do
     it 'rails assets precompile' do
+      Mina::Configuration.instance.set(:deploy_block, true)
       expect { invoke_all }.to output(output_file('rails_assets_precompile')).to_stdout
+      Mina::Configuration.instance.set(:deploy_block, false)
     end
   end
 

data/tasks/mina/default.rb

@@ -3,6 +3,13 @@ require 'mina/install'
 set :port, 22
 
 task :environment do
+  print_error ':environment is DEPRECATED! Please use local_environment and remote_environment'
+end
+
+task :local_environment do
+end
+
+task :remote_environment do
 end
 
 task :default do
@@ -29,7 +36,7 @@ task :debug_configuration_variables do
   end
 end
 
-desc 'Adds current repo host to the known hosts'
+desc 'Adds repo host to the known hosts'
 task :ssh_keyscan_repo do
   ensure!(:repository)
   repo_host = fetch(:repository).split(%r{@|://}).last.split(%r{:|\/}).first
@@ -44,7 +51,7 @@ task :ssh_keyscan_repo do
   }
 end
 
-desc 'Adds domain known hosts'
+desc 'Adds domain to the known hosts'
 task :ssh_keyscan_domain do
   ensure!(:domain)
   ensure!(:port)

data/tasks/mina/git.rb

@@ -6,7 +6,7 @@ set :remote, 'origin'
 set :git_not_pushed_message, -> { "Your branch #{fetch(:branch)} needs to be pushed to #{fetch(:remote)} before deploying" }
 
 namespace :git do
-  desc 'Clones the Git repository to the release path.'
+  desc 'Clones the Git repository to the current path.'
   task :clone do
     ensure!(:repository)
     ensure!(:deploy_to)
@@ -36,11 +36,13 @@ namespace :git do
     end
   end
 
+  desc 'Prints out current revision'
   task :revision do
     ensure!(:deploy_to)
     command %{cat #{fetch(:current_path)}/.mina_git_revision}
   end
 
+  desc 'Ensures local repository is pushed to remote'
   task :ensure_pushed do
     run :local do
       comment %{Ensuring everyting is pushed to git}

data/tasks/mina/rails.rb

@@ -30,6 +30,7 @@ end
 namespace :rails do
   desc 'Migrate database'
   task :db_migrate do
+    ensure!(:deploy_block, message: "Can't be run outside deploy do block. Please use mina 'rake[db_migrate]' instead")
     if fetch(:force_migrate)
       comment %{Migrating database}
       command %{#{fetch(:rake)} db:migrate}
@@ -57,6 +58,7 @@ namespace :rails do
 
   desc 'Precompiles assets (skips if nothing has changed since the last release).'
   task :assets_precompile do
+    ensure!(:deploy_block, message: "Can't be run outside deploy do block. Please use mina 'rake[assets_precompile]' instead")
     if fetch(:force_asset_precompile)
       comment %{Precompiling asset files}
       command %{#{fetch(:rake)} assets:precompile}

data/test_env/config/deploy.rb

@@ -70,3 +70,40 @@ task :test do
     command %{ls -al}
   end
 end
+
+desc 'Fails test'
+task :fail do
+  run :remote do
+    run :local do
+      command "pwd"
+    end
+  end
+end
+
+task :local_environment do
+  comment 'local environment run'
+  command 'export HERE=local'
+end
+
+task :remote_environment do
+  comment 'remote environment run'
+  command 'export HERE=remote'
+end
+
+task test_envs: :environment do
+  run(:local) do
+    command 'echo $HERE'
+  end
+
+  run(:remote) do
+    command 'echo $HERE'
+  end
+
+  run(:local) do
+    command 'echo $HERE'
+  end
+
+  run(:remote) do
+    command 'echo $HERE'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Stjepan Hadjić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -132,11 +132,12 @@ files:
 - data/deploy.sh.erb
 - docs/3rd_party_plugins.md
 - docs/Readme.md
-- docs/command_line_options.md
 - docs/cookbook.md
+- docs/default_plugins.md
 - docs/deploying.md
 - docs/faq.md
 - docs/getting_started.md
+- docs/how_mina_works.md
 - docs/migrating.md
 - docs/writing_your_own_tasks.md
 - lib/Minafile

data/docs/command_line_options.md

@@ -1,33 +0,0 @@
-Command line options
---------------------
-
-Basic usage:
-
-    $ mina [OPTIONS] [TASKS] [VAR1=val VAR2=val ...]
-
-### Options
-
-Beside normal rake options mina added some of its own:
-
-* `-v` / `--verbose` - This will show commands being done on the server. Off by
-  default.
-
-* `-s` / `--simulate` - This will not run any commands; instead, it will simply output the script it builds.
-
-* `-V` / `--version` - Shows the current version.
-
-* `-d` / `--debug-configuration-variables` - Display the defined config variables before runnig the tasks.
-
-### Tasks
-
-There are many tasks available. See the [tasks reference](https://mina-deploy.github.io/mina/tasks/), or
-type `mina -T`.
-
-### Variables
-
-You may specify additional variables in the `KEY=value` style, just like any other command line tools.
-You can add as many variables as needed.
-
-    $ mina restart on=staging
-
-    # This sets the ENV['on'] variable to 'staging'.