mina 1.0.0.beta2 → 1.0.0.beta3

data/tasks/mina/default.rb

@@ -5,6 +5,10 @@ task run_commands: :environment do
   commands.run(:remote) unless commands.queue.empty?
 end
 
+task :reset! do
+  reset!
+end
+
 task debug_configuration_variables: :environment do
   if fetch(:debug_configuration_variables)
     puts
@@ -45,5 +49,5 @@ end
 
 desc 'Open an ssh session to the server and cd to deploy_to folder'
 task ssh: :environment do
-  exec Mina::Backend::Remote.new(nil).ssh + " 'cd #{fetch(:deploy_to)} && exec \$SHELL'"
+  exec Mina::Backend::Remote.new(nil).ssh + %( "cd #{fetch(:deploy_to)} && exec $SHELL")
 end

data/tasks/mina/deploy.rb

@@ -6,28 +6,28 @@ set :current_path, -> { "#{fetch(:deploy_to)}/current" }
 set :lock_file, 'deploy.lock'
 set :deploy_script, 'data/deploy.sh.erb'
 set :keep_releases, 5
-set :version_scheme, :datetime
+set :version_scheme, :sequence
 set :execution_mode, :pretty
 
 namespace :deploy do
   desc 'Forces a deploy unlock.'
   task force_unlock: :environment do
-    comment 'Unlocking'
-    command "rm -f '#{fetch(:deploy_to)}/#{fetch(:lock_file)}'"
+    comment %(Unlocking)
+    command %(rm -f "#{fetch(:deploy_to)}/#{fetch(:lock_file)}")
   end
 
   desc 'Links paths set in :shared_dirs and :shared_files.'
   task link_shared_paths: :environment do
