mobile_workflow 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db09862ea4eafb49f52d1d37ca42e97408b77e0e0d406d00d83fb83ab47e00a1
-  data.tar.gz: f7720006c7171c7e4ca98861497de3f8064ffed9e4bad53c9a8205d35adf6624
+  metadata.gz: 59a42474dd2320d74da05ae06c5b5b143d7b916bc0be5672d5bbf9e725dadfa4
+  data.tar.gz: bd0c2418cfdb2c57f05c7cebe8caec037c96f4aa15bf9f1a0cd04e9fd531dad9
 SHA512:
-  metadata.gz: c8935b569351f6f584d9587ca9e250425f44b8a8a2ed0829d04032d889216ad92c2333ceba287c354eb3d6d679716889a335e5dbecedeba4ee5cfa975d19b1fb
-  data.tar.gz: 5c9856de14ffb565562078371a1b9b8bbef2529f80c2ae027378f4a73d41effe9737091563d567f911b9ff81d29ab668d6fb91ce753afb6f69e4d5514b1172af
+  metadata.gz: f95219a039c62458cd5e93a6d2ff859e4c2a8ff6bd39f8ae941e4d1cd63d9daf9b316ce1b9454a16969c84a16c8bb9e46a42dc6087425222613b971be359e524
+  data.tar.gz: 7b2b4f522160353494ba0b3ab1228622fb7e8cf8f104c5d76c2dc522023aacad57d67c3d773bb953d11615d2c2e460ec2a641d9785cef5ccc16d99714abe8e49

data/app/controllers/mobile_workflow/sns_notifications_controller.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  class SnsNotificationsController < ApiController
+  class SnsNotificationsController < ActionController::API
     if Object.const_defined?("Aws::S3") && Object.const_defined?("Aws::SNS")
       before_action :verify_request_authenticity
  

data/bin/mwf

@@ -10,6 +10,7 @@ end
 if ARGV.empty?
   puts "USAGE: mwf <platform> <command> [options]"
   puts "Example: mwf rails create:app_server --help"
+  puts "Example: mwf rails destroy:app_server --help"
   exit 0
 elsif ['-v', '--version'].include? ARGV[0]
   puts MobileWorkflow::VERSION

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

@@ -5,12 +5,13 @@ module MobileWorkflow
     class InstallGenerator < Rails::Generators::Base
       
       # Schemas to avoid generating models for (static items from MW)
-      SKIP_SCHEMAS = ["answer", "attachment", "ListItem", "DisplayItem", "DisplayText", "DisplayButton", "DisplayImage", "DisplayVideo"]
+      SKIP_SCHEMAS = ["attachment", "ListItem", "DisplayItem", "DisplayText", "DisplayButton", "DisplayImage", "DisplayVideo"]
       
       source_root File.expand_path("../templates", __FILE__)
 
       class_option :open_api_spec_path, type: :string, default: "config/open_api_spec.json"
       class_option :doorkeeper_oauth, type: :boolean, default: false
+      class_option :interactive, type: :boolean, default: false
 
       def create_api_controller
         template("api_controller.rb.erb", "app/controllers/api_controller.rb")
@@ -59,7 +60,7 @@ module MobileWorkflow
       end
       
       def generate_seeds
-        template("seeds.rb.erb", "db/seeds.rb")
+        template("seeds.rb.erb", "db/seeds.rb", force: true)
       end
 
       private
@@ -77,16 +78,20 @@ module MobileWorkflow
       
       def read_openapi_spec
         say "Loading OpenAPI Spec: #{open_api_spec_path}" 
-        return JSON.parse(File.read(File.join(Rails.root, open_api_spec_path))).with_indifferent_access 
+        return JSON.parse(File.read(open_api_spec_path)).with_indifferent_access 
       end
       
       def open_api_spec_path
         options[:open_api_spec_path]
       end
       
+      def interactive?
+        options[:interactive]
+      end
+      
       def model_properties(name, schema)
         generated_properties_args = schema["properties"].keys.collect{|key| "#{key}:#{model_property_type(schema["properties"][key])}" }.join(" ")
-        if yes?("Use generated schema #{name}(#{generated_properties_args})[yn]?")
+        if !interactive? || yes?("Use generated schema #{name}(#{generated_properties_args})[yn]?")
           generated_properties_args
         else
           ask "Specify schema for #{name}: (e.g. text:string image:attachment region:reference)"

data/lib/generators/mobile_workflow/install/templates/Gemfile.erb

@@ -4,11 +4,10 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '2.6.6'
 
 # Core Gems
-gem 'rails', '~> 6.0.2', '>= 6.0.2.2'
-gem 'puma', '~> 4.1'
+gem 'rails', '~> 6.1.0'
+gem 'puma', '~> 5.0'
 gem 'sass-rails', '>= 6'
 gem 'turbolinks', '~> 5'
-gem 'bootsnap', '>= 1.4.2', require: false
 
 # Mobile Workflow
 #gem 'mobile_workflow', path: '../mobile_workflow'
@@ -36,8 +35,6 @@ gem 'aws-sdk-sns', '~> 1.23'
 group :development do
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
-  gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
 group :development, :test do

data/lib/mobile_workflow/cli/app_builder.rb

@@ -16,6 +16,25 @@ module MobileWorkflow::Cli
     def rspec_generator
       generate 'rspec:install'
     end
+
+    def administrate_generator
+      Bundler.with_unbundled_env { generate 'administrate:install' }
+      
+      file 'app/assets/config/manifest.js', <<-CODE
+//= link administrate/application.css
+//= link administrate/application.js
+    CODE
+  
+      file 'app/controllers/admin/application_controller.rb', <<-CODE
+module Admin
+  class ApplicationController < Administrate::ApplicationController
+    http_basic_authenticate_with(name: ENV["ADMIN_USER"], password: ENV["ADMIN_PASSWORD"])
+  end
+end
+CODE
+
+      Bundler.with_unbundled_env { generate 'administrate:routes' }
+    end
     
     def ability_generator
       copy_file 'ability.rb', 'app/models/ability.rb'

data/lib/mobile_workflow/cli/app_server_generator.rb

@@ -9,6 +9,7 @@ module MobileWorkflow::Cli
     class_option :skip_test, type: :boolean, default: true, desc: "Skip Test Unit"
     class_option :force, type: :boolean, default: true, desc: "Force overwrite"
     class_option :skip_webpack_install, type: :boolean, default: true, desc: "Skip webpacker installation"
+    class_option :skip_bootsnap, type: :boolean, default: true, desc: "Skip Bootsnap"
     
     class_option :version, type: :boolean, aliases: "-v", desc: "Show version number and quit"
     class_option :help, type: :boolean, aliases: '-h', desc: "Show this help message and quit"
@@ -30,14 +31,13 @@ module MobileWorkflow::Cli
     def finish_template
       super
       after_bundle do
-        run "spring stop"
         build :procfiles
         build :rspec_generator
         build :ability_generator
         build :active_storage if options[:s3_storage] 
         build :mobile_workflow_generator, ARGV[1]
         setup_db
-        generate_administrate
+        build :administrate_generator
         
         generate_dot_env
         initial_git_commit
@@ -51,33 +51,18 @@ module MobileWorkflow::Cli
     protected
 
     def get_builder_class
-      MobileWorkflowCli::AppBuilder
+      ::MobileWorkflow::Cli::AppBuilder
     end
     
     # Todo: MBS - move these methods to the builder class
     # Ideally override RailsBuilder methods
     private
-    def generate_administrate
-      generate 'administrate:install'
-      file 'app/assets/config/manifest.js', <<-CODE
-//= link administrate/application.css
-//= link administrate/application.js
-    CODE
-  
-      file 'app/controllers/admin/application_controller.rb', <<-CODE
-module Admin
-  class ApplicationController < Administrate::ApplicationController
-    http_basic_authenticate_with(name: ENV["ADMIN_USER"], password: ENV["ADMIN_PASSWORD"])
-  end
-end
-CODE
-      generate 'administrate:routes'
-    end
-
     def setup_db
-      rails_command "db:drop"
-      rails_command "db:create"
-      rails_command "db:migrate"
+      Bundler.with_unbundled_env do 
+        rails_command("db:drop")
+        rails_command("db:create")
+        rails_command("db:migrate")
+      end
     end
 
     def initial_git_commit

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.5.0'
+  VERSION = '0.5.5'
   RUBY_VERSION = '2.5.5'
-  RAILS_VERSION = '6.0.0'
+  RAILS_VERSION = '6.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobile_workflow
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-27 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement