tetra 1.2.2 → 2.0.0

data/spec/lib/coarse/init_subcommand_spec.rb

@@ -0,0 +1,85 @@
+require "spec_helper"
+
+describe "`tetra`", type: :aruba do
+  it "shows an error if required parameters are not set" do
+    run_simple("tetra init", false)
+
+    expect(stderr_from("tetra init")).to include("parameter 'PACKAGE_NAME': no value provided")
+  end
+
+  it "shows an error if required parameters are not set, even if options are set" do
+    run_simple("tetra init -n", false)
+
+    expect(stderr_from("tetra init -n")).to include("parameter 'PACKAGE_NAME': no value provided")
+  end
+
+  it "shows an error if no sources are specified and -n is not set" do
+    run_simple("tetra init mypackage", false)
+
+    expect(stderr_from("tetra init mypackage")).to include("please specify a source archive")
+
+    check_directory_presence(["mypackage"], false)
+  end
+
+  it "inits a new project without sources" do
+    run_simple("tetra init --no-archive mypackage")
+
+    expect(output_from("tetra init --no-archive mypackage")).to include("Project inited in mypackage/.")
+
+    check_directory_presence(["mypackage"], true)
+    cd("mypackage")
+    check_directory_presence([".git", "kit", "src"], true)
+  end
+
+  it "inits a new project with a zip source file" do
+    archive_contents = File.read(File.join("spec", "data", "commons-collections-3.2.1-src.zip"))
+    write_file("commons-collections.zip", archive_contents)
+
+    run_simple("tetra init commons-collections commons-collections.zip")
+
+    output = output_from("tetra init commons-collections commons-collections.zip")
+    expect(output).to include("Project inited in commons-collections/.")
+    expect(output).to include("Sources decompressed in commons-collections/src/")
+    expect(output).to include("original archive copied in commons-collections/packages/.")
+    expect(output).to include("Please add any other precompiled build dependency to kit/.")
+
+    check_directory_presence(["commons-collections"], true)
+
+    cd("commons-collections")
+    check_directory_presence([".git", "kit", "src", "packages"], true)
+
+    check_directory_presence([File.join("src", "commons-collections-3.2.1-src")], true)
+    check_file_presence([File.join("src", "commons-collections-3.2.1-src", "pom.xml")], true)
+
+    check_file_presence([File.join("packages", "commons-collections", "commons-collections.zip")], true)
+
+    run_simple("git rev-list --format=%B --max-count=1 HEAD")
+    expect(stdout_from("git rev-list --format=%B --max-count=1 HEAD")).to include("Inital sources added from archive")
+  end
+
+  it "inits a new project with a tar source file" do
+    archive_contents = File.read(File.join("spec", "data", "commons-collections-3.2.1-src.tar.gz"))
+    write_file("commons-collections.tar.gz", archive_contents)
+
+    run_simple("tetra init commons-collections commons-collections.tar.gz")
+
+    output = output_from("tetra init commons-collections commons-collections.tar.gz")
+    expect(output).to include("Project inited in commons-collections/.")
+    expect(output).to include("Sources decompressed in commons-collections/src/")
+    expect(output).to include("original archive copied in commons-collections/packages/.")
+    expect(output).to include("Please add any other precompiled build dependency to kit/.")
+
+    check_directory_presence(["commons-collections"], true)
+
+    cd("commons-collections")
+    check_directory_presence([".git", "kit", "src", "packages"], true)
+
+    check_directory_presence([File.join("src", "commons-collections-3.2.1-src")], true)
+    check_file_presence([File.join("src", "commons-collections-3.2.1-src", "pom.xml")], true)
+
+    check_file_presence([File.join("packages", "commons-collections", "commons-collections.tar.gz")], true)
+
+    run_simple("git rev-list --format=%B --max-count=1 HEAD")
+    expect(stdout_from("git rev-list --format=%B --max-count=1 HEAD")).to include("Inital sources added from archive")
+  end
+end

data/spec/lib/coarse/main_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe "`tetra`", type: :aruba do
+  it "lists subcommands" do
+    run_simple("tetra")
+
+    expect(stdout_from("tetra")).to include("Usage:")
+
+    expect(stdout_from("tetra")).to include("init")
+    expect(stdout_from("tetra")).to include("dry-run")
+    expect(stdout_from("tetra")).to include("generate-kit")
+    expect(stdout_from("tetra")).to include("generate-script")
+    expect(stdout_from("tetra")).to include("generate-spec")
+    expect(stdout_from("tetra")).to include("generate-all")
+    expect(stdout_from("tetra")).to include("patch")
+    expect(stdout_from("tetra")).to include("move-jars-to-kit")
+    expect(stdout_from("tetra")).to include("get-pom")
+  end
+end

