tetra 0.43.0 → 0.44.0

data/spec/lib/{spec_generator_spec.rb → speccable.rb}

@@ -2,26 +2,17 @@
 
 require "spec_helper"
 
-describe Tetra::SpecGenerator do
+describe Tetra::Speccable do
   include Tetra::Mockers
 
   # mock
-  class SpecGeneratorTestClass
+  class SpeccableTestClass
     attr_accessor :world_property
 
-    include Tetra::SpecGenerator
-    attr_reader :project
-    attr_reader :package_name
-    attr_reader :spec_dir
-    attr_reader :template_spec_name
+    include Tetra::Speccable
 
-    def initialize(project)
+    def initialize
       @world_property = "World!"
-
-      @project = project
-      @package_name = "test-package"
-      @spec_dir = "kit"
-      @template_spec_name = "test.spec"
     end
   end
 
@@ -31,10 +22,10 @@ describe Tetra::SpecGenerator do
     @template_path = File.join(instance.template_path, "test.spec")
     File.open(@template_path, "w") { |io| io.puts "Hello <%= world_property %>\nintentionally blank line\n" }
 
-    @destination_path = File.join("output", instance.package_name, "#{instance.package_name}.spec")
+    @destination_path = File.join("output", "test-package", "test-package.spec")
   end
 
-  let(:instance) { SpecGeneratorTestClass.new(@project) }
+  let(:instance) { SpeccableTestClass.new }
 
   after(:each) do
     delete_mock_project
@@ -43,7 +34,7 @@ describe Tetra::SpecGenerator do
 
   describe "#to_spec" do
     it "generates a first version" do
-      expect(instance.to_spec).to be_truthy
+      expect(instance._to_spec(@project, "test-package", "kit", "test.spec")).to be_truthy
 
       @project.from_directory do
         spec_lines = File.readlines(@destination_path)
@@ -52,7 +43,7 @@ describe Tetra::SpecGenerator do
     end
 
     it "generates a second version" do
-      expect(instance.to_spec).to be_truthy
+      expect(instance._to_spec(@project, "test-package", "kit", "test.spec")).to be_truthy
 
       @project.from_directory do
         File.open(@destination_path, "a") do |io|
@@ -62,7 +53,7 @@ describe Tetra::SpecGenerator do
 
       instance.world_property = "Mario!"
 
-      expect(instance.to_spec).to be_truthy
+      expect(instance._to_spec(@project, "test-package", "kit", "test.spec")).to be_truthy
 
       @project.from_directory do
         spec_lines = File.readlines(@destination_path)
@@ -73,7 +64,7 @@ describe Tetra::SpecGenerator do
     end
 
     it "generates a conflicting version" do
-      expect(instance.to_spec).to be_truthy
+      expect(instance._to_spec(@project, "test-package", "kit", "test.spec")).to be_truthy
 
       @project.from_directory do
         spec_contents = File.read(@destination_path)
@@ -86,7 +77,7 @@ describe Tetra::SpecGenerator do
 
       instance.world_property = "Mario!"
 
