rack-app-sequel 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23af9cd20adf68714349c3f34bc69b70a5674775
-  data.tar.gz: 9737aa5b69ac905706180b01ee050db873344cec
+  metadata.gz: 914f7c22acd4f1ce23ba7f19fb6954cd8af04495
+  data.tar.gz: 5d34c4c7622b903f18c8df1b9ea23a85ea6b4a88
 SHA512:
-  metadata.gz: 7028d06a03ead126f90eb6c807b284d18537a051ee02503628c5dbfcd20e04ff52a715724d6070a2c27aa9f8d159ce088806d1a28454fcc4d7308d93f90cbbcb
-  data.tar.gz: f09b34648c93c5e3178ba23ef08c7af7c3b5652c61d07ee46d6e35154283fdc72b0cffc83c3c9663a1d57ed1e463da953c5bd42f12b2c6fb1e90f42581c33069
+  metadata.gz: 540109421ffb84f45c9f4578f90e35e80e66ba48b8a93227a0908604a654b61a23775006e65999509543f142a7c5c06a06c7ab6fd227428166084a5451611ed1
+  data.tar.gz: d56fc9162254defaa5a1a68d9927442040852b62e7f1116d0e7d4d5a08dc61686c246473589f9b27e70996035e6f6f6d18d5e2929c27760edc3b04cfd94db610

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/rack/app/sequel.rb

@@ -3,6 +3,7 @@ require 'rack/app'
 module Rack::App::SeQueL
 
   require 'rack/app/sequel/ext'
+  require 'rack/app/sequel/runner'
   require 'rack/app/sequel/version'
   require 'rack/app/sequel/migration'
 

data/lib/rack/app/sequel/migration/cli.rb

@@ -1,74 +1,7 @@
 Rack::App::SeQueL::Migration::CLI = lambda do
+  Dir.glob(File.join(File.dirname(__FILE__), 'cli', '*.rb')).each do |file_path|
+    next if File.directory?(file_path)
 
-    command "db:migrate" do
-      description 'Run migrations'
-
-      option '-v', '--version [TIMESTAMP]', 'set to what db migration version number should db to be set' do |string|
-        options[:version] = string
-      end
-
-      option '--allow-missing-migration-files', 'In some cases, you may want to allow a migration in the database that does not exist in the filesystem' do
-        options[:allow_missing_migration_files] = true
-      end
-
-      option '-m', '--path-to-migration-patches [DIR_PATH]', "set to check what directory should be used for db migrations (default: #{Rack::App::SeQueL::Migration::DEFAULT_DIRECTORY})" do |string|
-        options[:migration_directory] = string
-      end
-
-      option '--verbose', 'set migration to be verbose instead of silent' do
-        options[:verbose] = true
-      end
-
-      action do
-
-        options[:migration_directory] ||= Rack::App::SeQueL::Migration::DEFAULT_DIRECTORY
-
-        Sequel.extension(:migration)
-        db = Rack::App::SeQueL.open_connection
-        db = Sequel.connect(ENV.fetch('DATABASE_URL'))
-
-        logger = Logger.new(options[:verbose] ? ::STDOUT : ::IO::NULL)
-        db.loggers << logger
-
-        migration_config = {}
-        if options[:allow_missing_migration_files]
-          migration_config[:allow_missing_migration_files]= true
-        end
-
-        if options[:version]
-          logger.info("Migrating to version #{options[:version]}")
-
-          migration_config[:target]= options[:version].to_i
-        end
-
-        Sequel::Migrator.run(db, options[:migration_directory], migration_config)
-
-        logger.info('Migration completed')
-      end
-
-    end
-
-    command "db:migration:create" do
-      description 'create migration patch'
-
-      option '-m', '--path-to-migration-patches [DIR_PATH]', "set to check what directory should be used for db migrations (default: #{Rack::App::SeQueL::Migration::DEFAULT_DIRECTORY})" do |string|
-        options[:migration_directory] = string
-      end
-
-      action do |*name_parts|
-        options[:migration_directory] ||= Rack::App::SeQueL::Migration::DEFAULT_DIRECTORY
-        name = name_parts.join('_')
-
-        require 'fileutils'
-        FileUtils.mkdir_p(options[:migration_directory])
-        timestamp = Time.now.to_i
-        filebasename = [timestamp.to_s, name].join('_') + '.rb'
-        file_path = File.join(options[:migration_directory], filebasename)
-        File.write(file_path, Rack::App::SeQueL::Migration::TEMPLATE)
-
-        STDOUT.puts(file_path)
-      end
-
-    end
-
+    instance_eval(File.read(file_path))
+  end
 end

data/lib/rack/app/sequel/migration/cli/migrate.rb

@@ -0,0 +1,10 @@
+command 'db:migrate' do
+
+  description 'Migrates the supplied database using the migration files in the specified directory'
+  Rack::App::SeQueL::Runner.setup_command(self)
+
+  action do
+    exit(Rack::App::SeQueL::Runner.new(options, migration_config).run)
+  end
+
+end

data/lib/rack/app/sequel/migration/cli/rollback.rb

@@ -0,0 +1,9 @@
+# command 'db:rollback' do
+#   description "Perform rollback to specified target or full rollback as default"
+#   Rack::App::SeQueL::Runner.setup_command(self)
+
+#   action do
+#     exit(Rack::App::SeQueL::Runner.new(options, migration_config).run)
+#   end
+
+# end

data/lib/rack/app/sequel/migration/cli/template.rb

@@ -0,0 +1,21 @@
+command 'db:migration:create' do
+  description 'create migration patch'
+
+  option '-m', '--path-to-migration-patches [DIR_PATH]', "set to check what directory should be used for db migrations (default: #{Rack::App::SeQueL::Migration::DEFAULT_DIRECTORY})" do |string|
+    options[:migration_directory] = string
+  end
+
+  action do |*name_parts|
+    options[:migration_directory] ||= Rack::App::SeQueL::Migration::DEFAULT_DIRECTORY
+    name = name_parts.join('_')
+
+    require 'fileutils'
+    FileUtils.mkdir_p(options[:migration_directory])
+    timestamp = Time.now.to_i
+    filebasename = [timestamp.to_s, name].join('_') + '.rb'
+    file_path = File.join(options[:migration_directory], filebasename)
+    File.write(file_path, Rack::App::SeQueL::Migration::TEMPLATE)
+
+    STDOUT.puts(file_path)
+  end
+end

data/lib/rack/app/sequel/migration/cli/version.rb

@@ -0,0 +1,15 @@
+# command 'db:schema:version' do
+#   description 'prints current schema version'
+
+#   action do
+#     Sequel.extension(:migration)
+#     db = Rack::App::SeQueL.open_connection
+#     db = Sequel.connect(ENV.fetch('DATABASE_URL'))
+
+#     version = if db.tables.include?(:schema_info)
+#                 db[:schema_info].first[:version]
+#     end || 0
+
+#     STDOUT.puts("Schema Version: #{version}")
+#   end
+# end

data/lib/rack/app/sequel/runner.rb

@@ -0,0 +1,79 @@
+class Rack::App::SeQueL::Runner
+
+  def self.setup_command(command)
+    command.class_eval do
+
+      option '-a', '--allow_missing_migration_files', 'In some cases, you may want to allow a migration in the database that does not exist in the filesystem' do
+        migration_config[:allow_missing_migration_files] = true
+      end
+
+      option '-c', '--current [CURRENT_VERION]', 'Set the current version of the database for the execution' do |current_database_version|
+        migration_config[:current] = current_database_version
+      end
+
+      # option '-r', '--relative [MIGRATION_COUNT]', 'Run the given number of migrations, with a positive number being migrations to migrate up, and a negative number being migrations to migrate down (IntegerMigrator only).' do |value|
+      #   migration_config[:relative] = value.to_i
+      # end
+
+      option '-t', '--target [TIMESTAMP]', 'The target version to which to migrate.  If not given, migrates to the maximum version.' do |target_version|
+        migration_config[:target] = target_version
+      end
+
+      option '-m', '--path-to-migration-patches [DIR_PATH]', "set to check what directory should be used for db migrations (default: #{Rack::App::SeQueL::Migration::DEFAULT_DIRECTORY})" do |new_migration_directory|
+        options[:migration_directory] = new_migration_directory
+      end
+
+      option '-v', '--verbose', 'set migration to be verbose instead of silent' do
+        options[:verbose] = true
+      end
+
+      private
+
+      def migration_config
+        @migration_config ||= {}
+      end
+
+    end
+  end
+
+  attr_reader :code
+
+  def initialize(options, migration_options)
+    @code = 0
+    @options = options
+    @migration_options = migration_options
+  end
+
+  def run
+    Sequel.extension(:migration)
+
+    Rack::App::SeQueL.open_connection do |db|
+      db.loggers << logger
+
+      run_migrator(db, migration_directory, migration_config)
+    end
+
+    return @code
+  end
+
+  private
+
+  def logger
+    @logger ||= Logger.new(@options[:verbose] ? ::STDOUT : ::IO::NULL)
+  end
+
+  def migration_config
+    @migration_config ||= {}
+  end
+
+  def migration_directory
+    @options[:migration_directory] || Rack::App::SeQueL::Migration::DEFAULT_DIRECTORY
+  end
+
+  def run_migrator(db, directory, config)
+    ::Sequel::Migrator.run(db, directory, config)
+  rescue => ex
+    logger.error(ex.message)
+    @code = 1
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app-sequel
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -91,7 +91,12 @@ files:
 - lib/rack/app/sequel/ext.rb
 - lib/rack/app/sequel/migration.rb
 - lib/rack/app/sequel/migration/cli.rb
+- lib/rack/app/sequel/migration/cli/migrate.rb
+- lib/rack/app/sequel/migration/cli/rollback.rb
+- lib/rack/app/sequel/migration/cli/template.rb
+- lib/rack/app/sequel/migration/cli/version.rb
 - lib/rack/app/sequel/migration/template.rb
+- lib/rack/app/sequel/runner.rb
 - lib/rack/app/sequel/version.rb
 - rack-app-sequel.gemspec
 - script/database