tetra 0.40.0 → 0.41.0

data/lib/tetra/commands/generate_kit_archive.rb

@@ -3,14 +3,14 @@
 module Tetra
   # tetra generate-kit-archive
   class GenerateKitArchiveCommand < Tetra::BaseCommand
-    option %w(-w --whole), :flag, "recreate the whole archive (not incremental)"
-
     def execute
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
-          result_path = Tetra::Archiver.new(project).archive_kit(whole?)
-          print_generation_result(project, result_path)
+          Tetra::Kit.new(project).items.each do |item|
+            result_path = item.to_archive
+            print_generation_result(project, result_path)
+          end
         end
       end
     end

data/lib/tetra/commands/generate_kit_spec.rb

@@ -7,8 +7,10 @@ module Tetra
       checking_exceptions do
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
-          result_path, conflict_count = Tetra::SpecGenerator.new(project).generate_kit_spec
-          print_generation_result(project, result_path, conflict_count)
+          Tetra::Kit.new(project).items.each do |item|
+            result_path, conflict_count = item.to_spec
+            print_generation_result(project, result_path, conflict_count)
+          end
         end
       end
     end

data/lib/tetra/commands/generate_package_archive.rb

@@ -10,7 +10,7 @@ module Tetra
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
           package_name = project.get_package_name(directory)
-          result_path = Tetra::Archiver.new(project).archive_package package_name
+          result_path = Tetra::Package.new(project, package_name).to_archive
           print_generation_result(project, result_path)
         end
       end

data/lib/tetra/commands/generate_package_spec.rb

@@ -12,8 +12,8 @@ module Tetra
         project = Tetra::Project.new(".")
         ensure_dry_running(false, project) do
           package_name = project.get_package_name(directory)
-          result_path, conflict_count = Tetra::SpecGenerator.new(project)
-            .generate_package_spec(package_name, pom, filter)
+          result_path, conflict_count =
+            Tetra::Package.new(project, package_name, pom, filter).to_spec
           print_generation_result(project, result_path, conflict_count)
         end
       end

data/lib/tetra/git.rb

@@ -46,10 +46,10 @@ module Tetra
       end
     end
 
-    # adds all files in the current directory and removes
-    # all files not in the current directory.
-    # if tag is given, commit is also tagged
-    def commit_whole_directory(message, tag = nil, tag_message = nil)
+    # adds all files in the current directory, removes
+    # all files not in the current directory, commits
+    # and tags with prefix
+    def commit_whole_directory(message, tag, tag_message = nil)
       Dir.chdir(@directory) do
         log.debug "committing with message: #{message}"
 
@@ -65,16 +65,25 @@ module Tetra
         `git add .`
         `git commit -m "#{message}"`
 
-        unless tag.nil?
-          if !tag_message.nil?
-            `git tag tetra_#{tag} -m "#{tag_message}"`
-          else
-            `git tag tetra_#{tag}`
-          end
+        if !tag_message.nil?
+          `git tag tetra_#{tag} -m "#{tag_message}"`
+        else
+          `git tag tetra_#{tag}`
         end
       end
     end
 
+    # commits and tags one single file
+    # if tag is given, commit is also tagged
+    def commit_file(path, message, tag)
+      Dir.chdir(@directory) do
+        log.debug "committing path #{path} with message: #{message}"
+        `git add #{path}`
+        `git commit -m "#{message}"`
+        `git tag tetra_#{tag}`
+      end
+    end
+
     # returns the highest suffix found in tags with the given prefix
     def get_tag_maximum_suffix(prefix)
       Dir.chdir(@directory) do

data/lib/tetra/glue_kit_item.rb

