geordi 0.14.6 → 0.14.7

data/bin/console-for

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + "/../lib/geordi"
-include Geordi
+require File.dirname(__FILE__) + "/../lib/geordi/capistrano"
+include Geordi::Capistrano
 
 catching_errors do
-  retrieve_data!
-
-  if File.exists? "#{root}/script/console" # => Rails 2
-    system "shell-for #{stage} --no-bash script/console #{env}"
+  self.stage = ARGV.shift
+  if File.exists? "#{config.root}/script/console" # => Rails 2
+    shell_for("script/console #{config.env}")
   else
-    system "shell-for #{stage} --no-bash bundle exec rails console #{env}"
+    shell_for("bundle exec rails console #{config.env}")
   end
 end

data/bin/dump-for

@@ -1,29 +1,29 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + "/../lib/geordi"
-include Geordi
+require File.dirname(__FILE__) + "/../lib/geordi/capistrano"
+require File.dirname(__FILE__) + "/../lib/geordi/dump_loader"
+include Geordi::Capistrano
 
 catching_errors do
-  retrieve_data!
+  self.stage = ARGV.shift
   
-  command = %(ssh #{user}@#{server} -t "cd #{path} && dumple #{env} --for_download")
-  success = system command
+  success = shell_for("dumple #{config.env} --for_download", :exec => false)
   
   if success
     source_path = "~/dumps/dump_for_download.dump"
-    destination_directory = "#{root}/tmp"
+    destination_directory = "#{config.root}/tmp"
     system "mkdir -p #{destination_directory}" # Ensure the destination directory exists
     destination_path = "#{destination_directory}/#{stage}.dump"
 
     puts "Downloading dump_for_download..."
-    system "scp #{user}@#{server}:#{source_path} #{destination_path}"
+    system "scp #{config.user}@#{config.server}:#{source_path} #{destination_path}"
     puts
-    puts "Dumped the #{stage.upcase} database to: #{File.basename root}/tmp/#{stage}.dump"
+    puts "Dumped the #{stage.upcase} database to: #{File.basename config.root}/tmp/#{stage}.dump"
 
     # source dump if option was given
     if ARGV.include?("-s")
       puts "Sourcing dump into development database..."
-      puts `load-dump #{destination_path}`
-      if $?.to_i == 0
+      success = DumpLoader.new([destination_path]).execute
+      if success
         puts "Your database is now sourced with a fresh #{stage} dump."
       else
         $stderr.puts "Could not source the downloaded #{stage} dump."

data/bin/load-dump

@@ -1,91 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'highline'
-
-
-class DumpLoader
-
-  def initialize(argv)
-    @argv = argv
-    @verbose = !!@argv.delete('-v')
-  end
-
-  def dumps_dir
-    require 'etc'
-    user_dir = Etc.getpwuid.dir
-    File.join(user_dir, 'dumps')
-  end
-
-  def db_console_command
-    if File.exists?("script/dbconsole")
-      "script/dbconsole -p"
-    else
-      "rails dbconsole -p"
-    end
-  end
-
-  def source_dump(dump)
-    require 'pty'
-    output_buffer = StringIO.new
-    PTY.spawn(db_console_command) do |output, input, pid|
-      input.write("source #{dump};\nexit;\n")
-      output_buffer.write output.read
-    end
-
-    output_and_errors = output_buffer.string.split("\n")
-    output = output_and_errors.reject{ |line| line =~ /^ERROR / }
-    errors = output_and_errors.select{ |line| line =~ /^ERROR / }
-
-    [output, errors]
-  end
-
-  def choose_dump_file
-    highline = HighLine.new
-
-    available_dumps = Dir.glob("#{dumps_dir}/*.dump").sort
-    selected_dump = highline.choose(*available_dumps) do |menu|
-      menu.hidden('') { exit }
-    end
-  end
-
-  def get_dump_file
-    if ARGV[0] && File.exists?(ARGV[0])
-      ARGV[0]
-    else
-      choose_dump_file
-    end
-  end
-
-
-  def puts_info(msg = "")
-    puts msg if @verbose
-  end
-
-  def execute!
-    dump_to_load = get_dump_file
-
-    puts_info
-    puts_info "sourcing #{dump_to_load} into db ..."
-
-    output, errors = source_dump(dump_to_load)
-
-    puts_info
-    puts_info output.join("\n")
-
-    if errors.empty?
-      puts_info "sourcing completed successfully."
-      exit(0)
-    else
-      $stderr.puts "some errors occured while loading the dump #{File.basename(dump_to_load)}:"
-      $stderr.puts errors.join("\n");
-      exit(1)
-    end
-  end
-
-end
+require File.dirname(__FILE__) + "/../lib/geordi/dump_loader"
 
 
 DumpLoader.new(ARGV).execute!
-
-

data/bin/shell-for

@@ -1,17 +1,8 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + "/../lib/geordi"
-include Geordi
+require File.dirname(__FILE__) + "/../lib/geordi/capistrano"
+include Geordi::Capistrano
 
 catching_errors do
-  retrieve_data!
-  no_bash         = ARGV.delete('--no-bash')
-  remote_command  = ARGV.join(' ').strip
-  
-  ssh = %(ssh #{user}@#{server})
-
-  commands = [ "cd #{path}" ]
-  commands << remote_command unless remote_command.empty?
-  commands << "bash --login" unless no_bash
-  
-  exec ssh + %( -t "#{commands.join(' && ')}")
-end
+  self.stage = ARGV.shift
+  shell_for(ARGV)
+end

data/lib/geordi/capistrano.rb

@@ -0,0 +1,107 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'capistrano'
+require 'singleton'
+
+module Geordi
+  module Capistrano
+
+    class Config
+
+      attr_accessor :stage, :root
+
+      def initialize(stage)
+        @stage = stage
+        @root = find_project_root!
+        load_capistrano_config
+      end
+      
+      def user
+        @capistrano_config.fetch(:user)
+      end
+
+      def server
+        @capistrano_config.find_servers(:roles => [:app]).first
+      end
+
+      def path
+        @capistrano_config.fetch(:deploy_to) + '/current'
+      end
+
+      def env
+        @capistrano_config.fetch(:rails_env, 'production')
+      end
+
+      def shell
+        @capistrano_config.fetch(:default_shell, 'bash --login')
+      end
+      
+
+      private
+
+      def load_capistrano_config
+        config = ::Capistrano::Configuration.new
+        config.load('config/deploy')
+        if @stage and @stage != ''
+          config.stage = @stage
+          config.find_and_execute_task(stage)
+        end
+
+        @capistrano_config = config
+      end
+
+      def find_project_root!
+        current = Dir.pwd
+        until (File.exists? 'Capfile')
+          Dir.chdir '..'
+          raise 'Call me from inside a Rails project!' if current == Dir.pwd
+          current = Dir.pwd
+        end
+        current
+      end
+    end
+
+
+    attr_accessor :stage
+
+    def config
+      @config ||= {}
+      @config[stage] ||= Config.new(stage)
+    end
+
+    def catching_errors(&block)
+      begin
+        yield
+      rescue Exception => e
+        $stderr.puts e.message
+        exit 1
+      end
+    end
+
+    def shell_for(*args)
+      options = {}
+      if args.last.is_a?(Hash)
+        options = args.pop
+      end
+
+      remote_command  = args.join(' ').strip
+      
+      login = %(#{config.user}@#{config.server})
+
+      commands = [ "cd #{config.path}" ]
+      if remote_command == ''
+        commands << config.shell
+      else
+        commands << %{#{config.shell} -c '#{remote_command}'}
+      end
+      
+      args = ['ssh', login, '-t', commands.join(' && ')]
+      if options.fetch(:exec, true)
+        exec(*args)
+      else
+        system(*args)
+      end
+    end
+  
+  end
+end

data/lib/geordi/dump_loader.rb

@@ -0,0 +1,93 @@
+require 'rubygems'
+require 'highline'
+
+
+class DumpLoader
+
+  def initialize(argv)
+    @argv = argv
+    @verbose = !!@argv.delete('-v')
+  end
+
+  def dumps_dir
+    require 'etc'
+    user_dir = Etc.getpwuid.dir
+    File.join(user_dir, 'dumps')
+  end
+
+  def db_console_command
+    if File.exists?("script/dbconsole")
+      "script/dbconsole -p"
+    else
+      "rails dbconsole -p"
+    end
+  end
+
+  def source_dump(dump)
+    require 'pty'
+    output_buffer = StringIO.new
+    PTY.spawn(db_console_command) do |output, input, pid|
+      input.write("source #{dump};\nexit;\n")
+      output_buffer.write output.read
+    end
+
+    output_and_errors = output_buffer.string.split("\n")
+    output = output_and_errors.reject{ |line| line =~ /^ERROR / }
+    errors = output_and_errors.select{ |line| line =~ /^ERROR / }
+
+    [output, errors]
+  end
+
+  def choose_dump_file
+    highline = HighLine.new
+
+    available_dumps = Dir.glob("#{dumps_dir}/*.dump").sort
+    selected_dump = highline.choose(*available_dumps) do |menu|
+      menu.hidden('') { exit }
+    end
+  end
+
+  def get_dump_file
+    if @argv[0] && File.exists?(@argv[0])
+      @argv[0]
+    else
+      choose_dump_file
+    end
+  end
+
+
+  def puts_info(msg = "")
+    puts msg if @verbose
+  end
+
+  def execute
+    dump_to_load = get_dump_file
+
+    puts_info
+    puts_info "sourcing #{dump_to_load} into db ..."
+
+    output, errors = source_dump(dump_to_load)
+
+    puts_info
+    puts_info output.join("\n")
+
+    if errors.empty?
+      puts_info "sourcing completed successfully."
+      true
+    else
+      $stderr.puts "some errors occured while loading the dump #{File.basename(dump_to_load)}:"
+      $stderr.puts errors.join("\n");
+      false
+    end
+  end
+
+  def execute!
+    if execute
+      exit(0)
+    else
+      exit(1)
+    end
+  end
+
+end
+

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '0.14.6'
+  VERSION = '0.14.7'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geordi
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 14
-  - 6
-  version: 0.14.6
+  - 7
+  version: 0.14.7
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-18 00:00:00 +01:00
+date: 2013-03-01 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -83,8 +83,9 @@ files:
 - bin/shell-for
 - bin/tests
 - geordi.gemspec
-- lib/geordi.rb
+- lib/geordi/capistrano.rb
 - lib/geordi/cuc.rb
+- lib/geordi/dump_loader.rb
 - lib/geordi/gitpt.rb
 - lib/geordi/setup_firefox_for_selenium.rb
 - lib/geordi/version.rb

data/lib/geordi.rb

@@ -1,64 +0,0 @@
-module Geordi
-  
-  attr_accessor :stage, :user, :server, :path, :env, :root
-  
-  def catching_errors(&block)
-    begin
-      yield
-    rescue Exception => e
-      $stderr.puts e.message
-      exit 1
-    end
-  end
-  
-  def retrieve_data!
-    @stage = ARGV.shift
-    @root   = find_project_root!
-    
-    {}.tap do |data|
-      @lines = if stage
-        deploy_file = Dir['config/deploy/*.rb'].find do |file|
-          file.match(/\/#{stage}.rb$/)
-        end
-        deploy_file or raise "Stage does not exist: #{stage}"
-    
-        File.open(deploy_file).readlines
-      else
-        []
-      end
-      @lines += File.open("config/deploy.rb").readlines
-    
-      @user   = retrieve! "user", /^set :user,/
-      @server = retrieve! "server", /^server /
-      @path   = retrieve!("deploy_to", /^set :deploy_to,/) + '/current'
-      @env    = retrieve!("environment", /^set :rails_env,/, 'production')
-    
-      # fix
-      %w[user server path env].each do |attr|
-        self.send(attr).gsub! /#\{site_id\}/, stage.sub(/_.*/, '')
-      end
-    end
-  end
-  
-  def find_project_root!
-    current = Dir.pwd
-    until (File.exists? 'Capfile')
-      Dir.chdir '..'
-      raise 'Call me from inside a Rails project!' if current == Dir.pwd
-      current = Dir.pwd
-    end
-    current
-  end
-  
-  def retrieve!(name, regex, default = nil)
-    if line = @lines.find{ |line| line =~ regex }
-      line.match(/["'](.*)["']/)
-      $1
-    elsif default
-      default
-    else
-      raise "Could not find :#{name} for stage '#{stage}'!\nAborting..."
-    end
-  end
-  
-end