-    comment 'Symlinking shared paths'
+    comment %(Symlinking shared paths)
 
     fetch(:shared_dirs, []).each do |linked_dir|
       command %(mkdir -p #{File.dirname("./#{linked_dir}")})
-      command "rm -rf './#{linked_dir}'"
-      command "ln -s '#{fetch(:shared_path)}/#{linked_dir}' './#{linked_dir}'"
+      command %(rm -rf "./#{linked_dir}")
+      command %(ln -s "#{fetch(:shared_path)}/#{linked_dir}" "./#{linked_dir}")
     end
 
     fetch(:shared_files, []).each do |linked_path|
-      command "ln -s '#{fetch(:shared_path)}/#{linked_path}' './#{linked_path}'"
+      command %(ln -s "#{fetch(:shared_path)}/#{linked_path}" "./#{linked_path}")
     end
   end
 
@@ -36,27 +36,27 @@ namespace :deploy do
     ensure!(:keep_releases)
     ensure!(:deploy_to)
 
-    comment "Cleaning up old releases (keeping #{fetch(:keep_releases)})"
+    comment %(Cleaning up old releases (keeping #{fetch(:keep_releases)}))
     in_path "#{fetch(:releases_path)}" do
-      command 'count=`ls -A1 | sort -rn | wc -l`'
-      command "remove=$((count > #{fetch(:keep_releases)} ? $count - #{fetch(:keep_releases)} : 0))"
-      command 'ls -A1 | sort -rn | tail -n $remove | xargs rm -rf {}'
+      command %(count=$(ls -A1 | sort -rn | wc -l))
+      command %(remove=$((count > #{fetch(:keep_releases)} ? count - #{fetch(:keep_releases)} : 0)))
+      command %(ls -A1 | sort -rn | tail -n $remove | xargs rm -rf {})
     end
   end
 end
 
 desc 'Rollbacks the latest release'
 task rollback: :environment do
-  comment "Rolling back to previous release"
+  comment %(Rolling back to previous release)
 
   in_path "#{fetch(:releases_path)}" do
     # TODO: add check if there are more than 1 release
-    command "rollback_release=`ls -1A | sort -n | tail -n 2 | head -n 1`"
-    comment 'Rollbacking to release: $rollback_release'
-    command "ln -nfs #{fetch(:releases_path)}/$rollback_release #{fetch(:current_path)}"
-    command "current_release=`ls -1A | sort -n | tail -n 1`"
-    comment 'Deleting current release: $current_release'
-    command "rm -rf #{fetch(:releases_path)}/$current_release"
+    command %(rollback_release=$(ls -1A | sort -n | tail -n 2 | head -n 1))
+    comment %(Rollbacking to release: $rollback_release)
+    command %(ln -nfs #{fetch(:releases_path)}/$rollback_release #{fetch(:current_path)})
+    command %(current_release=$(ls -1A | sort -n | tail -n 1))
+    comment %(Deleting current release: $current_release)
+    command %(rm -rf #{fetch(:releases_path)}/$current_release)
   end
 end
 
@@ -64,23 +64,27 @@ desc 'Sets up a site.'
 task setup: :environment do
   ensure!(:deploy_to)
 
-  comment "Setting up #{fetch(:deploy_to)}"
-  command "mkdir -p '#{fetch(:deploy_to)}'"
-  command "chown -R `whoami` '#{fetch(:deploy_to)}'"
-  command "chmod g+rx,u+rwx '#{fetch(:deploy_to)}'"
-  command "mkdir -p '#{fetch(:releases_path)}'"
-  command "chmod g+rx,u+rwx '#{fetch(:releases_path)}'"
-  command "mkdir -p '#{fetch(:shared_path)}'"
-  command "chmod g+rx,u+rwx '#{fetch(:shared_path)}'"
+  comment %(Setting up #{fetch(:deploy_to)})
+  command %(mkdir -p "#{fetch(:deploy_to)}")
+  command %(chown -R $(whoami) "#{fetch(:deploy_to)}")
+  command %(chmod g+rx,u+rwx "#{fetch(:deploy_to)}")
+  command %(mkdir -p "#{fetch(:releases_path)}")
+  command %(chmod g+rx,u+rwx "#{fetch(:releases_path)}")
+  command %(mkdir -p "#{fetch(:shared_path)}")
+  command %(chmod g+rx,u+rwx "#{fetch(:shared_path)}")
 
   in_path "#{fetch(:shared_path)}" do
     fetch(:shared_dirs, []).each do |linked_dir|
-      command "mkdir -p '#{linked_dir}'"
-      command "chmod g+rx,u+rwx '#{linked_dir}'"
+      command %(mkdir -p "#{linked_dir}")
+      command %(chmod g+rx,u+rwx "#{linked_dir}")
+    end
+    fetch(:shared_paths, []).each do |linked_path|
+      command %(mkdir -p "#{File.dirname(linked_path)}")
+      command %(chmod g+rx,u+rwx "#{File.dirname(linked_path)}")
     end
   end
 
-  command "tree '#{fetch(:deploy_to)}' || ls -al '#{fetch(:deploy_to)}'"
+  command %(tree "#{fetch(:deploy_to)}" || ls -al "#{fetch(:deploy_to)}")
 
   invoke :ssh_keyscan
 end

data/tasks/mina/git.rb

@@ -2,6 +2,8 @@ require 'mina/default'
 
 set :branch, 'master'
 set :remove_git_dir, true
+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.'
@@ -9,9 +11,9 @@ namespace :git do
     ensure!(:repository)
     ensure!(:deploy_to)
     if set?(:commit)
-      comment "Using git commit '#{fetch(:commit)}'"
-      command "git clone '#{fetch(:repository)}' . --recursive"
-      command "git checkout -b current_release '#{fetch(:commit)}' --force"
+      comment %(Using git commit \\"#{fetch(:commit)}\\")
+      command %(git clone "#{fetch(:repository)}" . --recursive)
+      command %(git checkout -b current_release "#{fetch(:commit)}" --force)
     else
       command %(if [ ! -d "#{fetch(:deploy_to)}/scm/objects" ]; then
           echo "-----> Cloning the Git repository"
@@ -24,16 +26,26 @@ namespace :git do
         #{echo_cmd %[git clone "#{fetch(:deploy_to)}/scm" . --recursive --branch "#{fetch(:branch)}"]}), quiet: true
     end
 
-    comment 'Using this git commit'
-    command 'git rev-parse HEAD > .mina_git_revision'
-    command "git --no-pager log --format='%aN (%h):%n> %s' -n 1"
+    comment %(Using this git commit)
+    command %(git rev-parse HEAD > .mina_git_revision)
+    command %(git --no-pager log --format="%aN (%h):%n> %s" -n 1)
     if fetch(:remove_git_dir)
-      command 'rm -rf .git'
+      command %(rm -rf .git)
     end
   end
 
   task revision: :environment do
     ensure!(:deploy_to)
-    command "cat #{fetch(:current_path)}/.mina_git_revision"
+    command %(cat #{fetch(:current_path)}/.mina_git_revision)
+  end
+
+  task ensure_pushed: :environment do
+    run :local do
+      comment %(Ensuring everyting is pushed to git)
+      command %( if [ $(git log #{fetch(:remote)}/#{fetch(:branch)}..#{fetch(:branch)} | wc -l) -ne 0 ]; then
+        echo "! #{fetch(:git_not_pushed_message)}"
+        exit 1
+      fi)
+    end
   end
 end

data/tasks/mina/install.rb

@@ -1,3 +1,4 @@
+
 desc 'Creates a sample config file.'
 task :init do
   name = Rake.application.name

data/tasks/mina/rails.rb

@@ -2,7 +2,7 @@ require 'mina/deploy'
 require 'mina/bundler'
 
 set :rails_env, 'production'
-set :bundle_prefix, -> { "RAILS_ENV='#{fetch(:rails_env)}' #{fetch(:bundle_bin)} exec" }
+set :bundle_prefix, -> { %(RAILS_ENV="#{fetch(:rails_env)}" #{fetch(:bundle_bin)} exec) }
 set :rake, -> { "#{fetch(:bundle_prefix)} rake" }
 set :rails, -> { "#{fetch(:bundle_prefix)} rails" }
 set :compiled_asset_path, 'public/assets'
@@ -15,7 +15,7 @@ desc 'Starts an interactive console.'
 task console: :environment do
   set :execution_mode, :exec
   in_path "#{fetch(:current_path)}" do
-    command "#{fetch(:rails)} console"
+    command %(#{fetch(:rails)} console)
   end
 end
 
@@ -23,7 +23,7 @@ desc 'Tail log from server'
 task log: :environment do
   set :execution_mode, :exec
   in_path "#{fetch(:shared_path)}/log" do
-    command "tail -f #{fetch(:rails_env)}.log"
+    command %(tail -f #{fetch(:rails_env)}.log)
   end
 end
 
@@ -31,14 +31,14 @@ namespace :rails do
   desc 'Migrate database'
   task db_migrate: :environment do
     if fetch(:force_migrate)
-      comment 'Migrating database'
-      command "#{fetch(:rake)} db:migrate"
+      comment %(Migrating database)
+      command %(#{fetch(:rake)} db:migrate)
     else
       command check_for_changes_script(
         at: fetch(:migration_dirs),
-        skip: "echo '-----> DB migrations unchanged; skipping DB migration'",
+        skip: %(echo "-----> DB migrations unchanged; skipping DB migration"),
         changed: %(
-          echo '-----> Migrating database'
+          echo "-----> Migrating database"
           #{echo_cmd("#{fetch(:rake)} db:migrate")}
         )
       ), quiet: true
@@ -47,25 +47,25 @@ namespace :rails do
 
   desc 'Create database'
   task db_create: :environment do
-    comment 'Creating database'
-    command "#{fetch(:rake)} db:create"
+    comment %(Creating database)
+    command %(#{fetch(:rake)} db:create)
   end
 
   desc 'Rollback database'
   task db_rollback: :environment do
-    comment 'Rollbacking database'
-    command "#{fetch(:rake)} db:rollback"
+    comment %(Rollbacking database)
+    command %(#{fetch(:rake)} db:rollback)
   end
 
   desc 'Precompiles assets (skips if nothing has changed since the last release).'
   task assets_precompile: :environment do
     if fetch(:force_asset_precompile)
-      comment 'Precompiling asset files'
-      command "#{fetch(:rake)} assets:precompile"
+      comment %(Precompiling asset files)
+      command %(#{fetch(:rake)} assets:precompile)
     else
       command check_for_changes_script(
         at: fetch(:asset_dirs),
-        skip: 'echo "-----> Skipping asset precompilation"',
+        skip: %(echo "-----> Skipping asset precompilation"),
         changed: %(
           echo "-----> Precompiling asset files"
           #{echo_cmd "#{fetch(:rake)} assets:precompile"}
@@ -77,7 +77,7 @@ end
 
 def check_for_changes_script(options)
   diffs = options[:at].map do |path|
-    "diff -qrN '#{fetch(:current_path)}/#{path}' './#{path}' 2>/dev/null"
+    %(diff -qrN "#{fetch(:current_path)}/#{path}" "./#{path}" 2>/dev/null)
   end.join(' && ')
 
   %(if #{diffs}

data/tasks/mina/rbenv.rb

@@ -1,15 +1,13 @@
 set :rbenv_path, "$HOME/.rbenv"
 
 task :'rbenv:load' do
-  comment 'Loading rbenv'
-  command "export RBENV_ROOT='#{fetch(:rbenv_path)}'"
-  command "export PATH='#{fetch(:rbenv_path)}/bin:$PATH'"
-  command %(
-    if ! which rbenv >/dev/null; then
+  comment %(Loading rbenv)
+  command %(export RBENV_ROOT="#{fetch(:rbenv_path)}")
+  command %(export PATH="#{fetch(:rbenv_path)}/bin:$PATH")
+  command %(if ! which rbenv >/dev/null; then
       echo "! rbenv not found"
       echo "! If rbenv is installed, check your :rbenv_path setting."
       exit 1
-    fi
-  )
-  command 'eval "$(rbenv init -)"'
+    fi)
+  command %(eval "$(rbenv init -)")
 end

data/tasks/mina/rvm.rb

@@ -2,38 +2,34 @@ set :rvm_path, '$HOME/.rvm/scripts/rvm'
 
 task :'rvm:use', :env do |_, args|
   unless args[:env]
-    print_error "Task 'rvm:use' needs an RVM environment name as an argument."
-    print_error "Example: invoke :'rvm:use[ruby-1.9.2@default]'"
-    die
+    puts "Task 'rvm:use' needs an RVM environment name as an argument."
+    puts "Example: invoke :'rvm:use[ruby-1.9.2@default]'"
+    exit 1
   end
 
-  comment "Using RVM environment '#{args[:env]}'"
-  command %(
-    if [[ ! -s "#{fetch(:rvm_path)}" ]]; then
+  comment %(Using RVM environment \\\"#{args[:env]}\\\")
+  command %(if [[ ! -s "#{fetch(:rvm_path)}" ]]; then
       echo "! Ruby Version Manager not found"
       echo "! If RVM is installed, check your :rvm_path setting."
       exit 1
-    fi
-  )
-  command "source #{fetch(:rvm_path)}"
-  command "rvm use '#{args[:env]}' --create"
+    fi)
+  command %(source #{fetch(:rvm_path)})
+  comment %(rvm use \\"#{args[:env]}\\" --create)
 end
 
 task :'rvm:wrapper', :env, :name, :bin do |_, args|
   unless args[:env] && args[:name] && args[:bin]
-    print_error "Task 'rvm:wrapper' needs an RVM environment name, an wrapper name and the binary name as arguments"
-    print_error "Example: invoke :'rvm:wrapper[ruby-1.9.2@myapp,myapp,unicorn_rails]'"
-    die
+    puts "Task 'rvm:wrapper' needs an RVM environment name, an wrapper name and the binary name as arguments"
+    puts "Example: invoke :'rvm:wrapper[ruby-1.9.2@myapp,myapp,unicorn_rails]'"
+    exit 1
   end
 
-  comment "creating RVM wrapper '#{args[:name]}_#{args[:bin]}' using '#{args[:env]}'"
-  command %(
-    if [[ ! -s "#{fetch(:rvm_path)}" ]]; then
+  comment %(creating RVM wrapper "#{args[:name]}_#{args[:bin]}" using \\"#{args[:env]}\\")
+  command %(if [[ ! -s "#{fetch(:rvm_path)}" ]]; then
       echo "! Ruby Version Manager not found"
       echo "! If RVM is installed, check your :rvm_path setting."
       exit 1
-    fi
-  )
-  command "source #{fetch(:rvm_path)}"
-  command "rvm wrapper #{args[:env]} #{args[:name]} #{args[:bin]} || exit 1"
+    fi)
+  command %(source #{fetch(:rvm_path)})
+  command %(rvm wrapper #{args[:env]} #{args[:name]} #{args[:bin]} || exit 1)
 end

data/tasks/mina/ry.rb

@@ -2,25 +2,21 @@ set :ry_path, '$HOME/.local'
 
 task :ry, :env do |_, args|
   unless args[:env]
-    print_status "Task 'ry' without argument will use default Ruby version."
+    puts "Task 'ry' without argument will use default Ruby version."
   end
 
-  comment "ry to version: '#{args[:env] || '**not specified**'}"
-  comment 'Loading ry'
+  comment %(ry to version: \\"#{args[:env] || '**not specified**'}\\")
+  comment %(Loading ry)
 
-  command %(
-    if [[ ! -e "#{fetch(:ry_path)}/bin" ]]; then
+  command %(if [[ ! -e "#{fetch(:ry_path)}/bin" ]]; then
       echo "! ry not found"
       echo "! If ry is installed, check your :ry_path setting."
       exit 1
-    fi
-  )
-  command "export PATH='#{fetch(:ry_path)}/bin:$PATH'"
-  command 'eval "$(ry setup)"'
-  command "RY_RUBY='#{args[:env]}'"
-  command %(
-    if [ -n "$RY_RUBY" ]; then
+    fi)
+  command %(export PATH="#{fetch(:ry_path)}/bin:$PATH")
+  command %(eval "$(ry setup)")
+  command %(RY_RUBY="#{args[:env]}")
+  command %(if [ -n "$RY_RUBY" ]; then
       #{echo_cmd 'ry use $RY_RUBY'} || exit 1
-    fi
-  )
+    fi)
 end

data/test_env/config/deploy.rb

@@ -29,7 +29,7 @@ set :shared_paths, ['config/database.yml', 'log']
 set :keep_releases, 2
 
 task :environment do
-  command 'eval "$(rbenv init -)"'
+  command %(eval "$(rbenv init -)")
 end
 #
 # desc "Deploys."
@@ -42,7 +42,7 @@ task deploy: :environment do
     invoke :'deploy:cleanup'
 
     on :launch do
-      comment 'in launch'
+      comment %(in launch)
     end
   end
 end
@@ -50,12 +50,12 @@ end
 desc 'Task description'
 task :test do
   run :local do
-    comment 'PWD'
+    comment %(PWD)
     in_path('/Users') do
-      command 'ls -al'
+      command %(ls -al)
     end
     on :after do
-      command 'pwd'
+      command %(pwd)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Stjepan Hadjić
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +112,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - PRE_1_CHANGELOG.md
@@ -154,9 +155,37 @@ files:
 - spec/lib/mina/helpers/internal_spec.rb
 - spec/lib/mina/helpers/output_spec.rb
 - spec/lib/mina/runner_spec.rb
-- spec/lib/mina_spec.rb
 - spec/spec_helper.rb
-- spec/support/run_helper.rb
+- spec/support/outputs/bundle_clean.txt
+- spec/support/outputs/bundle_install.txt
+- spec/support/outputs/chruby.txt
+- spec/support/outputs/console.txt
+- spec/support/outputs/deploy_cleanup.txt
+- spec/support/outputs/deploy_force_unlock.txt
+- spec/support/outputs/deploy_link_shared_paths.txt
+- spec/support/outputs/git_clone.txt
+- spec/support/outputs/git_clone_commit.txt
+- spec/support/outputs/git_revision.txt
+- spec/support/outputs/log.txt
+- spec/support/outputs/rails_assets_precompile.txt
+- spec/support/outputs/rails_db_create.txt
+- spec/support/outputs/rails_db_migrate.txt
+- spec/support/outputs/rails_db_rollback.txt
+- spec/support/outputs/rbenv_load.txt
+- spec/support/outputs/rollback.txt
+- spec/support/outputs/run.txt
+- spec/support/outputs/rvm_use.txt
+- spec/support/outputs/ry.txt
+- spec/support/outputs/setup.txt
+- spec/support/outputs/ssh_keyscan.txt
+- spec/support/rake_example_group.rb
+- spec/tasks/bundler_spec.rb
+- spec/tasks/default_spec.rb
+- spec/tasks/deploy_spec.rb
+- spec/tasks/git_spec.rb
+- spec/tasks/init_spec.rb
+- spec/tasks/rails_spec.rb
+- spec/tasks/ruby_managers_spec.rb
 - tasks/mina/bundler.rb
 - tasks/mina/chruby.rb
 - tasks/mina/default.rb