@@ -0,0 +1,42 @@
+# encoding: UTF-8
+
+module Tetra
+  # represents a prebuilt package dependency from a jar file
+  # in a kit
+  class GlueKitItem
+    # implement to_spec
+    include SpecGenerator
+    attr_reader :project
+    attr_reader :package_name
+    attr_reader :spec_dir
+    attr_reader :template_spec_name
+    attr_reader :conflicts
+
+    # implement to_archive
+    include Archiver
+    attr_reader :source_dir
+    attr_reader :source_paths
+    attr_reader :destination_dir
+
+    # template-specific attributes
+    attr_reader :provides_symbol
+    attr_reader :provides_version
+    attr_reader :install_dir
+
+    def initialize(project, source_paths)
+      @project = project
+      @package_name = "kit-item-glue-#{project.name}"
+      @spec_dir = "kit"
+      @template_spec_name = "kit_item.spec"
+      @conflicts = true
+
+      @source_dir = File.join("kit")
+      @source_paths = source_paths
+      @destination_dir = @package_name
+
+      @provides_symbol = "tetra-glue"
+      @provides_version = "#{project.name}-#{project.version}"
+      @install_dir = ""
+    end
+  end
+end

data/lib/tetra/jar_kit_item.rb

@@ -0,0 +1,45 @@
+# encoding: UTF-8
+
+module Tetra
+  # represents a prebuilt package dependency from a jar file
+  # in a kit
+  class JarKitItem
+    # implement to_spec
+    include SpecGenerator
+    attr_reader :project
+    attr_reader :package_name
+    attr_reader :spec_dir
+    attr_reader :template_spec_name
+    attr_reader :conflicts
+
+    # implement to_archive
+    include Archiver
+    attr_reader :source_dir
+    attr_reader :source_paths
+    attr_reader :destination_dir
+
+    # template-specific  attributes
+    attr_reader :provides_symbol
+    attr_reader :provides_version
+    attr_reader :install_dir
+
+    def initialize(project, path)
+      _, name = Pathname.new(path).split
+      hash = Digest::SHA1.file(path).hexdigest
+
+      @project = project
+      @package_name = "kit-item-#{name.to_s.gsub(".", "-")}"
+      @spec_dir = "kit"
+      @template_spec_name = "kit_item.spec"
+      @conflicts = false
+
+      @source_dir = File.join("kit", "jars")
+      @source_paths = [path]
+      @destination_dir = @package_name
+
+      @provides_symbol = "tetra-jar(#{name})"
+      @provides_version = hash
+      @install_dir = "jars"
+    end
+  end
+end

data/lib/tetra/kit.rb

@@ -0,0 +1,73 @@
+# encoding: UTF-8
+
+module Tetra
+  # represents a set of binary dependency packages
+  class Kit
+    include Logging
+
+    def initialize(project)
+      @project = project
+    end
+
+    def items
+      managed_items = maven_kit_items + jar_kit_items
+
+      managed_items + glue_kit_items(managed_items)
+    end
+
+    def maven_kit_items
+      @project.from_directory(File.join("kit", "m2")) do
+        files_in_dir = {}
+        poms = []
+        Find.find(".") do |file|
+          dir = File.dirname(file)
+          if files_in_dir.key?(dir)
+            files_in_dir[dir] << file
+          else
+            files_in_dir[dir] = [file]
+          end
+
+          if file =~ /\.pom$/
+            log.debug "pom found in #{file}"
+            poms << file
+          end
+        end
+
+        poms.map do |pom|
+          Tetra::MavenKitItem.new(@project, pom, files_in_dir[File.dirname(pom)])
+        end
+      end
+    end
+
+    def jar_kit_items
+      @project.from_directory(File.join("kit", "jars")) do
+        Pathname.new(".").children.select do |child|
+          child.to_s =~ /.jar$/
+        end.sort.map do |jar|
+          Tetra::JarKitItem.new(@project, jar)
+        end
+      end
+    end
+
+    def glue_kit_items(managed_items)
+      managed_files = managed_items.map do |item|
+        item.source_paths.map do |e|
+          Pathname.new(File.join(item.source_dir, e)).cleanpath
+        end
+      end.flatten
+
+      unmanaged_files = []
+
+      @project.from_directory do
+        Find.find("kit") do |file|
+          pathname = Pathname.new(file)
+          if !managed_files.include?(pathname) && !File.directory?(pathname)
+            unmanaged_files << pathname.relative_path_from(Pathname.new("kit"))
+          end
+        end
+      end
+
+      [Tetra::GlueKitItem.new(@project, unmanaged_files)]
+    end
+  end
+end

data/lib/tetra/maven_kit_item.rb

@@ -0,0 +1,64 @@
+# encoding: UTF-8
+
+module Tetra
+  # represents a prebuilt package dependency from a Maven local repo
+  # in a kit
+  class MavenKitItem
+    # implement to_spec
+    include SpecGenerator
+    attr_reader :project
+    attr_reader :package_name
+    attr_reader :spec_dir
+    attr_reader :template_spec_name
+    attr_reader :conflicts
+
+    # implement to_archive
+    include Archiver
+    attr_reader :source_dir
+    attr_reader :source_paths
+    attr_reader :destination_dir
+
+    # template-specific attributes
+    attr_reader :provides_symbol
+    attr_reader :provides_version
+    attr_reader :install_dir
+
+    def initialize(project, pom, source_paths)
+      path, _ = path_split(pom)
+      rest, version = path_split(path)
+      group_directory, artifact_id = path_split(rest)
+      group_id = path_to_group(group_directory)
+
+      @project = project
+      @package_name = "kit-item-#{group_id.gsub(".", "-")}-#{artifact_id}-#{version}"
+      @spec_dir = "kit"
+      @template_spec_name = "kit_item.spec"
+      @conflicts = false
+
+      @provides_symbol = "tetra-mvn(#{group_id}:#{artifact_id})"
+      @provides_version = version
+      @install_dir = "m2"
+
+      @source_dir = File.join("kit", "m2")
+      @source_paths = source_paths
+      @destination_dir = @package_name
+    end
+
+    private
+
+    # splits a path string into a [head, tail] string couple
+    def path_split(path)
+      Pathname.new(path).split.map { |e| e.to_s }
+    end
+
+    # transforms a path into a Maven group
+    def path_to_group(path)
+      splits = path_split(path)
+      if splits[0] == "."
+        return splits[1]
+      else
+        return "#{path_to_group(splits[0])}.#{splits[1]}"
+      end
+    end
+  end
+end

data/lib/tetra/package.rb

@@ -0,0 +1,82 @@
+# encoding: UTF-8
+
+module Tetra
+  # represents a Java project package in Tetra, corresponding to a directory
+  # in src/
+  class Package
+    extend Forwardable
+    include SpecGenerator
+
+    attr_reader :name
+
+    def_delegator :@project, :name, :project_name
+
+    def_delegator :@kit, :items, :kit_items
+
+    def_delegator :@pom, :license_name, :license
+    def_delegator :@pom, :url
+    def_delegator :@pom, :group_id
+    def_delegator :@pom, :artifact_id
+    def_delegator :@pom, :version
+    def_delegator :@pom, :runtime_dependency_ids
+
+    # implement to_archive
+    include Archiver
+    attr_reader :source_dir
+    attr_reader :source_paths
+    attr_reader :destination_dir
+
+    def initialize(project, name, pom_path = nil, filter = nil)
+      @project = project
+      @kit = Tetra::Kit.new(project)
+      @name = name
+      @pom = pom_path.nil? ? nil : Tetra::Pom.new(pom_path)
+      @filter = filter
+
+      @source_dir = File.join("src", name)
+      @source_paths = ["*"]
+      @destination_dir = name
+    end
+
+    # a short summary from the POM
+    def summary
+      cleanup_description(@pom.description, 60)
+    end
+
+    # a long summary from the POM
+    def description
+      cleanup_description(@pom.description, 1500)
+    end
+
+    # files produced by this package
+    def outputs
+      @project.get_produced_files(@name).select do |file|
+        File.fnmatch?(@filter, File.basename(file))
+      end
+    end
+
+    def cleanup_description(raw, max_length)
+      raw
+        .gsub(/[\s]+/, " ")
+        .strip
+        .slice(0..max_length - 1)
+        .sub(/\s\w+$/, "")
+        .sub(/\.+$/, "")
+    end
+
+    # needed by SpecGenerator
+    attr_reader :project
+
+    def package_name
+      name
+    end
+
+    def spec_dir
+      File.join("src", name)
+    end
+
+    def template_spec_name
+      "package.spec"
+    end
+  end
+end

