dohmysql 0.2.12 → 0.2.13

data/bin/migrate

@@ -2,58 +2,29 @@
 require 'doh/app/cli'
 require 'doh/mysql/migrate/runner'
 require 'doh/mysql/migrate/analyzer'
-
-COMMAND_INFO = [
-['make', '<name>', 'creates the files for a new migration'],
-['check', '<name>', 'checks that all migrations are valid'],
-['commit', '<name>', 'UNIMPLEMENTED: executes the check command, then git add,commit'],
-['apply', '<name>', 'applies one or more migrations'],
-['revert', '<name>', 'reverts one or more migrations'],
-['verify' ,'<name>', 'verifies that the migration has been integrated into the base files'],
-['merge', '<name>', 'UNIMPLEMENTED: executes the verify command, then git rm,commit'],
-].freeze
-COMMANDS = COMMAND_INFO.collect {|name, args, desc| name}.freeze
-NOTIFY_COMMANDS = %w(apply revert)
-
-cmd_detail = COMMAND_INFO.collect do |name, args, desc|
-  args = ' ' + args unless args.empty?
-  name_rpad = ' ' * (33 - (name.size + args.size))
-  "    #{name}#{args}#{name_rpad}#{desc}"
-end.join("\n")
-
-opts = Doh::Options.new(
-{'database' => [Doh.config[:default_database], "-d", "--database <database>", "name of the database to migrate -- defaults to config[:default_database], currently '#{Doh.config[:default_database]}'"] \
-}, true, "Commands:\n\n#{cmd_detail}")
-
-cmd_name = opts.varargs.shift
-cmd_args = opts.varargs
-
-unless COMMANDS.include?(cmd_name)
-  warn "unrecognized command #{cmd_name}"
-  exit 1
-end
-
-if opts.database.to_s.empty?
-  warn "You must specify a database, either here with -d or in config"
-  exit 1
-end
-
-if ['make', 'apply', 'revert'].include?(cmd_name)
-  success, msg = DohDb::MigrateRunner.new(opts.database).send(cmd_name, *cmd_args)
-elsif ['check', 'verify'].include?(cmd_name)
-  success, msg = DohDb::MigrateAnalyzer.new(opts.database).send(cmd_name, *cmd_args)
+require 'doh/mysql/migrate/options'
+module DohDb
+module Migrate
+
+if ['make', 'apply', 'revert'].include?(CMD_NAME)
+  success, msg = DohDb::MigrateRunner.new(OPTS.database).send(CMD_NAME, *CMD_ARGS)
+elsif ['check', 'verify'].include?(CMD_NAME)
+  success, msg = DohDb::MigrateAnalyzer.new(OPTS.database).send(CMD_NAME, *CMD_ARGS)
 end
 
 if success
   puts "succcess: " + msg
-  if NOTIFY_COMMANDS.include?(cmd_name)
+  if NOTIFY_COMMANDS.include?(CMD_NAME)
     dohlog.notify("success: #{msg}")
   end
 else
   warn "***************** FAILURE **********************"
   warn msg
-  if NOTIFY_COMMANDS.include?(cmd_name)
+  if NOTIFY_COMMANDS.include?(CMD_NAME)
     dohlog.notify("FAILURE: #{msg}")
   end
   exit 1
 end
+
+end
+end

data/lib/doh/mysql/migrate/options.rb

@@ -0,0 +1,41 @@
+module DohDb
+module Migrate
+COMMAND_INFO = [
+['make', '<name>', 'creates the files for a new migration'],
+['check', '<name>', 'checks that all migrations are valid'],
+['commit', '<name>', 'UNIMPLEMENTED: executes the check command, then git add,commit'],
+['apply', '<name>', 'applies one or more migrations'],
+['revert', '<name>', 'reverts one or more migrations'],
+['verify' ,'<name>', 'verifies that the migration has been integrated into the base files'],
+['merge', '<name>', 'UNIMPLEMENTED: executes the verify command, then git rm,commit'],
+].freeze
+COMMANDS = COMMAND_INFO.collect {|name, args, desc| name}.freeze
+NOTIFY_COMMANDS = %w(apply revert)
+
+cmd_detail = COMMAND_INFO.collect do |name, args, desc|
+  args = ' ' + args unless args.empty?
+  name_rpad = ' ' * (33 - (name.size + args.size))
+  "    #{name}#{args}#{name_rpad}#{desc}"
+end.join("\n")
+
+OPTS = Doh::Options.new(
+{'database' => [Doh.config[:default_database], "-d", "--database <database>", "name of the database to migrate -- defaults to config[:default_database], currently '#{Doh.config[:default_database]}'"] \
+}, true, "Commands:\n\n#{cmd_detail}")
+
+CMD_NAME, CMD_ARGS = OPTS.varargs.shift, OPTS.varargs
+unless COMMANDS.include?(CMD_NAME)
+  warn "unrecognized command #{cmd_name}"
+  exit 1
+end
+
+if OPTS.database.to_s.empty?
+  warn "You must specify a database, either here with -d or in config"
+  exit 1
+end
+
+def self.cmd_name_and_args
+  [OPTS, CMD_NAME, CMD_ARGS]
+end
+
+end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
@@ -118,6 +118,7 @@ files:
 - lib/doh/mysql/load_sql.rb
 - lib/doh/mysql/metadata_util.rb
 - lib/doh/mysql/migrate/analyzer.rb
+- lib/doh/mysql/migrate/options.rb
 - lib/doh/mysql/migrate/runner.rb
 - lib/doh/mysql/raw_row_builder.rb
 - lib/doh/mysql/readonly_row.rb