capistrano-composer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGUxYWY0NWQwMzZkMmU5ZWUzZmEwNDRmZDgyMWRhMDJkMjFjOTU2Nw==
-  data.tar.gz: !binary |-
-    OTlmYWRmMjI3MGU5YTA2NmQyNWFhZDlhNmI3MTRlYTZhMWZjZjNkZg==
+SHA1:
+  metadata.gz: 541cd7950b62d60a30541b353ce7de9b088ebf49
+  data.tar.gz: a086b49e69a310e41cbb7686811b4e251001db9d
 SHA512:
-  metadata.gz: !binary |-
-    OTllNWUzZWQwYThiNTg2MTkyYWJhYjM5MzJjMTIyMmYxMGMyN2E2NTkyNjZh
-    NTI4N2NjZjVlYjUzYjNjN2JkODI1NGM5OWQ0MDZlOThkZGQ3NTA4MjBiMjA4
-    MjRkYzdjM2U3YTIyMWE3NjM5Zjg2YzQ3NDZmZTU2NDkyYzJkMWQ=
-  data.tar.gz: !binary |-
-    NGMzZThkZWQyZWQyNTlkNmU2NTI2M2QzZWRiNjkwYWUzMzk1N2JlN2U1ZmU5
-    MWQ3ZjA4MmZkNDE2ZGU0ZDg0OWQ0NTJiYjZmNmFmN2YzYTIxNDdlZDY5Yzhi
-    ZmQ1YWQxZjc1OWNlOGMwN2I5OWMwNDRjZGQ5OGM3MmQ0ZjAzNTI=
+  metadata.gz: ecba7850d7382d694b390cb16a6dbe03ab62786bb79f97d825b7b510a25f39472890eeca69c43af0d74576aaeda5245ac59415a25921698ac5b2bb715f32f742
+  data.tar.gz: 0755924045ea16621e7fcecdf68a710e1dc2001bb13c3f6d91455120a7af90ae5f4659e1a49ffc896494d96199dd691e7a7a01356ceef6faa93204e897b485fa

data/README.md

@@ -52,6 +52,7 @@ Configurable options, shown here with defaults:
 ```ruby
 set :composer_install_flags, '--no-dev --no-interaction --quiet --optimize-autoloader'
 set :composer_roles, :all
+set :composer_working_dir, -> { fetch(:release_path) }
 set :composer_dump_autoload_flags, '--optimize'
 set :composer_download_url, "https://getcomposer.org/installer"
 set :composer_version, '1.0.0-alpha8' #(default: not set)
@@ -63,10 +64,10 @@ Add the following to `deploy.rb` to manage the installation of composer during
 deployment (composer.phar is install in the shared path).
 
 ```ruby
-SSHKit.config.command_map[:composer] = "#{shared_path.join("composer.phar")}"
+SSHKit.config.command_map[:composer] = "php #{shared_path.join("composer.phar")}"
 
 namespace :deploy do
-  before :starting, 'composer:install_executable'
+  after :starting, 'composer:install_executable'
 end
 ```
 
@@ -89,6 +90,18 @@ task :my_custom_composer_task do
 end
 ```
 
+### Removing the default install task
+
+If you do not want to run the default install task on `deploy:updated`, (for 
+example, if you do not have root level dependencies stored in a `composer.json`
+you can remove it by adding the following line to your `config/deploy.rb`:
+
+```ruby
+Rake::Task['deploy:updated'].prerequisites.delete('composer:install')
+```
+
+You can then call `composer.install` task within your own defined tasks, at an 
+appropriate juncture.
 
 ## Contributing
 

data/capistrano-composer.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-composer'
-  spec.version       = '0.0.4'
+  spec.version       = '0.0.5'
   spec.authors       = ['Scott Walkinshaw', 'Peter Mitchell']
   spec.email         = ['scott.walkinshaw@gmail.com', 'peterjmit@gmail.com']
   spec.description   = %q{Composer support for Capistrano 3.x}
@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capistrano', '>= 3.0.0.pre'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 10.1'
 end

data/lib/capistrano/tasks/composer.rake

@@ -3,13 +3,13 @@ namespace :composer do
     Installs composer.phar to the shared directory
     In order to use the .phar file, the composer command needs to be mapped:
       SSHKit.config.command_map[:composer] = "\#{shared_path.join("composer.phar")}"
-    This is best used before deploy:starting:
+    This is best used after deploy:starting:
       namespace :deploy do
-        before :starting, 'composer:install_executable'
+        after :starting, 'composer:install_executable'
       end
   DESC
   task :install_executable do
-    on roles fetch(:composer_roles) do
+    on release_roles(fetch(:composer_roles)) do
       within shared_path do
         unless test "[", "-e", "composer.phar", "]"
           composer_version = fetch(:composer_version, nil)
@@ -22,8 +22,8 @@ namespace :composer do
 
   task :run, :command do |t, args|
     args.with_defaults(:command => :list)
-    on roles fetch(:composer_roles) do
-      within release_path do
+    on release_roles(fetch(:composer_roles)) do
+      within fetch(:composer_working_dir) do
         execute :composer, args[:command], *args.extras
       end
     end
@@ -64,6 +64,7 @@ namespace :load do
   task :defaults do
     set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --quiet --optimize-autoloader'
     set :composer_roles, :all
+    set :composer_working_dir, -> { fetch(:release_path) }
     set :composer_dump_autoload_flags, '--optimize'
     set :composer_download_url, "https://getcomposer.org/installer"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-composer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Scott Walkinshaw
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0.pre
 - !ruby/object:Gem::Dependency
@@ -43,16 +43,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 description: Composer support for Capistrano 3.x
 email:
 - scott.walkinshaw@gmail.com
@@ -81,17 +81,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Composer support for Capistrano 3.x