batteries 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3744b08b2cac266833ffcb26fa59acfcc32560ef
-  data.tar.gz: b9c7df8b15e479390d0ae9375592355f11b03b6b
+  metadata.gz: 1b72dbe55d0b2e75ac7f7252523cc0a6e9aa0e8c
+  data.tar.gz: 14941b0f5403a9f8d808dab344a1311ba478d5e6
 SHA512:
-  metadata.gz: 9e66a0b0c755dfcab9693436015b7813a555c83088204cd27fc2de2848e1498be9dc35c92862fa83b9b8afc105ff640c6a281f9ce788f28f4ec923c33876fa15
-  data.tar.gz: d0729dafcc6b13cb21295a316c08288380a0b1e79bac4af357c8b8585d082dc7b2341b99b5aae0418a6ec17975bcbe2cbcbf13a2c66d86526e1792ea1b9f0984
+  metadata.gz: a580120bb878da83920740b14f0897633026a4fbdb080df8a206fd8ade2c7351e7ea461e7bebd4220b9d301f50c7e88060479e540fff04dd6b07f4fa4a5abf28
+  data.tar.gz: a2d3ed6ab93bed2e952dd51e387be6c3a6cdb549521a8e2057649390a540b7d4397e89ad1f65be24a9809a93e1689bce5810ed3916ab7ed45102ed15f245adb4

data/lib/batteries/tasks/migrations.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 require "rake"
 require "rake/tasklib"
+require "logger"
 
 module Batteries
   module Tasks
     class Migrations < ::Rake::TaskLib
-      attr_accessor :migrations_path, :requires
+      attr_accessor :migrations_path, :database, :logger
 
-      def initialize
-        @migrations_path = "migrate"
-        @requires = ["./db"]
+      def initialize(options: {})
+        @migrations_path = options.fetch(:migrations_path) { "migrate" }
+        @database = options.fetch(:database) { DB if defined?(DB) }
+        @logger = options.fetch(:logger) { Logger.new($stdout) }
 
         yield self if block_given?
 
@@ -61,12 +63,9 @@ module Batteries
       end
 
       def migrate(env, version)
-        ENV["RACK_ENV"] = env
-        require "logger"
-        requires.each { |f| require f }
         Sequel.extension :migration
-        DB.loggers << Logger.new(STDOUT)
-        Sequel::Migrator.apply(DB, migrations_path, version)
+        database.loggers << logger if logger
+        Sequel::Migrator.apply(database, migrations_path, version)
       end
     end
   end

data/lib/batteries/tasks/notes.rb

@@ -7,11 +7,11 @@ module Batteries
     class Notes < ::Rake::TaskLib
       attr_accessor :name, :description, :excluded_dirs, :matchers
 
-      def initialize(name = :notes)
-        @name           = name
-        @description    = "Notes"
-        @excluded_dirs  = %w(node_modules public)
-        @matchers       = %w(FIXME TODO)
+      def initialize(name = :notes, options: {})
+        @name           = options[:name] || name
+        @description    = options.fetch(:description)   { "Notes" }
+        @excluded_dirs  = options.fetch(:excluded_dirs) { %w(node_modules public) }
+        @matchers       = options.fetch(:matchers)      { %w(FIXME TODO) }
 
         yield self if block_given?
 

data/lib/batteries/tasks/secret.rb

@@ -7,11 +7,11 @@ module Batteries
     class Secret < ::Rake::TaskLib
       attr_accessor :name, :description, :secret_file, :generator
 
-      def initialize(name = :secret)
+      def initialize(name = :secret, options: {})
         @name = name
-        @secret_file = ".session_secret"
-        @description = "Generate a session secret in #{secret_file}"
-        @generator = method(:default_generator)
+        @secret_file = options.fetch(:secret_file) { ".session_secret" }
+        @description = options.fetch(:description) { default_description }
+        @generator = options.fetch(:generator) { method(:default_generator) }
 
         yield self if block_given?
 
@@ -29,6 +29,10 @@ module Batteries
         require "securerandom"
         File.write(secret_file, SecureRandom.random_bytes(40))
       end
+
+      def default_description
+        "Generate a session secret in #{secret_file}"
+      end
     end
   end
 end

data/lib/batteries/tasks.rb

@@ -1,3 +1,4 @@
+require "ostruct"
 require "batteries/tasks/notes"
 require "batteries/tasks/migrations"
 require "batteries/tasks/secret"
@@ -6,10 +7,24 @@ module Batteries
   module Tasks
     module_function
 
-    def new
-      Notes.new
-      Migrations.new
-      Secret.new
+    def new(tasks: default_tasks)
+      task_options = setup_task_options(tasks)
+
+      yield task_options if block_given?
+
+      tasks.each do |task|
+        const_get(task.to_s.capitalize).new(options: task_options[task].to_h)
+      end
+    end
+
+    def default_tasks
+      %i(notes migrations secret)
+    end
+
+    def setup_task_options(tasks)
+      tasks.each_with_object(OpenStruct.new) do |task, memo|
+        memo.send("#{task}=", OpenStruct.new)
+      end
     end
   end
 end

data/lib/batteries/version.rb

@@ -1,3 +1,3 @@
 module Batteries
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batteries
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Daniels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Powering your Roda/Sinatra applications