crossroads_capistrano 1.4.17 → 1.4.18

data/crossroads_capistrano.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "crossroads_capistrano"
-  s.version     = "1.4.17"
+  s.version     = "1.4.18"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Kenworthy", "Ben Tillman", "Nathan Broadbent"]
   s.email       = ["it_dept@crossroads.org.hk"]

data/lib/crossroads_capistrano/recipes/ldap.rb

@@ -1,11 +1,11 @@
 namespace :ldap do
   desc "Create the LDAP configuration file"
   task :config do
-    prompt_with_default("LDAP host", :ldap_host, "ldap.crossroadsint.org")
-    prompt_with_default("LDAP domain", :ldap_domain, "crossroadsint")
-    prompt_with_default("LDAP username", :ldap_bind_username, "ldapuser")
+    prompt_with_default("LDAP host", :ldap_host, "")
+    prompt_with_default("LDAP domain", :ldap_domain, "")
+    prompt_with_default("LDAP username", :ldap_bind_username, "")
     prompt_with_default("LDAP password", :ldap_bind_password, "")
-    prompt_with_default("LDAP search base", :ldap_base_dn, "dc=crossroadsint,dc=org")
+    prompt_with_default("LDAP search base", :ldap_base_dn, "")
     prompt_with_default("LDAP port", :ldap_port, "389")
     ldap_yml = <<-EOF
 host: #{ldap_host}

data/lib/crossroads_capistrano/recipes/thinking_sphinx.rb

@@ -1,11 +1,5 @@
 namespace :ts do
 
-  desc "Links the sphinx database files by inserting magic code"
-  task :symlink do
-    sed "#{release_path}/script/link_sphinx.rb", {"DEPLOY_TO" => "shared"}
-    run "#{release_path}/script/runner -e production #{release_path}/script/link_sphinx.rb"
-  end
-
   desc "Index data for Sphinx using Thinking Sphinx's settings"
   task :in do
     run "cd #{current_path} && RAILS_ENV=production rake ts:in"
@@ -46,4 +40,3 @@ and no need for recovery."""
   end
 
 end
-

data/lib/crossroads_capistrano/recipes/user_permissions.rb

@@ -2,8 +2,9 @@
 # ----------------------------------------------------------
 
 # Fetch user from ~/.netrc or $USER.
-set :user, if File.exist?("~/.netrc")
-  File.open(`echo ~/.netrc`.strip, 'r').read[/login ([a-z_]+)/m, 1]
+netrc = `echo ~/.netrc`.strip
+set :user, if File.exist?(netrc)
+  File.open(netrc, 'r').read[/login ([a-z_]+)/m, 1]
 else
   `echo $USER`.strip
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crossroads_capistrano
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 1
   - 4
-  - 17
-  version: 1.4.17
+  - 18
+  version: 1.4.18
 platform: ruby
 authors: 
 - Steve Kenworthy
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 +08:00
+date: 2011-06-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency