geordi 0.17.3 → 0.17.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGQ5ZmIyZjI4ZTQwOGI3MjU4NzkxODQ5MTRlNzE3OTE2YjYzNDAzZA==
+  data.tar.gz: !binary |-
+    ZTYzYWY4NzYwNDE3M2E3OWViNjg3YjhlNmFkNzBkMjBmMjFhNDRmMw==
+SHA512:
+  metadata.gz: !binary |-
+    NDFmZWE3ZTNkMTNlOTU2ODlkZGExZjNmYzYyMDBkMjc4NTAxMDY4ZTQ0ZDA2
+    ZGFlMWY2ZTM5MzFmNjdjMTM3MWVhNTM1MDkyODRjNGJkMTRiZjZiNWM4MWQ0
+    YWQ5MDY3Y2E2NzkwZGEyYWFjNWJhNDBlMDJhMjg4YzVjMTIwM2M=
+  data.tar.gz: !binary |-
+    NGZiOTlkODE1ZGRmN2JiYjc0ZGQ3NjhiYWM4OWY4MTMwZjRkMmEzY2QxNmNm
+    YzUzYWE0ZmZiY2FlZTcwNjk2MTAyN2FkNjlkZWRmMmExMmIwODk4ZmQ4YWI5
+    Y2I1OWNhMWE5ZWE1YTE5NTk0YTQzMDkxNzIwOWE4ZDNkYzJjMmI=

data/lib/geordi/cuc.rb

@@ -234,7 +234,7 @@ module Geordi
         98 # was already running after all
         true
       when 127 # not installed
-        puts "Could not launch VNC server. Install it by running cuc-setup-vnc."
+        puts "Could not launch VNC server. Install it by running cuc-vnc-setup."
         puts
         puts
         false

data/lib/geordi/dump_loader.rb

@@ -15,28 +15,36 @@ class DumpLoader
     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 development_database_config
+    require 'yaml'
 
-  def source_dump(dump)
-    require 'open3'
-    output_buffer = StringIO.new
-    Open3.popen3(db_console_command) do |stdin, stdout, stderr|
-      stdin.puts("source #{dump};")
-      stdin.close
-      output_buffer.write stdout.read
-      output_buffer.write stderr.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 / }
+    @config ||= YAML::load(ERB.new(File.read('config/database.yml')).result)
+    @config['development']
+  end
+  alias_method :config, :development_database_config
+  
+  def mysql_command
+    ENV['MYSQL_PWD'] = config['password']
+    command = 'mysql --silent'
+    command << ' -u' << config['username']
+    command << ' --default-character-set=utf8'
+    command << ' ' << config['database']
+    command << ' < ' << dump_file
+  end
+  alias_method :mysql2_command, :mysql_command
+  
+  def postgresql_command
+    ENV['PGPASSWORD'] = config['password']
+    command = 'pg_restore --no-owner --clean'
+    command << ' --username=' << config['username']
+    command << ' --host=' << config['host']
+    command << ' --dbname=' << config['database']
+    command << ' ' << dump_file
+  end
 
-    [output, errors]
+  def source_dump!
+    source_command = send("#{config['adapter']}_command")
+    `#{source_command}`
   end
 
   def choose_dump_file
@@ -48,46 +56,30 @@ class DumpLoader
     end
   end
 
-  def get_dump_file
-    if @argv[0] && File.exists?(@argv[0])
+  def dump_file
+    @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 ..."
+    puts "Sourcing #{dump_file} into #{config['database']} db ..." if @verbose
 
-    output, errors = source_dump(dump_to_load)
+    source_dump!
 
-    puts_info
-    puts_info output.join("\n")
-
-    if errors.empty?
-      puts_info "sourcing completed successfully."
-      true
+    if $?.success?
+      puts 'Successfully sourced the dump.' if @verbose
     else
-      $stderr.puts "some errors occured while loading the dump #{File.basename(dump_to_load)}:"
-      $stderr.puts errors.join("\n");
-      false
+      $stderr.puts "An error occured while loading the dump #{File.basename(dump_file)}."
     end
+    
+    $?.success?
   end
 
   def execute!
-    if execute
-      exit(0)
-    else
-      exit(1)
-    end
+    execute or exit(1)
   end
 
 end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '0.17.3'
+  VERSION = '0.17.4'
 end

metadata

@@ -1,27 +1,20 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geordi
-version: !ruby/object:Gem::Version 
-  hash: 93
-  prerelease: 
-  segments: 
-  - 0
-  - 17
-  - 3
-  version: 0.17.3
+version: !ruby/object:Gem::Version
+  version: 0.17.4
 platform: ruby
-authors: 
+authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-11-21 00:00:00 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies: []
-
-description: Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.
-email: 
+description: Collection of command line tools we use in our daily work with Ruby,
+  Rails and Linux at makandra.
+email:
 - henning.koch@makandra.de
-executables: 
+executables:
 - apache-site
 - b
 - cap-all
@@ -49,10 +42,8 @@ executables:
 - shell-for
 - tests
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -92,37 +83,28 @@ files:
 - lib/geordi/gitpt.rb
 - lib/geordi/version.rb
 homepage: http://makandra.com
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: geordi
-rubygems_version: 1.8.28
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
-summary: Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.
+specification_version: 4
+summary: Collection of command line tools we use in our daily work with Ruby, Rails
+  and Linux at makandra.
 test_files: []
-