capones_recipes 1.20.0 → 1.20.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e50fccda62b4d0debdd59c43b2cd4f108bed2660
+  data.tar.gz: d80042b0d1e2d51b0f0d40634238685e8f1e3699
+SHA512:
+  metadata.gz: 7b62fe3c9f58263cf09c8a06f7afcc7dca2b15350662ff117336e3cb3419dffbb579f91dce7468325f559a683d16aa47e180d26cbab346b77d4c1bcf0011acdb
+  data.tar.gz: ca703c5da6663b33b1aa07dfbc53f65a6d3f771f198a8db5a9798dfaf94d1dba2e76a39b222517c10ad96a28b4c98faf1a5315677c77ee07af33184a57b704da

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.20.1
+======
+* Support newer versions of thinking_sphinx gem
+
 1.20.0
 ======
 * Allow domainless hostnames with up to two dots when looking up FQDN for webserver in DB server grant.

data/lib/capones_recipes/tasks/database/sync.rb

@@ -48,7 +48,7 @@ Capistrano::Configuration.instance.load do
         run_locally "rm -f #{filename}"
 
         logger.important "sync database from the stage '#{stage}' to local finished"
-        
+
         # Start db:migrate
         run_locally "rake db:migrate"
       end
@@ -122,13 +122,5 @@ Capistrano::Configuration.instance.load do
       database = YAML::load(config)
       return database["#{env}"]['username'], database["#{env}"]['password'], database["#{env}"]['database'], database["#{env}"]['host']
     end
-
-    #
-    # Returns the actual host name to sync and port
-    #
-    def host_and_port
-      return roles[:web].servers.first.host, ssh_options[:port] || roles[:web].servers.first.port || 22
-    end
-
   end
 end

data/lib/capones_recipes/tasks/thinking_sphinx.rb

@@ -1,5 +1,10 @@
 # Thinking Sphinx for Capistrano
-require 'thinking_sphinx/deploy/capistrano'
+begin
+  require 'thinking_sphinx/capistrano'
+rescue LoadError
+  # Support older versions of the thinking_sphinx gem (< 3.0)
+  require 'thinking_sphinx/deploy/capistrano'
+end
 
 Capistrano::Configuration.instance.load do
   before "thinking_sphinx:symlink", "thinking_sphinx:setup"

data/lib/capones_recipes/version.rb

@@ -1,3 +1,3 @@
 module CaponesRecipes
-  VERSION = "1.20.0"
+  VERSION = "1.20.1"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capones_recipes
 version: !ruby/object:Gem::Version
-  version: 1.20.0
-  prerelease: 
+  version: 1.20.1
 platform: ruby
 authors:
 - Roman Simecek (CyT)
@@ -10,102 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cap-recipes
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A collection of usefull capistrano recipes used by CyT GmbH and others.
@@ -118,8 +105,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
 - CHANGELOG
 - Capfile
 - Gemfile
@@ -169,27 +156,25 @@ files:
 homepage: http://github.com/raskhadafi/capones-recipes
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: Some capistrano recipes for use.
 test_files: []
-has_rdoc: