capistrano 3.0.0.pre6 → 3.0.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36d91e4713c310c8f8624cb568bb86149d4f5855
-  data.tar.gz: 373f83bb092d16ed4df6e2bcf07985e1193c733a
+  metadata.gz: 117f494efdcee24c00ce4880240a374a8a8a82ee
+  data.tar.gz: e2eb9bee0c6d23634ba571f47e367584df04f112
 SHA512:
-  metadata.gz: 9cfaa3cd982407bbd40bcd6026c9938cbf4e84536fad40f9c333f1d8320f5a5768229448d442bc5de093c7b0f92343bfb3378b39b9d5b538e24fa1afb10bd65e
-  data.tar.gz: f6609c210bc0fb32d855f12c328e18f526a6c896712c45533229874dba124def821ef234b442a84225301c5f3bbc7f163cfa33f5eec4dd605964b7591fbd7d9a
+  metadata.gz: 8abcc2ca0e5dd55d43d0e6e09ca13ec585b71b7fed96a9c1fd87a0d896c123257ddf49be61e7b4ea0c21edf4aa3397fc4b6938d1a10f653b0f5dceb682115ae0
+  data.tar.gz: 3412ab48b2ff5b8aeeec526113a7208955189bb933f5ba5b4cd9026cc47d2a2e6fb0b23c99c5d7d1e21cdc7aab472e2bc354a0ef6e20394565f40f940c30e97c

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Capistrano 3.x Changelog
+
+Reverse Chronological Order:
+
+## `3.0.0.pre7`
+
+ * Fix Git https authentication. (@leehambley)
+ * Capfile template fixes (repo/repo_url) (@teohm)
+ * Readme Fixes (@ffmike, @kejadlen, @dwickwire)
+ * Fix the positioning of the bundler hook, now immediately after finalize. (@teohm)

data/README.md

@@ -19,7 +19,7 @@ $ bundle --binstubs
 ```
 
 Capify:
-
+*make sure there's no "Capfile" or "capfile" present* 
 ``` shell
 $ cap install
 ```
@@ -184,8 +184,8 @@ or at least they are being used incorrectly.
 Whilst, especially in the case of language runtimes (Ruby, Node, Python and friends in
 particular) there is a temptation to run multiple versions in parallel on a single server
 and to switch between them using environmental variables, this is an anti-pattern, and
-sympotamtic of bad design (i.e. you're testing a second version of Ruby in production because
-your company lacks the infrastructure to test this in a staging environment)
+symptomatic of bad design (i.e. you're testing a second version of Ruby in production because
+your company lacks the infrastructure to test this in a staging environment).
 
 ## Configuration
 
@@ -199,7 +199,7 @@ The following variables are settable:
 
 ## SSHKit
 
-[SSHKit][https://github.com/capistrano/sshkit] is the driver for SSH
+[SSHKit](https://github.com/capistrano/sshkit) is the driver for SSH
 connections behind the scenes in Capistrano, depending how deep you dig, you
 might run into interfaces that come directly from SSHKit (the configuration is
 a good example).

data/capistrano.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = Capistrano::VERSION
   gem.authors       = ["Tom Clements", "Lee Hambley"]
   gem.email         = ["seenmyfate@gmail.com", "lee.hambley@gmail.com"]
-  gem.description   = %q{PENDING: Write a gem description}
-  gem.summary       = %q{PENDING: Write a gem summary}
+  gem.description   = %q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
+  gem.summary       = %q{Capistrano - Welcome to easy deployment with Ruby over SSH}
   gem.homepage      = ""
 
   gem.files         = `git ls-files`.split($/)

data/lib/capistrano/dsl/paths.rb

@@ -26,7 +26,7 @@ module Capistrano
       def repo_url
         require 'cgi'
         require 'uri'
-        if fetch(:git_http_username) and not fetch(:git_http_password)
+        if fetch(:git_http_username) and fetch(:git_http_password)
           URI.parse(fetch(:repo_url)).tap do |repo_uri|
             repo_uri.user     = fetch(:git_http_username)
             repo_uri.password = CGI.escape(fetch(:git_http_password))

data/lib/capistrano/tasks/bundler.rake

@@ -9,5 +9,5 @@ namespace :deploy do
     end
   end
 
-  before :finalize, :bundle
+  after 'deploy:update', 'deploy:bundle'
 end

data/lib/capistrano/templates/deploy.rb.erb

@@ -1,5 +1,5 @@
 set :application, 'my app name'
-set :repo, 'git@example.com:me/my_repo.git'
+set :repo_url, 'git@example.com:me/my_repo.git'
 
 ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }
 

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.0.0.pre6"
+  VERSION = "3.0.0.pre7"
 end

data/spec/integration/deploy_finalize_spec.rb

@@ -10,7 +10,7 @@ describe 'cap deploy:finished', slow: true do
       %{
         set :stage, :#{stage}
         set :deploy_to, '#{deploy_to}'
-        set :repo, 'git://github.com/capistrano/capistrano.git'
+        set :repo_url, 'git://github.com/capistrano/capistrano.git'
         set :branch, 'v3'
         server 'localhost', roles: %w{web app}, user: '#{current_user}'
         set :linked_files, %w{config/database.yml}

data/spec/integration/deploy_finished_spec.rb

@@ -10,7 +10,7 @@ describe 'cap deploy:finished', slow: true do
       %{
         set :stage, :#{stage}
         set :deploy_to, '#{deploy_to}'
-        set :repo, 'git://github.com/capistrano/capistrano.git'
+        set :repo_url, 'git://github.com/capistrano/capistrano.git'
         set :branch, 'v3'
         server 'localhost', roles: %w{web app}, user: '#{current_user}'
         set :linked_files, %w{config/database.yml}

data/spec/integration/deploy_started_spec.rb

@@ -10,7 +10,7 @@ describe 'cap deploy:started', slow: true do
       %{
         set :stage, :#{stage}
         set :deploy_to, '#{deploy_to}'
-        set :repo, 'git://github.com/capistrano/capistrano.git'
+        set :repo_url, 'git://github.com/capistrano/capistrano.git'
         set :branch, 'v3'
         server 'localhost', roles: %w{web app}, user: '#{current_user}'
         set :linked_files, %w{config/database.yml}

data/spec/integration/deploy_update_spec.rb

@@ -10,7 +10,7 @@ describe 'cap deploy:update', slow: true do
       %{
         set :stage, :#{stage}
         set :deploy_to, '#{deploy_to}'
-        set :repo, 'git://github.com/capistrano/capistrano.git'
+        set :repo_url, 'git://github.com/capistrano/capistrano.git'
         set :branch, 'v3'
         server 'localhost', roles: %w{web app}, user: '#{current_user}'
         set :linked_files, %w{config/database.yml}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre6
+  version: 3.0.0.pre7
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -81,7 +81,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 'PENDING: Write a gem description'
+description: Capistrano is a utility and framework for executing commands in parallel
+  on multiple remote machines, via SSH.
 email:
 - seenmyfate@gmail.com
 - lee.hambley@gmail.com
@@ -92,6 +93,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -172,7 +174,7 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: 'PENDING: Write a gem summary'
+summary: Capistrano - Welcome to easy deployment with Ruby over SSH
 test_files:
 - spec/integration/deploy_finalize_spec.rb
 - spec/integration/deploy_finished_spec.rb