openteam-capistrano 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f2a5bc8fcc78f4534338aae6e4d6ec39d49d8de
-  data.tar.gz: 3324d64096b0068d588fd1bfbfd1277e14c7b3b2
+  metadata.gz: ed7d988cc824f8b61abcad37b463277ad7e02f96
+  data.tar.gz: 15d9c69dc2890eaf73ff0f35f0310ec0357caea2
 SHA512:
-  metadata.gz: c072758652ae7d8d1a37197b1bd3a8fb6098440a22388e344692566982b07921e2511e19b4f71ef5680fc6da0dd2d75c0e9b118235cdb15607e3d30510cd19d7
-  data.tar.gz: 82fb51d32ef90f82310546b8059d981f5be9c4c8ecbd8009b9010b5e1a901d06a955ab5099f5d9a8d6a97fe562036863dc3722e8d489e0a2aa14e6cb13402e84
+  metadata.gz: a61eeed14190d47db2d847da281b93a3d4942544e114baaa601e38f9a9c07a87ef34c4c2883000dd0bee07231ced7893cabc1644af855d6ede4ea7bd9f7fe803
+  data.tar.gz: ef48c3ec9546560773ce9d39d5438f67aaadbafdd63884b1f468fc90ec248376d923d1a06b7e43234f47191fc599c1f268a5e0fddc97f47a078e563d1f56dd45

data/lib/openteam/capistrano/deploy.rb

@@ -11,9 +11,5 @@ if fetch(:stage) && !fetch(:stage).empty?
   require 'openteam/capistrano/tagging'
   require 'openteam/capistrano/unicorn'           if used_unicorn?
   require 'openteam/capistrano/whenever'          if used_whenever?
-  begin
-    require "rsolr"
-    require "openteam/capistrano/sunspot"
-  rescue LoadError
-  end
+  require "openteam/capistrano/sunspot"           if used_solr?
 end

data/lib/openteam/capistrano/hooks.rb

@@ -2,5 +2,5 @@ after  'deploy',            'deploy:tagging:create'
 after  'deploy:publishing', 'unicorn:restart'
 after  'unicorn:restart',   'airbrake:deploy'
 before 'deploy:cleanup',    'deploy:tagging:clean'
-after  'sunspot:pull',      'sunspot:reload'
-after  'sunspot:clear',     'sunspot:reload'
+after  'sunspot:pull',      'sunspot:reload' if used_solr?
+after  'sunspot:clear',     'sunspot:reload' if used_solr?

data/lib/openteam/capistrano/tasks/sunspot.rake

@@ -1,43 +1,47 @@
-require File.expand_path('../../solr/solr', __FILE__)
+begin
+  require 'rsolr'
+  require File.expand_path('../../solr/solr', __FILE__)
 
-def development_solr_url
-  @development_solr_url ||= ''.tap do |s|
-    begin
-      s << YAML.load_file('config/settings.yml')['solr']['url']
-    rescue
-      puts 'Can\'t read solr settings'
-      exit
+  def development_solr_url
+    @development_solr_url ||= ''.tap do |s|
+      begin
+        s << YAML.load_file('config/settings.yml')['solr']['url']
+      rescue
+        puts 'Can\'t read solr settings'
+        exit
+      end
     end
   end
-end
 
-def development_core
-  @development_core ||= development_solr_url.match('(?<=/)\w+\z').to_s
-end
+  def development_core
+    @development_core ||= development_solr_url.match('(?<=/)\w+\z').to_s
+  end
 
-namespace :sunspot do
-  desc "Synchronize your local solr using remote solr data"
-  task :pull do
-    puts
-    remote_solr_url = ''
+  namespace :sunspot do
+    desc "Synchronize your local solr using remote solr data"
+    task :pull do
+      puts
+      remote_solr_url = ''
 
-    on roles(:web) do
-      ruby_expression = "puts YAML.load_file('#{current_path}/config/settings.yml')['solr']['url']"
-      remote_solr_url = capture(:ruby, " -ryaml -e \"#{ruby_expression}\"")
-    end
+      on roles(:web) do
+        ruby_expression = "puts YAML.load_file('#{current_path}/config/settings.yml')['solr']['url']"
+        remote_solr_url = capture(:ruby, " -ryaml -e \"#{ruby_expression}\"")
+      end
 
-    Solr::Replicator.new(:remote => remote_solr_url, :local => development_solr_url).replicate
-  end
+      Solr::Replicator.new(:remote => remote_solr_url, :local => development_solr_url).replicate
+    end
 
-  desc 'Reload development core'
-  task :reload do
-    puts
-    Solr.new(development_solr_url).send_reload_core_command(development_core)
-  end
+    desc 'Reload development core'
+    task :reload do
+      puts
+      Solr.new(development_solr_url).send_reload_core_command(development_core)
+    end
 
-  desc 'Clear development index'
-  task :clear do
-    puts
-    Solr.new(development_solr_url).send_clear_command(development_core)
+    desc 'Clear development index'
+    task :clear do
+      puts
+      Solr.new(development_solr_url).send_clear_command(development_core)
+    end
   end
+rescue LoadError
 end

data/openteam-capistrano.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'openteam-capistrano'
-  gem.version       = '1.0.9'
+  gem.version       = '1.0.10'
   gem.authors       = ["OpenTeam developers"]
   gem.email         = ["developers@openteam.ru"]
   gem.description   = %q{OpenTeam common capistrano3 recipe}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openteam-capistrano
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - OpenTeam developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake