reality-generators 1.20.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82111a8ab71e331d0ec673a36b5ec56e4f19e84de0316cd00c246aca63512559
-  data.tar.gz: 632cbc111de977f63725442d7d70cb90da044b497621f14c14e5a5ec098b4281
+  metadata.gz: ca1b20beebe092fd1966b84a2446b31aa22eb5531dee6976906a022930a1dc9c
+  data.tar.gz: 2b61fadb43193f400dd8e25db27f64836f5e29c76f3220de7f01dd4344beeb87
 SHA512:
-  metadata.gz: 97a5261683324a9e6813d498aa0f776d3fec0e92492947c0bf6211669d7baeea054f3863a02c318bb9294bbdc998fbd735983085c83a0df91e1d86d571d2b1b4
-  data.tar.gz: f992d99aa30624121674ab8659853ecdb03366253434929a997bd6f4d6de16278cf7333a877304f5e7e8d6f042e5eb6ac49ece8232572f51bb49fc95f511f07e
+  metadata.gz: aa60f23b7ecffca2c87e8ac5f7328974c44738c18ae47d06ff6edda7283286617ae4713936e84bcc91db0a794511ca8dd992542c54a228441dc4df17f6440d68
+  data.tar.gz: 12d9ac6d0c823ebd82c809bc4ba529d54e5e571b22c8c42a18baed97fa1daff559aa2043d0a257b2748bf1ad1ed69da6c23136b34b61359a1568f58be5467a83

data/lib/reality/generators/buildr_integration.rb

@@ -19,13 +19,17 @@ 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, mark_as_generated_in_ide)
+        def configure_buildr_project(buildr_project, generator_task, templates, target_dir, mark_as_generated_in_ide, clean_files = true)
           if buildr_project.nil?
-            task('clean') do
-              rm_rf target_dir
+            if clean_files
+              task('clean') do
+                rm_rf target_dir
+              end
             end
           else
-            buildr_project.clean { rm_rf target_dir }
+            if clean_files
+              buildr_project.clean { rm_rf target_dir }
+            end
             file(File.expand_path(target_dir) => [generator_task])
 
             # Is there java source generated in project?

data/lib/reality/generators/rake_integration.rb

@@ -49,6 +49,8 @@ module Reality #nodoc
           if target_dir.nil? && !buildr_project.nil?
             if clean_generated_files
               target_dir = buildr_project._(:target, :generated, self.generated_type_path_prefix, build_key)
+            elsif buildr_project.inline_generated_source?
+              target_dir = buildr_project._('src')
             else
               target_dir = buildr_project._(:srcgen, self.generated_type_path_prefix, build_key)
             end
@@ -64,7 +66,7 @@ module Reality #nodoc
             buildr_project.clean { rm_rf target_dir }
           end
 
-          self.const_get(:GenerateTask).new(element_key, build_key, generator_keys, target_dir, buildr_project, &block)
+          self.const_get(:GenerateTask).new(element_key, build_key, generator_keys, target_dir, buildr_project, clean_generated_files, &block)
         end
       end
 
@@ -83,7 +85,7 @@ module Reality #nodoc
 
         attr_reader :task_name
 
-        def initialize(root_element_key, key, generator_keys, target_dir, buildr_project = nil)
+        def initialize(root_element_key, key, generator_keys, target_dir, buildr_project = nil, clean_generated_files = true)
           @root_element_key = root_element_key
           @key = key
           @generator_keys = generator_keys
@@ -92,11 +94,12 @@ module Reality #nodoc
           # Turn on verbose messages if buildr is turned on tracing
           @verbose = trace?
           @mark_as_generated_in_ide = true
+          @clean_generated_files = clean_generated_files
           @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, mark_as_generated_in_ide?)
+          Reality::Generators::Buildr.configure_buildr_project(buildr_project, task_name, @templates, target_dir, mark_as_generated_in_ide?, clean_generated_files?)
         end
 
         protected
@@ -155,6 +158,10 @@ module Reality #nodoc
           !!@mark_as_generated_in_ide
         end
 
+        def clean_generated_files?
+          !!@clean_generated_files
+        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.20.0'
+  s.version            = '1.22.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
 
   s.rdoc_options       = %w(--line-numbers --inline-source --title reality-generators)
 
-  s.add_dependency 'reality-core', '>= 1.7.0'
-  s.add_dependency 'reality-naming', '>= 1.9.0'
+  s.add_dependency 'reality-core', '>= 1.8.0'
+  s.add_dependency 'reality-naming', '>= 1.13.0'
 
   s.add_development_dependency(%q<minitest>, ['= 5.9.1'])
   s.add_development_dependency(%q<test-unit>, ['= 3.1.5'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reality-generators
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.22.0
 platform: ruby
 authors:
 - Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-22 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reality-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: reality-naming
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement