mina 0.1.0 → 0.1.1

data/.gitignore

@@ -2,3 +2,4 @@ doc
 test_env/deploy
 .rvmrc
 Gemfile.lock
+pkg/

data/HISTORY.md

@@ -1,3 +1,19 @@
+v0.1.1 - Jun 07, 2012
+---------------------
+
+### Added:
+  * Check for releases_path directory in deploy script.
+  * mina deploy:cleanup
+  * Support for -f option.
+
+### Changed:
+  * Gem description.
+
+### Fixed:
+  * deploy.rb template (domain, user, git:clone).
+  * Handle empty Git repository.
+  * Add pkg to gitignore.
+
 v0.1.0 - Jun 06, 2012
 ---------------------
 

data/bin/mina

@@ -26,7 +26,10 @@ Rake.application.instance_eval do
   standard_exception_handling do
     # Initialize Rake and make it think it's Mina.
     init 'mina'
-    @rakefiles = ['Minafile', 'config/deploy.rb']
+
+    # (The only way @rakefiles has only 1 value is if -f is specified.)
+    custom_rakefile = (@rakefiles.size == 1)
+    @rakefiles = ['Minafile', 'config/deploy.rb']  unless custom_rakefile
 
     # Workaround: Rake 0.9+ doesn't record task descriptions unless it's needed.
     # Need it for 'mina help'
@@ -38,7 +41,7 @@ Rake.application.instance_eval do
     require 'mina/rake'
 
     # Allow running without a Rakefile
-    load_rakefile  if have_rakefile
+    load_rakefile  if have_rakefile || custom_rakefile
 
     # Run tasks
     top_level

data/data/deploy.rb

@@ -3,22 +3,22 @@ require 'mina/rails'
 require 'mina/git'
 
 # Basic settings:
-# host       - The hostname to SSH to
+# domain     - The hostname to SSH to
 # deploy_to  - Path to deploy into
 # repository - Git repo to clone from (needed by mina/git)
 # user       - Username in the  server to SSH to (optional)
 
-set :host, 'foobar.com'
+set :domain, 'foobar.com'
 set :deploy_to, '/var/www/foobar.com'
 set :repository, 'git://...'
-# set :user, 'foobar.com'
+# set :user, 'foobar'
 
 desc "Deploys the current version to the server."
 task :deploy do
   deploy do
     # Put things that will set up an empty directory into a fully set-up
     # instance of your project.
-    invoke :'git:checkout'
+    invoke :'git:clone'
     invoke :'bundle:install'
     invoke :'rails:db_migrate'
     invoke :'rails:assets_precompile'

data/data/deploy.sh.erb

@@ -11,7 +11,15 @@ cd "<%= deploy_to %>" || (
   echo "The path '<%= deploy_to %>' is not accessible on the server."
   echo "You may need to run 'mina setup' first."
   false
-) || exit 16
+) || exit 15
+
+# Check releases path
+if [ ! -d "<%= releases_path %>" ]; then
+  echo "=====> ERROR: not set up."
+  echo "The directory '<%= releases_path %>' does not exist on the server."
+  echo "You may need to run 'mina setup' first."
+  exit 16
+fi
 
 # Check lockfile
 if [ -e "<%= lock_file %>" ]; then
@@ -94,5 +102,5 @@ fi
   # Unlock
   <%= echo_cmd %[rm -f "#{lock_file}"] %>
   echo "OK"
-  exit 8
+  exit 19
 )

data/lib/mina/default.rb

@@ -74,7 +74,8 @@ task :help do
     [ "-V, --version", "Show program version" ],
     [ "-v, --verbose", "Show commands as they happen" ],
     [ "-S, --simulate", "Run in simulation mode" ],
-    [ "-t, --trace", "Show backtraces when errors occur" ]
+    [ "-t, --trace", "Show backtraces when errors occur" ],
+    [ "-f FILE", "Use FILE as the deploy configuration" ]
   ]
   opts.each { |args| puts "  %-17s %s" % args }
   puts ""

data/lib/mina/deploy.rb

@@ -2,6 +2,7 @@ set_default :releases_path, "releases"
 set_default :shared_path, "shared"
 set_default :current_path, "current"
 set_default :lock_file, "deploy.lock"
+set_default :keep_releases, 5
 
 namespace :deploy do
   desc "Forces a deploy unlock."
@@ -27,6 +28,18 @@ namespace :deploy do
       #{cmds.join(" &&\n")}
     }
   end
