capistranovelys 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf43dc5cfa937aedb411d6fc78c89c0774ce622e
-  data.tar.gz: 3215f8004ab47fd42b0b19d3e2092925808f7733
+  metadata.gz: 8748950ff9c9d04bb793134bb78dd457767b70d0
+  data.tar.gz: a1f4833e0f47b8bfc59aad5e4a13db344df84a73
 SHA512:
-  metadata.gz: 27f57b6e57d6dfe8d86640063aa0eae536fb4a21ae0eae8a51db8bc25b9fb7b2851e8a2513faa3ae6738f526bf683c10668b6091172afb4fe0a39f727ea86eab
-  data.tar.gz: ffcfcf21a61034dff4fdc5df39555458e47dd92694dbef3499bad02c957e13f203c532e5c31283b8847d0b2ccf9b3f96041d06addb69a18a0808f802b049bbe4
+  metadata.gz: e8bff43daefc899c40594904a14b37dd5f0a42a4512c8bcbee65e45781dcb301ab88a57408fe4f6a9dca8ea04921ffb63b5f324790e1914153360a16ea1af6ce
+  data.tar.gz: b0aa94df8f5becc416c2e4e246b04ba415e851a735fb372f9ea20c9a22f17b0aafbd22a68b0839489140cb102d3be2ff81613ae63ccdef8ea4ffb3107f494994

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## `2.0.0`
+
+* Add missing sphinx recipes;
+* Extracted novelys-specific config in a specific file;
+* Added defaults option for `bundle_without`;
+* Renamed `use_stack` to `use_recipes` and `use_default_stack` to `use_novelys`;
+* `rails2` tasks are namespaced under `rails` (but the module name stays `rails2`).
+
+## `1.0.0`
+
+First release

data/README.md

@@ -1,6 +1,6 @@
 # Capistranovelys - Keeping our recipes DRY
 
-This gem, once stable, should include every recipe/task that serves for more than one of our project.
+This gem includes every recipe/task that is in use in more than one project at Novelys.
 
 ## Installation
 
@@ -8,17 +8,18 @@ This gem, once stable, should include every recipe/task that serves for more tha
 meaning you can remove `capistrano` and `capistrano-ext` from your Gemfile, and replace it with :
 
 ```ruby
-gem "capistranovelys", :git => 'git@github.com:novelys/capistranovelys.git'
+gem "capistranovelys", '~> 2.0.0'
 ```
 
 ## Usage
 
 In your deploy.rb :
 