data/spec/lib/{git_spec.rb → fine/git_spec.rb}

@@ -38,19 +38,67 @@ describe Tetra::Git do
     end
   end
 
-  describe "#commit_whole_directory" do
-    it "commits all contents of a directory to git for later use" do
+  describe "#commit_directories" do
+    it "commits contents of multiple directories to git for later use" do
       Dir.chdir(@git_path) do
         FileUtils.touch("file1")
-        Dir.mkdir("subdir")
-        FileUtils.touch(File.join("subdir", "file2"))
+        Dir.mkdir("subdir1")
+        FileUtils.touch(File.join("subdir1", "file2"))
+        Dir.mkdir("subdir2")
+        FileUtils.touch(File.join("subdir2", "file3"))
 
-        @git.commit_whole_directory("subdir", "test")
+        @git.commit_directories(%w(subdir1 subdir2), "test")
 
         files = `git ls-tree --name-only -r HEAD`.split("\n")
 
         expect(files).not_to include("file1")
-        expect(files).to include("subdir/file2")
+        expect(files).to include("subdir1/file2")
+        expect(files).to include("subdir2/file3")
+      end
+    end
+  end
+
+  describe "#revert_directories" do
+    it "reverts contents of multiple directories from git" do
+      Dir.chdir(@git_path) do
+        FileUtils.touch("expected_file")
+        Dir.mkdir("subdir1")
+        FileUtils.touch(File.join("subdir1", "expected_file"))
+        Dir.mkdir("subdir2")
+        FileUtils.touch(File.join("subdir2", "expected_file"))
+        @git.commit_directories(["."], "test-start")
+
+        FileUtils.touch(File.join("subdir1", "unexpected_file"))
+        FileUtils.touch(File.join("subdir2", "unexpected_file"))
+
+        @git.commit_directories(%w(subdir1 subdir2), "test-end")
+
+        @git.revert_directories(%w(subdir1 subdir2), @git.latest_id("test-start"))
+
+        files = Find.find(".").to_a
+
+        expect(files).to include("./expected_file")
+        expect(files).to include("./subdir1/expected_file")
+        expect(files).to include("./subdir2/expected_file")
+        expect(files).not_to include("./subdir1/unexpected_file")
+        expect(files).not_to include("./subdir2/unexpected_file")
+      end
+    end
+  end
+
+  describe "#disable_special_files" do
+    it "renames git special files to 'disable' them" do
+      Dir.chdir(@git_path) do
+        Dir.mkdir("src")
+        FileUtils.touch(File.join("src", ".gitignore"))
+        Dir.mkdir(File.join("src", ".git"))
+
+        @git.disable_special_files("src")
+
+        files = Dir.new("src").to_a
+
+        expect(files).not_to include(".gitignore")
+        expect(files).not_to include(".git")
       end
     end
   end

data/spec/lib/{package_spec.rb → fine/package_spec.rb}

@@ -7,6 +7,12 @@ describe Tetra::Package do
 
   before(:each) do
     create_mock_project
+
+    Dir.chdir(@project_path) do
+      FileUtils.mkdir_p(File.join("packages", "test-project"))
+      FileUtils.touch(File.join("packages", "test-project", "test-project-4.0.tar.gz"))
+    end
+
     @project.dry_run
     Dir.chdir(@project_path) do
       FileUtils.touch(File.join("kit", "jars", "test.jar"))
@@ -51,6 +57,7 @@ describe Tetra::Package do
         expect(spec_lines).to include("License:        The Apache Software License, Version 2.0\n")
         expect(spec_lines).to include("Summary:        Nailgun is a client, protocol, and server for running Java\n")
         expect(spec_lines).to include("Url:            http://martiansoftware.com/nailgun\n")
+        expect(spec_lines).to include("Source0:        test-project-4.0.tar.gz\n")
         expect(spec_lines).to include("BuildRequires:  test-project-kit == #{@project.version}\n")
         expect(spec_lines).to include("Provides:       mvn(com.martiansoftware:nailgun-server) == 0.9.1\n")
         expect(spec_lines).to include("Provides:       mvn(com.martiansoftware:nailgun-examples) == 0.9.1\n")

data/spec/lib/{project_spec.rb → fine/project_spec.rb}

@@ -96,26 +96,6 @@ describe Tetra::Project do
     end
   end
 
-  describe "#commit_whole_directory" do
-    it "commits the project contents to git for later use" do
-      @project.from_directory do
-        FileUtils.touch(File.join("kit", "test"))
-
-        # check that gitignore files are moved correctly
-        File.open(File.join("src", ".gitignore"), "w") do |file|
-          file.write "file"
-        end
-
-        @project.commit_whole_directory(".", "test")
-
-        files = `git ls-tree --name-only -r HEAD`.split("\n")
-        expect(files).to include("src/.gitignore_disabled_by_tetra")
-
-        expect(`git rev-list --all`.split("\n").length).to eq 2
-      end
-    end
-  end
-
   describe "#finish" do
     it "ends the current dry-run phase after a successful build" do
       @project.from_directory do
@@ -217,24 +197,6 @@ describe Tetra::Project do
     end
   end
 
-  describe "#archive_source" do
-    it "archives the latest source version" do
-      @project.from_directory do
-        FileUtils.touch(File.join("src", "Included.java"))
-        @project.commit_sources("first version", true)
-
-        FileUtils.touch(File.join("src", "Excluded.java"))
-        @project.commit_sources("patched version")
-
-        @project.archive_sources
-
-        file_list = `tar --list -f packages/test-project/test-project.tar.xz`.split
-        expect(file_list).to include("src/Included.java")
-        expect(file_list).not_to include("src/Excluded.java")
-      end
-    end
-  end
-
   describe "#write_source_patches" do
     it "writes patches from the tarball generated by archive_source" do
       @project.from_directory do
@@ -243,7 +205,7 @@ describe Tetra::Project do
         @project.commit_sources("first version", true)
 
         File.open(test_file, "w") { |f| f.write("A") }
-        @project.commit_sources("patched version")
+        @project.commit_sources("patched version", false)
 
         patches = @project.write_source_patches.map { |f| File.basename(f) }
         expect(patches).to include("0001-patched-version.patch")

data/spec/lib/fine/tar_spec.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+require "spec_helper"
+
+describe Tetra::Tar do
+  include Tetra::Mockers
+
+  let(:zipfile) { File.join("spec", "data", "commons-collections-3.2.1-src.tar.gz") }
+  let(:tar) { Tetra::Tar.new }
+
+  describe "#decompress"  do
+    it "decompresses a file in a directory" do
+      Dir.mktmpdir do |dir|
+        tar.decompress(zipfile, dir)
+
+        files = Find.find(dir).to_a
+
+        expect(files).to include("#{dir}/commons-collections-3.2.1-src/DEVELOPERS-GUIDE.html")
+      end
+    end
+  end
+end

data/spec/lib/fine/unzip_spec.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+require "spec_helper"
+
+describe Tetra::Unzip do
+  include Tetra::Mockers
+
+  let(:zipfile) { File.join("spec", "data", "commons-collections-3.2.1-src.zip") }
+  let(:unzip) { Tetra::Unzip.new }
+
+  describe "#decompress"  do
+    it "decompresses a file in a directory" do
+      Dir.mktmpdir do |dir|
+        unzip.decompress(zipfile, dir)
+
+        files = Find.find(dir).to_a
+
+        expect(files).to include("#{dir}/commons-collections-3.2.1-src/DEVELOPERS-GUIDE.html")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,15 +1,32 @@
 # encoding: UTF-8
 
+require "aruba/api"
+require "aruba/reporting"
+
 require "tetra"
 
+# configure aruba for rspec use
+RSpec.configure do |config|
+  config.include Aruba::Api
+
+  # use tetra executable from the bin path, not the system-installed one
+  config.before(:suite) do
+    ENV["PATH"] = "#{File.join(File.dirname(__FILE__), '..', 'bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+  end
+
+  # set up aruba API
+  config.before(:each) do
+    restore_env
+    clean_current_dir
+  end
+end
+
 module Tetra
   # custom mock methods
   module Mockers
     # creates a minimal tetra project
     def create_mock_project
       @project_path = File.join("spec", "data", "test-project")
-      Dir.mkdir(@project_path)
-
       Tetra::Project.init(@project_path, false)
       @project = Tetra::Project.new(@project_path)
     end

