geordi 0.16.2 → 0.16.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWZhZWY3ZTUwZTllY2QyMjNkNGQxNTE5NDcxNjNlZTVmYzM3NzE5Yw==
+    MzljZjY4Y2MxYjM3NmY0NTIyOWRkYjRjMjcwMmM4ZGJhZjNhYTQ0Yw==
   data.tar.gz: !binary |-
-    NWY4MjI5NWJiNWU1ODg1Yzg1NzY1MTQ3ZTkzMWMxZjdiMDk1MWUwNA==
+    MmU3M2RhMTllYmU2YWRkMzYzODYzODE2MmY1YmZlMDczY2ZjNTIzZg==
 SHA512:
   metadata.gz: !binary |-
-    NjMzOGEyNjY4MWNjOGUyNjU1ZGM3ODhmMDNjOTcwMTE0OGU2MTZkMzYyN2Jh
-    NDQ2MGEyOGFjZGNkZTJmMjBjMDkyZjdiYzQ3YWYzNDM1MDMxY2Q2MTJlOGJk
-    MTllZGUxNmFjMTgzZWQ4ZDM3MDVkZjQwMTI1MjAwNjY0YzYwYzg=
+    YjBmNjgzN2E2MDhmMjMzOTA2MGU2MjU4OWE4ZThlZTRmMmRmY2I2MWVjNDcz
+    MmNlMjhlZjNhYTY5MGI2NDIxYmRmYjRjZTI3ZDNhNTk3MTczNmJkMzAwMTgy
+    OGFlNjBiNmQ4NGQ5ZjAwMWQ0NDUxNzdlNDBjYWVjZTM5NGMyNjY=
   data.tar.gz: !binary |-
-    YmU1Njk4ZGZhMzk3MGFjN2ZjZDg3NzZiZjAxMzQ4MmFlOWQ3Mjc3OWY1ZGE5
-    MTkyYzkwN2ExMTNhZTEzNmIzOTU0MjQzZDMyMDQ5N2MwNTI5MDgzYWZlYjRm
-    MDcxYmExNmM0OWQ2N2E4ZmI5YjI3ZDlhYjZjZTg2MDMzZjUyMWQ=
+    NDU4ZmUyZmRhZGU3MGQzZDZiZTUwM2U5YjQ0M2I4NjEzMmQ2ZTZmODA4MTAy
+    ZmVmOGUzNmMzNjcxMzU2M2FmYjk0ZjI5ZmI5OGJiODg0OWU2NThjZWE5ZDk3
+    ZGZlNjc2NTA0NDFjZWU4MjI2Njk1OGUxMTFhODZiYzRhNzVkZWU=

data/bin/console-for

@@ -4,9 +4,11 @@ include Geordi::Capistrano
 
 catching_errors do
   self.stage = ARGV.shift
+  options = { :select_server => true }
+
   if File.exists? "#{config.root}/script/console" # => Rails 2
-    shell_for("script/console #{config.env}")
+    shell_for("script/console #{config.env}", options)
   else
-    shell_for("bundle exec rails console #{config.env}")
+    shell_for("bundle exec rails console #{config.env}", options)
   end
 end

data/bin/dump-for

@@ -14,13 +14,13 @@ catching_errors do
     system "mkdir -p #{destination_directory}" # Ensure the destination directory exists
     destination_path = "#{destination_directory}/#{stage}.dump"
 
-    puts "Downloading dump_for_download..."
-    system "scp #{config.user}@#{config.server}:#{source_path} #{destination_path}"
-    puts
-    puts "Dumped the #{stage.upcase} database to: #{File.basename config.root}/tmp/#{stage}.dump"
+    puts "Downloading dump_for_download ..."
+    system "scp #{config.user}@#{config.primary_server}:#{source_path} #{destination_path}"
+    puts "Dumped the #{stage.upcase} database to RAILS_ROOT/tmp/#{stage}.dump"
 
     # source dump if option was given
     if ARGV.include?("-s")
+      puts
       puts "Sourcing dump into development database..."
       success = DumpLoader.new([destination_path]).execute
       if success

data/bin/shell-for

@@ -4,5 +4,7 @@ include Geordi::Capistrano
 
 catching_errors do
   self.stage = ARGV.shift
-  shell_for(ARGV)
+  command = ARGV.any? ? ARGV.join(' ') : nil
+
+  shell_for(command, :select_server => true)
 end

data/lib/geordi/capistrano.rb

@@ -24,6 +24,10 @@ module Geordi
       def servers
         @capistrano_config.find_servers(:roles => [:app])
       end
+      
+      def primary_server
+        @capistrano_config.find_servers(:roles => [:app], :only => { :primary => true }).first
+      end
 
       def path
         @capistrano_config.fetch(:deploy_to) + '/current'
@@ -85,29 +89,22 @@ module Geordi
         config.servers.each do |server|
           menu.choice(server) { server }
         end
+
+        # Default to the first listed server (by convention, the first server
+        # in the deploy files is the primary one).
         menu.default = '1'
         menu.prompt = 'Connect to [1]: '
       end
     end
 
-    def shell_for(*args)
-      options = {}
-      if args.last.is_a?(Hash)
-        options = args.pop
-      end
-
-      remote_command  = args.join(' ').strip
+    def shell_for(command, options = {})
+      server = options[:select_server] ? select_server : config.primary_server
       
-      login = %(#{config.user}@#{select_server})
-
-      commands = [ "cd #{config.path}" ]
-      if remote_command == ''
-        commands << config.shell
-      else
-        commands << %{#{config.shell} -c '#{remote_command}'}
-      end
+      remote_commands = [ 'cd', config.path ]
+      remote_commands << '&&' << config.shell
+      remote_commands << "-c '#{command}'" if command
       
-      args = ['ssh', login, '-t', commands.join(' && ')]
+      args = [ 'ssh', %(#{config.user}@#{server}), '-t', remote_commands.join(' ') ]
       if options.fetch(:exec, true)
         exec(*args)
       else

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '0.16.2'
+  VERSION = '0.16.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Henning Koch