geordi 0.2.3 → 0.2.5

data/README.md

@@ -23,7 +23,7 @@ More information at http://makandra.com/notes/807-shell-script-to-quickly-switch
 b
 -
 
-Run the given command under `bundle exec` if a `Gemfile` is present in your working directory. If no `Gemfile` is present it just runs the given command:
+Runs the given command under `bundle exec` if a `Gemfile` is present in your working directory. If no `Gemfile` is present just runs the given command:
 
     b spec spec/models
 
@@ -43,7 +43,7 @@ More information at http://makandra.com/notes/1008-dump-your-database-with-dumpl
 install-gems-remotely
 ---------------------
 
-Installs all gems in your `Gemfile.lock` as well as vendored gems on the given host:
+Installs all gems in your `Gemfile.lock`, as well as vendored gems, to the given host:
 
     install-gems-remotely my.server.com
 
@@ -63,7 +63,7 @@ This script is considered legacy and will be removed eventually. You should [fix
 power-rake
 ----------
 
-Runs the given rake task in each Rails environment in `development`, `test`, `cucumber`, `performance`, if it exists:
+Runs the given rake task in each Rails environment in `development`, `test`, `cucumber`, `performance`, if existing:
 
     power-rake db:migrate
 
@@ -83,9 +83,11 @@ More information at http://makandra.com/notes/520-create-a-remote-branch-in-git
 remove-executable-flags
 -----------------------
 
-Recursively removes executable flags from files in the working directory that probably shouldn't have them:
+Recursively removes executable flags from files in the working directory that probably shouldn't have them (like Ruby, HTML, CSS, image, Rake and similar files).
 
     remove-executable-flags
+    
+More information at http://makandra.com/notes/659-recursively-remove-unnecessary-execute-flags
 
 
 shell-for
@@ -97,3 +99,13 @@ Opens an SSH shell on the given [Capistrano multistage](https://github.com/capis
 
 More information at http://makandra.com/notes/1209-script-to-open-an-ssh-shell-to-a-capistrano-deployment-target
 
+
+dump-for
+--------
+
+Dumps the database on your server for a given [Capistrano multistage](https://github.com/capistrano/capistrano/wiki/2.x-Multistage-Extension) deployment target, then copies the dump to your project root.
+
+    dump-for production
+
+More information at http://makandra.com/notes/1237-script-to-create-and-copy-a-production-dump-to-your-project-root
+

data/bin/dump-for

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+
+def unquote(line)
+  if line  
+    line.match(/["'](.*)["']/)
+    $1
+  end
+end
+
+def find_project_root
+  current = Dir.pwd
+  until (File.exists? 'Capfile')
+    Dir.chdir '..'
+    return nil if current == Dir.pwd
+    current = Dir.pwd
+  end
+  @project_root = current
+end
+
+begin
+  require 'rubygems'
+  require 'net/ssh'
+  
+  stage = ARGV.shift
+  
+  find_project_root or raise 'Call me from inside a Rails project'
+  
+  data = if stage
+    deploy_file = Dir['config/deploy/*.rb'].find do |file|
+      file.match(/\/#{stage}.rb$/)
+    end
+    deploy_file or raise "Unknown stage: #{stage}"
+    
+    File.open(deploy_file).readlines
+  else
+    []
+  end + File.open("config/deploy.rb").readlines
+
+  user        = unquote data.find{ |line| line =~ /^set :user,/}
+  server      = unquote data.find{ |line| line =~ /^server / }
+  deploy_to   = unquote data.find{ |line| line =~ /^set :deploy_to,/}
+  environment = unquote data.find{ |line| line =~ /^set :rails_env,/}
+  (user and server and deploy_to and environment) or raise "Could not find required data (user, server, deploy target and environment).\nUsage: dump-for DEPLOYMENT_STAGE"
+  
+  path = deploy_to + "/current"
+  if path.match /#\{.*\}/
+    puts %(NOTE: "#{path}" is not a valid path.)
+    puts %(NOTE: You will need to fetch the dump yourself.)
+    raise ""
+  end
+
+  command = %(ssh #{user}@#{server} -t "cd #{path} && dumple #{environment} --for_download")
+  system command
+
+  puts "Downloading dump_for_download..."
+  exec "scp #{user}@#{server}:~/dumps/dump_for_download.dump #{@project_root}"
+  
+rescue Exception => e
+  $stderr.puts e.message
+  exit 1
+end

data/bin/dumple

@@ -11,46 +11,64 @@ if ARGV.include?("-i")
   exit
 end
 
-require "yaml"
+###
 
+require "yaml"
 config_path = 'config/database.yml'
-unless File.exist?(config_path) 
-  if fail_gently
-    puts "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
-    puts "*                                                             *"
-    puts "*                                                             *"
-    puts "*     Script is not called from inside a Rails project,       *"
-    puts "*                                                             *"
-    puts "*            THE DATABASE WILL NOT BE DUMPED.                 *"
-    puts "*                                                             *"
-    puts "*                                                             *"
-    puts "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
-    sleep 5
-    exit
-  else
-    raise "Call me from inside a Rails project."
+
+begin
+  # go to project root
+  current = Dir.pwd
+  until (File.exists? config_path)
+    Dir.chdir '..'
+    if current == Dir.pwd
+      if fail_gently
+        puts "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
+        puts "*                                                             *"
+        puts "*                                                             *"
+        puts "*     Script is not called from inside a Rails project,       *"
+        puts "*                                                             *"
+        puts "*            THE DATABASE WILL NOT BE DUMPED.                 *"
+        puts "*                                                             *"
+        puts "*                                                             *"
+        puts "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
+        sleep 5
+        exit
+      else
+        raise "Call me from inside a Rails project."
+      end
+    end
+    current = Dir.pwd
   end
-end
-config = YAML::load(File.open(config_path))
 
-environment = ARGV.reject{ |arg| arg[0].chr == '-' }.first || 'production'
-config = config[environment] or raise "No production environment found. Please do `dumple [env_name]`"
+  config = YAML::load(File.open(config_path))
 
-dump_dir = "#{ENV['HOME']}/dumps"
-unless File.directory?(dump_dir)
-  Dir.mkdir(dump_dir)
-  system("chmod 700 #{dump_dir}")
-end
-dump_path = "#{dump_dir}/#{config['database']}_#{Time.now.strftime("%Y%m%d_%H%M%S")}.dump"
+  environment = ARGV.reject{ |arg| arg[0].chr == '-' }.first || 'production'
+  config = config[environment] or raise "No #{environment} database found.\nUsage: dumple ENVIRONMENT"
 
-puts
-puts "Dumping database for environment \"#{environment}\"..."
+  dump_dir = "#{ENV['HOME']}/dumps"
+  unless File.directory?(dump_dir)
+    Dir.mkdir(dump_dir)
+    system("chmod 700 #{dump_dir}")
+  end
+  
+  if ARGV.find{ |arg| arg == '--for_download'}
+    dump_path = "#{dump_dir}/dump_for_download.dump"
+  else
+    dump_path = "#{dump_dir}/#{config['database']}_#{Time.now.strftime("%Y%m%d_%H%M%S")}.dump"
+  end
 
-system "mysqldump -u\"#{config['username']}\" -p\"#{config['password']}\" #{config['database']} -r #{dump_path}"
-system "chmod 600 #{dump_path}"
+  puts
+  puts "Dumping database for \"#{environment}\" environment ..."
 
-dump_size_kb = (File.size(dump_path) / 1024).round
+  system "mysqldump -u\"#{config['username']}\" -p\"#{config['password']}\" #{config['database']} -r #{dump_path}"
+  system "chmod 600 #{dump_path}"
 
-puts "Dumped to #{dump_path} (#{dump_size_kb} KB)"
-puts
+  dump_size_kb = (File.size(dump_path) / 1024).round
 
+  puts "Dumped to #{dump_path} (#{dump_size_kb} KB)"
+  puts
+rescue Exception => e
+  $stderr.puts e.message
+  exit 1
+end

data/bin/install-gems-remotely.sh

@@ -1,4 +1,9 @@
 #!/bin/sh
+if [ -z "$1" ]; then
+  echo "Please specify the remote server name"
+  exit 1
+fi
+mkdir -p tmp
 if ls vendor/gems/*/*.gemspec > /dev/null 2>&1; then
   tar cf tmp/gemfiles_for_remote_install Gemfile Gemfile.lock vendor/gems/*/*.gemspec
 else
@@ -8,4 +13,4 @@ scp tmp/gemfiles_for_remote_install $1:~
 stty_orig=`stty -g`
 stty -echo
 ssh -t $1 "mkdir /tmp/install_gems; mv gemfiles_for_remote_install /tmp/install_gems; cd /tmp/install_gems; tar xf gemfiles_for_remote_install; bundle install; rm -rf /tmp/install_gems"
-stty $stty_orig
+stty $stty_orig

data/bin/power-deploy

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
 
 stage = ARGV[0]
+puts "NOTE: This Script is considered legacy and will be removed eventually."
+puts "NOTE: You should fix your deploy scripts (see http://makandra.com/notes/1176-which-capistrano-hooks-to-use-for-events-to-happen-on-both-cap-deploy-and-cap-deploy-migrations)"
+puts "Note: and use `cap deploy:migrations` (see http://makandra.com/notes/1000-deploy-and-migrate-with-a-single-capistrano-command) instead."
+puts
 exec "cap #{stage} deploy && cap #{stage} deploy:migrate && cap #{stage} deploy:restart"

data/bin/power-rake

@@ -2,7 +2,7 @@
 
 for env in %w[development test cucumber performance]
   if File.exists? "config/environments/#{env}.rb"
-    call = ['rake'] + ARGV + ["RAILS_ENV=#{env}"]
+    call = ['b', 'rake'] + ARGV + ["RAILS_ENV=#{env}"]
     puts call.join(' ')
     system *call
   end

data/bin/{remove-execute-flags → remove-executable-flags}

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-puts "Removing execute flags:"
+puts "Removing executable-flags:"
 for pattern in %w[*.rb *.html *.erb *.haml *.yml *.css *.sass *.rake *.png *.jpg *.gif *.pdf *.txt *.rdoc Rakefile VERSION README Capfile]
   puts "- #{pattern}"
-  `find . -name "#{pattern}" -exec chmod -x {} \`
+  `find . -name "#{pattern}" -exec chmod -x {} \ `
 end
 puts "Done."

data/bin/shell-for

@@ -1,42 +1,56 @@
 #!/usr/bin/env ruby
 
-def quoted_text(line)
-  line.match(/["'].*["']/).to_s.gsub(/["']/, '')
+def unquote(line)
+  if line  
+    line.match(/["'](.*)["']/)
+    $1
+  end
 end
 
-def read_deploy_files
-  all_deploy_files = Dir["config/deploy/*.rb"]
-  
-  deploy_file = all_deploy_files.find do |file|
-    file.match(/\/#{@stage}.rb$/)
-  end  
-  raise "Unknown stage: #{@stage}" unless deploy_file
-  
-  @specific = File.open(deploy_file).readlines
-  @for_all = File.open("config/deploy.rb").readlines
-end
-
-def build_command
-  path = quoted_text(@deploy_to) + "/current"
-
-  @command = "ssh #{quoted_text(@user)}@#{quoted_text(@server)}"
-  @command += %( -t "cd #{path} && bash --login") unless path.match /#\{/
+def find_project_root
+  current = Dir.pwd
+  until (File.exists? 'Capfile')
+    Dir.chdir '..'
+    return nil if current == Dir.pwd
+    current = Dir.pwd
+  end
+  current
 end
 
 begin
-  @stage = ARGV.shift
+  stage = ARGV.shift
+  
+  find_project_root or raise 'Call me from inside a Rails project'
   
-  raise "Usage: shell_for DEPLOYMENT_STAGE" unless @stage
-  raise "Run me from inside a Rails project" unless File.exists?("config/deploy.rb")
+  data = if stage
+    deploy_file = Dir['config/deploy/*.rb'].find do |file|
+      file.match(/\/#{stage}.rb$/)
+    end
+    deploy_file or raise "Unknown stage: #{stage}"
+    
+    File.open(deploy_file).readlines
+  else
+    []
+  end + File.open("config/deploy.rb").readlines
 
-  read_deploy_files
-  @user      = @specific.find{ |line| line =~ /^set :user, /}       || @for_all.find{ |line| line =~ /^set :user, / }
-  @server    = @specific.find{ |line| line =~ /^server / }          || @for_all.find{ |line| line =~ /^server / }
-  @deploy_to = @specific.find{ |line| line =~ /^set :deploy_to, /}  || @for_all.find{ |line| line =~ /^set :deploy_to, / }
+  user      = unquote data.find{ |line| line =~ /^set :user, /}
+  server    = unquote data.find{ |line| line =~ /^server / }
+  deploy_to = unquote data.find{ |line| line =~ /^set :deploy_to, /}
   
-  build_command
+  (user and server and deploy_to) or raise "Could not find required data (user, server and deploy-target).\nUsage: shell-for DEPLOYMENT_STAGE"
   
-  exec @command
+  path = deploy_to + "/current"
+  command = %(ssh #{user}@#{server})
+  
+  if path.match /#\{.*\}/
+    puts %(NOTE: "#{path}" is not a valid path.)
+    puts %(NOTE: Connecting to deploy user home.)
+    sleep 2
+  else
+    command += %( -t "cd #{path} && bash --login")
+  end
+
+  exec command
   
 rescue Exception => e
   $stderr.puts e.message

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geordi
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 +02:00
+date: 2011-05-30 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -25,13 +25,14 @@ email:
 executables: 
 - apache-site
 - b
+- dump-for
 - dumple
 - install-gems-remotely
 - install-gems-remotely.sh
 - power-deploy
 - power-rake
 - remotify-local-branch
-- remove-execute-flags
+- remove-executable-flags
 - shell-for
 extensions: []
 
@@ -44,13 +45,14 @@ files:
 - Rakefile
 - bin/apache-site
 - bin/b
+- bin/dump-for
 - bin/dumple
 - bin/install-gems-remotely
 - bin/install-gems-remotely.sh
 - bin/power-deploy
 - bin/power-rake
 - bin/remotify-local-branch
-- bin/remove-execute-flags
+- bin/remove-executable-flags
 - bin/shell-for
 - geordi.gemspec
 - lib/geordi/version.rb
@@ -84,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geordi
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.