negroku 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49df8e7185364d3baa0e9cf231fd651cbd33d327
-  data.tar.gz: dff869ebbc0b4916a9cd6d2d15265008724ae45f
+  metadata.gz: 14d53aec7f354efc4a17bad4e9486214fc4ff710
+  data.tar.gz: b6c15222c644ad3c8238b55c71ea155277cbb07a
 SHA512:
-  metadata.gz: f058feb0b26a8efa29d1ec5fce42f4cdda51efc0af302e774c68becc7846d2c870670fd419dab2b3b2037739a687ffa8710d55cc9ba30efa1f8433e1aa79f77a
-  data.tar.gz: c2a829026912082bf193ae5ba15af6f7c56f4c20ea61be311c8acaa2d00b1bdb0b46e22d0329972c99c1788004756692bcd5039abdba17f0599935dfbea02bdd
+  metadata.gz: d350d87e50c3c4063f1aeb33701addfcb61375a1132ade613ad41f5648d4cf58aeff32352ecc932cc9cb74a4c665eaea3f4eef4dac181091ca02ea0651e2345a
+  data.tar.gz: 1b8c3cd3b982dbcae2e5e72a07c2f607744c44792d3341ef75db350674ea57ad420964c7e717a84f12a15c0efe3bfd1d80d32f338e3c4e422cdea76961072883

data/lib/negroku/tasks/eye/thinking_sphinx.rake

@@ -20,7 +20,7 @@ namespace :thinking_sphinx do
       # Reload or restart after the application is published
       desc "using eye"
       task cmd do
-        invoke "eye:#{cmd}", 'thinking_sphinx'
+        invoke "eye:#{cmd}", 'sphinx'
       end
     end
   end

data/lib/negroku/tasks/log.rake

@@ -13,7 +13,11 @@ namespace :log do
         task name, :lines do |t, args|
           on release_roles [:app, :web] do
             within current_path do
+              old_state = `stty -g`
+              system "stty -echoctl"
+
               args.with_defaults(:lines => 10)
+              trap("INT") { puts 'Bye!'; system "stty #{old_state}"; exit 0; }
               execute :tail, '-f', Pathname.new(shared_path).join("log", path), "-n", args[:lines]
             end
           end

data/lib/negroku/tasks/thinking_sphinx.rake

@@ -10,7 +10,7 @@ namespace :load do
     # Local path to look for custom config template
     set :thinking_sphinx_template, -> { "config/deploy/#{fetch(:stage)}/thinking_sphinx.yml.erb" }
 
-    set :thinking_sphinx_env, -> { "#{fetch(:stage)}" }
+    set :thinking_sphinx_env, -> { fetch(:rails_env) || fetch(:stage) }
 
     # Link thinking_sphinx.yml file
     set :linked_files, fetch(:linked_files, []) << 'config/thinking_sphinx.yml'
@@ -48,16 +48,16 @@ namespace :negroku do
       end
     end
 
-    after 'thinking_sphinx:configure', :backup_config do
+    # Backup the config
+    task :backup_config do
       on release_roles fetch(:thinking_sphinx_roles) do
         within "#{shared_path}/config" do
           execute :cp, fetch(:thinking_sphinx_configuration_file), '/tmp/sphinx.conf.bak'
         end
       end
     end
-    # Backup the config on every configure
-    # Rake::Task['thinking_sphinx:configure'].enhance ['negroku:thinking_sphinx:backup_config']
 
+    # Check whether the conf changed
     task :check_config do
       on release_roles fetch(:thinking_sphinx_roles) do
         within "#{shared_path}/config" do
@@ -67,18 +67,33 @@ namespace :negroku do
       end
     end
 
+    # Backup the config on every configure
+    Rake::Task['thinking_sphinx:configure'].enhance ['negroku:thinking_sphinx:backup_config'] do
+      # Change whether the config changed or not
+      Rake::Task['negroku:thinking_sphinx:check_config'].invoke
+    end
+
+    task :rebuild do
+      on release_roles fetch(:thinking_sphinx_roles) do
+        within current_path do
+          with rails_env: fetch(:rails_env), index_only: true do
+            invoke 'thinking_sphinx:stop'
+            sleep 2
+            execute :rake, 'ts:clear'
+            execute :rake, 'ts:index'
+            invoke 'thinking_sphinx:start'
+          end
+        end
+      end
+    end
 
     # Configure and regenerate after the application is published
     after 'deploy:published', 'restart' do
       invoke 'negroku:thinking_sphinx:setup'
       invoke 'thinking_sphinx:configure'
 
-      # Change whether the config changed or not
-      invoke 'negroku:thinking_sphinx:check_config'
-
-      if fetch(:thinking_sphinx_config_changed)
-        invoke 'thinking_sphinx:regenerate'
-      end
+      # Rebuild the index
+      invoke 'negroku:thinking_sphinx:rebuild' if fetch(:thinking_sphinx_config_changed)
     end
 
     define_logs(:sphinx, {

data/lib/negroku/version.rb

@@ -1,3 +1,3 @@
 module Negroku
-  VERSION = '2.3.4'
+  VERSION = '2.3.5'
 end

data/negroku.gemspec

@@ -28,7 +28,7 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency('capistrano-nc', '~> 0.1.4')
   s.add_runtime_dependency('capistrano-github', '~> 0.1.1')
 
-  s.add_runtime_dependency('capistrano-nodenv', '~> 1.0.0')
+  s.add_runtime_dependency('capistrano-nodenv', '~> 1.0.1')
   s.add_runtime_dependency('capistrano-bower', '~> 1.1.0')
   s.add_runtime_dependency('capistrano3-nginx', '~> 2.1.1')
   s.add_runtime_dependency('capistrano3-unicorn', '~> 0.2.1')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: negroku
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: capistrano-bower
   requirement: !ruby/object:Gem::Requirement