+
+  desc "Clean up old releases. By default, the last 5 releases are kept on
+    each server (though you can change this with the keep_releases setting).
+    All other deployed revisions are removed from the servers."
+  task :cleanup do
+    queue %{echo "-----> Cleaning up old releases (keeping #{keep_releases!})"}
+    queue echo_cmd %{cd "#{deploy_to!}" || exit 15}
+    queue echo_cmd %{cd "#{releases_path!}" || exit 16}
+    queue echo_cmd %{count=`ls -1d [0-9]* | sort -rn | wc -l`}
+    queue echo_cmd %{remove=$((count > 5 ? count - #{keep_releases} : 0))}
+    queue echo_cmd %{ls -1d [0-9]* | sort -rn | tail -n $remove | xargs rm -rf {}}
+  end
 end
 
 desc "Sets up a site."

data/lib/mina/git.rb

@@ -3,6 +3,11 @@ namespace :git do
   task :clone do
     settings.revision ||= `git rev-parse HEAD`.strip
 
+    if settings.revision.empty?
+      error "Git revision is empty. Check if you are in git tree."
+      exit 1
+    end
+
     queue %{
       echo "-----> Cloning the Git repository"
       #{echo_cmd %[git clone "#{repository!}" . -n --recursive]} &&

data/lib/mina/version.rb

@@ -1,5 +1,5 @@
 module Mina
   def self.version
-    "0.1.0"
+    "0.1.1"
   end
 end

data/mina.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name = "mina"
   s.version = Mina.version
   s.summary = %{Really fast deployer and server automation tool.}
-  s.description = %Q{Builds scripts."}
+  s.description = %Q{Really fast deployer and server automation tool.}
   s.authors = ["Rico Sta. Cruz", "Michael Galero"]
   s.email = ["rico@nadarei.co", "mikong@nadarei.co"]
   s.homepage = "http://github.com/nadarei/mina"

data/spec/commands/command_spec.rb

@@ -55,6 +55,12 @@ describe "Invoking the 'mina' command in a project" do
     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'
+  end
+
   it "with 'mina tasks' should print tasks" do
     mina 'tasks'
 

data/spec/commands/custom_config_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'command_helper'
+
+describe "Invoking the 'mina' command in a project without a deploy.rb" do
+  before :each do
+    Dir.chdir root('spec/fixtures/custom_file_env')
+    FileUtils.rm_rf 'deploy'
+  end
+
+  it 'should fail' do
+    run_command 'deploy', '--simulate'
+    exitstatus.should 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'
+  end
+end
+

data/spec/commands/git_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'command_helper'
+
+describe "Invoking the 'mina deploy' command outside of git tree" do
+  before do
+    temp_path = "/tmp/mina-spec"
+    FileUtils.mkdir_p("#{temp_path}/config")
+    FileUtils.cp root('spec/fixtures/empty_env/config/deploy.rb'), "#{temp_path}/config/deploy.rb"
+    Dir.chdir temp_path
+  end
+
+  after do
+    FileUtils.rm_rf "/tmp/mina-spec"
+    Dir.chdir root
+  end
+
+  it 'should prompt empty revision error message' do
+    run_command 'deploy', 'simulate=1'
+    exitstatus.should_not eq(0)
+    stderr.should match(/git revision is empty/i)
+  end
+end

data/spec/dsl/settings_in_rake_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe 'Settings in rake tasks' do
   it '#set should work' do
-    rake { set :host, 'localhost' }
+    rake { set :domain, 'localhost' }
 
-    rake.host.should == 'localhost'
-    rake.settings.host.should == 'localhost'
+    rake.domain.should == 'localhost'
+    rake.settings.domain.should == 'localhost'
   end
 
   it '#settings ||= should work' do

data/spec/dsl/settings_spec.rb

@@ -7,8 +7,8 @@ describe 'Settings' do
     end
 
     it 'setting/getting should work' do
-      @settings.host = '192.168.1.1'
-      @settings.host.should == '192.168.1.1'
+      @settings.domain = '192.168.1.1'
+      @settings.domain.should == '192.168.1.1'
     end
 
     it 'question mark should work' do

data/spec/fixtures/custom_file_env/custom_deploy.rb

@@ -0,0 +1,15 @@
+require 'fileutils'
+FileUtils.mkdir_p "#{Dir.pwd}/deploy"
+
+require 'mina/git'
+
+set :domain, 'localhost'
+set :deploy_to, "#{Dir.pwd}/deploy"
+set :repository, "#{Dir.pwd}"
+
+desc "Deploys."
+task :deploy do
+  deploy do
+    invoke :'git:clone'
+  end
+end

data/spec/fixtures/empty_env/config/deploy.rb

@@ -0,0 +1,15 @@
+require 'fileutils'
+FileUtils.mkdir_p "#{Dir.pwd}/deploy"
+
+require 'mina/git'
+
+set :domain, 'localhost'
+set :deploy_to, "#{Dir.pwd}/deploy"
+set :repository, "#{Dir.pwd}"
+
+desc "Deploys."
+task :deploy do
+  deploy do
+    invoke :'git:clone'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70316358397800 !ruby/object:Gem::Requirement
+  requirement: &70204554987380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70316358397800
+  version_requirements: *70204554987380
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70316358397380 !ruby/object:Gem::Requirement
+  requirement: &70204554986960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70316358397380
+  version_requirements: *70204554986960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70316358396960 !ruby/object:Gem::Requirement
+  requirement: &70204554986540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,8 +44,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70316358396960
-description: Builds scripts."
+  version_requirements: *70204554986540
+description: Really fast deployer and server automation tool.
 email:
 - rico@nadarei.co
 - mikong@nadarei.co
@@ -80,7 +80,9 @@ files:
 - mina.gemspec
 - spec/command_helper.rb
 - spec/commands/command_spec.rb
+- spec/commands/custom_config_spec.rb
 - spec/commands/deploy_spec.rb
+- spec/commands/git_spec.rb
 - spec/commands/outside_project_spec.rb
 - spec/commands/real_deploy_spec.rb
 - spec/commands/verbose_spec.rb
@@ -88,6 +90,8 @@ files:
 - spec/dsl/settings_in_rake_spec.rb
 - spec/dsl/settings_spec.rb
 - spec/dsl/to_spec.rb
+- spec/fixtures/custom_file_env/custom_deploy.rb
+- spec/fixtures/empty_env/config/deploy.rb
 - spec/spec_helper.rb
 - test_env/config/deploy.rb
 homepage: http://github.com/nadarei/mina