mysql_rake_tasks 0.1.2 → 0.1.3

data/lib/mysql_rake_tasks/tasks.rb

@@ -13,47 +13,46 @@ module MysqlRakeTasks
     # Parses input args for username and password, if not given
     # it will prompt the user
     def self.get_input(*args)
-      if !args[0].nil? then
+      unless args[0].nil?
         root_user = args[0][:root_user]
         root_pass = args[0][:pass]
       end
 
-      if root_user.nil? or root_pass.nil? then
+      if root_user.nil? or root_pass.nil?
         $stdout.puts 'mysql user:'
         root_user = $stdin.gets.chomp
 
-	$stdout.puts 'mysql password:'
+        $stdout.puts 'mysql password:'
         system 'stty -echo'
         root_pass = $stdin.gets.chomp
         system 'stty echo'
       end
 
-      {:root_user => root_user, :pass => root_pass}
+      return root_user, root_pass
     end
 
     # creates user permissions for mysql database for localhost only
     def self.create_users(args)
-      args = self.get_input(args)
-      @root_user = args[:root_user]
-      @pass = args[:pass]
+      @root_user, @pass = self.get_input(args)
 
       # create a mysql user for each listing in database.yml file
       Rails::configuration.database_configuration.each do |listing|
+        @config = listing[1]
+        username = @config['username']
+        db_name = @config['database']
+
         begin
-  	  @config = listing[1]
           db = Mysql2::Client.new(
-               :host => 'localhost',
-               :username => @root_user,
-               :password => @pass,
-               :socket => @config['socket'])
-
-          sql = self.create_user_sql(@config)
-          db.query sql
-	  $stdout.puts "Created #{@config['username']} on #{@config['database']}\n"
+            :host => 'localhost',
+            :username => @root_user,
+            :password => @pass,
+            :socket => @config['socket'])
+
+            sql = self.create_user_sql(@config)
+            db.query sql
+            $stdout.puts "Created #{username} on #{db_name}\n"
         rescue Mysql2::Error => e
-          $stdout.puts "Error code: #{e.errno}"
-          $stdout.puts "Error message: #{e.error}"
-          $stdout.puts "Error SQLSTATE: #{e.sqlstate}" if e.respond_to?("sqlstate")
+          error_output(e)
         ensure # disconnect from server
           db.close if db
         end
@@ -61,11 +60,11 @@ module MysqlRakeTasks
     end
 
     def self.create_user_sql(config)
-      if config.nil? then
-        return ""
+      if config.nil?
+        return ''
       end
 
-      if config['username'].nil? then
+      if config['username'].nil?
         puts 'Error code: missing username entry'
       end
 
@@ -83,45 +82,54 @@ module MysqlRakeTasks
 
       begin
         dbh = Mysql2::Client.new( :host => config['host'], :username => config['username'], :password => config['password'])
-        sql = stats_query(config['database'])
+        db_name = config['database']
+        version = dbh.info[:version]
+
+        sql = stats_query(db_name)
         result = dbh.query sql
 
-        print_header
-        db_total = 0
-        result.each  do |row|
-          printf "| %30s | %13s | %9s | %8s | %10s |\n",
-            row["table_name"].ljust(30),
-            number_to_human(row["rows"]).rjust(13),
-            number_to_human_size(row["data"]),
-            number_to_human_size(row["idx"]),
-            number_to_human_size(row["total_size"])
-
-	  db_total += row["total_size"].to_i
-        end
+      print_header
 
-        print_separator
-        printf "|%70s | %10s |\n",'',  number_to_human_size(db_total)
-        print_separator
-        puts "Database: #{config['database']}  MySQL Server Version: #{dbh.info[:version]}\n"
-        puts " "
+      db_total = 0
+      result.each  do |row|
+        print_stat_line(row)
+        db_total += row["total_size"].to_i
+      end
+
+      print_footer(db_total, db_name, version)
       rescue Mysql2::Error => e
-        puts "Error code: #{e.errno}"
-        puts "Error message: #{e.error}"
-        puts "Error SQLSTATE: #{e.sqlstate}" if e.respond_to?("sqlstate")
+        error_output(e)
       ensure
         dbh.close if dbh
       end
     end
 
     def self.print_separator
-      puts   "+--------------------------------+---------------+-----------+----------+------------+"
+      puts  "+--------------------------------+---------------+-----------+----------+------------+"
     end
 
     def self.print_header
       print_separator
       printf "| %30s | %13s | %9s | %8s | %8s |\n",
         "Table Name".ljust(30), "Rows", "Data Size", "IDX Size", "Total Size"
-       print_separator
+      print_separator
+    end
+
+    def self.print_stat_line(row)
+      printf "| %30s | %13s | %9s | %8s | %10s |\n",
+        row["table_name"].ljust(30),
+        number_to_human(row["rows"]).rjust(13),
+        number_to_human_size(row["data"]),
+        number_to_human_size(row["idx"]),
+        number_to_human_size(row["total_size"])
+    end
+
+    def self.print_footer(db_total, db_name, version)
+      print_separator
+      printf "|%70s | %10s |\n",'', number_to_human_size(db_total)
+      print_separator
+      puts "Database: #{db_name}  MySQL Server Version: #{version}\n"
+      puts " "
     end
 
     def self.stats_query(db_name)
@@ -136,5 +144,11 @@ module MysqlRakeTasks
           ORDER BY table_name;
       SQL
     end
+
+    def self.error_output(e)
+      $stdout.puts "Error code: #{e.errno}"
+      $stdout.puts "Error message: #{e.error}"
+      $stdout.puts "Error SQLSTATE: #{e.sqlstate}" if e.respond_to?("sqlstate")
+    end
   end
 end

data/lib/mysql_rake_tasks/version.rb

@@ -1,3 +1,3 @@
 module MysqlRakeTasks
-  VERSION = "0.1.2"
+  VERSION = '0.1.3'
 end

data/test/tasks_test.rb

@@ -11,24 +11,23 @@ class TasksTest < Test::Unit::TestCase
   end
 
   def test_two_args_returns_two_values
-    output = MysqlRakeTasks::Tasks::get_input({:root_user => 'user', :pass => 'pass'})
+    user, pass = MysqlRakeTasks::Tasks::get_input({:root_user => 'user', :pass => 'pass'})
 
-    assert_equal 2, output.length
-    assert_equal 'user', output[:root_user]
-    assert_equal 'pass', output[:pass]
+    assert_equal 'user', user
+    assert_equal 'pass', pass
   end
 
   def test_lack_of_args_invokes_cli_interface
     output = ""
     screen = io_mock do |input|
                input.string = "root\nmyrootpass\n"
-               output = MysqlRakeTasks::Tasks.get_input
+               @user, @pass = MysqlRakeTasks::Tasks.get_input
              end
 
     assert_equal 'mysql user:', screen[0]
     assert_equal 'mysql password:', screen[1]
-    assert_equal 'root', output[:root_user]
-    assert_equal 'myrootpass', output[:pass]
+    assert_equal 'root', @user
+    assert_equal 'myrootpass',@pass
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70343679479880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
+  version_requirements: *70343679479880
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70343679479020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.12
+  version_requirements: *70343679479020
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70343679478240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,12 +43,7 @@ dependencies:
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.7
+  version_requirements: *70343679478240
 description: A collection of rails rake tasks for mysql.
 email:
 - gregory.ostermayr@gmail.com
@@ -101,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mysql_rake_tasks
-rubygems_version: 1.8.19
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Rake tasks for mysql