mina 0.3.0 → 0.3.1

data/spec/commands/deploy_spec.rb

@@ -12,25 +12,25 @@ describe "Invoking the 'mina' command in a project" do
     end
 
     it "should take care of the lockfile" do
-      stdout.should =~ /ERROR: another deployment is ongoing/
-      stdout.should =~ /touch ".*deploy\.lock"/
-      stdout.should =~ /rm -f ".*deploy\.lock"/
+      expect(stdout).to match(/ERROR: another deployment is ongoing/)
+      expect(stdout).to match(/touch ".*deploy\.lock"/)
+      expect(stdout).to match(/rm -f ".*deploy\.lock"/)
     end
 
     it "should honor releases_path" do
-      stdout.should include "releases/"
+      expect(stdout).to include "releases/"
     end
 
     it "should symlink the current_path" do
-      stdout.should =~ /ln .*current/
+      expect(stdout).to match(/ln .*current/)
     end
 
     it "should include deploy directives" do
-      stdout.should include "bundle exec rake db:migrate"
+      expect(stdout).to include "bundle exec rake db:migrate"
     end
 
     it "should include 'to :launch' directives" do
-      stdout.should include "touch tmp/restart.txt"
+      expect(stdout).to include "touch tmp/restart.txt"
     end
   end
 end

data/spec/commands/outside_project_spec.rb

@@ -12,22 +12,22 @@ describe "Invoking the 'mina' command outside a project" do
     end
 
     it 'should print standard help tasks' do
-      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 not print project-specific tasks" do
-      stdout.should_not include('mina deploy')
-      stdout.should_not include('mina restart')
-      stdout.should_not include('mina setup')
+      expect(stdout).not_to include('mina deploy')
+      expect(stdout).not_to include('mina restart')
+      expect(stdout).not_to include('mina setup')
     end
 
     %w[-h --help].each do |arg|
       it "should have the same output as 'mina #{arg}'" do
         @previous_output = stdout
         mina arg
-        stdout.should == @previous_output
+        expect(stdout).to eq(@previous_output)
       end
     end
   end

data/spec/commands/real_deploy_spec.rb

@@ -21,33 +21,33 @@ describe "Invoking the 'mina' command in a project", :ssh => true do
   it 'should set up and deploy fine' do
     print "[setup]" if ENV['verbose']
     mina 'setup', '--verbose'
-    File.directory?('deploy').should be_true
-    File.directory?('deploy/releases').should be_true
-    File.directory?('deploy/shared').should be_true
-    File.exists?('deploy/last_version').should be_false
-    File.exists?('deploy/deploy.lock').should be_false
+    expect(File.directory?('deploy')).to be_truthy
+    expect(File.directory?('deploy/releases')).to be_truthy
+    expect(File.directory?('deploy/shared')).to be_truthy
+    expect(File.exists?('deploy/last_version')).to be_falsey
+    expect(File.exists?('deploy/deploy.lock')).to be_falsey
 
     print "[deploy 1]" if ENV['verbose']
     mina 'deploy', '--verbose'
-    stdout.should include "-----> Creating a temporary build path"
-    stdout.should include "rm -rf .git"
-    stdout.should include "mkdir -p"
-    File.exists?('deploy/last_version').should be_true
-    File.exists?('deploy/deploy.lock').should be_false
-    File.directory?('deploy/releases').should be_true
-    File.directory?('deploy/releases/1').should be_true
-    File.exists?('deploy/releases/1/README.md').should be_true
-    File.directory?('deploy/releases/2').should be_false
-    File.exists?('deploy/current').should be_true
-    File.read('deploy/last_version').strip.should == '1'
-    File.exists?('deploy/current/tmp/restart.txt').should be_true
+    expect(stdout).to include "-----> Creating a temporary build path"
+    expect(stdout).to include "rm -rf .git"
+    expect(stdout).to include "mkdir -p"
+    expect(File.exists?('deploy/last_version')).to be_truthy
+    expect(File.exists?('deploy/deploy.lock')).to be_falsey
+    expect(File.directory?('deploy/releases')).to be_truthy
+    expect(File.directory?('deploy/releases/1')).to be_truthy
+    expect(File.exists?('deploy/releases/1/README.md')).to be_truthy
+    expect(File.directory?('deploy/releases/2')).to be_falsey
+    expect(File.exists?('deploy/current')).to be_truthy
+    expect(File.read('deploy/last_version').strip).to eq('1')
+    expect(File.exists?('deploy/current/tmp/restart.txt')).to be_truthy
 
     # And again, to test out sequential versions and stuff
     print "[deploy 2]" if ENV['verbose']
     mina 'deploy'
-    stdout.should_not include "rm -rf .git"
-    stdout.should_not include "mkdir -p"
-    File.directory?('deploy/releases/2').should be_true
-    File.read('deploy/last_version').strip.should == '2'
+    expect(stdout).not_to include "rm -rf .git"
+    expect(stdout).not_to include "mkdir -p"
+    expect(File.directory?('deploy/releases/2')).to be_truthy
+    expect(File.read('deploy/last_version').strip).to eq('2')
   end
 end

data/spec/commands/verbose_spec.rb

@@ -10,12 +10,12 @@ describe "Invoking the 'mina' command in a project" do
   it 'should echo commands in verbose mode' do
     mina 'deploy', '--verbose', '--simulate'
 
-    stdout.should include %[echo #{Shellwords.escape('$ git')}]
+    expect(stdout).to include %[echo #{Shellwords.escape('$ git')}]
   end
 
   it 'should not echo commands when not in verbose mode' do
     mina 'deploy', '--simulate'
 
-    stdout.should_not include %[echo #{Shellwords.escape('$ git')}]
+    expect(stdout).not_to include %[echo #{Shellwords.escape('$ git')}]
   end
 end

data/spec/dsl/invoke_spec.rb

@@ -13,7 +13,7 @@ describe 'Mina' do
       rake { invoke :clone }
     }
 
-    rake.commands.should == ['git clone']
+    expect(rake.commands).to eq(['git clone'])
   end
 
   it '#invoke should work with :reenable option' do
@@ -28,6 +28,21 @@ describe 'Mina' do
       rake { invoke :pull, :reenable => true }
     }
 
-    rake.commands.should == ['git pull', 'git pull']
+    expect(rake.commands).to eq(['git pull', 'git pull'])
+  end
+
+  it '#invoke with task arguments should work with :reenable option' do
+
+    rake {
+      task :hello, [:world] do |t, args|
+        queue "echo Hello #{args[:world]}"
+      end
+    }
+
+    %w(World Pirate).each { |name|
+      rake { invoke :"hello[#{name}]", :reenable => true }
+    }
+
+    expect(rake.commands).to eq(['echo Hello World', 'echo Hello Pirate'])
   end
 end

data/spec/dsl/queue_spec.rb

@@ -8,7 +8,7 @@ describe 'Mina' do
       end
       invoke :hello
     }
-    rake.instance_variable_get(:@hello).should == 'world'
+    expect(rake.instance_variable_get(:@hello)).to eq('world')
   end
 
   it '#queue should work' do
@@ -16,7 +16,7 @@ describe 'Mina' do
       queue 'sudo service nginx restart'
     }
 
-    rake.commands.should == ['sudo service nginx restart']
+    expect(rake.commands).to eq(['sudo service nginx restart'])
   end
 
   it '#queue should work with multiple commands' do
@@ -25,7 +25,7 @@ describe 'Mina' do
       queue 'sudo service nginx restart'
     }
 
-    rake.commands.should == ['echo Restarting', 'sudo service nginx restart']
+    expect(rake.commands).to eq(['echo Restarting', 'sudo service nginx restart'])
   end
 
   it '#queue should work inside tasks' do
@@ -44,6 +44,6 @@ describe 'Mina' do
 
     rake { invoke :restart }
 
-    rake.commands.should == ['echo Restarting', 'touch tmp/restart.txt']
+    expect(rake.commands).to eq(['echo Restarting', 'touch tmp/restart.txt'])
   end
 end

data/spec/dsl/settings_in_rake_spec.rb

@@ -4,8 +4,8 @@ describe 'Settings in rake tasks' do
   it '#set should work' do
     rake { set :domain, 'localhost' }
 
-    rake.domain.should == 'localhost'
-    rake.settings.domain.should == 'localhost'
+    expect(rake.domain).to eq('localhost')
+    expect(rake.settings.domain).to eq('localhost')
   end
 
   it '#settings ||= should work' do
@@ -14,8 +14,8 @@ describe 'Settings in rake tasks' do
       settings.version ||= '3'
     }
 
-    rake.settings.version.should == '2'
-    rake.version.should == '2'
+    expect(rake.settings.version).to eq('2')
+    expect(rake.version).to eq('2')
   end
 
   it '#settings with lambdas should work' do
@@ -24,8 +24,8 @@ describe 'Settings in rake tasks' do
       set :path, lambda { "/var/www/#{version}" }
     }
 
-    rake.path.should == "/var/www/42"
-    rake.path?.should be_true
+    expect(rake.path).to eq("/var/www/42")
+    expect(rake.path?).to be_truthy
   end
 
   it '#settings with a bang should work' do

data/spec/dsl/settings_spec.rb

@@ -8,38 +8,43 @@ describe 'Settings' do
 
     it 'setting/getting should work' do
       @settings.domain = '192.168.1.1'
-      @settings.domain.should == '192.168.1.1'
+
+      expect(@settings.domain).to eq('192.168.1.1')
     end
 
     it 'question mark should work' do
       @settings.deploy_to = '/var/www/there'