-      expect(instance.to_spec).to be_truthy
+      expect(instance._to_spec(@project, "test-package", "kit", "test.spec")).to be_truthy
 
       @project.from_directory do
         spec_lines = File.readlines(@destination_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.44.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -167,23 +167,22 @@ files:
 - lib/template/kit/jars/CONTENTS
 - lib/template/kit/m2/settings.xml
 - lib/template/kit_item.spec
-- lib/template/output/CONTENTS
 - lib/template/package.spec
+- lib/template/packages/CONTENTS
+- lib/template/packages/kit/CONTENTS
 - lib/template/src/CONTENTS
 - lib/tetra.rb
 - lib/tetra/ant_runner.rb
-- lib/tetra/archiver.rb
 - lib/tetra/commands/ant.rb
 - lib/tetra/commands/base.rb
 - lib/tetra/commands/download_maven_source_jars.rb
 - lib/tetra/commands/dry_run.rb
 - lib/tetra/commands/finish.rb
 - lib/tetra/commands/generate_all.rb
-- lib/tetra/commands/generate_kit_archive.rb
-- lib/tetra/commands/generate_kit_spec.rb
-- lib/tetra/commands/generate_package_archive.rb
-- lib/tetra/commands/generate_package_script.rb
-- lib/tetra/commands/generate_package_spec.rb
+- lib/tetra/commands/generate_archive.rb
+- lib/tetra/commands/generate_kit.rb
+- lib/tetra/commands/generate_script.rb
+- lib/tetra/commands/generate_spec.rb
 - lib/tetra/commands/get_pom.rb
 - lib/tetra/commands/get_source.rb
 - lib/tetra/commands/init.rb
@@ -191,23 +190,24 @@ files:
 - lib/tetra/commands/move_jars_to_kit.rb
 - lib/tetra/commands/mvn.rb
 - lib/tetra/git.rb
-- lib/tetra/glue_kit_item.rb
-- lib/tetra/jar_kit_item.rb
-- lib/tetra/kit.rb
 - lib/tetra/kit_checker.rb
 - lib/tetra/kit_runner.rb
 - lib/tetra/logger.rb
 - lib/tetra/main.rb
-- lib/tetra/maven_kit_item.rb
 - lib/tetra/maven_runner.rb
 - lib/tetra/maven_website.rb
-- lib/tetra/package.rb
+- lib/tetra/packages/archivable.rb
+- lib/tetra/packages/built_package.rb
+- lib/tetra/packages/glue_kit_item.rb
+- lib/tetra/packages/jar_kit_item.rb
+- lib/tetra/packages/kit.rb
+- lib/tetra/packages/maven_kit_item.rb
+- lib/tetra/packages/scriptable.rb
+- lib/tetra/packages/speccable.rb
 - lib/tetra/pom.rb
 - lib/tetra/pom_getter.rb
 - lib/tetra/project.rb
-- lib/tetra/script_generator.rb
 - lib/tetra/source_getter.rb
-- lib/tetra/spec_generator.rb
 - lib/tetra/version.rb
 - lib/tetra/version_matcher.rb
 - spec/data/ant-super-simple-code/build.xml
@@ -227,7 +227,8 @@ files:
 - spec/data/struts-apps/pom.xml
 - spec/data/tomcat/pom.xml
 - spec/lib/ant_runner_spec.rb
-- spec/lib/archiver_spec.rb
+- spec/lib/archivable_spec.rb
+- spec/lib/built_package_spec.rb
 - spec/lib/git_spec.rb
 - spec/lib/glue_kit_item_spec.rb
 - spec/lib/kit_checker_spec.rb
@@ -235,13 +236,12 @@ files:
 - spec/lib/maven_kit_item_spec.rb
 - spec/lib/maven_runner_spec.rb
 - spec/lib/maven_website_spec.rb
-- spec/lib/package_spec.rb
 - spec/lib/pom_getter_spec.rb
 - spec/lib/pom_spec.rb
 - spec/lib/project_spec.rb
-- spec/lib/script_generator_spec.rb
+- spec/lib/scriptable_spec.rb
 - spec/lib/source_getter_spec.rb
-- spec/lib/spec_generator_spec.rb
+- spec/lib/speccable.rb
 - spec/lib/version_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/kit_runner_examples.rb

data/lib/tetra/archiver.rb

@@ -1,31 +0,0 @@
-# encoding: UTF-8
-
-module Tetra
-  # implements a to_archive method
-  module Archiver
-    include Logging
-    # expected attributes:
-    #   project (Tetra::Project)
-    #   package_name (string)
-    #   source_dir (string)
-    #   source_paths ([string])
-    #   destination_dir (string)
-
-    # generates an archive and returns its name
-    # this will archive source_paths starting from source_dir in
-    # destination_dir + package_name + extension
-    def to_archive
-      full_destination_dir = File.join(project.full_path, "output", destination_dir)
-      FileUtils.mkdir_p(full_destination_dir)
-
-      project.from_directory(source_dir) do
-        destination_path = File.join(full_destination_dir, "#{package_name}.tar.xz")
-        log.debug "creating #{destination_path}"
-
-        `tar -cJf #{destination_path} #{source_paths.join(" ")}`
-
-        destination_path
-      end
-    end
-  end
-end

data/lib/tetra/commands/generate_kit_archive.rb

@@ -1,18 +0,0 @@
-# encoding: UTF-8
-
-module Tetra
-  # tetra generate-kit-archive
-  class GenerateKitArchiveCommand < Tetra::BaseCommand
-    def execute
-      checking_exceptions do
-        project = Tetra::Project.new(".")
-        ensure_dry_running(false, project) do
-          Tetra::Kit.new(project).items.each do |item|
-            result_path = item.to_archive
-            print_generation_result(project, result_path)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/tetra/commands/generate_package_script.rb

@@ -1,18 +0,0 @@
-# encoding: UTF-8
-
-module Tetra
-  # tetra generate-package-script
-  class GeneratePackageScriptCommand < Tetra::BaseCommand
-    def execute
-      checking_exceptions do
-        project = Tetra::Project.new(".")
-        ensure_dry_running(false, project) do
-          history_file = File.join(Dir.home, ".bash_history")
-          result_path, conflict_count = Tetra::ScriptGenerator.new(project, history_file)
-            .generate_build_script
-          print_generation_result(project, result_path, conflict_count)
-        end
-      end
-    end
-  end
-end

data/lib/tetra/script_generator.rb

@@ -1,58 +0,0 @@
-# encoding: UTF-8
-
-module Tetra
-  # generates build scripts from bash_history
-  class ScriptGenerator
-    include Logging
-
-    def initialize(project, history_path)
-      @project = project
-      @ant_runner = Tetra::AntRunner.new(project)
-      @maven_runner = Tetra::MavenRunner.new(project)
-      @history_path = history_path
-    end
-
-    def generate_build_script
-      @project.from_directory do
-        history_lines = File.readlines(@history_path).map { |e| e.strip }
-        relevant_lines =
-          history_lines
-            .reverse
-            .take_while { |e| e.match(/tetra +dry-run/).nil? }
-            .reverse
-            .take_while { |e| e.match(/tetra +finish/).nil? }
-            .select { |e| e.match(/^#/).nil? }
-
-        script_lines = [
-          "#!/bin/bash",
-          "set -xe",
-          "PROJECT_PREFIX=`readlink -e .`",
-          "cd #{@project.latest_dry_run_directory}"
-        ] +
-        relevant_lines.map do |line|
-          if line =~ /tetra +mvn/
-            line.gsub(/tetra +mvn/, "#{@maven_runner.get_maven_commandline("$PROJECT_PREFIX", ["-o"])}")
-          elsif line =~ /tetra +ant/
-            line.gsub(/tetra +ant/, "#{@ant_runner.get_ant_commandline("$PROJECT_PREFIX")}")
-          else
-            line
-          end
-        end
-
-        new_content = script_lines.join("\n") + "\n"
-
-        result_path = File.join("src", "build.sh")
-        conflict_count = @project.merge_new_content(new_content, result_path, "Build script generated",
-                                                    "generate_build_script")
-
-        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)
-
-        [destination_script_path, conflict_count]
-      end
-    end
-  end
-end

data/spec/lib/archiver_spec.rb

@@ -1,50 +0,0 @@
-# encoding: UTF-8
-
-require "spec_helper"
-
-describe Tetra::Archiver do
-  include Tetra::Mockers
-
-  # mock
-  class TestArchiverClass
-    include Tetra::Archiver
-
-    attr_reader :project
-    attr_reader :package_name
-    attr_reader :source_dir
-    attr_reader :source_paths
-    attr_reader :destination_dir
-
-    def initialize(project)
-      @project = project
-      @package_name = "test-package"
-      @source_dir = "kit"
-      @source_paths = ["*"]
-      @destination_dir = "test-package"
-    end
-  end
-
-  before(:each) do
-    create_mock_project
-  end
-
-  let(:instance) { TestArchiverClass.new(@project) }
-
-  after(:each) do
-    delete_mock_project
-  end
-
-  describe "#to_archive" do
-    it "generates an archive" do
-      @project.from_directory("kit") do
-        FileUtils.touch("kit_test")
-      end
-
-      instance.to_archive
-
-      @project.from_directory do
-        expect(`tar -Jtf output/test-package/test-package.tar.xz`.split).to include("kit_test")
-      end
-    end
-  end
-end