eycap 0.6.7 → 0.6.8

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.8 / 2013-05-29
+  * #42 allow custom path for ey binaries - Michal Papis.
+  * Added bundle_config task for bundler - Tyler Bird.
+  * Change default output of bundle install to --quiet for speed increase - Tyler Bird.
+
 == 0.6.7 / 2013-03-25
   * follow up to #37, pull #40 works to ensure rvm and non-rvm work properly - Michal Papis.
   * #39 Joe does some good house cleaning, thanks!

data/README.markdown

@@ -33,13 +33,13 @@ To ensure your environments are ready to deploy, check on staging.
 
 This will determine if all requirements are met to deploy.  Sometimes if the default folders are not setup you may be able to repair by running:
 
-	$ cap staging deploy:setup
+    $ cap staging deploy:setup
 
 If you cannot get `deploy:check` to pass, please open a [new support ticket](https://support.cloud.engineyard.com/tickets/new) and let us know.
 
 Now you're ready to do a test deploy.
 
-Optionally, `cap deploy:cold` will run your migrations and start (instead of restart) your app server.  
+Optionally, `cap deploy:cold` will run your migrations and start (instead of restart) your app server.
 
     $ cap staging deploy:cold
 
@@ -57,15 +57,24 @@ For a list of all available commands, run:
 
     $ cap -T
 
-This will show you not only the default capistrano commands but also the ones you get by including the eycap gem.    
+This will show you not only the default capistrano commands but also the ones you get by including the eycap gem.
+
+## Custom binaries path
+
+In rare cases (`unicorn` / `sphinx`) it is required to set custom path for binaries when using
+development versions of scripts. It is as easy as:
+
+    $ set :engineyard_bin, "/engineyard/custom"
+
+The default is `/engineyard/bin` and is just fine in normal deployment.
 
 ## Pull Requests
- 
+
 If you'd like to contribute to the eycap gem please create a fork, then send a pull request and a member of the eycap team will review it.
 
 ## Issues
 
-When you run into a problem please check the [issues](/issues) to see if one has been reported.  If not, please report the issue and we'll get to work on fixing it. 
+When you run into a problem please check the [issues](/issues) to see if one has been reported.  If not, please report the issue and we'll get to work on fixing it.
 ## License
 
 Copyright (c) 2008-2012 Engine Yard
@@ -87,4 +96,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/eycap/recipes/backgroundrb.rb

@@ -3,9 +3,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :bdrb do
     desc "After update_code you want to reindex"
     task :reindex, :roles => [:app], :only => {:backgroundrb => true} do
-      run "/engineyard/bin/searchd #{application} reindex"
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/searchd #{application} reindex"
     end
-  
+
     desc "Start Backgroundrb"
     task :start, :roles => [:app], :only => {:backgroundrb => true} do
       sudo "/usr/bin/monit start all -g backgroundrb_#{application}"
@@ -17,7 +17,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "Restart Backgroundrb"
     task :restart, :roles => [:app], :only => {:backgroundrb => true} do
       sudo "/usr/bin/monit restart all -g backgroundrb_#{application}"
-    end        
+    end
   end
 
 end

data/lib/eycap/recipes/bundler.rb

@@ -17,7 +17,7 @@ set :bundle_without, "test development" unless exists?(:bundle_without)
         session.else <<-SHELL.split("\n").map(&:strip).join("; ")
           mkdir -p #{shared_path}/bundled_gems
           if [ -f #{release_path}/Gemfile ]
-          then cd #{release_path} && bundle install --without=#{bundle_without} --binstubs #{release_path}/bin --path #{shared_path}/bundled_gems
+          then cd #{release_path} && bundle install --without=#{bundle_without} --binstubs #{release_path}/bin --path #{shared_path}/bundled_gems --quiet
           fi
           if [ ! -h #{release_path}/bin ]
           then ln -nfs #{release_path}/bin #{release_path}/ey_bundler_binstubs
@@ -25,6 +25,15 @@ set :bundle_without, "test development" unless exists?(:bundle_without)
         SHELL
       end
     end
+    task :bundle_config, :roles => :app, :only => {:no_bundle => true} do
+      <<-SHELL.split("\n").map(&:strip).join("; ")
+        bundle config --local BIN /data/#{application}/releases/#{release_path}/bin
+        bundle config --local PATH /data/#{application}/shared/bundled_gems
+        bundle config --local DISABLE_SHARED_GEMS "1"
+        bundle config --local WITHOUT test:development 
+      SHELL
+    end
     after "deploy:symlink_configs","bundler:bundle_gems"
+    after "bundler:bundle_gems","bundler:bundle_config"
   end
 end

data/lib/eycap/recipes/sphinx.rb

@@ -3,12 +3,12 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :sphinx do
     desc "After update_code you want to configure, then reindex"
     task :configure, :roles => [:app], :only => {:sphinx => true}, :except => {:no_release => true} do
-      run "/engineyard/bin/searchd #{application} configure"
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/searchd #{application} configure"
     end
 
     desc "After configure you want to reindex"
     task :reindex, :roles => [:app], :only => {:sphinx => true} do
-      run "/engineyard/bin/searchd #{application} reindex"
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/searchd #{application} reindex"
     end
 
     desc "Start Sphinx Searchd"
@@ -29,25 +29,25 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :symlink, :roles => [:app], :only => {:sphinx => true}, :except => {:no_release => true} do
       run "if [ -d #{latest_release}/config/ultrasphinx ]; then mv #{latest_release}/config/ultrasphinx #{latest_release}/config/ultrasphinx.bak; fi"
       run "ln -nfs #{shared_path}/config/ultrasphinx #{latest_release}/config/ultrasphinx"
-    end  
+    end
   end
 
   namespace :acts_as_sphinx do
     desc "After update_code you to to reindex"
     task :reindex, :roles => [:app], :only => {:sphinx => true} do
-      run "/engineyard/bin/acts_as_sphinx_searchd #{application} reindex"
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/acts_as_sphinx_searchd #{application} reindex"
     end
   end
 
   namespace :thinking_sphinx do
     desc "After update_code you want to configure, then reindex"
     task :configure, :roles => [:app], :only => {:sphinx => true}, :except => {:no_release => true} do
-      run "/engineyard/bin/thinking_sphinx_searchd #{application} configure #{rails_env}"
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/thinking_sphinx_searchd #{application} configure #{rails_env}"
     end
 
     desc "After configure you want to reindex"
     task :reindex, :roles => [:app], :only => {:sphinx => true} do
-      run "/engineyard/bin/thinking_sphinx_searchd #{application} reindex #{rails_env}"
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/thinking_sphinx_searchd #{application} reindex #{rails_env}"
     end
 
     task :symlink, :roles => [:app], :only => {:sphinx => true}, :except => {:no_release => true} do
@@ -60,17 +60,17 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :ultrasphinx do
     desc "After update_code you want to configure, then reindex"
     task :configure, :roles => [:app], :only => {:sphinx => true}, :except => {:no_release => true} do
-      run "/engineyard/bin/ultrasphinx_searchd #{application} configure"
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/ultrasphinx_searchd #{application} configure"
     end
 
     desc "After configure you want to reindex"
     task :reindex, :roles => [:app], :only => {:sphinx => true} do
-      run "/engineyard/bin/ultrasphinx_searchd #{application} reindex"
-    end   
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/ultrasphinx_searchd #{application} reindex"
+    end
 
     task :symlink, :roles => [:app], :only => {:sphinx => true}, :except => {:no_release => true} do
       run "if [ -d #{latest_release}/config/ultrasphinx ]; then mv #{latest_release}/config/ultrasphinx #{latest_release}/config/ultrasphinx.bak; fi"
       run "ln -nfs #{shared_path}/config/ultrasphinx #{latest_release}/config/ultrasphinx"
-    end    
+    end
   end
 end

data/lib/eycap/recipes/unicorn.rb

@@ -27,28 +27,28 @@ Capistrano::Configuration.instance(:must_exist).load do
     Reloads the unicorn works gracefully - Use deploy task for deploys
     DESC
     task :reload, :roles => [:app], :except => {:unicorn => false} do
-      run "/engineyard/bin/unicorn #{application} reload"
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/unicorn #{application} reload"
     end
 
     desc <<-DESC
     Adds a Unicorn worker - Beware of causing your host to swap, this setting isn't permanent
     DESC
     task :aworker, :roles => [:app], :except => {:unicorn => false} do
-      run "/engineyard/bin/unicorn #{application} aworker"
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/unicorn #{application} aworker"
     end
 
     desc <<-DESC
     Removes a unicorn worker (gracefully)
     DESC
     task :rworker, :roles => [:app], :except => {:unicorn => false} do
-      run "/engineyard/bin/unicorn #{application} rworker"
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/unicorn #{application} rworker"
     end
 
     desc <<-DESC
     Deploys app gracefully with USR2 and unicorn.rb combo
     DESC
     task :deploy, :roles => [:app], :except => {:unicorn => false} do
-      run "/engineyard/bin/unicorn #{application} deploy"
+      run "#{fetch(:engineyard_bin, "/engineyard/bin")}/unicorn #{application} deploy"
     end
   end
 end

data/lib/eycap/version.rb

@@ -1,4 +1,4 @@
 module Eycap
-  VERSION = '0.6.7'
+  VERSION = '0.6.8'
 end
 

metadata

@@ -2,7 +2,7 @@
 name: eycap
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Engine Yard
@@ -21,72 +21,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rake
   type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: minitest
   type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: minitest-capistrano
   type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 description: Capistrano recipes for the Engine Yard Managed platform.
 email:
 - appsupport@engineyard.com
@@ -140,17 +140,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: -2005581508759271806
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: -2005581508759271806
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23