-      @settings.deploy_to?.should be_true
-      @settings.foobar?.should be_false
+
+      expect(@settings.deploy_to?).to be_truthy
+      expect(@settings.foobar?).to be_falsey
     end
 
     it 'question mark should work with nils' do
       @settings.deploy_to = nil
-      @settings.deploy_to?.should be_true
-      @settings.foobar?.should be_false
+
+      expect(@settings.deploy_to?).to be_truthy
+      expect(@settings.foobar?).to be_falsey
     end
 
     it '||= should work (1)' do
       @settings.x = 2
       @settings.x ||= 3
-      @settings.x.should == 2
+
+      expect(@settings.x).to eq(2)
     end
 
     it '||= should work (2)' do
       @settings.x ||= 3
-      @settings.x.should == 3
+
+      expect(@settings.x).to eq(3)
     end
 
     it 'lambdas should work' do
       @settings.path = lambda { "/var/www/#{@settings.version}" }
       @settings.version = '3'
 
-      @settings.path?.should be_true
-      @settings.path.should == "/var/www/3"
+      expect(@settings.path?).to be_truthy
+      expect(@settings.path).to eq("/var/www/3")
     end
 
     it 'bangs should check for settings' do
@@ -48,7 +53,8 @@ describe 'Settings' do
 
     it 'bangs should return settings' do
       @settings.version = 4
-      @settings.version!.should == 4
+
+      expect(@settings.version!).to eq(4)
     end
   end
 end

data/spec/dsl/to_spec.rb

@@ -14,7 +14,7 @@ describe 'Mina' do
 
     rake { invoke :deploy }
 
-    rake.commands.should == ['git clone']
-    rake.commands(:restart).should == ['touch tmp/restart.txt']
+    expect(rake.commands).to eq(['git clone'])
+    expect(rake.commands(:restart)).to eq(['touch tmp/restart.txt'])
   end
 end

data/spec/helpers/exec_helper_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'Exec Helpers' do
+  before :each do
+    @exec = Object.new
+    @exec.send :extend, Mina::ExecHelpers
+
+    allow(@exec).to receive(:print_char)
+  end
+
+  it 'pretty_system' do
+    @exec.pretty_system "echo 'Hello there'"
+
+    expect(@exec).to have_received(:print_char).
+      with("e").with("r").with("e").with("h").with("t").
+      with(" ").
+      with("o").with("l").with("l").with("e").with("H")
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
 require 'mina'
 require 'rake'
 
+RSpec.configure do |config|
+  config.order = 'random'
+  config.seed = '12345'
+end
+
 class RakeScope
   include Rake::DSL  if Rake.const_defined?(:DSL)
   include Mina::Helpers
@@ -19,3 +24,4 @@ end
 def root(*a)
   File.join File.expand_path('../../', __FILE__), *a
 end
+

data/support/Readme-footer.md

@@ -0,0 +1,32 @@
+
+Acknowledgements
+----------------
+
+© 2012-2014, Nadarei. Released under the [MIT 
+License](http://www.opensource.org/licenses/mit-license.php).
+
+Mina is authored and maintained by [Rico Sta. Cruz][rsc] and [Michael 
+Galero][mg] with help from its [contributors][c]. It is sponsored by our 
+startup, [Nadarei][nd].
+
+ * [Nadarei](http://nadarei.co) (nadarei.co)
+ * [Github](http://github.com/nadarei) (@nadarei)
+
+Rico:
+
+ * [My website](http://ricostacruz.com) (ricostacruz.com)
+ * [Github](http://github.com/rstacruz) (@rstacruz)
+ * [Twitter](http://twitter.com/rstacruz) (@rstacruz)
+
+Michael:
+
+ * [My website][mg] (michaelgalero.com)
+ * [Github](http://github.com/mikong) (@mikong)
+
+[rsc]: http://ricostacruz.com
+[mg]:  http://devblog.michaelgalero.com/
+[c]:   http://github.com/nadarei/mina/contributors
+[nd]:  http://nadarei.co
+[issues]: https://github.com/nadarei/mina/issues
+[trello]: https://trello.com/board/mina/4fc8b3023d9c9a4d72e573e6
+

data/support/Readme-header.md

@@ -0,0 +1,16 @@
+# Mina
+
+Really fast deployer and server automation tool.
+
+Mina works really fast because it's a deploy Bash script generator. It
+generates an entire procedure as a Bash script and runs it remotely in the
+server.
+
+Compare this to the likes of Vlad or Capistrano, where each command
+is run separately on their own SSH sessions. Mina only creates *one* SSH
+session per deploy, minimizing the SSH connection overhead.
+
+    $ gem install mina
+    $ mina
+
+[![Build Status](https://travis-ci.org/mina-deploy/mina.svg?branch=master)](https://travis-ci.org/mina-deploy/mina) [![Gem Version](https://badge.fury.io/rb/mina.svg)](http://badge.fury.io/rb/mina)