data/tetra.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "aruba"
 
   s.add_runtime_dependency "clamp"
   s.add_runtime_dependency "json_pure"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tetra
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +150,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rubocop.yml
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -142,8 +159,6 @@ files:
 - Rakefile
 - SPECIAL_CASES.md
 - bin/tetra
-- integration-tests/build-commons.sh
-- integration-tests/commons-collections-3.2.1-src.zip
 - lib/template/bashrc
 - lib/template/bundled/apache-ant-1.9.4/INSTALL
 - lib/template/bundled/apache-ant-1.9.4/KEYS
@@ -311,7 +326,6 @@ files:
 - lib/template/bundled/apache-maven-3.2.5/lib/wagon-http.license
 - lib/template/bundled/apache-maven-3.2.5/lib/wagon-provider-api-2.8.jar
 - lib/template/bundled/apache-maven-3.2.5/lib/wagon-provider-api.license
-- lib/template/gitignore
 - lib/template/kit.spec
 - lib/template/kit/.keep
 - lib/template/kit/jars/.keep
@@ -325,6 +339,8 @@ files:
 - lib/tetra/facades/git.rb
 - lib/tetra/facades/mvn.rb
 - lib/tetra/facades/process_runner.rb
+- lib/tetra/facades/tar.rb
+- lib/tetra/facades/unzip.rb
 - lib/tetra/generatable.rb
 - lib/tetra/kit.rb
 - lib/tetra/logger.rb
@@ -336,9 +352,10 @@ files:
 - lib/tetra/pom.rb
 - lib/tetra/pom_getter.rb
 - lib/tetra/project.rb
+- lib/tetra/project_initer.rb
+- lib/tetra/ui/change_sources_subcommand.rb
 - lib/tetra/ui/dry_run_subcommand.rb
 - lib/tetra/ui/generate_all_subcommand.rb
-- lib/tetra/ui/generate_archive_subcommand.rb
 - lib/tetra/ui/generate_kit_subcommand.rb
 - lib/tetra/ui/generate_script_subcommand.rb
 - lib/tetra/ui/generate_spec_subcommand.rb
@@ -359,6 +376,8 @@ files:
 - spec/data/ant-super-simple-code/src/mypackage/HW.java
 - spec/data/antlr/antlr-2.7.2.jar
 - spec/data/antlr/pom.xml
+- spec/data/commons-collections-3.2.1-src.tar.gz
+- spec/data/commons-collections-3.2.1-src.zip
 - spec/data/commons-logging/commons-logging-1.1.1.jar
 - spec/data/commons-logging/parent_pom.xml
 - spec/data/commons-logging/pom.xml
@@ -366,19 +385,26 @@ files:
 - spec/data/nailgun/pom.xml
 - spec/data/struts-apps/pom.xml
 - spec/data/tomcat/pom.xml
-- spec/lib/ant_spec.rb
-- spec/lib/git_spec.rb
-- spec/lib/kit_package_spec.rb
-- spec/lib/kit_spec.rb
-- spec/lib/maven_website_spec.rb
-- spec/lib/mvn_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/scriptable_spec.rb
-- spec/lib/speccable_spec.rb
-- spec/lib/version_matcher_spec.rb
+- spec/lib/coarse/dry_run_subcommand_spec.rb
+- spec/lib/coarse/generate_all_subcommand_spec.rb
+- spec/lib/coarse/generate_spec_subcommand_spec.rb
+- spec/lib/coarse/init_subcommand_spec.rb
+- spec/lib/coarse/main_spec.rb
+- spec/lib/fine/ant_spec.rb
+- spec/lib/fine/git_spec.rb
+- spec/lib/fine/kit_package_spec.rb
+- spec/lib/fine/kit_spec.rb
+- spec/lib/fine/maven_website_spec.rb
+- spec/lib/fine/mvn_spec.rb
+- spec/lib/fine/package_spec.rb
+- spec/lib/fine/pom_getter_spec.rb
+- spec/lib/fine/pom_spec.rb
+- spec/lib/fine/project_spec.rb
+- spec/lib/fine/scriptable_spec.rb
+- spec/lib/fine/speccable_spec.rb
+- spec/lib/fine/tar_spec.rb
+- spec/lib/fine/unzip_spec.rb
+- spec/lib/fine/version_matcher_spec.rb
 - spec/spec_helper.rb
 - tetra.gemspec
 - utils/delete_nonet_user.sh