-* remove `require "production_chain/capistrano";
+* remove `require "production_chain/capistrano" if you are using [novelys/production_chain](https://github.com/novelys/production_chain)
 * add `require 'capistrano/novelys'` (loads the core recipes)
-* load recipes you need, eg: `use_stack :database, :rails2, :rbenv, :whenever`. To be used **BEFORE** other loading of recipes such as `deploy/assets`, otherwise some hooks (such as the symlinks) will be executed too late.
-  * You can use `use_default_stack_and [arg, ...]`. It will load `airbrake`, `rbenv`, `unicorn`, `logs`, `stages`, `remote_commands, production_chain`, and the recipes supplied as arguments. Use `use_default_stack` if you don't want/need anything else.
+* load recipes you need, eg: `use_recipes :database, :rails2, :rbenv, :whenever`. To be used **BEFORE** other loading of recipes such as `deploy/assets`, otherwise some hooks (such as the symlinks) will be executed too late.
+  * You can use `use_novelys_and [arg, ...]`. It will load `airbrake`, `rbenv`, `logs`, `stages`, `remote_commands, production_chain`, and the recipes supplied as arguments. This will also use Novelys' configuration for `user`, `deploy_to`, and `repository`. Use `use_novelys` if you don't want/need anything else.
+* You probably want to set `user`, `deploy_to`, and `repository` at the very least. Refer to `core.rb` to see which default values are set
 * Make sure you don't have duplicates!
 
 ## Recipes available
@@ -45,9 +46,9 @@ Rails 3 & 4 commands.
 
 Rails 2 commands.
 
-* `rails2:console` : open a rails console
-* `rails2:secret_token:copy` : copy the session_store from your local file to the shared path
-* `rails2:secret_token:symlink` : symlink the session_store.rb file from the shared path to the current path. Hooked after `deploy:update_code`
+* `rails:console` : open a rails console
+* `rails:secret_token:copy` : copy the session_store from your local file to the shared path
+* `rails:secret_token:symlink` : symlink the session_store.rb file from the shared path to the current path. Hooked after `deploy:update_code`
 
 ### Stages (`stages`)
 
@@ -78,7 +79,7 @@ You should not require `capistrano/ext/multistage`.
 
 ### Production chain (`production_chain`)
 
-Recipes usings rake tasks from [novelys/production_chain](https://github.com/novelys/production_chain)
+Recipes usings rake tasks from [novelys/production_chain](https://github.com/novelys/production_chain). Will work only if the gem is present.
 
 * `db:dump_and_restore`: restore the database from the server to your local env. Supply `FILE=mongoid` when using mongoid.
 * `assets:dump_and_restore`: restore the assets from the public direction to your local env.

data/lib/capistrano/novelys/core.rb

@@ -9,13 +9,10 @@ set(:repository_cache) { 'git_cache' }
 set(:copy_exclude)     { %w(.svn .DS_Store .git) }
 set(:keep_releases)    { 5 }
 set(:public_children)  { %w(images) }
-set(:bundle_cmd)       { 'bundle' }
 
-## Default app configuration
-set(:user)             { application }
-set(:deploy_to)        { "/home/#{user}/www/" }
-set(:github_account)   { 'novelys' }
-set(:repository)       { "git@github.com:#{github_account}/#{application}" }
+## Bundle
+set(:bundle_cmd)       { 'bundle' }
+set(:bundle_without)   { (stages + [:development, :test]) - [stage] }
 
 ## SSH Options
 ssh_options[:forward_agent] = true

data/lib/capistrano/novelys/core_extensions.rb

@@ -1,15 +1,15 @@
 module Capistrano
   class Configuration
     # Sugar for loading given recipes
-    def use_stack(*args)
+    def use_recipes(*args)
       args.each { |recipes| load "novelys/#{recipes.to_s}" }
     end
 
     # Sugar for loading common recipes (+ supplied is present)
-    def use_default_stack(*args)
-      args = ([:airbrake, :logs, :production_chain, :rbenv, :remote_commands, :stages, :unicorn] + args).uniq
+    def use_novelys(*args)
+      args = ([:airbrake, :logs, :production_chain, :rbenv, :remote_commands, :novelys, :stages] + args).uniq
       use_stack(*args)
     end
-    alias :use_default_stack_and :use_default_stack
+    alias :use_novelys_and :use_novelys
   end
 end

data/lib/capistrano/novelys/novelys.rb

@@ -0,0 +1,6 @@
+## Default Novelys app configuration
+
+set(:user)             { application }
+set(:deploy_to)        { "/home/#{user}/www/" }
+set(:github_account)   { 'novelys' }
+set(:repository)       { "git@github.com:#{github_account}/#{application}" }

data/lib/capistrano/novelys/rails2.rb

@@ -1,19 +1,19 @@
 require 'readline'
 
 ## Hooks
-after 'deploy:update_code', 'rails2:secret_token:symlink'
+after 'deploy:update_code', 'rails:secret_token:symlink'
 
 ## Tasks
-namespace :rails2 do
+namespace :rails do
   namespace :secret_token do
     desc "Copy the secret token file to the server"
     task :copy do
-      upload "config/initializers/session_store.rb", "#{shared_path}/config/initializers/session_store.rb", :via => :scp
+      upload "config/initializers/session_store.rb", "#{shared_path}/config/initializes/session_store.rb", :via => :scp
     end
 
     desc "Symlink the secret token file in the current release"
     task :symlink do
-      run "test -f #{release_path}/config/initializers/session_store.rb || ln -s #{shared_path}/config/initializers/session_store.rb #{release_path}/config/initializers/session_store.rb"
+      run "test -f #{release_path}/initializers/session_store.rb || ln -s #{shared_path}/initializers/session_store.rb #{release_path}/initializers/session_store.rb"
     end
   end
 

data/lib/capistrano/novelys/sphinx.rb

@@ -13,6 +13,46 @@ namespace :thinking_sphinx do
   task :symlink do
     run "test -f #{release_path}/config/#{rails_env}.sphinx.conf || ln -s #{shared_path}/config/#{rails_env}.sphinx.conf #{release_path}/config/#{rails_env}.sphinx.conf"
   end
+
+  desc "Generate the Sphinx configuration file"
+  task :configure do
+    Novelys::Helpers.run_remote_rake(self, "thinking_sphinx:configure")
+  end
+
+  desc "Index data"
+  task :index do
+    Novelys::Helpers.run_remote_rake(self, "thinking_sphinx:index")
+  end
+
+  desc "Start the Sphinx daemon"
+  task :start do
+    configure
+    Novelys::Helpers.run_remote_rake(self, "thinking_sphinx:start")
+  end
+
+  desc "Stop the Sphinx daemon"
+  task :stop do
+    configure
+    Novelys::Helpers.run_remote_rake(self, "thinking_sphinx:stop")
+  end
+
+  desc "Stop and then start the Sphinx daemon"
+  task :restart do
+    stop
+    start
+  end
+
+  desc "Stop, re-index and then start the Sphinx daemon"
+  task :rebuild do
+    stop
+    index
+    start
+  end
+
+  desc "Add the shared folder for sphinx files for the current environment"
+  task :shared_sphinx_folder, :roles => :web do
+    run "mkdir -p #{shared_path}/db/sphinx/#{rails_env}"
+  end
 end
 
 ## Alias for thinking_sphinx namespace

data/lib/capistrano/novelys/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Novelys
-    VERSION = '1.0.1'
+    VERSION = '2.0.0'
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: capistranovelys
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Kevin Soltysiak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.15.0
 - !ruby/object:Gem::Dependency
   name: sushi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
 description: Capistrano recipes in use at novelys
@@ -44,7 +44,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENCE
 - README.md
@@ -57,6 +58,7 @@ files:
 - lib/capistrano/novelys/helpers.rb
 - lib/capistrano/novelys/logs.rb
 - lib/capistrano/novelys/mongoid.rb
+- lib/capistrano/novelys/novelys.rb
 - lib/capistrano/novelys/production_chain.rb
 - lib/capistrano/novelys/puma.rb
 - lib/capistrano/novelys/rails.rb
@@ -80,17 +82,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.2.0
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Capistrano recipes for novelys