data/lib/tetra/project.rb

@@ -61,19 +61,26 @@ module Tetra
       Dir.chdir(dir) do
         Tetra::Git.new(".").init
 
-        FileUtils.mkdir_p "src"
-        FileUtils.mkdir_p "kit"
+        FileUtils.mkdir_p("src")
+        FileUtils.mkdir_p("kit")
 
         # populate the project with templates and take a snapshot
         project = Project.new(".")
 
-        template_manager = Tetra::TemplateManager.new
-        template_manager.copy "output", "."
-        template_manager.copy "kit", "."
-        template_manager.copy "src", "."
-        template_manager.copy "gitignore", ".gitignore"
+        template_path = File.join(File.dirname(__FILE__), "..", "template")
 
-        project.take_snapshot "Template files added", :init
+        templates = {
+          "output" => ".",
+          "kit" => ".",
+          "src" => ".",
+          "gitignore" => ".gitignore"
+        }
+
+        templates.each do |source, destination|
+          FileUtils.cp_r(File.join(template_path, source), destination)
+        end
+
+        project.take_snapshot("Template files added", :init)
       end
     end
 
@@ -83,7 +90,7 @@ module Tetra
     def dry_run
       return false if dry_running?
 
-      current_directory = Pathname.new(Dir.pwd).relative_path_from Pathname.new(@full_path)
+      current_directory = Pathname.new(Dir.pwd).relative_path_from(Pathname.new(@full_path))
 
       take_snapshot("Dry-run started", :dry_run_started, current_directory)
       true
@@ -103,11 +110,11 @@ module Tetra
           @git.revert_whole_directory(".", latest_tag(:dry_run_started))
           @git.delete_tag(latest_tag(:dry_run_started))
         else
-          take_snapshot "Changes during dry-run", :dry_run_changed
+          take_snapshot("Changes during dry-run", :dry_run_changed)
 
           @git.revert_whole_directory("src", latest_tag(:dry_run_started))
 
-          take_snapshot "Dry run finished", :dry_run_finished
+          take_snapshot("Dry run finished", :dry_run_finished)
         end
         return true
       end
@@ -115,16 +122,8 @@ module Tetra
     end
 
     # takes a revertable snapshot of this project
-    def take_snapshot(message, tag_prefix = nil, tag_message = nil)
-      tag = (
-        if tag_prefix
-          "#{tag_prefix}_#{latest_tag_count(tag_prefix) + 1}"
-        else
-          nil
-        end
-      )
-
-      @git.commit_whole_directory(message, tag, tag_message)
+    def take_snapshot(message, tag_prefix, tag_message = nil)
+      @git.commit_whole_directory(message, next_tag(tag_prefix), tag_message)
     end
 
     # replaces content in path with new_content, takes a snapshot using
@@ -144,7 +143,7 @@ module Tetra
 
         File.open(path, "w") { |io| io.write(new_content) }
         log.debug "taking snapshot with new content: #{snapshot_message}"
-        take_snapshot(snapshot_message, tag_prefix)
+        @git.commit_file(path, snapshot_message, next_tag(tag_prefix))
 
         if already_existing
           if previous_tag == ""
@@ -172,6 +171,11 @@ module Tetra
       @git.get_tag_maximum_suffix(prefix)
     end
 
+    # returns the next tag for a given tag prefix
+    def next_tag(prefix)
+      "#{prefix}_#{latest_tag_count(prefix) + 1}"
+    end
+
     # runs a block from the project directory or a subdirectory
     def from_directory(subdirectory = "")
       Dir.chdir(File.join(@full_path, subdirectory)) do