sequel-rake 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f829c0aac27e097cb60ce782c391227c5c8548d
-  data.tar.gz: a52bdb119e6466e09a03c27886e53b319349b22d
+  metadata.gz: 5c87cab3732a1ecd2a079afc7428096a97d45d1a
+  data.tar.gz: ab876b7698e792d3b6063806a14541768fe3ed32
 SHA512:
-  metadata.gz: 74a5d9f0eaed4f29d7f835f8dba773579f0ab86ae392ab0fd06bf2a213262451ad5f8d6382f5db73ef324933065052df846646987b0e34ddc221d3028b847753
-  data.tar.gz: 2fb55e0d7908468b7c79b27c3c54a7cac11a67769158484cb2741c8f274e04b0cdb6a9f51e011fdb521e2d81ee8037b514461647d4620784b0daf2d92a10b4aa
+  metadata.gz: 33f38bf1623a696053ce84e891ad806902da2e4b8adfd292ad14f4d1de3b77ec65c42b128553e9ed593189a89d7fdae8641115ff48e83331ca3675a92c879146
+  data.tar.gz: 77ca6b4608f1f6ed48c769f5849a65ae24ff993ec85794fab7e1747b5d15f8a52e665db17ae4447746002c20b879bc7373b81f6766d5181c879739d36c7a1c19

data/README.md

@@ -32,9 +32,10 @@ require 'sequel/rake'
 ```
 $ bundle exec rake ...
 
-sequel:generate[name]   # Generate a new migration file `sequel:generate[create_books]`
 sequel:init             # Creates a database.yml file
+sequel:generate[name]   # Generate a new migration file `sequel:generate[create_books]`
 sequel:migrate[version] # Migrate the database (you can specify the version with `db:migrate[N]`)
+sequel:rollback[step]   # Rollback the database N steps (you can specify the version with `db:rollback[N]`)
 sequel:remigrate        # Undo all migrations and migrate again
 ```
 
@@ -42,6 +43,7 @@ sequel:remigrate        # Undo all migrations and migrate again
 
 * Rollback to previous version
 * Write some tests
+* Seeds
 
 ## Contributing
 

data/Rakefile

@@ -1,8 +1,6 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
-require 'sequel/rake'
-
 Rake::TestTask.new do |t|
   t.pattern = 'test/**/*_test.rb'
   t.libs.push 'test'

data/lib/sequel/rake/tasks.rake

@@ -0,0 +1,63 @@
+namespace :sequel do
+  require "sequel"
+  require "fileutils"
+
+  desc "Creates the migrations directory"
+  task :init do
+    FileUtils::mkdir_p migrations
+    puts "generated: #{migrations}"
+  end
+
+  desc "Generate a new migration file `sequel:generate[create_books]`"
+  task :generate, :name do |_, args|
+    name = args[:name]
+    abort("Missing migration file name") if name.nil?
+
+    content = "# frozen_string_literal: true\n\nSequel.migration do\n  change do\n    \n  end\nend\n"
+    timestamp = Time.now.to_i
+    filename = File.join(migrations, "#{timestamp}_#{name}.rb")
+    File.write(filename, content)
+    puts "Generated: #{filename}"
+  end
+
+  desc "Migrate the database (you can specify the version with `db:migrate[N]`)"
+  task :migrate, [:version] do |task, args|
+    version = args[:version] ? Integer(args[:version]) : nil
+    migrate(version)
+    puts "Migration complete"
+  end
+
+  desc "Rollback the database N steps (you can specify the version with `db:rollback[N]`"
+  task :rollback, [:step] do |task, args|
+    step = args[:step] ? Integer(args[:step]) : 1
+    version = 0
+
+    if row = connection[:schema_migrations].order(Sequel.desc(:filename)).offset(step).first
+      version = Integer(row[:filename].match(/([\d]+)/)[0])
+    end
+
+    migrate(version)
+    puts "Rollback complete"
+    puts "Rolled back to version: #{version}"
+  end
+
+  desc "Undo all migrations and migrate again"
+  task :remigrate do
+    migrate(0)
+    migrate
+    puts "Remigration complete"
+  end
+
+  def migrate(version = nil)
+    Sequel.extension :migration
+    Sequel::Migrator.apply(connection, migrations, version)
+  end
+
+  def connection
+    @connection ||= Sequel.connect(Sequel::Rake.get(:connection))
+  end
+
+  def migrations
+    Sequel::Rake.get(:migrations)
+  end
+end

data/lib/sequel/rake.rb

@@ -1,97 +1,40 @@
 # frozen_string_literal: true
 
 module Sequel
+  #
+  # @example
+  #   Sequel::Rake.configure do
+  #     set :connection, ENV["DATABASE_URL"]
+  #     set :migrations, "#{__dir__}/lib/db/migrations"
+  #   end
+  #
   module Rake
     # Current version number.
-    VERSION = '0.0.1'
-  end
-end
-
-namespace :sequel do
-  require 'sequel'
-  require 'fileutils'
-  require 'yaml'
-
-  desc 'Creates a database.yml file'
-  task :init do
-    skeleton = "#{__dir__}/database.yml"
-
-    if File.directory?(path('config'))
-      FileUtils.cp(skeleton, path('config/database.yml'))
-    else
-      FileUtils.cp(skeleton, path('database.yml'))
-    end
-
-    FileUtils::mkdir_p path('db/migrations')
-  end
-
-  desc 'Generate a new migration file `sequel:generate[create_books]`'
-  task :generate, :name do |_, args|
-    name = args[:name]
-    abort('Missing migration file name') if name.nil?
-
-    content = "# frozen_string_literal: true\n\nSequel.migration do\n  change do\n    \n  end\nend\n"
-    timestamp = Time.now.to_i
-    filename = File.join(config[env]['migrations'], "#{timestamp}_#{name}.rb")
-
-    File.write(filename, content)
-  end
-
-  desc 'Migrate the database (you can specify the version with `db:migrate[N]`)'
-  task :migrate, [:version] do |task, args|
-    version = args[:version] ? Integer(args[:version]) : nil
-    migrate(version)
-  end
-
-  desc 'Undo all migrations and migrate again'
-  task :remigrate do
-    migrate(0)
-    migrate
-  end
-
-  def migrate(version = nil)
-    databases.each do |db|
-      conn, opts = db
-      Sequel.extension :migration
-      Sequel::Migrator.apply(conn, opts['migrations'], version)
-    end
-  end
-
-  def databases
-    envs = []
-    if env == 'production' || env == 'staging'
-      envs << env
-    else
-      envs.concat(['development', 'test'])
-    end
-    envs.map { |e| [Sequel.connect(config[e]), config[env]] }
-  end
-
-  def path(path)
-    "#{Dir.pwd}/#{path}"
-  end
-
-  def connection
-    @connection ||= Sequel.connect(config)
-  end
+    VERSION = '0.1.0'
+
+    class << self
+      def configuration
+        @configuration ||= {
+          connection: ENV["DATABASE_URL"],
+          migrations: "db/migrations"
+        }
+      end
 
-  def config
-    @config ||= begin
-      filepath = path('database.yml')
+      def configure(&block)
+        instance_eval(&block)
+      end
 
-      unless File.exist?(filepath)
-        filepath = path('config/database.yml')
+      def set(key, value)
+        configuration[key] = value
+      end
 
-        unless File.exist?(filepath)
-          abort 'Missing database.yml file. Run `seqcli init` first'
-        end
+      def get(key)
+        configuration.fetch(key)
       end
 
-      @config = YAML.load_file(filepath)
+      def load!
+        load "#{__dir__}/rake/tasks.rake"
+      end
     end
   end
-
-  def env
-    ENV['RACK_ENV'] || 'development'
-  end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rake
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Tobias Sandelius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -135,8 +135,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/sequel/database.yml
 - lib/sequel/rake.rb
+- lib/sequel/rake/tasks.rake
 - sequel-rake.gemspec
 - test/test_helper.rb
 - test/unit/rake_test.rb
@@ -167,3 +167,4 @@ summary: Rake tasks for the Sequel gem.
 test_files:
 - test/test_helper.rb
 - test/unit/rake_test.rb
+has_rdoc: 

data/lib/sequel/database.yml

@@ -1,26 +0,0 @@
-defaults: &defaults
-  migrations: db/migrations
-  adapter: postgres
-  max_connections: 5
-  host: localhost
-  user: postgres
-
-development:
-  <<: *defaults
-  password:
-  database: app_development
-
-test:
-  <<: *defaults
-  password:
-  database: app_test
-
-staging:
-  <<: *defaults
-  password:
-  database: app_staging
-
-production:
-  <<: *defaults
-  password:
-  database: app