mobile_workflow 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 685158e15df7ff0f9d893db92dcb1446827e3a8ad61db0a18f76ca95904b4d29
-  data.tar.gz: 223f09dd75966eec26028fa1c17bdcc2ab7ddaf01a5c73a119817c22064b81f7
+  metadata.gz: 913509d1248a7a63226904e313ba1e56c700df9b95f0e393bb642d8f512c94b5
+  data.tar.gz: f1718f9a7e22d33c90ff546215c3ed6047118fca4148ccff6344ec34bedb375c
 SHA512:
-  metadata.gz: ae81fb8cfc35faf25aacb35ecab0a46deb91c706c7c280aaa3b41d090dd9ff88a8c2480ce21d07c2f2e6190268c8fa7794dc4565ef441e488c19146ede830258
-  data.tar.gz: 99801e61d43ccf7d64a533b7c786001444359a7e3b244b4443805d588310de9f4dfa4b14979be40fa19867ecd70436cda26f308b840d1fe00157ba919158decc
+  metadata.gz: 2bc79973227c2db3e308c4329076ea441364ed7c65f2b095fabb201e23fedd2d736883c872ed051aa0ee17e2a94e626f4a99c3dbb95a058d8dbf568dc9d25a05
+  data.tar.gz: 5689ffc81f5df062ac81e25fdbe04da2986c10e434ba5bc9ce27d502381a3fbc63da5c8d8ffa698e4d85571b56ea3b74a0e26936c9178874dd66e60b773aa50a

data/lib/generators/mobile_workflow/install/install_generator.rb

@@ -1,9 +1,13 @@
 require "rails/generators/base"
+require "rails/generators/active_model"
+require "rails/generators/active_record/migration"
+require "active_record"
 require "mobile_workflow/open_api_spec/parser"
 
 module MobileWorkflow
   module Generators
     class InstallGenerator < Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
       
       source_root File.expand_path("../templates", __FILE__)
 
@@ -24,6 +28,8 @@ module MobileWorkflow
         return unless options[:doorkeeper_oauth]
         say "Generating Doorkeeper OAuth"
         
+        migration_template "create_users.rb", "db/migrate/create_users.rb"
+        
         generate 'doorkeeper:install'
         gsub_file 'config/initializers/doorkeeper.rb', 'raise "Please configure doorkeeper resource_owner_authenticator block located in #{__FILE__}"', 'User.find_by_id(session[:user_id]) || redirect_to(new_session_url(return_to: request.fullpath))'
         generate 'doorkeeper:migration'

data/lib/mobile_workflow/cli/app_builder.rb

@@ -22,9 +22,15 @@ module MobileWorkflow::Cli
         "config.include FactoryBot::Syntax::Methods"
       end
     end
+    
+    def migrate_db 
+      rails_command("db:drop")
+      rails_command("db:create")
+      rails_command("db:migrate")
+    end
 
     def administrate_generator
-      Bundler.with_unbundled_env { generate 'administrate:install' }
+      generate 'administrate:install'
       
       file 'app/assets/config/manifest.js', <<-CODE
 //= link administrate/application.css
@@ -39,7 +45,7 @@ module Admin
 end
 CODE
 
-      Bundler.with_unbundled_env { generate 'administrate:routes' }
+      generate 'administrate:routes'
     end
     
     def ability_generator
@@ -57,9 +63,6 @@ CODE
       gen_opts = ""
       gen_opts += "--doorkeeper_oauth" if options[:doorkeeper_oauth]
       generate "mobile_workflow:install #{gen_opts}"
-      
-      # Copy user migrations if needed
-      rails_command 'mobile_workflow:install:migrations' if options[:doorkeeper_oauth]
     end
     
     def s3_backend(region)

data/lib/mobile_workflow/cli/app_server_generator.rb

@@ -37,7 +37,7 @@ module MobileWorkflow::Cli
         build :ability_generator
         build :active_storage if options[:s3_storage] 
         build :mobile_workflow_generator, ARGV[1]
-        setup_db
+        build :migrate_db
         build :administrate_generator
         
         generate_dot_env
@@ -58,14 +58,6 @@ module MobileWorkflow::Cli
     # Todo: MBS - move these methods to the builder class
     # Ideally override RailsBuilder methods
     private
-    def setup_db
-      Bundler.with_unbundled_env do 
-        rails_command("db:drop")
-        rails_command("db:create")
-        rails_command("db:migrate")
-      end
-    end
-
     def initial_git_commit
       git add: "."
       git commit: %Q{ -m 'Initial commit' }

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
   RUBY_VERSION = '2.7.2'
   RAILS_VERSION = '6.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile_workflow
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Matt Brooke-Smith
@@ -103,7 +103,6 @@ files:
 - app/views/layouts/mobile_workflow/application.html.erb
 - bin/mwf
 - config/routes.rb
-- db/migrate/20200823174210_create_users.rb
 - lib/generators/mobile_workflow/controller_generator.rb
 - lib/generators/mobile_workflow/install/install_generator.rb
 - lib/generators/mobile_workflow/install/templates/Gemfile.erb
@@ -115,6 +114,7 @@ files:
 - lib/generators/mobile_workflow/install/templates/app/helpers/application_helper.rb
 - lib/generators/mobile_workflow/install/templates/app/views/layouts/application.html.erb
 - lib/generators/mobile_workflow/install/templates/app/views/sessions/new.html.erb
+- lib/generators/mobile_workflow/install/templates/create_users.rb
 - lib/generators/mobile_workflow/install/templates/seeds.rb.erb
 - lib/generators/mobile_workflow/install/templates/sessions_controller.rb.erb
 - lib/generators/mobile_workflow/install/templates/storage.s3.yml