tetra 0.42.0 → 0.43.0

data/lib/template/package.spec

@@ -46,13 +46,13 @@ Requires:       mvn(<%= dependency_id[0] %>:<%= dependency_id[1] %>) <% if depen
 %>
 
 %prep
-%setup -q -c -n src/<%= name %>
+%setup -q -c -n src
 cp -f %{SOURCE1} .
-cp -Rf %{_datadir}/tetra ../../kit
+cp -Rf %{_datadir}/tetra ../kit
 
 %build
-cd ../../
-sh src/<%= name %>/build.sh
+cd ..
+sh src/build.sh
 
 %install
 export NO_BRP_CHECK_BYTECODE_VERSION=true

data/lib/tetra/project.rb

@@ -117,25 +117,24 @@ module Tetra
     def merge_new_content(new_content, path, snapshot_message, tag_prefix)
       from_directory do
         log.debug "merging new content to #{path} with prefix #{tag_prefix}"
-        already_existing = File.exist? path
-        previous_tag = latest_tag(tag_prefix)
+        already_existing = File.exist?(path)
 
         if already_existing
+          if latest_tag_count(tag_prefix) == 0
+            log.debug "saving untagged version"
+            @git.commit_file(path, snapshot_message, next_tag(tag_prefix))
+          end
           log.debug "moving #{path} to #{path}.tetra_user_edited"
           File.rename path, "#{path}.tetra_user_edited"
         end
 
+        previous_tag = latest_tag(tag_prefix)
+
         File.open(path, "w") { |io| io.write(new_content) }
         log.debug "taking snapshot with new content: #{snapshot_message}"
         @git.commit_file(path, snapshot_message, next_tag(tag_prefix))
 
         if already_existing
-          if previous_tag == ""
-            previous_tag = latest_tag(tag_prefix)
-            log.debug "there was no tag with prefix #{tag_prefix} before snapshot"
-            log.debug "defaulting to #{previous_tag} after snapshot"
-          end
-
           # 3-way merge
           conflict_count = @git.merge_with_tag("#{path}", "#{path}.tetra_user_edited", previous_tag)
           File.delete "#{path}.tetra_user_edited"

data/lib/tetra/script_generator.rb

@@ -25,6 +25,7 @@ module Tetra
 
         script_lines = [
           "#!/bin/bash",
+          "set -xe",
           "PROJECT_PREFIX=`readlink -e .`",
           "cd #{@project.latest_dry_run_directory}"
         ] +
@@ -44,10 +45,13 @@ module Tetra
         conflict_count = @project.merge_new_content(new_content, result_path, "Build script generated",
                                                     "generate_build_script")
 
-        destination_script_path =  File.join("output", @project.name, "build.sh")
+        output_dir = File.join("output", @project.name)
+        FileUtils.mkdir_p(output_dir)
+
+        destination_script_path =  File.join(output_dir, "build.sh")
         FileUtils.symlink(File.expand_path(result_path), destination_script_path, force: true)
 
-        [result_path, conflict_count]
+        [destination_script_path, conflict_count]
       end
     end
   end

data/lib/tetra/spec_generator.rb

@@ -18,8 +18,9 @@ module Tetra
         spec_path = File.join(spec_dir, spec_name)
 
         new_content = generate(template_spec_name, binding)
+        label = "Spec for #{package_name} generated"
         conflict_count = project.merge_new_content(new_content, spec_path,
-                                                   "Spec generated", "generate_#{package_name}_spec")
+                                                   label, "generate_#{package_name}_spec")
 
         output_dir = File.join("output", package_name)
         FileUtils.mkdir_p(output_dir)
@@ -27,7 +28,7 @@ module Tetra
         spec_link_path = File.join(output_dir, spec_name)
         FileUtils.symlink(File.expand_path(spec_path), spec_link_path, force: true)
 
-        [spec_path, conflict_count]
+        [spec_link_path, conflict_count]
       end
     end
 

data/lib/tetra/version.rb

@@ -2,5 +2,5 @@
 
 # base module for tetra
 module Tetra
-  VERSION = "0.42.0"
+  VERSION = "0.43.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.43.0
   prerelease: 
 platform: ruby
 authors: