mina 1.0.0.beta3 → 1.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 261d84773ca676a3055c61340791b56b0effdec0
-  data.tar.gz: f863a1a2a91bf1ec553b143827b1d7b466b2eb2d
+  metadata.gz: d7e4bbe584b47f1733e6d26dd00d4ec9fb9a8127
+  data.tar.gz: 2ecc4e001b83398d545575b3c8aabaf5ae6c48c7
 SHA512:
-  metadata.gz: 1afb944dc91032e50b394f5d4610d0b6fc73c17931dda7e1929dab92f97c372e65693ce8e97123a99acb1719b1adf021429ddb85ec9e23dd3d98585843cddcc0
-  data.tar.gz: a18b131de119c56faf129f08521ac0ca4e0c79918fa10a366ae42140dcddba63567ad090003cce90bb0b6377e176ef10f4f67acfc9be7fda4c56d1b5ca8b5268
+  metadata.gz: a56e0f7f29d5758dc21b0637bbd37ea0f6df2f3ecb8b14120154c5d2ecd6c8b3390837ae33d63d51652354eaaf389a390c84814d064176b147d39dbf5d0ade8a
+  data.tar.gz: 564a98a1deb9456b9b87631c0817f1811bec4300aed0682c5a0d4cfef22b0825bd4d058c10ff2d1ec206b1dbb4f8c5dfde78071a7b9958e129115a1213ee801d

data/data/deploy.rb

@@ -37,7 +37,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: :environment do
-  # command %(rbenv install 2.3.0)
+  # command %{rbenv install 2.3.0}
 end
 
 desc "Deploys the current version to the server."
@@ -56,8 +56,8 @@ task deploy: :environment do
 
     on :launch do
       in_path(fetch(:current_path)) do
-        command %(mkdir -p tmp/)
-        command %(touch tmp/restart.txt)
+        command %{mkdir -p tmp/}
+        command %{touch tmp/restart.txt}
       end
     end
   end

data/lib/mina/commands.rb

@@ -19,9 +19,9 @@ module Mina
 
     def comment(code, indent: nil)
       if indent
-        queue[stage] << indent(indent, %(echo "-----> #{code}"))
+        queue[stage] << indent(indent, %{echo "-----> #{code}"})
       else
-        queue[stage] << %(echo "-----> #{code}")
+        queue[stage] << %{echo "-----> #{code}"}
       end
     end
 
@@ -31,8 +31,8 @@ module Mina
 
     def process(path = nil)
       if path
-        queue[stage].unshift(%(echo "$ cd #{path}")) if fetch(:verbose)
-        %((cd #{path} && #{queue[stage].join(' && ')}))
+        queue[stage].unshift(%{echo "$ cd #{path}"}) if fetch(:verbose)
+        %{(cd #{path} && #{queue[stage].join(' && ')})}
       else
         queue[stage].join("\n")
       end

data/lib/mina/version.rb

@@ -1,3 +1,3 @@
 module Mina
-  VERSION = '1.0.0.beta3'.freeze
+  VERSION = '1.0.0.beta4'.freeze
 end

data/tasks/mina/bundler.rb

@@ -3,19 +3,19 @@ require 'mina/default'
 set :bundle_bin, 'bundle'
 set :bundle_path, 'vendor/bundle'
 set :bundle_withouts, 'development test'
-set :bundle_options, -> { %(--without #{fetch(:bundle_withouts)} --path "#{fetch(:bundle_path)}" --deployment) }
+set :bundle_options, -> { %{--without #{fetch(:bundle_withouts)} --path "#{fetch(:bundle_path)}" --deployment} }
 set :shared_dirs, fetch(:shared_dirs, []).push(fetch(:bundle_path))
 
 namespace :bundle do
   desc 'Install gem dependencies using Bundler.'
   task install: :environment do
-    comment %(Installing gem dependencies using Bundler)
-    command %(#{fetch(:bundle_bin)} install #{fetch(:bundle_options)})
+    comment %{Installing gem dependencies using Bundler}
+    command %{#{fetch(:bundle_bin)} install #{fetch(:bundle_options)}}
   end
 
   desc 'Cleans up unused gems in your bundler directory'
   task :clean do
-    comment %(Cleans up unsed gems)
-    command %(#{fetch(:bundle_bin)} clean #{fetch(:bundle_options)})
+    comment %{Cleans up unsed gems}
+    command %{#{fetch(:bundle_bin)} clean #{fetch(:bundle_options)}}
   end
 end

data/tasks/mina/chruby.rb

@@ -7,11 +7,11 @@ task :chruby, :env do |_, args|
     exit 1
   end
 
-  comment %(chruby to version: \\"#{args[:env]}\\")
-  command %(if [[ ! -s "#{fetch(:chruby_path)}" ]]; then
+  comment %{chruby to version: \\"#{args[:env]}\\"}
+  command %{if [[ ! -s "#{fetch(:chruby_path)}" ]]; then
       echo "! chruby.sh init file not found"
       exit 1
-    fi)
-  command %(source #{fetch(:chruby_path)})
-  command %(chruby "#{args[:env]}" || exit 1)
+    fi}
+  command %{source #{fetch(:chruby_path)}}
+  command %{chruby "#{args[:env]}" || exit 1}
 end

data/tasks/mina/default.rb

@@ -49,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

@@ -12,22 +12,22 @@ 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 %{mkdir -p #{File.dirname("./#{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,27 +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)}")
+      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

@@ -11,11 +11,11 @@ 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
+      command %{if [ ! -d "#{fetch(:deploy_to)}/scm/objects" ]; then
           echo "-----> Cloning the Git repository"
           #{echo_cmd %[git clone "#{fetch(:repository)}" "#{fetch(:deploy_to)}/scm" --bare]}
         else
@@ -23,29 +23,29 @@ namespace :git do
           #{echo_cmd %[(cd "#{fetch(:deploy_to)}/scm" && git fetch "#{fetch(:repository)}" "#{fetch(:branch)}:#{fetch(:branch)}" --force)]}
         fi &&
         echo "-----> Using git branch '#{fetch(:branch)}'" &&
-        #{echo_cmd %[git clone "#{fetch(:deploy_to)}/scm" . --recursive --branch "#{fetch(:branch)}"]}), quiet: true
+        #{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
+      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)
+      fi}
     end
   end
 end

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,45 +31,41 @@ 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"),
-        changed: %(
-          echo "-----> Migrating database"
-          #{echo_cmd("#{fetch(:rake)} db:migrate")}
-        )
+        skip: %{echo "-----> DB migrations unchanged; skipping DB migration"},
+        changed: %{echo "-----> Migrating database"
+          #{echo_cmd("#{fetch(:rake)} db:migrate")}}
       ), quiet: true
     end
   end
 
   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"),
-        changed: %(
-          echo "-----> Precompiling asset files"
-          #{echo_cmd "#{fetch(:rake)} assets:precompile"}
-        )
+        skip: %{echo "-----> Skipping asset precompilation"},
+        changed: %{echo "-----> Precompiling asset files"
+          #{echo_cmd "#{fetch(:rake)} assets:precompile"}}
       ), quiet: true
     end
   end
@@ -77,15 +73,15 @@ 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}
+  %{if #{diffs}
     then
       #{options[:skip]}
     else
       #{options[:changed]}
-    fi)
+    fi}
 end
 
 # Macro used later by :rails, :rake, etc
@@ -95,10 +91,10 @@ make_run_task = lambda { |name, example|
 
     arguments = args[:arguments]
     unless arguments
-      puts %(You need to provide arguments. Try: mina "#{name}[#{example}]")
+      puts %{You need to provide arguments. Try: mina "#{name}[#{example}]"}
       exit 1
     end
-    command %(cd "#{deploy_to!}/#{current_path!}" && #{fetch(name)} #{arguments})
+    command %{cd "#{deploy_to!}/#{current_path!}" && #{fetch(name)} #{arguments}}
   end
 }
 

data/tasks/mina/rbenv.rb

@@ -1,13 +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

@@ -7,14 +7,14 @@ task :'rvm:use', :env do |_, args|
     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)})
-  comment %(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|
@@ -24,12 +24,12 @@ task :'rvm:wrapper', :env, :name, :bin do |_, args|
     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

@@ -5,18 +5,18 @@ task :ry, :env do |_, args|
     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.beta3
+  version: 1.0.0.beta4
 platform: ruby
 authors:
 - Stjepan Hadjić