gjp 0.17.1 → 0.18.0

data/README.md

@@ -36,11 +36,11 @@ Building a package with `gjp` is quite unusual — this is a [deliberate choice]
 The basic process is:
 
 * a `gjp` project is created;
-* sources are added to the project, `gjp` keeps track of them;
-* any other file that is needed for the build, except the JDK, is added in binary form (jars, the Maven executable, its plugins,  etc.). Again, `gjp` keeps track of what you add, noting that those were binary build dependencies and not sources;
-* a build is attempted. After the build is successful, `gjp` tracks which files were produced and restores sources in their original state, making it a "repeatable dry-run build". `gjp` also retains any files that were automatically downloaded by Maven or other similar tools during the dry-run as binary build dependencies;
-* `gjp` produces spec files for two packages: one for the project itself and one for all of its binary build dependencies, called a **kit**;
-* kit and project packages can be submitted to [OBS](http://en.opensuse.org/openSUSE:Build_Service). Project package will rebuild cleanly because it needs no Internet access - all files were already downloaded during the dry-run above and are included in the kit.
+* package sources are added in `src/<package name>`;
+* any other file that is needed for the build, except the JDK, is added in binary form (jars, the Maven executable, plugins,  etc.) in `kit/`. In `gjp` a **kit** is a set of binary files that satisfies all build dependencies in a `gjp` project;
+* a build is attempted and during the build, `gjp` keeps track of file changes. When it finishes, `gjp` restores `src/` in its original state, making it a "repeatable dry-run build". `gjp` will retain any files that were automatically downloaded by Maven or other similar tools in `kit/`, along with other binary build dependencies, and create a list of files produced by the build for later spec generation;
+* `gjp` produces spec files for two packages: one for the project itself and one for the kit needed to build it;
+* kit and project packages can be submitted to [OBS](http://en.opensuse.org/openSUSE:Build_Service). Project package will rebuild cleanly because it needs no Internet access - all files were already downloaded during the dry-run phase above and are included in the kit.
 
 Note that:
 
@@ -50,15 +50,9 @@ Note that:
 * a `gjp` project can be used to build a number of packages that share one binary kit. This can help if the kit becomes big in size;
 * `gjp` will take advantage of Maven's pom files to generate its specs if they are available. This allows to precompile most spec fields automatically.
 
-In `gjp`, the build process can be in one of the following phases at any given moment:
-
-* **gathering**: in this phase you add sources and kit files. New projects start in this phase, you can always enter it later with `gjp gather`;
-* **dry-running**: in this phase you attempt a build. Any change in the sources will be reverted after it ends, while files added to the kit will be retained. You can enter this phase with `gjp dry-run`;
-* **finishing**: in this phase `gjp` generates specs and archive files. You can enter it running `gjp finish`;
-
 ### Sample project (commons-io)
 
-#### Initialization and first gathering phase
+#### Initialization and project setup
 
 Ceate a new `gjp` project, in this example named "galaxy":
 
@@ -66,7 +60,7 @@ Ceate a new `gjp` project, in this example named "galaxy":
     cd galaxy
     gjp init
 
-`gjp init` automatically starts a new gathering phase in which you can add sources and kit files. It also generated a folder structure and assumes you respect it, in particular, you should place all your projects' source files in `src/`. Every `src/` subfolder will become a separate package named after the folder itself, so use the following commands to create a `commons-collections` folders and populate it:
+`gjp init` generates a folder structure and assumes you respect it, in particular, you should place all your projects' source files in `src/`. Every `src/` subfolder will become a separate package named after the folder itself, so use the following commands to create a `commons-collections` folders and populate it:
 
     cd src
     mkdir commons-collections
@@ -85,18 +79,23 @@ Now let's move to the kit (which, unsurprisingly, should be placed in the `kit/`
 
 This is actually everything needed to do a first dry-run build.
 
-#### First dry-run phase
+#### First dry-run build
 
 Let's call `gjp dry-run` to let `gjp` know we are building and then call Maven. Note that `gjp mvn` is used instead of plain `mvn`: `gjp` will take care of locating the Maven installation in `kit/` and ensure it will store all downloaded files there.
 
     gjp dry-run
     cd src/commons-collections/commons-collections-3.2.1-src/
     gjp mvn package
+
+Success! Now we have to tell gjp to return in normal mode:
+
     gjp finish
 
-Success! At this point `gjp` took note of all needed files, and restored `src/` as it was before the build. This should be sufficient to be able to repeat the build on a machine with no Internet access, but what if we wanted to be 100% sure of that?
+At this point `gjp` restored `src/` as it was before the build and listed outputs in `file_lists/commons-collections_output`. Those will be used later to compile the `%install` and `%files` sections of the project spec.
+
+This should be sufficient to be able to repeat the build on a machine with no Internet access, but what if we wanted to be 100% sure of that?
 
-#### Second, networkless, dry-run phase
+#### Second, networkless, dry-run build
 
 `gjp` has a subcommand to setup a `nonet` user without Internet access, courtesy of `iptables`. You can simply retry the build using that user to see if it works. Note that the following commands will alter group permissions to allow both your current user and `nonet` to work on the same files. 
 
@@ -108,17 +107,18 @@ Success! At this point `gjp` took note of all needed files, and restored `src/`
     gjp mvn package
     chmod -R g+rw .
     exit
+    gjp finish
 
 The above is obviously not mandatory, but it can be useful for debugging purposes.
 
-#### Second gathering phase: adding a build.sh file
+#### Adding a build.sh file
 
 One last thing before generating packages is to setup a build script. By default `gjp` will generate a spec file which assumes a `build.sh` script in the source folder of your project that contains all commands needed to build the package itself. At the moment, this needs to be done manually, but it will hopefully be automated in a future release.
 
-Let's start a new gathering phase and add that:
+Let's just create it:
 
-    gjp gather
-    vi ../build.sh
+    cd ../../..
+    vi src/commons-collections/build.sh
 
 Add the following lines:
 
@@ -127,10 +127,6 @@ Add the following lines:
     ../../../kit/apache-maven-3.1.0/bin/mvn -Dmaven.repo.local=`readlink -e ../../../kit/m2` -s`readlink -e ../../../kit/m2/settings.xml` package
 
 Note that `build.sh` gets called from the `gjp` project root, hence the `cd` line, and the Maven line was taken directly from `gjp mvn` output above and pasted verbatim.
-Now complete the gathering:
-
-    gjp finish
-    cd ../../..
 
 #### Generating archives and spec files
 
@@ -154,10 +150,7 @@ You can then generate the project spec and archive files provided you have a pom
     gjp generate-package-archive commons-collections
     less specs/commons-collections.spec
 
-commons-collection BuldRequires galaxy-kit, its archive contains only source files and it will install any produced .jar file in `/usr/lib/java`. The archive is generated from `file_lists/commons-collections_input`, which lists source files. Output files are in `file_lists/commons-collections_output` and are used to compile the `%install` and `%files` sections of the project spec (by default only jar files are included, see `gjp generate-package-spec --help`).
-
-    less file_lists/commons-collections_input
-    less file_lists/commons-collections_output
+commons-collection BuldRequires galaxy-kit, its archive contains only source files and it will install any produced .jar file in `/usr/lib/java`.
 
 Packages are ready to be submitted to an OBS project. As OBS integration is not yet implemented, refer to OBS documentation to do that.
 
@@ -184,8 +177,6 @@ You are advised to use [Maven Central](http://search.maven.org/) to search for s
 
 ### Troubleshooting
 
-To know in which phase you are in, use `gjp status`.
-
 `gjp` internally uses `git` to keep track of files, any gjp project is actually also a `git` repo. Feel free to navigate it, you can commit, push and pull freely as long as the `gjp` tags are preserved. You can also delete commits and tags, effectively rewiding gjp history (just make sure to delete all tags pointing to a certain commit when you discard it).
 
 ## Motivation

data/integration-tests/commons-io.sh

@@ -22,15 +22,14 @@ cd ..
 gjp dry-run
 cd src/commons-collections/commons-collections-3.2.1-src/
 gjp mvn package
+gjp finish
 
-gjp gather
-cat >../build.sh << "EOF"
+cd ../../..
+cat >src/commons-collections/build.sh << "EOF"
 #!/bin/sh
 cd src/commons-collections/commons-collections-3.2.1-src/
 ../../../kit/apache-maven-3.1.0/bin/mvn -Dmaven.repo.local=`readlink -e ../../../kit/m2` -s`readlink -e ../../../kit/m2/settings.xml` package
 EOF
-gjp finish
-cd ../../..
 
 gjp generate-kit-spec
 gjp generate-kit-archive

data/lib/gjp/archiver.rb

@@ -9,39 +9,29 @@ module Gjp
       @project = project
     end
 
-    # generates an archive for the s kit package based on ts file list
+    # generates an archive for the kit package
     def archive_kit
-      list_file = File.join(@project.full_path, "file_lists/kit")
-      if not File.exist? list_file
-        return nil
-      end
       destination_file = File.join(@project.full_path, "archives/#{@project.name}-kit.tar.xz")
 
-      @project.from_directory "kit" do
-        archive list_file, destination_file
-      end
+      archive("kit", destination_file)
       
       Pathname.new(destination_file).relative_path_from Pathname.new(@project.full_path)
     end
 
     # generates an archive for a project's package based on its file list
     def archive_package(name)
-      list_file = File.join(@project.full_path, "file_lists/#{name}_input")
-      if not File.exist? list_file
-        return nil
-      end
       destination_file = File.join(@project.full_path, "archives/#{name}.tar.xz")
 
-      @project.from_directory File.join("src", name) do
-        archive list_file, destination_file
-      end
+      archive(File.join("src", name), destination_file)
 
       Pathname.new(destination_file).relative_path_from Pathname.new(@project.full_path)
     end
 
-    # compresses files specified in the list file to the destination file
-    def archive(list_file, destination_file)
-      `tar --files-from=#{list_file} -cJf #{destination_file}`
+    # archives a folder's contents to the destination file
+    def archive(folder, destination_file)
+      @project.from_directory folder do
+        `tar -cJf #{destination_file} *`
+      end
     end
   end
 end

data/lib/gjp/cli.rb

@@ -39,36 +39,22 @@ module Gjp
     subcommand "init", "Inits a gjp project in the current directory" do
       def execute
         Gjp::Project.init(".")
-        puts "Project inited, now gathering."
-        explain_gathering
+        puts "Project inited."
+        puts "Any file added to kit/ will be added to the kit package."
+        puts "Any file added to src/<name> will be added to the corresponding package."
+        puts "When you are ready to test a build, use \"gjp dry-run\"."
       end
     end
 
-    subcommand "gather", "Starts a gathering phase, to add source and kit files" do
-      def execute
-        if Gjp::Project.new(".").gather
-          puts "Now gathering."
-          explain_gathering
-        end
-      end
-    end
-
-    def explain_gathering
-      puts "Any file added to kit/ will be added to the kit package."
-      puts "Any file added to src/<name> will be added to the corresponding package."
-      puts "When you are ready to test a build, use \"gjp dry-run\"."
-    end
-
-    subcommand "dry-run", "Starts a dry-run phase, to attempt a build" do
+    subcommand "dry-run", "Starts a dry-run build" do
       def execute
         if Gjp::Project.new(".").dry_run
           puts "Now dry-running, please start your build."
           puts "Any file added to kit/, presumably downloaded dependencies, will be added to the kit."
           puts "The src/ directory and all files in it will be brought back to the current state when finished."
           puts "Note that .gitignore files are honored!"
-          puts "To run a Maven from the kit, use \"gjp mvn\"."
-          puts "To add or remove files, use \"gjp gather\"."
-          puts "To finalize this dry run, use \"gjp finish\"."
+          puts "To run Maven from the kit, use \"gjp mvn\"."
+          puts "To end this dry run, use \"gjp finish\"."
         end
       end
     end
@@ -88,25 +74,17 @@ module Gjp
           puts "Real commandline was:"
           puts "#{result}"
         rescue Gjp::MavenNotFoundException
-          puts "mvn executable not found in kit/ or any of its subdirectories, gather it"
+          puts "mvn executable not found in kit/ or any of its subdirectories"
         end
       end
     end
 
-    subcommand "status", "Prints the current phase" do
-      def execute
-        puts "Now #{Gjp::Project.new(".").get_status.to_s}"
-      end
-    end
-
-    subcommand "finish", "Ends the current phase" do
+    subcommand "finish", "Ends the current dry-run" do
       def execute
-        result = Gjp::Project.new(".").finish        
-        if result == :gathering
-          puts "Gathering finished."
-          puts "New files have been added to gjp_file_list files in respective directories."
-          puts "Feel free to edit them if needed."
-          puts "You can start a dry run build with \"gjp dry-run\" or add more files with \"gjp gather\"."
+        if Gjp::Project.new(".").finish
+          puts "Dry-run finished."
+        else
+          puts "No dry-run is in progress."
         end
       end
     end
@@ -123,13 +101,7 @@ module Gjp
       def execute
         project = Gjp::Project.new(".")
         result_path = Gjp::Archiver.new(project).archive_kit
-        if result_path != nil
-          puts "#{result_path} generated"
-        else
-          "The file_list/kit file was not found. Ensure you already added content to kit/ " +
-          "during a gathering and/or dry-running phase, and ensure you ended that phase " +
-          "with \"gjp finish\"."
-        end
+        puts "#{result_path} generated"
       end
     end
 
@@ -154,12 +126,7 @@ module Gjp
       def execute
         project = Gjp::Project.new(".")
         result_path = Gjp::Archiver.new(project).archive_package name
-        if result_path != nil
-          puts "#{result_path} generated"
-        else
-          "The file_list/#{name}_input file was not found. Ensure you have already added content to " +
-          "src/#{name} during a gathering phase, and ensure you ended that phase with \"gjp finish\"."
-        end
+        puts "#{result_path} generated"
       end
     end
 

data/lib/gjp/project.rb

@@ -8,7 +8,7 @@ module Gjp
     include Logger
 
     # list of possible statuses
-    @@statuses = [:gathering, :dry_running]
+    @@statuses = [:dry_running]
 
     attr_accessor :full_path
 
@@ -45,8 +45,8 @@ module Gjp
         Dir.mkdir "src"
         Dir.mkdir "kit"
 
-        # automatically begin a gathering phase
-        Project.new(".").gather
+        # populate the project with templates and take a snapshot
+        project = Project.new(".")
 
         template_manager = Gjp::TemplateManager.new
         template_manager.copy "archives", "."
@@ -54,25 +54,9 @@ module Gjp
         template_manager.copy "kit", "."
         template_manager.copy "specs", "."
         template_manager.copy "src", "."
-      end
-    end
-
-    # starts a gathering phase, all files added to the project
-    # will be added to packages (including kit)
-    def gather
-      from_directory do
-        status = get_status
-        if status == :gathering
-          return false
-        elsif status == :dry_running
-          finish
-        end
 
-        set_status :gathering
-        take_snapshot "Gathering started", :gathering_started
+        project.take_snapshot "Template files added", :init
       end
-
-      true
     end
 
     # starts a dry running phase: files added to kit/ will be added
@@ -83,8 +67,6 @@ module Gjp
         status = get_status
         if status == :dry_running
           return false
-        elsif status == :gathering
-          finish
         end
 
         set_status :dry_running
@@ -99,22 +81,10 @@ module Gjp
     def finish
       from_directory do
         status = get_status
-        if status == :gathering
-          take_snapshot "Changes during gathering"
-
-          update_changed_file_list "kit", "kit", :gathering_started
-          update_changed_src_file_list :input, :gathering_started
-          take_snapshot "File list updates"
-
-          set_status nil
-          take_snapshot "Gathering finished", :gathering_finished
-
-          :gathering
-        elsif status == :dry_running
+        if status == :dry_running
           take_snapshot "Changes during dry-run"
 
-          update_changed_file_list "kit", "kit", :dry_run_started
-          update_changed_src_file_list :output, :dry_run_started
+          update_output_file_lists
           take_snapshot "File list updates"
 
           revert "src", :dry_run_started
@@ -123,45 +93,42 @@ module Gjp
           set_status nil
           take_snapshot "Dry run finished", :dry_run_finished
 
-          :dry_running
+          return true
         end
       end
+      false
     end
 
-    # updates one of the files that tracks changes in src/ directories form a certain tag
-    # list_name is the name of the list of files to update, there will be one for each
-    # package (subdirectory) in src/
-    def update_changed_src_file_list(list_name, tag)
+    # updates files that contain lists of the output files produced by
+    # the build of each package
+    def update_output_file_lists
       Dir.foreach("src") do |entry|
         if File.directory?(File.join(Dir.getwd, "src", entry)) and entry != "." and entry != ".."
-          update_changed_file_list(File.join("src", entry), "#{entry}_#{list_name.to_s}", tag)
-        end
-      end
-    end
-
-    # updates file_name with the file names changed in directory since tag
-    def update_changed_file_list(directory, file_name, tag)
-      list_file = File.join("file_lists", file_name)
-      tracked_files = if File.exists?(list_file)
-        File.readlines(list_file).map { |line| line.strip }
-      else
-        []
-      end
-
-      new_tracked_files = (
-        `git diff-tree --no-commit-id --name-only -r #{latest_tag(tag)} HEAD`.split("\n")
-        .select { |file| file.start_with?(directory) }
-        .map { |file|file[directory.length + 1, file.length] }
-        .concat(tracked_files)
-        .uniq
-        .sort
-      )
-
-      log.debug("writing file list for #{directory}: #{new_tracked_files.to_s}")
+          directory = File.join("src", entry)
+          file_name = "#{entry}_output"
+          list_file = File.join("file_lists", file_name)
+          tracked_files = if File.exists?(list_file)
+            File.readlines(list_file).map { |line| line.strip }
+          else
+            []
+          end
 
-      File.open(list_file, "w+") do |file_list|
-        new_tracked_files.each do |file|
-          file_list.puts file
+          new_tracked_files = (
+            `git diff-tree --no-commit-id --name-only -r #{latest_tag(:dry_run_started)} HEAD`.split("\n")
+            .select { |file| file.start_with?(directory) }
+            .map { |file|file[directory.length + 1, file.length] }
+            .concat(tracked_files)
+            .uniq
+            .sort
+          )
+
+          log.debug("writing file list for #{directory}: #{new_tracked_files.to_s}")
+
+          File.open(list_file, "w+") do |file_list|
+            new_tracked_files.each do |file|
+              file_list.puts file
+            end
+          end
         end
       end
     end

data/lib/gjp/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Gjp
-  VERSION = "0.17.1"
+  VERSION = "0.18.0"
 end

data/lib/template/archives/CONTENTS

@@ -1,3 +1,3 @@
 gjp will generate source archives for packages here.
 
-Those should not be edited by hand, rather you can edit which files get included by editing contents of the file_lists/ direcotry, and the files themselves from the kit and src/<package name> folders.
+Those should not be edited by hand, rather you should edit the files themselves from the kit and src/<package name> folders.

data/lib/template/file_lists/CONTENTS

@@ -1,3 +1,3 @@
-gjp will generate file lists for all packages here.
+gjp will generate file lists its internal use here.
 
-You can edit them manually if you wish before package generation.
+You should not edit them manually.

data/spec/lib/archiver_spec.rb

@@ -21,9 +21,8 @@ describe Gjp::Archiver do
     it "archives a list of files" do
       @project.from_directory do
         File.open("test", "w") { |io| io.puts "test content" }
-        File.open("test_list", "w") { |io| io.puts "test" }
 
-        archiver.archive "test_list", "test.tar.xz"
+        archiver.archive ".", "test.tar.xz"
         `tar -Jtf test.tar.xz`.split.should include("test")
       end
     end
@@ -46,14 +45,14 @@ describe Gjp::Archiver do
   describe "#archive_package" do
     it "archives a package files" do
       @project.from_directory do
-        Dir.mkdir(File.join("src", "a:b:c"))
-        File.open(File.join("src", "a:b:c", "src_test"), "w") { |io| io.puts "test content" }
+        Dir.mkdir(File.join("src", "package-name"))
+        File.open(File.join("src", "package-name", "src_test"), "w") { |io| io.puts "test content" }
       end
       @project.finish
 
-      archiver.archive_package "a:b:c"
+      archiver.archive_package "package-name"
       @project.from_directory do
-        `tar -Jtf archives/a:b:c.tar.xz`.split.should include("src_test")
+        `tar -Jtf archives/package-name.tar.xz`.split.should include("src_test")
       end
     end
   end

data/spec/lib/maven_runner_spec.rb

@@ -59,7 +59,6 @@ describe Gjp::MavenRunner do
   end
 
   def mock_maven_executable
-    @project.gather
     Dir.chdir(@project_path) do
       @bin_dir = File.join("kit", "mvn", "bin")
       FileUtils.mkdir_p(@bin_dir)
@@ -67,7 +66,5 @@ describe Gjp::MavenRunner do
       File.open(@maven_executable, "w") { |io| io.puts "echo $0 $*>test_out" }
       File.chmod(0777, @maven_executable)
     end
-
-    @project.finish
   end
 end

data/spec/lib/project_spec.rb

@@ -48,21 +48,14 @@ describe Gjp::Project do
 
       src_path = File.join(@project_path, "src")
       Dir.exists?(src_path).should be_true
-
-      @project.from_directory do
-        @project.latest_tag(:gathering_started).should eq "gjp_gathering_started_1"
-        `git rev-list --all`.split("\n").length.should eq 1
-      end
-
-      @project.get_status.should eq :gathering
     end
   end
 
   describe "#set_status" do
     it "stores a project's status flag" do
       @project.from_directory do
-        @project.set_status :gathering
-        File.exists?(".gathering").should be_true
+        @project.set_status :dry_running
+        File.exists?(".dry_running").should be_true
      end
     end
   end
@@ -70,9 +63,9 @@ describe Gjp::Project do
   describe "#get_status" do
     it "gets a project's status flag" do
       @project.from_directory do
-        @project.get_status.should eq :gathering
-        @project.set_status nil
         @project.get_status.should be_nil
+        @project.set_status :dry_running
+        @project.get_status.should eq :dry_running
       end
     end
   end
@@ -90,78 +83,39 @@ describe Gjp::Project do
     end
   end
   
-  describe "#gather" do
-    it "starts a gathering phase" do
-      @project.finish.should eq :gathering
-
-      @project.from_directory do
-        `touch src/test`
-      end
-
-      @project.gather.should be_true
-
-      @project.from_directory do
-        @project.get_status.should eq :gathering
-        `git rev-list --all`.split("\n").length.should eq 5
-        `git diff-tree --no-commit-id --name-only -r HEAD`.split("\n").should include("src/test")
-      end
-    end
-  end
-
   describe "#finish" do
-    it "ends the current gathering phase" do
-      @project.from_directory do
-        Dir.mkdir("src/abc")
-        `touch src/abc/test`
-        `touch kit/test`
-      end
-
-      @project.finish.should eq :gathering
-      @project.get_status.should be_nil
-
-      @project.from_directory do
-        `git rev-list --all`.split("\n").length.should eq 4
-        `git diff-tree --no-commit-id --name-only -r HEAD~2`.split("\n").should include("src/abc/test")
-        File.readlines(File.join("file_lists", "abc_input")).should include("test\n")
-        File.readlines(File.join("file_lists","kit")).should include("test\n")
-      end
-    end
-
     it "ends the current dry-run phase" do
       @project.from_directory do
         Dir.mkdir("src/abc")
         `echo A > src/abc/test`
       end
 
-      @project.finish.should eq :gathering
+      @project.finish.should be_false
 
       @project.dry_run.should be_true
 
       @project.from_directory do
         `echo B > src/abc/test`
         `touch src/abc/test2`
-        `touch kit/test`
       end
 
-      @project.finish.should eq :dry_running
+      @project.finish.should be_true
       @project.get_status.should be_nil
 
       @project.from_directory do
-        `git rev-list --all`.split("\n").length.should eq 9
+        `git rev-list --all`.split("\n").length.should eq 6
         File.read("src/abc/test").should eq "A\n"
         File.readlines(File.join("file_lists", "abc_output")).should include("test2\n")
-        File.readlines(File.join("file_lists", "abc_input")).should_not include("test2\n")
 
         `git diff-tree --no-commit-id --name-only -r HEAD~2`.split("\n").should_not include("src/abc/test2")
         File.exists?("src/abc/test2").should be_false
-        File.readlines(File.join("file_lists", "kit")).should include("test\n")
       end
     end
   end
 
   describe "#dry_run" do
     it "starts a dry running phase" do
-      @project.finish.should eq :gathering
+      @project.finish.should be_false
 
       @project.from_directory do
         `touch src/test`
@@ -171,7 +125,7 @@ describe Gjp::Project do
 
       @project.from_directory do
         @project.get_status.should eq :dry_running
-        `git rev-list --all`.split("\n").length.should eq 5
+        `git rev-list --all`.split("\n").length.should eq 2
         `git diff-tree --no-commit-id --name-only -r HEAD`.split("\n").should include("src/test")
       end
     end

data/spec/lib/scaffolder_spec.rb

@@ -15,7 +15,6 @@ describe Gjp::Scaffolder do
       test_file = File.join("kit", "test")
       File.open(test_file, "w") { |io| io.puts "kit content test file" }
     end
-    @project.gather
 
     @scaffolder = Gjp::Scaffolder.new(@project)
   end
@@ -26,6 +25,9 @@ describe Gjp::Scaffolder do
 
   describe "#generate_kit_spec" do
     it "scaffolds the first version" do
+      @project.dry_run
+      @project.finish
+
       @scaffolder.generate_kit_spec.should be_true
 
       @project.from_directory do
@@ -46,7 +48,7 @@ describe Gjp::Scaffolder do
           io.write("nonconflicting line")
         end
       end
-      @project.gather
+      @project.finish
 
       @scaffolder.generate_kit_spec.should be_true
 
@@ -74,7 +76,6 @@ describe Gjp::Scaffolder do
           io.write(spec_contents)
         end
       end
-      @project.gather
 
       @scaffolder.generate_kit_spec.should be_true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gjp
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake