mina 0.3.0 → 0.3.1

data/bin/mina

@@ -58,7 +58,7 @@ Rake.application.instance_eval do
       puts ""
       scope.print_error "Command failed."
       scope.print_stderr "#{e.message}"
-      exit e.exitstatus
+      exit(e.exitstatus > 255 ? e.exitstatus >> 8 : e.exitstatus)
     end
   end
 end

data/data/deploy.rb

@@ -15,6 +15,9 @@ set :deploy_to, '/var/www/foobar.com'
 set :repository, 'git://...'
 set :branch, 'master'
 
+# For system-wide RVM install.
+#   set :rvm_path, '/usr/local/rvm/bin/rvm'
+
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
 # They will be linked in the 'deploy:link_shared_paths' step.
 set :shared_paths, ['config/database.yml', 'log']
@@ -22,6 +25,7 @@ set :shared_paths, ['config/database.yml', 'log']
 # Optional settings:
 #   set :user, 'foobar'    # Username in the server to SSH to.
 #   set :port, '30000'     # SSH port number.
+#   set :forward_agent, true     # SSH forward_agent.
 
 # This task is the environment that is loaded for most commands, such as
 # `mina deploy` or `mina rake`.
@@ -38,14 +42,14 @@ end
 # For Rails apps, we'll make some of the shared paths that are shared between
 # all releases.
 task :setup => :environment do
-  queue! %[mkdir -p "#{deploy_to}/shared/log"]
-  queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/log"]
+  queue! %[mkdir -p "#{deploy_to}/#{shared_path}/log"]
+  queue! %[chmod g+rx,u+rwx "#{deploy_to}/#{shared_path}/log"]
 
-  queue! %[mkdir -p "#{deploy_to}/shared/config"]
-  queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config"]
+  queue! %[mkdir -p "#{deploy_to}/#{shared_path}/config"]
+  queue! %[chmod g+rx,u+rwx "#{deploy_to}/#{shared_path}/config"]
 
-  queue! %[touch "#{deploy_to}/shared/config/database.yml"]
-  queue  %[echo "-----> Be sure to edit 'shared/config/database.yml'."]
+  queue! %[touch "#{deploy_to}/#{shared_path}/config/database.yml"]
+  queue  %[echo "-----> Be sure to edit '#{deploy_to}/#{shared_path}/config/database.yml'."]
 end
 
 desc "Deploys the current version to the server."
@@ -58,9 +62,11 @@ task :deploy => :environment do
     invoke :'bundle:install'
     invoke :'rails:db_migrate'
     invoke :'rails:assets_precompile'
+    invoke :'deploy:cleanup'
 
     to :launch do
-      queue "touch #{deploy_to}/tmp/restart.txt"
+      queue "mkdir -p #{deploy_to}/#{current_path}/tmp/"
+      queue "touch #{deploy_to}/#{current_path}/tmp/restart.txt"
     end
   end
 end

data/lib/mina/bundler.rb

@@ -19,10 +19,15 @@ set_default :bundle_bin, 'bundle'
 
 set_default :bundle_path, './vendor/bundle'
 
+# ### bundle_withouts
+# Sets the colon-separated list of groups to be skipped from installation.
+
+set_default :bundle_withouts, 'development:test'
+
 # ### bundle_options
 # Sets the options for installing gems via Bundler.
 
-set_default :bundle_options, lambda { %{--without development:test --path "#{bundle_path}" --binstubs bin/ --deployment} }
+set_default :bundle_options, lambda { %{--without #{bundle_withouts} --path "#{bundle_path}" --deployment} }
 
 # ## Deploy tasks
 # These tasks are meant to be invoked inside deploy scripts, not invoked on

data/lib/mina/chruby.rb

@@ -0,0 +1,49 @@
+# # Modules: chruby
+# Adds settings and tasks for managing [chruby] installations.
+#
+# [chruby]: https://github.com/postmodern/chruby
+#
+#     require 'mina/chruby'
+#
+# ## Common usage
+#
+#     task :environment do
+#       invoke :'chruby[ruby-1.9.3-p392]'
+#     end
+#
+#     task :deploy => :environment do
+#       ...
+#     end
+
+# ## Settings
+# Any and all of these settings can be overriden in your `deploy.rb`.
+
+# ### chruby_path
+# Path where *chruby* init scripts are installed.
+#
+set_default :chruby_path, "/etc/profile.d/chruby.sh"
+
+# ## Tasks
+
+# ### chruby[version]
+# Switch to given Ruby version
+
+task :chruby, :env do |t, args|
+  unless args[:env]
+    print_error "Task 'chruby' needs a Ruby version as an argument."
+    print_error "Example: invoke :'chruby[ruby-1.9.3-p392]'"
+    die
+  end
+
+  queue %{
+    echo "-----> chruby to version: '#{args[:env]}'"
+
+    if [[ ! -s "#{chruby_path}" ]]; then
+      echo "! chruby.sh init file not found"
+      exit 1
+    fi
+
+    source #{chruby_path}
+    #{echo_cmd %{chruby "#{args[:env]}"}} || exit 1
+  }
+end

data/lib/mina/default.rb

@@ -131,6 +131,7 @@ task :help do
   puts ""
   puts "All of Rake's options are also available as '#{name}' options. See 'rake --help'"
   puts "for more information."
+  exit
 end
 
 # ### tasks

data/lib/mina/deploy.rb

@@ -4,10 +4,26 @@
 # ## Settings
 # Any and all of these settings can be overriden in your `deploy.rb`.
 
+# ### releases_path
+# (default: 'releases')
 set_default :releases_path, "releases"
+
+# ### shared_path
+# (default: 'shared')
 set_default :shared_path, "shared"
+
+# ### current_path
+# (default: 'current_path')
 set_default :current_path, "current"
+
+# ### lock_file
+# Name of the file to generate while a deploy is currently ongoing.
+# (default: 'deploy.lock')
 set_default :lock_file, "deploy.lock"
+
+# ### keep_releases
+# Number of releases to keep when doing the `deploy:cleanup` task.
+# (default: 5)
 set_default :keep_releases, 5
 
 namespace :deploy do
@@ -65,7 +81,7 @@ namespace :deploy do
       echo "-----> Cleaning up old releases (keeping #{keep_releases!})"
       #{echo_cmd %{cd "#{deploy_to!}/#{releases_path!}" || exit 15}}
       #{echo_cmd %{count=`ls -1d [0-9]* | sort -rn | wc -l`}}
-      #{echo_cmd %{remove=$((count > 5 ? count - #{keep_releases} : 0))}}
+      #{echo_cmd %{remove=$((count > #{keep_releases} ? count - #{keep_releases} : 0))}}
       #{echo_cmd %{ls -1d [0-9]* | sort -rn | tail -n $remove | xargs rm -rf {}}}
     }
   end

data/lib/mina/deploy_helpers.rb

@@ -15,11 +15,11 @@ module Mina
     # ### deploy_script
     # Wraps the things inside it in a deploy script.
     #
-    #   script = deploy_script do
-    #     invoke :'git:checkout'
-    #   end
+    #     script = deploy_script do
+    #       invoke :'git:checkout'
+    #     end
     #
-    #   queue script
+    #     queue script
     #
     # Returns the deploy script as a string, ready for `queue`ing.
     #

data/lib/mina/exec_helpers.rb

@@ -22,14 +22,14 @@ module Mina
           trap("INT") { Sys.handle_sigint(coathooks += 1, pid, self) }
 
           # __In the background,__ make stdin passthru, and stream stderr.
-          pid_err = Sys.stream_stderr!(e) { |str| print_stderr str }
-          pid_in  = Sys.stream_stdin!     { |chr| i.putc chr }
+          th_err = Sys.stream_stderr!(e) { |str| print_stderr str }
+          th_in  = Sys.stream_stdin!     { |chr| i.putc chr }
 
           # __In the foreground,__ stream stdout to the output helper.
           Sys.stream_stdout(o) { |ch| print_char ch }
 
-          Process.waitpid pid_err
-          Process.kill 'TERM', pid_in
+          th_err.join
+          th_in.terminate
         end
 
       status.exitstatus
@@ -59,31 +59,35 @@ module Mina
 
       # ### Sys.stream_stderr!
       # __Internal:__ Read from stderr stream `err` *[0]*, supress expected
-      # errors *[1]*, and yield. Returns the PID.
+      # errors *[1]*, and yield. Returns the thread.
 
       def stream_stderr!(err, &blk)
-        fork do
-          trap("INT") {}
-
-          while str = err.gets #[0]
-            next if str.include? "bash: no job control in this shell" #[1]
-            next if str.include? "stdin is not a terminal"
-
-            yield str.strip #[2]
+        Thread.new do
+          begin
+            while str = err.gets #[0]
+              next if str.include? "bash: no job control in this shell" #[1]
+              next if str.include? "stdin is not a terminal"
+
+              yield str.strip #[2]
+            end
+          rescue Interrupt
           end
         end
       end
 
       # ### Sys.stream_stdin!
       # __Internal:__ Read from the real stdin stream and pass it onto the given
-      # stdin stream `i`. Returns the PID.
+      # stdin stream `i`. Returns the thread.
 
       def stream_stdin!(&blk)
-        fork do
-          trap("INT") {}
-
-          while (char = STDIN.getbyte rescue nil)
-            yield char if char
+        Thread.new do
+          begin
+            while (char = STDIN.getbyte rescue nil)
+              yield char if char
+            end
+          rescue Interrupt
+          # rubinius 
+          rescue SignalException
           end
         end
       end
@@ -94,6 +98,9 @@ module Mina
 
       def stream_stdout(o, &blk)
         while str = o.getc
+          # Ruby 1.8.7 fix
+          str = str.chr if str.is_a? Fixnum
+          
           yield str
         end
       end

data/lib/mina/foreman.rb

@@ -40,11 +40,15 @@
 set_default :foreman_app,  lambda { application }
 set_default :foreman_user, lambda { user }
 set_default :foreman_log,  lambda { "#{deploy_to!}/#{shared_path}/log" }
+set_default :foreman_sudo, true
+set_default :foreman_format, 'upstart'
+set_default :foreman_location, '/etc/init'
 
 namespace :foreman do
   desc 'Export the Procfile to Ubuntu upstart scripts'
   task :export do
-    export_cmd = "sudo bundle exec foreman export upstart /etc/init -a #{foreman_app} -u #{foreman_user} -l #{foreman_log}"
+    sudo_cmd = "sudo" if foreman_sudo
+    export_cmd = "#{sudo_cmd} bundle exec foreman export #{foreman_format} #{foreman_location} -a #{foreman_app} -u #{foreman_user} -d #{deploy_to!}/#{current_path!} -l #{foreman_log}"
 
     queue %{
       echo "-----> Exporting foreman procfile for #{foreman_app}"

data/lib/mina/git.rb

@@ -52,7 +52,7 @@ namespace :git do
     status = %[
       echo "-----> Using this git commit" &&
       echo &&
-      #{echo_cmd %[git --no-pager log --format="%aN (%h):%n> %s" -n 1]} &&
+      #{echo_cmd %[git --no-pager log --format='%aN (%h):%n> %s' -n 1]} &&
       #{echo_cmd %[rm -rf .git]} &&
       echo
     ]

data/lib/mina/helpers.rb

@@ -1,4 +1,4 @@
-# # Helpers: Default helpers
+# # Helpers
 
 module Mina
   module Helpers
@@ -17,7 +17,10 @@ module Mina
 
     def invoke(task, options = {})
       Rake.application.invoke_task task
-      Rake::Task[task].reenable if options[:reenable]
+      if options[:reenable]
+        name = Rake.application.parse_task_string(task).first
+        Rake::Task[name].reenable
+      end
     end
 
     # ### erb
@@ -64,7 +67,7 @@ module Mina
     #     end
     #
     #     # Output:
-    #     # Elapsed time: 2.0 seconds
+    #     # Elapsed time: 2.00 seconds
 
     def report_time(&blk)
       time, output = measure &blk
@@ -73,13 +76,13 @@ module Mina
     end
 
     # ### measure
-    # Measures the time (in ms) a block takes.
+    # Measures the time (in seconds) a block takes.
     # Returns a [time, output] tuple.
 
     def measure(&blk)
       t = Time.now
       output = yield
-      [(Time.now - t).to_i, output]
+      [Time.now - t, output]
     end
 
     # ### mina_cleanup
@@ -119,9 +122,9 @@ module Mina
     # ## Queueing
 
     # ### queue
-    # Queues code to be ran.
+    # Queues code to be run.
     #
-    # This queues code to be ran to the current code bucket (defaults to `:default`).
+    # This queues code to be run to the current code bucket (defaults to `:default`).
     # To get the things that have been queued, use commands[:default]
     #
     # Returns nothing.
@@ -217,17 +220,18 @@ module Mina
     #
     # Returns nothing.
     #
-    #   in_directory './webapp' do
-    #     queue "./reload"
-    #   end
+    #     in_directory './webapp' do
+    #       queue "./reload"
+    #     end
     #
-    #   commands.should == ['cd ./webapp && (./reload && true)']
+    #     commands.should == ['cd ./webapp && (./reload && true)']
 
     def in_directory(path, &blk)
       isolated_commands = isolate { yield; commands }
       isolated_commands.each { |cmd| queue "(cd #{path} && (#{cmd}))" }
     end
 
+    # ### to
     # Defines instructions on how to do a certain thing.
     # This makes the commands that are `queue`d go into a different bucket in commands.
     #
@@ -310,13 +314,17 @@ module Mina
     # Checks if Rake was invoked with --verbose.
     #
     # Returns true or false.
+    #
+    #     if verbose_mode?
+    #       queue %[echo "-----> Starting a new process"]
+    #     end
 
     def verbose_mode?
       if Rake.respond_to?(:verbose)
-        # Rake 0.9.x
+        #- Rake 0.9.x
         Rake.verbose == true
       else
-        # Rake 0.8.x
+        #- Rake 0.8.x
         RakeFileUtils.verbose_flag != :default
       end
     end
@@ -369,6 +377,7 @@ module Mina
 
     # ### capture
     # Returns the output of command via SSH.
+
     def capture(cmd, options={})
       ssh cmd, options.merge(:return => true)
     end

data/lib/mina/rails.rb

@@ -12,7 +12,7 @@ require 'mina/bundler'
 # Sets the Rails environment for `rake` and `rails` commands.
 #
 # Note that changing this will NOT change the environment that your application
-# is ran in.
+# is run in.
 
 set_default :rails_env, 'production'
 
@@ -118,7 +118,7 @@ make_run_task[:rake, 'db:migrate']
 # ### console
 # Opens the Ruby console for the currently-deployed version.
 #
-#    $ mina console
+#     $ mina console
 
 desc "Starts an interactive console."
 task :console do
@@ -141,10 +141,10 @@ namespace :rails do
         'Migrating database'
 
       queue check_for_changes_script \
-        :check => 'db/schema.rb',
-        :at => ['db/schema.rb'],
+        :check => 'db/migrate/',
+        :at => ['db/migrate/'],
         :skip => %[
-          echo "-----> DB schema unchanged; skipping DB migration"
+          echo "-----> DB migrations unchanged; skipping DB migration"
         ],
         :changed => %[
           echo "-----> #{message}"
@@ -190,7 +190,7 @@ namespace :rails do
         :at => [*asset_paths],
         :skip => %[
           echo "-----> Skipping asset precompilation"
-          #{echo_cmd %[cp -R "#{deploy_to}/#{current_path}/public/assets" "./public/assets"]}
+          #{echo_cmd %[cp -R "#{deploy_to}/#{current_path}/public/assets" "./public"]}
         ],
         :changed => %[
           echo "-----> #{message}"

data/lib/mina/rbenv.rb

@@ -33,6 +33,7 @@ set_default :rbenv_path, "$HOME/.rbenv"
 task :'rbenv:load' do
   queue %{
     echo "-----> Loading rbenv"
+    #{echo_cmd %{export RBENV_ROOT="#{rbenv_path}"}}
     #{echo_cmd %{export PATH="#{rbenv_path}/bin:$PATH"}}
 
     if ! which rbenv >/dev/null; then

data/lib/mina/rvm.rb

@@ -57,9 +57,8 @@ task :'rvm:use', :env do |t, args|
   }
 end
 
-
 # ### rvm:wrapper[]
-# Creates a rvm wrapper for a given executable
+# Creates a rvm wrapper for a given executable.
 #
 # This is usually placed in the `:setup` task.
 #
@@ -71,7 +70,7 @@ end
 task :'rvm:wrapper', :env, :name, :bin do |t,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:use[ruby-1.9.2@myapp,myapp,unicorn_rails]'"
+    print_error "Example: invoke :'rvm:wrapper[ruby-1.9.2@myapp,myapp,unicorn_rails]'"
     die
   end
 
@@ -86,5 +85,4 @@ task :'rvm:wrapper', :env, :name, :bin do |t,args|
     source #{rvm_path}
     #{echo_cmd %{rvm wrapper #{args[:env]} #{args[:name]} #{args[:bin]} }} || exit 1
   }
-
 end

data/lib/mina/ssh_helpers.rb

@@ -83,7 +83,8 @@ module Mina
       # `term_mode`.  Called by `ssh`.
 
       def invoke(script, this)
-        term_mode = :"#{this.settings.term_mode}"
+        # Ruby 1.8.7 doesn't let you have empty symbols
+        term_mode = :"#{this.settings.term_mode}" if this.settings.term_mode
         code = "#{this.ssh_command} -- #{script}"
 
         # Certain environments can't do :pretty mode.

data/lib/mina/version.rb

@@ -1,5 +1,5 @@
 module Mina
   def self.version
-    "0.3.0"
+    "0.3.1"
   end
 end

data/lib/mina/whenever.rb

@@ -6,22 +6,22 @@ namespace :whenever do
   desc "Clear crontab"
   task :clear do
     queue %{
-      echo "-----> Clear crontab for #{domain}"
-      #{echo_cmd %[cd #{deploy_to!}/#{current_path!} ; bundle exec whenever --clear-crontab #{domain} --set 'environment=production&path=#{deploy_to!}/#{current_path!}']}
+      echo "-----> Clear crontab for #{domain}_#{rails_env}"
+      #{echo_cmd %[cd #{deploy_to!}/#{current_path!} ; #{bundle_bin} exec whenever --clear-crontab #{domain}_#{rails_env} --set 'environment=#{rails_env}&path=#{deploy_to!}/#{current_path!}']}
     }
   end
   desc "Update crontab"
   task :update do
     queue %{
-      echo "-----> Update crontab for #{domain}"
-      #{echo_cmd %[cd #{deploy_to!}/#{current_path!} ; bundle exec whenever --update-crontab #{domain} --set 'environment=production&path=#{deploy_to!}/#{current_path!}']}
+      echo "-----> Update crontab for #{domain}_#{rails_env}"
+      #{echo_cmd %[cd #{deploy_to!}/#{current_path!} ; #{bundle_bin} exec whenever --update-crontab #{domain}_#{rails_env} --set 'environment=#{rails_env}&path=#{deploy_to!}/#{current_path!}']}
     }
   end
   desc "Write crontab"
   task :write do
     queue %{
-      echo "-----> Update crontab for #{domain}"
-      #{echo_cmd %[cd #{deploy_to!}/#{current_path!} ; bundle exec whenever --write-crontab #{domain} --set 'environment=production&path=#{deploy_to!}/#{current_path!}']}
+      echo "-----> Update crontab for #{domain}_#{rails_env}"
+      #{echo_cmd %[cd #{deploy_to!}/#{current_path!} ; #{bundle_bin} exec whenever --write-crontab #{domain}_#{rails_env} --set 'environment=#{rails_env}&path=#{deploy_to!}/#{current_path!}']}
     }
   end
 end

data/mina.gemspec

@@ -12,6 +12,6 @@ Gem::Specification.new do |s|
   s.executables = Dir["bin/*"].map { |f| File.basename(f) }
 
   s.add_dependency "rake"
-  s.add_dependency "open4"
-  s.add_development_dependency "rspec"
+  s.add_dependency "open4", "~> 1.3.4"
+  s.add_development_dependency "rspec", "~> 3.0.0"
 end

data/spec/command_helper.rb

@@ -36,7 +36,7 @@ def mina(*args)
     puts stderr
   end
 
-  exitstatus.should == 0
+  expect(exitstatus).to eq(0)
 end
 
 def stdout

data/spec/commands/cleanup_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'command_helper'
+
+describe "Invoking the 'mina deploy:cleanup' command" do
+  before :each do
+    Dir.chdir root('test_env')
+  end
+
+  it "should cleanup old deployments", :ssh => true do
+    3.times { mina 'deploy' }
+
+    mina 'deploy:cleanup'
+
+    expect(Dir["deploy/releases/*"].length).to eq(2)
+  end
+end

data/spec/commands/command_spec.rb

@@ -8,24 +8,24 @@ describe "Invoking the 'mina' command in a project" do
 
   it "should think it's 'mina', not 'rake' (1)" do
     run_command 'pinkledills'
-    exitstatus.should_not == 0
-    stderr.should include 'mina aborted'
+    expect(exitstatus).not_to eq(0)
+    expect(stderr).to include 'mina aborted'
   end
 
   it "should think it's 'mina', not 'rake' (1)" do
     mina '-T'
-    stdout.should include 'mina help'
-    stdout.should include 'mina git:clone'
+    expect(stdout).to include 'mina help'
+    expect(stdout).to include 'mina git:clone'
   end
 
   it 'with --version should print the version' do
     mina '--version'
-    stdout.should include Mina.version
+    expect(stdout).to include Mina.version
   end
 
   it 'with -V should print the version' do
     mina '-V'
-    stdout.should include Mina.version
+    expect(stdout).to include Mina.version
   end
 
   describe 'without arguments' do
@@ -35,37 +35,37 @@ describe "Invoking the 'mina' command in a project" do
 
     it 'should print standard help tasks' do
       mina
-      stdout.should include 'mina help'
-      stdout.should include 'mina init'
-      stdout.should include 'mina tasks'
+      expect(stdout).to include 'mina help'
+      expect(stdout).to include 'mina init'
+      expect(stdout).to include 'mina tasks'
     end
 
     it 'should print project-specific tasks' do
       mina
-      stdout.should include 'mina deploy'
-      stdout.should include 'mina restart'
-      stdout.should include 'mina setup'
+      expect(stdout).to include 'mina deploy'
+      expect(stdout).to include 'mina restart'
+      expect(stdout).to include 'mina setup'
     end
 
     it "should be the same as running 'help'" do
       previous_out = stdout
 
       mina 'help'
-      stdout.should == previous_out
+      expect(stdout).to eq(previous_out)
     end
   end
 
   it "with 'mina -f' on a non-existing file should fail" do
     run_command '-f', 'foobar'
-    stderr.should include 'mina aborted'
-    stderr.should include 'No Rakefile found'
+    expect(stderr).to include 'mina aborted'
+    expect(stderr).to include 'No Rakefile found'
   end
 
   it "with 'mina tasks' should print tasks" do
     mina 'tasks'
 
-    stdout.should include('bundle:install')
-    stdout.should include('Install gem dependencies using Bundler')
-    stdout.should include('passenger:restart')
+    expect(stdout).to include('bundle:install')
+    expect(stdout).to include('Install gem dependencies using Bundler')
+    expect(stdout).to include('passenger:restart')
   end
 end

data/spec/commands/custom_config_spec.rb

@@ -9,12 +9,12 @@ describe "Invoking the 'mina' command in a project without a deploy.rb" do
 
   it 'should fail' do
     run_command 'deploy', '--simulate'
-    exitstatus.should be > 0
+    expect(exitstatus).to be > 0
   end
 
   it 'should pass if you provide a new rakefile' do
     mina 'deploy', '--simulate', '-f', 'custom_deploy.rb'
-    stdout.should include 'Creating a temporary build path'
+    expect(stdout).to include 'Creating a temporary build path'
   end
 end