multi_ar 6.0.0.pre.beta → 6.0.0.pre.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4be873bd564b04b81d3a4245160c98007dec42edb692cabf64ce1a4ae3e2b5ef
-  data.tar.gz: c33cbbed7eea9697166655ba9952e3155048c156975c82a20413bd99bb86b366
+  metadata.gz: 864f23be74df421560dbc71fc150ebad7e7d1984c6b40ffec8812c960c1f577f
+  data.tar.gz: 4fc6df8964c097198b9cce2a536c2df462624882ef3837e1cc28402e6bd0438a
 SHA512:
-  metadata.gz: e6a1152839e3967942d039eac8f6bc91a9ac572fe804f9d0cf1bbbc9aa040428d858350c5ed49d2dbcc3c2e0876bbc7a2801f606fb15876d2332e380d728af6f
-  data.tar.gz: 9ece6a831414d6bfbbdaf168db31e219ef3f161b31ad36e046da51f2244e2c06269da387217cd4250d7b96c81fa79cb665150afeb95a5d70a3db43623d9bb607
+  metadata.gz: 602f1193b42ae49ea30ee2f09ac014cce308518294e9e160ed9569fff18a13f0cf63b32f4289b6f13257f51eda8658ce57afbab10228da8a97e3c0f618c794f4
+  data.tar.gz: 2ab89db6d8613a79c52ef3c62aa6caebb9fc67853eb18e89630fd4be33334312e5dcdcf7c6ac56bd8920f24c25d05ef5e48f8e2436956e590bc3f5e665f74790

data/lib/multi_ar/interface.rb

@@ -55,6 +55,7 @@ module MultiAR
       @run_by_default = false
     end
 
+    # Default location of database configuration.
     DEFAULT_DB_CONFIG = "config/database.yaml"
 
     # @note Consumes ARGV, create copy of it if you need it for something.
@@ -107,7 +108,7 @@ module MultiAR
       bootstrap opts if opts["init"] # Bootstrap will exit after execution; in that case nothing after this will be run.
 
       raise "--config must be path to valid file" if opts[:config_given] and not File.exist? opts["config"]
-      raise "Database config #{opts["db_config"]} seems to be missing" if @options["db_config"] and not File.exist? opts["db_config"]
+      raise "Database config #{opts["db_config"]} seems to be missing. See --help for usage." if @options["db_config"] and not File.exist? opts["db_config"]
 
       @opts = opts
 
@@ -166,16 +167,19 @@ module MultiAR
 
     # @note This method will always quit the application or raise another exception for errors. Catch SystemExit if that’s not good for you.
     def bootstrap opts
-      raise "--databases must be given when bootstrapping." unless opts["databases"]
+      raise "Please specify --databases for your new project. See --help." unless opts["databases"]
       #raise "#{opts["init"]} already exists" if File.exist? opts["init"] # We don’t want to actually check it, init is more like “add missing configuration”.
 
       config_dir = "config"
       database_config = "database.yaml"
 
-      FileUtils.mkdir opts["init"] unless Dir.exist? opts["init"]
+      puts opts.inspect
+      execute_bundle_gem opts if not Dir.exist? opts["init"]
+
+      #FileUtils.mkdir opts["init"] unless Dir.exist? opts["init"]
       Dir.chdir opts["init"] do
         File.write "README.md", bootstrap_readme(opts) unless File.exist?("README.md")
-        bootstrap_gemfile
+        #bootstrap_gemfile
 
         FileUtils.mkdir config_dir unless Dir.exist? config_dir
         Dir.chdir config_dir do
@@ -191,6 +195,17 @@ module MultiAR
       exit 0
     end
 
+    def execute_bundle_gem opts
+      project_name = opts["init"]
+      `bundle gem #{project_name}`
+      # There is some custom files I rather have.
+      Dir.chdir project_name do
+        FileUtils.rm "README.md"
+
+        bootstrap_gemspec opts
+      end
+    end
+
     def bootstrap_db_config opts
       str = ""
       databases = parse_databases_input(opts["databases"])
@@ -220,6 +235,24 @@ module MultiAR
       end
     end
 
+    def bootstrap_gemspec opts
+      project_name = opts["init"]
+      gemspec = "#{project_name}.gemspec"
+
+      lines = File.readlines gemspec
+      puts lines.inspect
+      raise "Generated gemspec was not as expected..." if lines[-1] != "end\n"
+      lines.insert -2, "  spec.add_runtime_dependency \"multi_ar\", \"~> #{::MultiAR::VERSION}\""
+      lines.insert -2, "  spec.add_development_dependency \"multi_ar_migrations\", \"~> #{::MultiAR::VERSION}\""
+
+      puts lines.inspect
+
+      File.open gemspec, "w" do |f|
+        f.puts lines
+      end
+    end
+
+    # TODO: this is deprecated and not in use
     def bootstrap_gemfile
 
       str = <<-EOS.gsub(/^ {6}/, "")

data/lib/multi_ar/rake/ext.rb

@@ -2,10 +2,13 @@
 require "rake"
 
 # @api private
+#
 # Extension to Rake to provide rename task.
 module Rake
+
   # Extension to Rake to provide rename task.
   class Application
+
     # A Rake task to rename another Rake task.
     def rename_task(task, oldname, newname)
         if @tasks.nil?
@@ -19,23 +22,24 @@ module Rake
         end
     end
   end
-end
 
-# add new rename method to Rake::Task class
-# to rename a task
-class Rake::Task
-  # Renames current Rake task.
-  def rename(new_name)
-    if !new_name.nil?
-        old_name = @name
+  # Adds new method, rename, to Rake::Task class to rename a task.
+  class Task
+    # Renames current Rake task.
+    def rename(new_name)
+      if !new_name.nil?
+          old_name = @name
 
-        if old_name == new_name
-          return
-        end
+          if old_name == new_name
+            return
+          end
 
-        @name = new_name.to_s
-        application.rename_task(self, old_name, new_name)
+          @name = new_name.to_s
+          application.rename_task(self, old_name, new_name)
+      end
     end
   end
 end
 
+
+

data/lib/multi_ar/rake/migration_generator.rb

@@ -4,11 +4,18 @@ require "active_record/tasks/database_tasks"
 
 
 # @api private
+#
+# Overridden from Active Record to have custom migration path.
 module ActiveRecordMigrations
+
+  # Overridden from Active Record to have custom migration path.
   module Generators
+
+  # Overridden from Active Record to have custom migration path.
     class MigrationGenerator < ::ActiveRecord::Generators::MigrationGenerator
       source_root ::ActiveRecord::Generators::MigrationGenerator.source_root
 
+      # Overridden from Active Record to have custom migration path.
       def db_migrate_path
         database_name = MultiAR::MultiAR::databases.first[0]
         MultiAR::MultiAR::solve_migration_path database_name

data/lib/multi_ar/rake/tasks.rb

@@ -51,9 +51,7 @@ module Rake
     end
 
     class << self
-      attr_accessor :databases
       attr_accessor :environment
-      attr_accessor :common_migrations
     end
 
     # When called, this declares Rake tasks of MultiAR,

data/lib/multi_ar/version.rb

@@ -1,4 +1,5 @@
 
 module MultiAR
-    VERSION = "6.0.0-beta"
+    # MultiAR’s current version.
+    VERSION = "6.0.0-rc"
 end

data/lib/multi_ar.rb

@@ -100,6 +100,7 @@ module MultiAR
       ActiveRecord::Tasks::DatabaseTasks.migrations_paths
     end
 
+    # Calculates path to migration dir for given database.
     def self.migration_dir_for database_name
       ActiveRecord::Tasks::DatabaseTasks.migrations_paths
     end
@@ -144,6 +145,9 @@ module MultiAR
       @rake.invoke_task task_name
     end
 
+    # @api private
+    #
+    # Returns internal databases array.
     def self.databases
       @@__databases
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_ar
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.beta
+  version: 6.0.0.pre.rc
 platform: ruby
 authors:
 - Samu Voutilainen
@@ -34,7 +34,7 @@ cert_chain:
   OzjdOT7AkCnpLgMDZSIHOoDc3iydYxJAgo5iAkXVMHZJQ2IfZRoEIAHsE3yeLK7H
   37jzNNQuoDPqiNcASg0XaZAxvWI=
   -----END CERTIFICATE-----
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist