capistrano-ext-projectdx 0.1.14 → 0.1.20

data/bin/deploy.sh

@@ -18,6 +18,12 @@ if [ -z "${DEPLOY_VERSION}" ]; then
   export DEPLOY_VERSION=`git tag -l "${STAGE}/*" | egrep "^${STAGE}/[0-9]{4}-[0-9][0-9]-[0-9][0-9](\.[0-9]+)?" | sort -r | head -1`
 fi
 
+if [ "${APP}" == "projectdx-pdxrails" ]; then
+  DEPLOY=deploy:full
+else
+  DEPLOY=deploy
+fi
+
 if [ -z "${DEPLOY_VERSION}" ]; then
   echo "No deployable version found!"
   EXIT=1
@@ -31,7 +37,7 @@ else
   . .agent
   ssh-add
 
-  bundle exec cap ${STAGE} deploy
+  bundle exec cap "${STAGE}" "${DEPLOY}"
   EXIT=$?
 
   ssh-agent -k

data/lib/capistrano-ext-projectdx.rb

@@ -1 +0,0 @@
-require File.dirname(__FILE__) + '/database_operations'

data/lib/capistrano/ext/projectdx/cache.rb

@@ -1,8 +1,30 @@
 namespace :cache do
-  desc "Empty out shared cachedir and the cached javascript and css"
+  desc "Create cachedirs"
+  task :setup, :roles => :web do
+    # note: source is relative to #{current_path}
+    def setup_cache_path(name, source)
+      cache_path=fetch(:cache_path, "/dev/shm/apps/#{application}")
+      local_cache_path="#{current_path}/#{source}"
+      shm_cache_patch="#{cache_path}/#{name}"
+      run %Q{ mkdir -p "#{shm_cache_patch}" }
+      run %Q{ if [ -d #{local_cache_path} ]; then rsync -qa #{local_cache_path}/ #{shm_cache_patch} &&  rm -rf #{local_cache_path}; fi }
+      run %Q{ ln -s #{shm_cache_patch}/  #{local_cache_path} }
+    end
+    setup_cache_path('fragment_cache', 'tmp/fragment_cache')
+    setup_cache_path('public_cache', 'public/cache')
+    fetch(:caches, {}).each do |k,v|
+      setup_cache_path(k, v)
+    end
+  end
+  
+  after "deploy:symlink", "cache:setup"
+  
+
+  desc "Empty out shared cachedir, fragment cache, and the cached javascript and css"
   task :clean, :roles => :web  do
     run "shopt -s nullglob; cd #{current_path} && for i in ./public/javascripts/cache_*.js; do /bin/rm ${i}; done"
     run "shopt -s nullglob; cd #{current_path} && for i in ./public/stylesheets/cache_*.css; do /bin/rm ${i}; done"
-    run "shopt -s nullglob; cd #{shared_path} && /bin/rm -rf cache/*"
+    run "shopt -s nullglob; cd #{current_path} && /bin/rm -rf ./public/cache/*"
+    run "shopt -s nullglob; cd #{current_path} && /bin/rm -rf ./tmp/fragment_cache/*"
   end
 end

data/lib/capistrano/ext/projectdx/docs.rb

@@ -3,7 +3,7 @@ Capistrano::Configuration.instance.load do
     namespace :docs do
        desc "update docs directory"
        task :default do
-          run "cd #{current_path} && rake doc:local RDOC_DIR=#{docsdir}"
+          run "cd #{current_path} && bundle exec rake doc:local RDOC_DIR=#{docsdir}"
        end
        desc "force rebuild of docs directory"
        task :rebuild do
@@ -12,4 +12,4 @@ Capistrano::Configuration.instance.load do
        end
     end
   end
-end
+end

data/lib/capistrano/ext/projectdx/misc.rb

@@ -38,7 +38,7 @@ end
   
   desc "Allow running of remote rake tasks"
   task :rake_invoke do
-    run "cd #{deploy_to}/current && rake #{ENV['task']} RAILS_ENV=#{rails_env}"
+    run "cd #{deploy_to}/current && bundle exec rake #{ENV['task']} RAILS_ENV=#{rails_env}"
   end
 
 

data/lib/capistrano/ext/projectdx/projectdx.rb

@@ -15,14 +15,6 @@ Capistrano::Configuration.instance.load do
   end
 
   namespace :deploy do
-    desc "install database.yml, and other things "
-    task :local_config do
-      run "mkdir -p #{shared_path}/cache"
-      run "/bin/ln -nsf  #{release_path}/../../shared/cache #{release_path}/public/cache"
-    end
-
-    after "deploy:symlink", "deploy:local_config"
-
     desc "update selinux context"
     task :selinux do
       run %Q{if [ -d #{release_path} ]; then 
@@ -73,7 +65,7 @@ Capistrano::Configuration.instance.load do
       if releases.length < 2
         abort "could not rollback the code because there is no prior release"
       else
-        rake = fetch(:rake, "rake")
+        rake = fetch(:rake, "bundle exec rake")
         rails_env = fetch(:rails_env, "production")
         migrate_env = fetch(:migrate_env, "")
         migrate_target = fetch(:migrate_target, :latest)

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-ext-projectdx
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 51
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 14
-  version: 0.1.14
+  - 20
+  version: 0.1.20
 platform: ruby
 authors: 
 - Darrell Fuhriman
 - Joel Hoffman
 - Sam Livingston-Gray
 - Laurie Kemmerer
+- Dave Miller
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 -08:00
-default_executable: 
+date: 2012-06-25 00:00:00 Z
 dependencies: []
 
 description: Local extensions to capistrano, which others may find useful
@@ -28,6 +28,7 @@ email:
 - joel@renewfund.com
 - sam@renewfund.com
 - laurie@renewfund.com
+- dave.miller@renewfund.com
 executables: []
 
 extensions: []
@@ -47,11 +48,6 @@ files:
 - lib/capistrano/ext/projectdx/web.rb
 - lib/capistrano/ext/projectdx.rb
 - lib/capistrano-ext-projectdx.rb
-- lib/database_operations.rb
-- lib/projectdx/tasks.rb
-- lib/rf_filtering.rb
-- lib/sql_obfuscator.rb
-has_rdoc: true
 homepage: http://github.com/projectdx/capistrano-ext-projectdx
 licenses: []
 
@@ -83,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capistrano-ext-projectdx
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Local extensions to capistrano, which others may find useful

data/lib/database_operations.rb

@@ -1,68 +0,0 @@
-require 'open3'
-require 'tempfile'
-class DatabaseOperations
-  def self.pg(cfg, cmd)
-    ENV['PGPASSWORD'] = cfg["password"]
-
-    args = []
-    args << %{-h "#{cfg["host"]}"}     if cfg["host"]
-    args << %{-U "#{cfg["username"]}"} if cfg["username"]
-    args << %{-p "#{cfg["port"]}"}     if cfg["port"]
-    args << %{-w}
-
-    %x{#{cmd} #{args.join(' ')} "#{cfg['database']}"}
-  ensure
-    ENV.delete('PGPASSWORD')
-  end
-
-  def self.load_database_schema!(cfg, file)
-    pg(cfg, 'createdb') unless pg(cfg, "psql -l") =~ /^ #{cfg['database']}\s*\|/m
-
-    Tempfile.open('initdb') do |f|
-      f.puts "set client_min_messages=error;"
-      f.puts "drop schema if exists public cascade;"
-      f.puts "create schema public;"
-      f.puts "drop schema if exists tiger cascade;"
-
-      f.puts "drop language if exists plpgsql cascade;"
-      f.puts "create language plpgsql;"
-      f.flush
-      pg(cfg, "psql -f #{f.path}")
-    end
-
-    pg cfg, %{psql -f "#{file}"}
-  end
-
-  def self.dump_database_schema!(cfg, file)
-    search_path = cfg["schema_search_path"]
-    search_path = search_path.split(',').map{|x| "--schema=#{x}"}.join(' ') if search_path
-
-    File.open(Rails.root.join(file), "w") { |f|
-      f.puts "begin;"
-      f.write pg(cfg, %{pg_dump    -n tiger}).gsub('CREATE FUNCTION', 'CREATE OR REPLACE FUNCTION').lines.reject { |l| l =~ /soundex/ } * ""
-      f.write pg(cfg, %{pg_dump -s -n public}).gsub('CREATE FUNCTION', 'CREATE OR REPLACE FUNCTION')
-      f.write pg(cfg, %{pg_dump -a -t spatial_ref_sys})
-      f.write pg(cfg, %{pg_dump -a -t schema_migrations})
-      f.puts "commit;"
-    }
-  end
-
-  def self.load_views_and_triggers!
-    cfg = ActiveRecord::Base.configurations[Rails.env]
-    unless pg(cfg, "createlang -l") =~ /plpgsql/
-      pg(cfg, "createlang plpgsql")
-    end
-
-    output = nil 
-
-    Tempfile.open('load_views') do |temp|
-
-      Dir.glob(Rails.root.join('lib', 'sql_erb', '[0-9]*.sql.erb')).sort_by { |f| ('0.%s' % File.split(f).last.gsub(/\D.*/,'')).to_f }.each do |fpath|
-        temp.puts File.open(fpath){|io| ERB.new(io.read).result }
-      end 
-      temp.flush
-      output = pg cfg, %{psql --single-transaction -f #{temp.path} }
-    end 
-    output
-  end 
-end

data/lib/projectdx/tasks.rb

@@ -1,87 +0,0 @@
-def copy(src,dst)
- %x{if [ -e #{dst} ]; then mv #{dst} #{dst}.bak; fi; cp #{src} #{dst}}
-end
-
-require File.dirname(__FILE__) + '/../database_operations'
-
-namespace :ci do
-  task :setup => 'setup:default'
-
-  namespace :setup do
-    task :default => [:copy_config, :clone_structure]
-
-    task :cucumber => [:copy_config, :clean_logdir, :clean_cache, :default]
-
-    task :clone_structure do
-      abcs = YAML.load_file('config/database.yml') 
-      DatabaseOperations.dump_database_schema!(abcs['reference'], 'db/ci_structure.sql')
-      DatabaseOperations.load_database_schema!(abcs['test'], 'db/ci_structure.sql')
-      puts %x{env RAILS_ENV=test rake db:migrate}
-      DatabaseOperations.dump_database_schema!(abcs['test'], 'db/ci_structure.sql')
-    end
-
-    task :copy_config do
-      ci = YAML.load_file('config/database.ci.yml')
-      ci['login']['database'] = '%s-ci-%s' % [ci['login']['application'], %x{hostname}.strip.split('.').first]
-      login = ci.delete('login')
-      ref = '%s-reference' % login['application']
-      environments = login.delete('environments')
-
-      ci['reference'] = login.clone
-      ci['reference']['database'] = ref
-      ci['development'] = login.clone
-      
-      environments.each do |e|
-        ci[e] = login.clone
-      end
-
-      File.rename("config/database.yml", "config/database.yml.bak") if File.exists?("config/database.yml")
-  
-      File.open('config/database.yml', 'w') do |f| 
-        f.write(ci.to_yaml);
-      end
-
-      if File.exists?("config/cms_config.deploy.yml")
-        File.rename("config/cms_config.yml", "config/cms_config.yml.bak") if File.exists?("config/cms_config.yml")
-        copy 'config/cms_config.deploy.yml', 'config/cms_config.yml'
-      end
-    end
-    
-    task :clean_cache do
-      `rm -f public/javascripts/cache_*.js`
-    end
-
-    task :clean_logdir do
-      `for f in log/* tmp/*; do if [ -f $f ]; then rm $f ; fi; done`
-    end
-  end
-end
-
-namespace :db do
-  Rake::Task['db:structure:dump'].clear_actions()
-  namespace :structure do
-    desc "Dump the database structure to a SQL file"
-    task :dump => :environment do
-      if File.exists?('db/ci_structure.sql')
-        STDERR.puts "CI environment detected: not dumping schema"
-      else 
-        abcs = ActiveRecord::Base.configurations
-        DatabaseOperations.dump_database_schema!(abcs['development'], 'db/development_structure.sql')
-      end 
-    end 
-  end 
-
-  Rake::Task['db:test:clone_structure'].clear_actions()
-  namespace :test do
-    desc "Recreate the test databases from the development structure"
-    task :clone_structure => [ "db:structure:dump", "db:test:purge"] do
-      abcs = ActiveRecord::Base.configurations
-      if File.exists?('db/ci_structure.sql')
-        STDERR.puts "CI environment detected"
-        DatabaseOperations.load_database_schema!(abcs['test'], 'db/ci_structure.sql')
-      else
-        DatabaseOperations.load_database_schema!(abcs['test'], 'db/development_structure.sql')
-      end
-    end
-  end
-end

data/lib/rf_filtering.rb

@@ -1,64 +0,0 @@
-# Include this from application.rb and call rf_param_filtering() with a 
-# whitelist and a blacklist set of params, as below.  Blacklisted parameters 
-# are filtered first by Rails, and any other parameters not in the whitelist 
-# are filtered by this code.
-#
-## application.rb: 
-#
-# require 'rf_filtering'
-# ...
-# class Application < Rails::Application
-#   ...
-#   include RFFiltering
-#   RFFiltering.UnfilteredEnvironments << 'unfiltered_environment'
-#   rf_param_filtering(
-#     :blacklist => %w[password card_number card_number],
-#     :whitelist => %w[brochure_nickname id])
-#
-
-module RFFiltering
-  extend ActiveSupport::Concern
-  
-  UnfilteredEnvironments = ['development']
-  FilteredReplacement = '[+++]'
-
-  included do
-    # this space intentionally left blank
-  end
-  
-  module ClassMethods
-    attr_reader :rf_filtering_blacklist, :rf_filtering_whitelist
-    
-    # Leaving this exposed for mockability
-    def should_filter_params?
-      # there are not a few non-positives in this code.
-      !UnfilteredEnvironments.include?(Rails.env)
-    end
-    
-    protected
-    def rf_param_filtering(options = {})
-      @rf_filtering_blacklist = (options[:blacklist] || []).map(&:to_s)
-      @rf_filtering_whitelist = (options[:whitelist] || []).map(&:to_s).to_set
-
-      config.filter_parameters += rf_filtering_blacklist
-      config.filter_parameters << rf_whitelist_filter_proc
-    end
-
-    def rf_whitelist_filter_proc
-      lambda do |k,v|
-        next unless should_filter_params?
-        next unless v.present?
-        next unless v.respond_to?(:to_str) && v.respond_to?(:replace)
-        next if param_filter_white_list.include?(k.to_s)
-        v.replace FilteredReplacement
-      end
-    end
-  end
-  
-  module InstanceMethods
-    # Leaving this exposed for mockability
-    def param_filter_white_list
-      self.class.rf_filtering_whitelist
-    end
-  end
-end

data/lib/sql_obfuscator.rb

@@ -1,74 +0,0 @@
-# Include this with an initializer similar to the one below.
-#
-# whitelisted_fields = %w[
-#   cached_cms_responses.filename
-#   cached_cms_responses.site
-#   customers.hostname
-#   sessions.session_id
-# ]
-# whitelisted_fields.each { |field| SqlObfuscator.whitelist(field) }
-# 
-# SqlObfuscator.dont_obfuscate_table_and_field do |table, field|
-#   %w[created_at updated_at nickname].include?(field)
-# end
-# 
-# NewRelic::Agent.set_sql_obfuscator(:replace) do |sql|
-#   SqlObfuscator.obfuscate(sql)
-# end
-#
-
-
-module SqlObfuscator
-  module_function
-
-  # Provide a facility for whitelisting certain fields
-  WhitelistHash = Hash.new(false)
-  def whitelist(field_expression)
-    WhitelistHash[field_expression] = true
-  end
-  def whitelisted?(field_expression)
-    WhitelistHash[field_expression]
-  end
-
-  DontObfuscateProcs = []
-  # Provides a facility for *not* obfuscating if the field meets some arbitrary criteria.
-  # Takes blocks, calls them on expressions for which a table and field can be found.
-  # Blocks should take two arguments, table and field, and return TRUE if the value should NOT be obfuscated.
-  def dont_obfuscate_table_and_field(&proc)
-    DontObfuscateProcs << proc
-  end
-
-  # Should match:
-  #   f_table_name = 'sensitive data'
-  #   "some_table"."some_field" = 'sensitive data'
-  #   "some_table"."some_field" somehow_matches 'sensitive data'
-  # ...but see also test/unit/lib/sql_obfuscator_unit_test.rb
-  ComparisonExpression = /(?:("\w+"\."\w+")([^"']+)?)?'([^'\\]*((?:\\.|'')[^'\\]+)*)'/
-
-  # Actually do the obfuscation
-  def obfuscate(sql)
-    sql.gsub(ComparisonExpression) do |match|
-      field_expression, comparison, sensitive_data = $1, $2, $3
-
-      # Obfuscate by default
-      obfuscated_sql = [field_expression, comparison, obfuscate_value(sensitive_data)].compact.join
-
-      # Don't obfuscate if we have a field expression that's on the whitelist or is on a 'nickname' field
-      if field_expression.present?
-        table_name, field_name = field_expression.to_s.gsub('"', '').split('.')
-        case
-        when whitelisted?('%s.%s' % [table_name, field_name])
-          obfuscated_sql = match
-        when DontObfuscateProcs.any? { |proc| proc.call(table_name, field_name) }
-          obfuscated_sql = match
-        end
-      end
-
-      obfuscated_sql
-    end
-  end
-
-  def obfuscate_value(value)
-    "'%s'" % Digest::MD5.hexdigest("%d:%s" % [value.to_s.length, value.to_s])
-  end
-end