reality-generators 1.16.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd8a4936db77dd749853e4acafb77c085a1dcc850fc2f05765f81a3b5062c47
-  data.tar.gz: 0c4eec47b3067dfc911819a8f0d73b883ea6dfa28882c3abecdba01f577bb095
+  metadata.gz: fc49b7084dd8c304b394d4239e66db433771c2be21644d833443fc64575d058a
+  data.tar.gz: c9df932fbcd415525cb5357f33e3bd0e19b366fe5f7087102a398be634bae10d
 SHA512:
-  metadata.gz: fd269c773287b32e7420552b595134d5405c0d7954377fc23e76bada75b61308de2f801369f12a70197add6a40346c41ec0f50ce5fcc37a4336d4334028423a5
-  data.tar.gz: 77e1e1c98b11647d59647369576b9c72713bf39ce03cbb21c28bccb1cf3e62217f3af7722e79c75c1c0431ee80a011461b2b67504c46ff829a33b7953d5bf342
+  metadata.gz: c2956dd24501a523e7afd2a492b8218dfce9a79544e3eeccd4d50ceae995f67eff43ea005db0e5cd4e0fecea5af937c001c3d5a8fc936e60cbed3153efd491d4
+  data.tar.gz: 07ae6c65e4f97a0e4f40884f33fde589f900f79414c94a69f574e8117f8c734987a129aaee5d9ebb3bfc00f4d52bbd66e5092969e32c89ce5c4a06c2bb8dc225

data/lib/reality/generators/buildr_integration.rb

@@ -19,7 +19,7 @@ module Reality #nodoc
         # This method is called from a Rake or Buildr task to configure the Buildr
         # project so that it knows the location of all the generated artifacts and
         # adds them to the appropriate compile paths etc.
-        def configure_buildr_project(buildr_project, generator_task, templates, target_dir)
+        def configure_buildr_project(buildr_project, generator_task, templates, target_dir, mark_as_generated_in_ide)
           if buildr_project.nil?
             task('clean') do
               rm_rf target_dir
@@ -37,7 +37,7 @@ module Reality #nodoc
               buildr_project.compile.using :javac
               buildr_project.compile.from main_java_dir
               # Need to force this as it may have already been cached and thus will not recalculate
-              buildr_project.iml.main_generated_source_directories << main_java_dir if buildr_project.iml?
+              buildr_project.iml.main_generated_source_directories << main_java_dir if mark_as_generated_in_ide && buildr_project.iml?
             end
 
             # Is there resources generated in project?
@@ -56,7 +56,7 @@ module Reality #nodoc
                   end
                 end
               end
-              buildr_project.iml.main_generated_resource_directories << main_resources_dir if buildr_project.iml?
+              buildr_project.iml.main_generated_resource_directories << main_resources_dir if mark_as_generated_in_ide && buildr_project.iml?
             end
 
             # Is there assets generated in project?
@@ -76,7 +76,7 @@ module Reality #nodoc
               end
               buildr_project.test.compile.from test_java_dir
               # Need to force this as it may have already been cached and thus will not recalculate
-              buildr_project.iml.test_generated_source_directories << test_java_dir if buildr_project.iml?
+              buildr_project.iml.test_generated_source_directories << test_java_dir if mark_as_generated_in_ide && buildr_project.iml?
             end
 
             # Is there resources generated in project?
@@ -95,7 +95,7 @@ module Reality #nodoc
                   end
                 end
               end
-              buildr_project.iml.test_generated_resource_directories << test_resources_dir if buildr_project.iml?
+              buildr_project.iml.test_generated_resource_directories << test_resources_dir if mark_as_generated_in_ide && buildr_project.iml?
             end
           end
         end

data/lib/reality/generators/rake_integration.rb

@@ -33,6 +33,7 @@ module Reality #nodoc
           element_key = options[:"#{root_element_type}_key"]
           target_dir = options[:target_dir]
           buildr_project = options[:buildr_project]
+          clean_generated_files = options[:clean_generated_files].nil? ? true : !!options[:clean_generated_files]
 
           if buildr_project.nil? && ::Buildr.application.current_scope.size > 0
             buildr_project = ::Buildr.project(::Buildr.application.current_scope.join(':')) rescue nil
@@ -46,7 +47,11 @@ module Reality #nodoc
           end
 
           if target_dir.nil? && !buildr_project.nil?
-            target_dir = buildr_project._(:target, :generated, self.generated_type_path_prefix, build_key)
+            if clean_generated_files
+              target_dir = buildr_project._(:target, :generated, self.generated_type_path_prefix, build_key)
+            else
+              target_dir = buildr_project._(:srcgen, self.generated_type_path_prefix, build_key)
+            end
           elsif !target_dir.nil? && !buildr_project.nil?
             self.log_container.warn("#{self.name}.define_generate_task specifies a target directory parameter but it can be be derived from the context. The parameter should be removed.")
           end
@@ -55,6 +60,10 @@ module Reality #nodoc
             self.log_container.error("#{self.name}.define_generate_task should specify a target directory as it can not be derived from the context.")
           end
 
+          if clean_generated_files && buildr_project
+            buildr_project.clean { rm_rf target_dir }
+          end
+
           self.const_get(:GenerateTask).new(element_key, build_key, generator_keys, target_dir, buildr_project, &block)
         end
       end
@@ -65,6 +74,7 @@ module Reality #nodoc
         attr_accessor :namespace_key
         attr_accessor :filter
         attr_writer :verbose
+        attr_writer :mark_as_generated_in_ide
 
         attr_reader :root_element_key
         attr_reader :key
@@ -81,11 +91,12 @@ module Reality #nodoc
           @filter = nil
           # Turn on verbose messages if buildr is turned on tracing
           @verbose = trace?
+          @mark_as_generated_in_ide = true
           @target_dir = target_dir
           yield self if block_given?
           define
           @templates = self.template_set_container.generator.load_templates_from_template_sets(generator_keys)
-          Reality::Generators::Buildr.configure_buildr_project(buildr_project, task_name, @templates, target_dir)
+          Reality::Generators::Buildr.configure_buildr_project(buildr_project, task_name, @templates, target_dir, mark_as_generated_in_ide?)
         end
 
         protected
@@ -140,6 +151,10 @@ module Reality #nodoc
 
         private
 
+        def mark_as_generated_in_ide?
+          !!@mark_as_generated_in_ide
+        end
+
         def verbose?
           !!@verbose
         end

data/reality-generators.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name               = %q{reality-generators}
-  s.version            = '1.16.0'
+  s.version            = '1.18.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reality-generators
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reality-core