mysqlconn 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b059c109f934635f30660baa41c0734217bdb7
-  data.tar.gz: ab5e09aa4ee8da4bb4617ce11f45e17ca5647b98
+  metadata.gz: aca85e60949af842fe4c095cd5c540f1b230f7bc
+  data.tar.gz: bb4a79207e02965279ed63aa5dd8b74cb3387cdb
 SHA512:
-  metadata.gz: 0ff5c4184351c935e866d1da7771e20d04a1295f2ab987896a0f8eff7fef1dfd3c11832aff0f1f456927c4807f87b9b24ece5b96905caffcb70abc9c084bab03
-  data.tar.gz: 10a6e080b10c399ea47928203f2016c44ba990f4e6e1537b38631d4b9ff33c07d75ac432b390ff1f80af289af16f70c5e69a8b42137982866ec2f5b219f5874d
+  metadata.gz: c73d10528455315983f07334d4486b93eb26b49c0551df8920c0cc5480471d36e91a3692596e675a3a9767fe0036afb1f977d36f4d0794e41957abb4d499c516
+  data.tar.gz: 26736110e42e5ea6d1ed7149e4241fd4ec5b5842a90ae9b1ab1132646609af302262a7c57921cfe5b73628ecb13d866eca7f3722a58c6a640e0d4c52bf827435

data/README.md

@@ -1,6 +1,10 @@
 mysqlconn - The mysql connection assistant
 ------------------------------------------
 
+Store mysql connection credentials in a simple, secure configuration file. Many destinations can then be used with
+the *db_key* you specify. You can also run script files against the names you select. The mysql prompt is set
+for safety.
+
 ### Instructions
 
 Install:
@@ -11,6 +15,7 @@ Create `~/.db_connection_alias.yml`
 
     db_key:
       host: hostname
+      port: port			# Optional
       user: username		# Optional
       password: password		# Optional
     #  password: ''		# Optional, prompt for password
@@ -28,15 +33,32 @@ Connect:
 
 `mysqlconn db_key [additional options]`
 
+Look at that beautiful prompt:
+
+    mysqluser@db_key [database]> select now();
+    +---------------------+
+    | now()               |
+    +---------------------+
+    | 2014-04-15 11:09:33 |
+    +---------------------+
+    1 row in set (0.02 sec)
+    
+    mysqluser@db_key [database]>
+
 Pipe:
 
 `mysqlconn db_key < script.sql > output`
 
 etc..
 
+To mysqldump:
+
+`mysqldumpconn db_key [additional options]`
+
+
 ### Autocomplete
 
-Add to bash.completion.d
+Add to bash.completion.d or wherever:
 
     _mysqlconn() {
       local cur=${COMP_WORDS[COMP_CWORD]}

data/README.md~

@@ -0,0 +1,64 @@
+mysqlconn - The mysql connection assistant
+------------------------------------------
+
+Store mysql connection credentials in a simple, secure configuration file. Many destinations can then be used with
+the *db_key* you specify. You can also run script files against the names you select. The mysql prompt is set
+for safety.
+
+### Instructions
+
+Install:
+
+`gem install mysqlconn`
+
+Create `~/.db_connection_alias.yml`
+
+    db_key:
+      host: hostname
+      user: username		# Optional
+      password: password		# Optional
+    #  password: ''		# Optional, prompt for password
+      database: database		# Optional
+    db_key2:
+      ...
+
+Protect configuration file:
+
+`chmod 600 ~/.db_connection_alias.yml`
+
+### Usage
+
+Connect:
+
+`mysqlconn db_key [additional options]`
+
+Look at that beautiful prompt:
+    mysqluser@db_key [database]> select now();
+    +---------------------+
+    | now()               |
+    +---------------------+
+    | 2014-04-15 11:09:33 |
+    +---------------------+
+    1 row in set (0.02 sec)
+    
+    mysqluser@db_key [database]>
+
+Pipe:
+
+`mysqlconn db_key < script.sql > output`
+
+etc..
+
+### Autocomplete
+
+Add to bash.completion.d or wherever:
+
+    _mysqlconn() {
+      local cur=${COMP_WORDS[COMP_CWORD]}
+      COMPREPLY=( $( compgen -W "$(mysqlconn -l)" -- $cur ) )
+    }
+    complete -F _mysqlconn mysqlconn
+
+### License
+
+Apache 2.0 - go nuts

data/bin/mysqlconn

@@ -1,43 +1,7 @@
 #!/usr/bin/env ruby
 
-# Copyright Neville Kadwa (2014)
+require 'rubygems'
 
-require 'yaml'
-require 'fileutils'
+require File.expand_path("../../lib/mysqlconn.rb", __FILE__)
 
-CONFIG_LOCATION=File.expand_path("~/.db_connection_alias.yml")
-
-db_key = ARGV.shift || raise('no db key provided. Usage mysqlconn db_key [mysql opts]*')
-
-config = begin
-  File.open(CONFIG_LOCATION, 'r') do |f| 
-    YAML.load(f)
-  end
-rescue Errno::ENOENT => e
-  raise("No config found. Please follow instructions for creating #{CONFIG_LOCATION}")
-end
-raise("Config file is world readable. Exiting...") if File.stat(CONFIG_LOCATION).world_readable?
-
-if db_key == '-l'
-  filter = /.*#{ARGV.shift||'.*'}.*/
-  config.keys.each do |k|
-    puts k if filter =~ k
-  end 
-  exit(0)
-end
-
-db = config[db_key] || raise("No #{db_key} found")
-
-db['host'] || raise("No #{db_key}.host found")
-
-command = "mysql -h #{db['host']} --prompt=\"\\u@#{db_key} [\\d]> \""
-
-command << " -u #{db['user']}" if db['user']
-command << " -p#{db['password']}" if db['password']
-command << " -D #{db['database']}" if db['database']
-unless ARGV.empty?
-  command << " "
-  command << ARGV.map{|s| "'#{s}'"}.join(' ')
-end
-
-exec(command)
+MysqlConn.new(MysqlConn::MODE_MYSQL).run(ARGV)

data/bin/mysqlconn~

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+
+# Copyright Neville Kadwa (2014)
+
+require 'yaml'
+require 'fileutils'
+
+CONFIG_LOCATION=File.expand_path("~/.db_connection_alias.yml")
+
+db_key = ARGV.shift || raise('no db key provided. Usage mysqlconn db_key [mysql opts]*')
+
+config = begin
+  File.open(CONFIG_LOCATION, 'r') do |f| 
+    YAML.load(f)
+  end
+rescue Errno::ENOENT => e
+  raise("No config found. Please follow instructions for creating #{CONFIG_LOCATION}")
+end
+raise("Config file is world readable. Exiting...") if File.stat(CONFIG_LOCATION).world_readable?
+
+if db_key == '-l'
+  filter = /.*#{ARGV.shift||'.*'}.*/
+  config.keys.each do |k|
+    puts k if filter =~ k
+  end 
+  exit(0)
+end
+
+db = config[db_key] || raise("No #{db_key} found")
+
+db['host'] || raise("No #{db_key}.host found")
+
+command = "mysql -h #{db['host']} --prompt=\"\\u@#{db_key} [\\d]> \""
+
+command << " -u #{db['user']}" if db['user']
+command << " -p#{db['password']}" if db['password']
+command << " -D #{db['database']}" if db['database']
+unless ARGV.empty?
+  command << " "
+  command << ARGV.map{|s| "'#{s}'"}.join(' ')
+end
+
+exec(command)

data/bin/mysqldumpconn

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+
+require File.expand_path("../../lib/mysqlconn.rb", __FILE__)
+
+MysqlConn.new(MysqlConn::MODE_MYSQLDUMP).run(ARGV)

data/lib/mysqlconn.rb

@@ -0,0 +1,96 @@
+require 'yaml'
+require 'fileutils'
+require 'set'
+
+# Copyright Neville Kadwa (2014)
+
+class MysqlConn
+
+  MODE_MYSQL = :MYSQL
+  MODE_MYSQLDUMP = :MYSQLDUMP
+  CONFIG_LOCATION=File.expand_path("~/.db_connection_alias.yml")
+
+  attr_reader :mode
+  attr_reader :verbose
+  attr_reader :db_key
+
+  def initialize(mode)
+    @mode = mode
+    @verbose = false
+  end
+
+  def mode_command
+    case mode
+      when :MYSQL
+        "mysql"
+      when :MYSQLDUMP
+        "mysqldump"
+      else
+        raise "Unknown mode: #{mode}"
+    end
+  end
+
+  def mode_default_args(args)
+    case mode
+      when :MYSQL
+        "--prompt=\"\\u@#{db_key} [\\d]> \""
+      when :MYSQLDUMP
+        ""
+      else
+        raise "Unknown mode: #{mode}"
+    end
+  end
+
+  def run(args)
+
+    @db_key = args.shift || raise('no db key provided. Usage mysqlconn db_key [mysql opts]*')
+
+    config = begin
+      File.open(CONFIG_LOCATION, 'r') do |f|
+        YAML.load(f)
+      end
+    rescue Errno::ENOENT => e
+      raise("No config found. Please follow instructions for creating #{CONFIG_LOCATION}")
+    end
+    raise("Config file is world readable. Exiting...") if File.stat(CONFIG_LOCATION).world_readable?
+
+    if db_key == '-v'
+      @verbose = true
+      @db_key = args.shift
+    end
+    if db_key == '-l'
+      filter = /.*#{args.shift||'.*'}.*/
+      config.keys.each do |k|
+        puts k if filter =~ k
+      end
+      exit(0)
+    end
+
+    db = config[db_key] || raise("No #{db_key} found")
+
+    db['host'] || raise("No #{db_key}.host found")
+
+    command = "#{mode_command} -h #{db['host']} #{mode_default_args(args)}"
+
+    command << " -P #{db['port']}" if db['port']
+    command << " -u #{db['user']}" if db['user']
+    command << " -p#{db['password']}" if db['password']
+    if db['database'] && mode == :MYSQL
+      case mode
+        when :MYSQL
+          command << " -D #{db['database']}"
+        when :MYSQLDUMP
+          command << " #{db['database']}"
+      end
+    end
+    unless args.empty?
+      command << " "
+      command << args.map{|s| "'#{s}'"}.join(' ')
+    end
+
+    STDERR.puts command if verbose
+    exec(command)
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysqlconn
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Neville Kadwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies: []
 description: Save your various database credentials to a configuration file and zip
   around easily
@@ -16,11 +16,17 @@ email:
 - neville@kadwa.com
 executables:
 - mysqlconn
+- mysqlconn~
+- mysqldumpconn
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- README.md~
 - bin/mysqlconn
+- bin/mysqlconn~
+- bin/mysqldumpconn
+- lib/mysqlconn.rb
 homepage: http://github.com/kadwanev/mysqlconn
 licenses:
 - Apache-2.0
@@ -46,3 +52,4 @@ signing_key:
 specification_version: 4
 summary: mysql command line configuration assistant
 test_files: []
+has_rdoc: