mina 0.1.2.pre1 → 0.1.2.pre2

data/HISTORY.md

@@ -1,3 +1,14 @@
+v0.1.2.pre2 - Jul 3, 2012
+-------------------------
+
+### Added:
+  * Add bundle_bin option
+  * Add ssh port option
+
+### Fixed:
+  * Fix deploy:link_shared_paths to use absolute paths
+  * Fix console logs for task init
+
 v0.1.2.pre1 - Jun 12, 2012
 --------------------------
 

data/README.md

@@ -23,48 +23,60 @@ Problems or suggestions? File issues at the [issue tracker][issues]
 (github.com).  You may also look at the [Trello board][trello] (trello.com) we
 use for development.
 
+Documentation sources
+---------------------
+
+See [nadarei/mina-docs](https://github.com/nadarei/mina-docs) for the sources of
+the documentation site. Please ensure that docs there are in sync with the
+features here.
+
 Development & testing
 ---------------------
 
 To test out stuff in development:
 
-    # Run specs
-    $ rspec
-    $ rspec -t ssh     # Run SSH tests (read test_env/config/deploy.rb first)
-    $ rake=0.9 rspec
-    $ rake=0.8 rspec
+``` sh
+# Run specs
+$ rspec
+$ rspec -t ssh     # Run SSH tests (read test_env/config/deploy.rb first)
+$ rake=0.9 rspec
+$ rake=0.8 rspec
 
-    # Alias your 'mina' to use it everywhere
-    $ alias mina="`pwd -LP`/bin/mina"
+# Alias your 'mina' to use it everywhere
+$ alias mina="`pwd -LP`/bin/mina"
+```
 
 ### Doing test deploys
 
 Try out the test environment:
 
-    $ cd test_env
-    $ mina deploy --simulate
-    $ mina deploy
+``` sh
+$ cd test_env
+$ mina deploy --simulate
+$ mina deploy
 
-    # There's an rspec task for it too
-    $ rspec -t ssh
+# There's an rspec task for it too
+$ rspec -t ssh
+```
 
 ### Gem management
 
-    # To release the gem:
-    # Install the Git changelog helper: https://gist.github.com/2880525
-    # Then:
+``` sh
+# To release the gem:
+# Install the Git changelog helper: https://gist.github.com/2880525
+# Then:
 
-    $ vim lib/mina/version.rb
-    $ git clog -w
-    $ vim HISTORY.md
-    $ git commit -m "Release v0.8.4."
-    $ rake release
+$ vim lib/mina/version.rb
+$ git clog -w
+$ vim HISTORY.md
+$ git commit -m "Release v0.8.4."
+$ rake release
 
-    # Please don't forget to tag the release in github.com/nadarei/mina-docs
-    too!
+# Please don't forget to tag the release in github.com/nadarei/mina-docs too!
 
-    $ rake build      # Builds the gem file
-    $ rake install    # Installs the gem locally
+$ rake build      # Builds the gem file
+$ rake install    # Installs the gem locally
+```
 
 Acknowledgements
 ----------------

data/data/deploy.rb

@@ -12,6 +12,7 @@ set :domain, 'foobar.com'
 set :deploy_to, '/var/www/foobar.com'
 set :repository, 'git://...'
 # set :user, 'foobar'
+# set :port, '30000'
 
 desc "Deploys the current version to the server."
 task :deploy do

data/lib/mina/bundler.rb

@@ -1,4 +1,5 @@
 
+settings.bundle_bin ||= 'bundle'
 settings.bundle_path ||= './vendor/bundle'
 settings.bundle_options ||= lambda { %{--without development:test --path "#{bundle_path}" --binstubs bin/ --deployment} }
 
@@ -8,7 +9,7 @@ namespace :bundle do
     if bundle_path.nil?
       queue %{
         echo "-----> Installing gem dependencies using Bundler"
-        #{echo_cmd %[bundle install #{bundle_options}]}
+        #{echo_cmd %[#{bundle_bin} install #{bundle_options}]}
       }
     else
       queue %{
@@ -16,8 +17,8 @@ namespace :bundle do
         #{echo_cmd %[mkdir -p "#{deploy_to}/#{shared_path}/bundle"]}
         #{echo_cmd %[mkdir -p "#{File.dirname bundle_path}"]}
         #{echo_cmd %[ln -s "#{deploy_to}/#{shared_path}/bundle" "#{bundle_path}"]}
-        #{echo_cmd %[bundle install #{bundle_options}]}
+        #{echo_cmd %[#{bundle_bin} install #{bundle_options}]}
       }
     end
   end
-end
+end

data/lib/mina/default.rb

@@ -16,7 +16,7 @@ task :init do
   FileUtils.cp Mina.root_path('data/deploy.rb'), './config/deploy.rb'
 
   puts 'Created deploy.rb.'
-  puts 'Edit it, then run `#{name} setup` after.'
+  puts "Edit it, then run `#{name} setup` after."
 end
 
 task :default => :help

data/lib/mina/deploy.rb

@@ -20,7 +20,7 @@ namespace :deploy do
     end
 
     cmds += shared_paths.map do |file|
-      echo_cmd %{ln -s "#{shared_path}/#{file}" "./#{file}"}
+      echo_cmd %{ln -s "#{deploy_to}/#{shared_path}/#{file}" "./#{file}"}
     end
 
     queue %{

data/lib/mina/helpers.rb

@@ -113,6 +113,7 @@ module Mina
       args = domain!
       args = "#{user}@#{args}" if user?
       args << " -i #{identity_file}" if identity_file?
+      args << " -p #{port}" if port?
       args << " -t"
       "ssh #{args}"
     end

data/lib/mina/version.rb

@@ -1,5 +1,5 @@
 module Mina
   def self.version
-    "0.1.2.pre1"
+    "0.1.2.pre2"
   end
 end

data/spec/dsl/settings_in_rake_spec.rb

@@ -29,14 +29,11 @@ describe 'Settings in rake tasks' do
   end
 
   it '#settings with a bang should work' do
-    begin
+    expect {
       rake {
         set :path, lambda { "/var/www/#{version!}" }
       }
       rake.path
-      1.should == 2
-    rescue Mina::Error => e
-      e.message.should include "version"
-    end
+    }.to raise_error(Mina::Error, /version/)
   end
 end

data/spec/dsl/settings_spec.rb

@@ -43,12 +43,7 @@ describe 'Settings' do
     end
 
     it 'bangs should check for settings' do
-      begin
-        @settings.non_existent_setting!
-        1.should == 2
-      rescue Mina::Error => e
-        e.message.should include "non_existent_setting"
-      end
+      expect { @settings.non_existent_setting! }.to raise_error(Mina::Error, /non_existent_setting/)
     end
 
     it 'bangs should return settings' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre1
+  version: 0.1.2.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70278252972060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,15 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70278252972060
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70278252960240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,15 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70278252960240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70278252958560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,12 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70278252958560
 description: Really fast deployer and server automation tool.
 email:
 - rico@nadarei.co
@@ -129,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Really fast deployer and server automation tool.