gjp 0.10.0 → 0.11.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gjp (0.5.0)
+    gjp (0.10.2)
       clamp
       json
       nokogiri
@@ -16,7 +16,9 @@ GEM
     diff-lcs (1.2.4)
     json (1.8.0)
     mime-types (1.23)
-    nokogiri (1.5.9)
+    mini_portile (0.5.1)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     rake (10.0.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)

data/README.md

@@ -15,10 +15,17 @@ Easiest install is via RubyGems:
 ## Usage
 
 Currently available tools:
+* `gjp init` inits a new gjp project in the current directory, generating minimal directories and files;
+* `gjp gather` starts a new gathering phase, to add files to the packages you want to create. You should place source files in src/<orgId_artifactId_version>, and binary dependency files in kit/;
 * `gjp get-pom NAME` will attempt to find a pom. `NAME` can be a jar file on your disk, a project directory, or simply a `name-version` string. `gjp` will get the pom either from the package itself or through search.maven.org using heuristic searching;
 * `gjp get-parent-pom POM` will attempt to download a pom's parent from search.maven.org, where `POM` is a filename or URI;
 * `gjp get-source-address POM` will attempt to find the SCM Internet address of a pom.xml from the file itself or through api.github.com. `POM` can either be a filename or a URI;
 * `gjp get-source POM ADDRESS` downloads the source of a pom.xml's project from its SCM at ADDRESS;
+* `gjp finish` marks the end of a phase;
+* `gjp dry-run` starts a new dry-run phase, where you attempt to build your package. Any change to src/ will be reverted after you call `gjp finish`;
+* `gjp mvn` locates and runs Maven from any directory in kit/, using options to force repository in kit/m2 and settings in kit/m2/settings.xml;
+* `gjp set-up-nonet-user` sets up a user named `nonet` without Internet access using `iptables`, needs superuser privileges. You can then use it for networkless dry-runs;
+* `gjp tear-down-nonet-user` removes a user previously created by gjp;
 * `gjp scaffold-jar-table DIRECTORY` looks for jars in the project's DIRECTORY and classifies them as build-time dependencies (b), run-time dependencies (r) or products (p);
 
 ## Source

data/lib/gjp.rb

@@ -1,12 +1,15 @@
-require "gjp/logger"
 require "gjp/version"
 require "gjp/logger"
-require "gjp/cli"
+require "gjp/project"
 require "gjp/pom"
 require "gjp/version_matcher"
 require "gjp/maven_website"
-require "gjp/get_pom"
-require "gjp/get_parent_pom"
-require "gjp/get_source_address"
-require "gjp/get_source"
 require "gjp/jar_table"
+require "gjp/limited_network_user"
+require "gjp/pom_getter"
+require "gjp/source_address_getter"
+require "gjp/source_getter"
+require "gjp/parent_pom_getter"
+require "gjp/maven_runner"
+
+require "gjp/cli"

data/lib/gjp/cli.rb

@@ -43,6 +43,96 @@ module Gjp
     end
 
     # Subcommands
+    subcommand "init", "Inits a gjp project in the current directory" do
+      def execute
+        Gjp::Project.init(".")
+        puts "Project inited."
+        puts "Use \"gjp gather\" before adding files to have gjp track them."
+      end
+    end
+
+    subcommand "gather", "Starts a gathering phase, add source and kit files to project" do
+      def execute
+        result = Gjp::Project.new(".").gather
+        if result == :done
+          puts "Now gathering."
+          puts "Any file added to kit/ will be added to the kit package."
+          puts "Any file added to src/<orgId_artifactId_version> will be added to the corresponding package."
+          puts "Note that .gitignore files are honored!"
+          puts "To finalize this gathering, use \"gjp finish\"."
+        else
+          puts "Cannot begin gathering while #{result}, use \"gjp finish\" first."
+        end
+      end
+    end
+
+    subcommand "dry-run", "Starts a dry-run phase, attempt build to add dependencies to kit." do
+      def execute
+        result = Gjp::Project.new(".").dry_run
+        if result == :done
+          puts "Now dry-running, please start your build."
+          puts "Any file added to kit/, presumably downloaded dependencies, will be added to the kit package."
+          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 finalize this dry run, use \"gjp finish\"."
+        else
+          puts "Cannot begin a dry run while #{result}, use \"gjp finish\" first."
+        end
+      end
+    end
+
+    subcommand "mvn", "Runs Maven from the kit" do
+      parameter "[MAVEN OPTIONS] ...", "mvn options", :attribute_name => "dummy"
+
+      # override parsing in order to pipe everything to mvn
+      def parse(args)
+        @maven_options = args
+      end
+
+      def execute
+        project = Gjp::Project.new(".")
+        Gjp::MavenRunner.new(project).mvn(@maven_options)
+      end
+    end
+
+
+    subcommand "finish", "Finishes the current phase" 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\"."
+        end
+      end
+    end
+
+    subcommand "set-up-nonet-user", "Sets up a \"nonet\" user that cannot access the network" do
+      def execute
+        user = Gjp::LimitedNetworkUser.new("nonet")
+        user.set_up
+
+        "sudo #{user.get_path("useradd")} nonet\n" +
+        "sudo #{user.get_path("iptables")} -A OUTPUT -m owner --uid-owner nonet -j DROP\n" +
+        "User \"nonet\" set up, you can use \"sudo nonet\" to dry-run your build with no network access.\n" +
+        "Note that the above iptables rule will be cleared at next reboot, you can use your distribution " +
+        "tools to make it persistent or run \"gjp set-up-limited-nertwork-user\" again next time."
+      end
+    end
+
+    subcommand "tear-down-nonet-user", "Deletes a user previously created by gjp" do
+      def execute
+        user = Gjp::LimitedNetworkUser.new("nonet")
+
+        user.tear_down
+
+        "sudo #{user.get_path("iptables")} -D OUTPUT -m owner --uid-owner nonet -j DROP\n" +
+        "sudo #{user.get_path("userdel")} nonet\n"
+      end
+    end
+
     subcommand "get-pom", "Retrieves a pom corresponding to a filename" do
       parameter "NAME", "a jar file path, a project directory path or a non-existing filename in the `project-version` form"
       def execute

data/lib/gjp/jar_table.rb

@@ -32,14 +32,28 @@ module Gjp
     end
 
     def to_s
-      "# Legend: "
-      "#b - jar is required for building the project"
-      "#r - jar is required runtime by the project"
-      "#p - jar is produced by the project"
-      "#i - jar is ignored"
-      @rows.map do |key, value|
-        "#{value.to_s[0]} #{key}"
-      end.sort
+      "# Key: \n" +
+      "# b - jar is required for building the project\n" +
+      "# r - jar is required runtime by the project\n" +
+      "# p - jar is produced by the project\n" +
+      "# i - jar is ignored\n" +
+
+      (
+        rows = @rows.map do |key, value|
+          pathname = Pathname.new(key)
+          [value.to_s[0], pathname.basename.to_s, pathname.dirname.to_s]
+        end
+
+        max_field_lengths = (0..2).map do |i|
+          rows.map { |row| row[i].length  }.max
+        end
+
+        rows.map do |row|
+          row.each_with_index.map do |element, i|
+           "%-#{max_field_lengths[i]+1}s" % element
+          end.join
+        end.sort.join("\n")
+      )
     end
 
     # jar files in the project's directory

data/lib/gjp/limited_network_user.rb

@@ -0,0 +1,66 @@
+# encoding: UTF-8
+
+require 'find'
+
+module Gjp
+  # encapsulates a Linux user that cannot access the Internet
+  # assumes root access (sudo) and iptables are available
+  class LimitedNetworkUser
+    def log
+      Gjp.logger
+    end
+
+    def initialize(name)
+      @name = name
+    end
+
+    # creates a new Linux user without Internet access,
+    # if it does not exists
+    def set_up
+      log.debug "checking #{@name} user existence..."
+      if not user_exists?
+        log.debug "...not found. Setting up..."
+        `sudo #{get_path("useradd")} #{@name}`
+        `sudo #{get_path("passwd")} #{@name}`
+        log.debug "...set up"
+      end
+
+      if not firewall_rule_exists?
+        log.debug "...not found. Setting up..."
+        `sudo #{get_path("iptables")} -A OUTPUT -m owner --uid-owner #{@name} -j DROP`
+        log.debug "...set up"
+      end
+    end
+
+    # deletes a Linux user previously created by this class
+    def tear_down
+      if firewall_rule_exists?
+        `sudo #{get_path("iptables")} -D OUTPUT -m owner --uid-owner #{@name} -j DROP`
+      end
+
+      if user_exists?
+        `sudo #{get_path("userdel")} #{@name}`
+      end
+    end
+
+    # determines if a user without Internet access exists
+    def set_up?
+      user_exists? and firewall_rule_exists?
+    end
+
+    # checks user existence
+    def user_exists?
+      `id #{@name} 2>&1`.match(/no such user$/) == nil
+    end
+
+    # checks firewall rule existence
+    def firewall_rule_exists?
+      `sudo #{get_path("iptables")} -L`.match(/owner UID match #{@name}/) != nil
+    end
+
+    # returns a command's full path
+    def get_path(command)
+      `sudo which #{command}`.strip
+    end
+  end
+end

data/lib/gjp/maven_runner.rb

@@ -0,0 +1,55 @@
+# encoding: UTF-8
+
+require 'find'
+require 'pathname'
+
+module Gjp
+  # runs Maven from a gjp kit with gjp-specific options
+  class MavenRunner
+    def log
+      Gjp.logger
+    end
+
+    def initialize(project)      
+      @project = project
+    end
+
+    # finds mvn in kit
+    def find_maven_executable
+      @project.from_directory do
+        Find.find("kit") do |path|
+          if path =~ /bin\/mvn$/
+            log.debug("found Maven executable: #{path}")
+            return path
+          end
+        end
+      end
+
+      nil
+    end
+
+    # returns a command line for running Maven
+    def get_maven_commandline(kit_full_path, running_full_path)
+      prefix = path_from running_full_path, kit_full_path
+      maven_executable = find_maven_executable
+
+      mvn_path = File.join(prefix, maven_executable)
+      repo_path = File.join(prefix, "kit", "m2")
+      config_path = File.join(prefix, "kit", "m2", "settings.xml")
+
+      "#{mvn_path} -Dmaven.repo.local=`readlink -e #{repo_path}` -s`readlink -e #{config_path}`"
+    end
+
+    # returns a path from origin to destination, provided they are both absolute
+    def path_from(origin, destination)
+      (Pathname.new(destination).relative_path_from Pathname.new(origin)).split.first
+    end
+
+    # runs mvn in a subprocess
+    def mvn(options)
+      kit_full_path = File.join(@project.full_path, "kit")
+      running_full_path = File.expand_path(".")
+      Process.wait(Process.spawn("#{get_maven_commandline(kit_full_path, running_full_path)} #{options.join(' ')}"))
+    end
+  end
+end

data/lib/gjp/{get_parent_pom.rb → parent_pom_getter.rb}

@@ -3,7 +3,7 @@
 require "pathname"
 
 module Gjp
-  # implements the get-parent-pom subcommand
+  # attempts to get a pom's parent pom
   class ParentPomGetter
 
     def self.log

data/lib/gjp/{get_pom.rb → pom_getter.rb}

@@ -9,7 +9,7 @@ require "pathname"
 require "gjp/version_matcher"
 
 module Gjp
-  # implements the get-pom subcommand
+  # attempts to get java projects' pom file
   class PomGetter
 
     def self.log

data/lib/gjp/project.rb

@@ -0,0 +1,216 @@
+# encoding: UTF-8
+
+require 'find'
+
+module Gjp
+  # encapsulates a Gjp project directory
+  class Project
+    def log
+      Gjp.logger
+    end
+
+    attr_accessor :full_path
+
+    def initialize(path)      
+      @full_path = Gjp::Project.find_project_dir(File.expand_path(path))
+    end
+
+    # finds the project directory up in the tree, like git does
+    def self.find_project_dir(starting_dir)
+      result = starting_dir
+      while is_project(result) == false and result != "/"
+        result = File.expand_path("..", result)
+      end
+
+      raise ArgumentError, "This is not a gjp project directory" if result == "/"
+
+      result
+    end
+
+    # returns true if the specified directory is a valid gjp project
+    def self.is_project(dir)
+      File.directory?(File.join(dir, "src")) and
+      File.directory?(File.join(dir, "kit")) and
+      File.directory?(File.join(dir, ".git"))
+    end
+
+    # inits a new project directory structure
+    def self.init(dir)
+      Dir.chdir(dir) do
+        `git init`
+
+        Dir.mkdir("src")
+        File.open(File.join("src", "README"), "w") do |file|
+          file.puts "Sources are to be placed in subdirectories named after Maven names: orgId_artifactId_version"
+        end
+        Dir.mkdir("kit")
+        File.open(File.join("kit", "README"), "w") do |file|
+          file.puts "Build tool binaries are to be placed here"
+        end
+
+        `git add .`
+        `git commit -m "Project initialized"`
+        `git tag init`
+      end
+    end
+
+    # starts a gathering phase, all files added to the project
+    # will be added to packages (including kit)
+    def gather
+      from_directory do
+        if get_status(:gathering)
+          return :gathering
+        elsif get_status(:dry_running)
+          return :dry_running
+        end
+
+        set_status(:gathering)
+        commit_all("Gathering started")
+      end
+
+      :done
+    end
+
+    # starts a dry running phase: files added to the kit will
+    # be added to packages, while sources will be reset at the
+    # end
+    def dry_run
+      from_directory do
+        if get_status(:gathering)
+          return :gathering
+        elsif get_status(:dry_running)
+          return :dry_running
+        end
+
+        set_status(:dry_running)
+        commit_all("Dry-run started")
+      end
+
+      :done
+    end
+
+    # ends any phase that was previously started, 
+    # generating file lists
+    def finish
+      from_directory do
+        if get_status(:gathering)
+          commit_all("Changes during gathering")
+
+          update_changed_file_list("kit", "gjp_kit_file_list")
+          update_changed_src_file_list(:file_list)
+          commit_all("File list updates")
+
+          clear_status(:gathering)
+          commit_all("Gathering finished")
+
+          :gathering
+        elsif get_status(:dry_running)
+          commit_all("Changes during dry-run")
+
+          update_changed_file_list("kit", "gjp_kit_file_list")
+          update_changed_src_file_list(:produced_file_list)
+          commit_all("File list updates")
+
+          revert("src", 2)
+          commit_all("Sources reverted as before dry-run")
+
+          clear_status(:dry_running)
+          commit_all("Dry run finished")
+
+          :dry_running
+        end
+      end
+    end
+
+    def update_changed_src_file_list(list_name)
+      Dir.foreach("src") do |entry|
+        if File.directory?(File.join(Dir.getwd, "src", entry)) and entry =~ /([^_\/]+_[^_]+_[^_]+)$/
+          update_changed_file_list(File.join("src", entry), "gjp_#{$1}_#{list_name.to_s}")
+        end
+      end
+    end
+
+    def update_changed_file_list(directory, list_file)
+      existing_files = if File.exists?(list_file)
+        File.readlines(list_file)
+      else
+        []
+      end
+
+      files = (
+        `git diff-tree --no-commit-id --name-only -r HEAD`.split("\n")
+        .select { |file| file.start_with?(directory) }
+        .map { |file|file[directory.length + 1, file.length]  }
+        .concat(existing_files)
+        .sort
+        .uniq
+      )
+
+      log.debug("writing file list for #{directory}: #{files.to_s}")
+
+        
+      File.open(list_file, "w+") do |file_list|
+        files.each do |file|
+          file_list.puts file
+        end
+      end
+    end
+
+    # adds the project's whole contents to git
+    def commit_all(message)
+      Find.find(".") do |path|
+        if path =~ /.gitignore$/
+          puts "Deleting #{path} to preserve all files..."
+          File.delete(path)
+        end
+      end
+
+      log.debug "committing with message: #{message}"
+
+      `git rm -r --cached .`
+      `git add .`
+      `git commit -m "#{message}"`
+    end
+
+    # reverts dir contents as commit_count commits ago
+    def revert(dir, commit_count)
+      `git rm -rf --ignore-unmatch #{dir}`
+      `git checkout -f HEAD~#{commit_count} -- #{dir}`
+
+      `git clean -f -d #{dir}`
+    end
+
+    # gets a project status flag
+    def get_status(status)
+      file_name = status_file_name(status)
+      File.exists?(file_name)
+    end
+
+    # sets a project status flag
+    def set_status(status)
+      file_name = status_file_name(status)
+      if File.exists?(file_name) == false
+        FileUtils.touch(file_name)
+      end
+    end
+
+    # sets a project status flag
+    def clear_status(status)
+      file_name = status_file_name(status)
+      if File.exists?(file_name)
+        File.delete(file_name)
+      end
+    end
+
+    def status_file_name(status)
+      ".#{status.to_s}"
+    end
+
+    # runs a block from the project directory
+    def from_directory
+      Dir.chdir(@full_path) do
+        yield
+      end
+    end
+  end
+end

data/lib/gjp/{get_source_address.rb → source_address_getter.rb}

@@ -5,7 +5,7 @@ require "json"
 require "open-uri"
 
 module Gjp
-  # implements the get-source-address subcommand
+  # attempts to get java projects' scm addresses
   class SourceAddressGetter
     def self.log
       Gjp.logger

data/lib/gjp/{get_source.rb → source_getter.rb}

@@ -3,7 +3,7 @@
 require "rest_client"
 
 module Gjp
-  # implements the get-source subcommand
+  # attempts to get java projects' sources from scm
   class SourceGetter
     def self.log
       Gjp.logger

data/lib/gjp/version.rb

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

data/spec/lib/limited_network_user_spec_interactive.rb

@@ -0,0 +1,40 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Gjp::LimitedNetworkUser do
+
+  let(:user) { Gjp::LimitedNetworkUser.new("nonet_test") }
+
+  before(:each)  do
+    user.set_up
+  end
+
+  after(:each)  do
+    if user.set_up?
+      user.tear_down
+    end
+  end
+
+  describe ".set_up" do
+    it "set_ups a limited network user" do
+      user.set_up?.should be_true
+    end
+  end
+
+  describe ".tear_down" do
+    it "tears down a limited network user" do
+      user.tear_down
+      user.set_up?.should be_false
+    end
+  end
+
+  describe ".set_up?" do
+    it "checks if a limited network user has been set up" do
+      user.set_up?.should be_true
+
+      user.tear_down
+      user.set_up?.should be_false
+    end
+  end
+end

data/spec/lib/maven_runner_spec.rb

@@ -0,0 +1,56 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Gjp::MavenRunner do
+
+  before(:each) do
+    @project_path = File.join("spec", "data", "test-project")
+    Dir.mkdir(@project_path)
+
+    Gjp::Project.init(@project_path)
+    @project = Gjp::Project.new(@project_path)
+    @project.gather
+
+    # mock a Maven executable
+    Dir.chdir(@project_path) do
+      @bin_dir = File.join("kit", "mvn", "bin")
+      FileUtils.mkdir_p(@bin_dir)
+      @maven_executable = File.join(@bin_dir, "mvn")
+      File.open(@maven_executable, "w") { |io| io.puts "echo $0 $*>test_out" }
+      File.chmod(0777, @maven_executable)
+    end
+
+    @project.finish
+
+    @maven_runner = Gjp::MavenRunner.new(@project)
+  end
+
+  after(:each) do
+    FileUtils.rm_rf(@project_path)
+  end
+
+  describe "#find_maven_executable"  do
+    it "looks for Maven in kit" do
+      @maven_runner.find_maven_executable.should eq @maven_executable
+    end
+  end
+
+  describe "#get_maven_commandline"  do
+    it "returns commandline options for running maven" do
+      kit_full_path = File.join(@project.full_path, "kit")
+      commandline = @maven_runner.get_maven_commandline(kit_full_path, @project.full_path)
+
+      commandline.should eq "./#{@maven_executable} -Dmaven.repo.local=`readlink -e ./kit/m2` -s`readlink -e ./kit/m2/settings.xml`"
+    end
+  end
+
+  describe "#mvn"  do
+    it "runs maven" do
+      @project.from_directory do
+        @maven_runner.mvn(["extra-option"])
+        File.read("test_out").strip.should match /extra-option$/
+      end
+    end
+  end
+end

data/spec/lib/maven_website_spec.rb

@@ -27,9 +27,9 @@ describe Gjp::MavenWebsite do
 
   describe "#search_by_group_id_and_artifact_id" do
     it "uses search.maven.org to look for poms by group and artifact id" do
-      result = site.search_by_group_id_and_artifact_id("antlr", "antlrall")
+      results = site.search_by_group_id_and_artifact_id("antlr", "antlrall")
 
-      result.should include({"id"=>"antlr:antlrall:2.7.2", "g"=>"antlr", "a"=>"antlrall", "v"=>"2.7.2", "p"=>"jar", "timestamp"=>1182142732000, "ec"=>[".jar", ".pom"]}, {"id"=>"antlr:antlrall:2.7.4", "g"=>"antlr", "a"=>"antlrall", "v"=>"2.7.4", "p"=>"jar", "timestamp"=>1131488123000, "ec"=>[".jar", ".pom"]}, {"id"=>"antlr:antlrall:2.7.1", "g"=>"antlr", "a"=>"antlrall", "v"=>"2.7.1", "p"=>"jar", "timestamp"=>1131488123000, "ec"=>[".jar", ".pom"]})
+      results.any? { |result| result["id"] == "antlr:antlrall:2.7.2" }.should be_true
     end
   end
 

data/spec/lib/project_spec.rb

@@ -0,0 +1,190 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Gjp::Project do
+  before(:each) do
+    @project_path = File.join("spec", "data", "test-project")
+    Dir.mkdir(@project_path)
+
+    Gjp::Project.init(@project_path)
+    @project = Gjp::Project.new(@project_path)
+  end
+
+  after(:each) do
+    FileUtils.rm_rf(@project_path)
+  end
+
+  describe "#is_project"  do
+    it "checks if a directory is a gjp project or not" do
+      Gjp::Project.is_project(@project_path).should be_true    
+      Gjp::Project.is_project(File.join(@project_path, "..")).should be_false
+    end
+  end
+
+  describe "#find_project_dir"  do
+    it "recursively the parent project directory" do
+      expanded_path = File.expand_path(@project_path)
+      Gjp::Project.find_project_dir(expanded_path).should eq expanded_path
+      Gjp::Project.find_project_dir(File.expand_path("src", @project_path)).should eq expanded_path
+      Gjp::Project.find_project_dir(File.expand_path("kit", @project_path)).should eq expanded_path
+
+      expect {
+        Gjp::Project.find_project_dir(File.expand_path("..", @project_path)).should raise_error
+      }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe "full_path" do
+    it "returns the project's full path" do
+      @project.full_path.should eq File.expand_path(@project_path)
+    end
+  end
+
+  describe "#init" do
+    it "inits a new project" do
+      kit_path = File.join(@project_path, "kit")
+      Dir.exists?(kit_path).should be_true
+
+      src_path = File.join(@project_path, "src")
+      Dir.exists?(src_path).should be_true
+
+      @project.from_directory do
+        `git tag`.strip.should eq("init")
+        `git rev-list --all`.split("\n").length.should eq 1
+      end
+    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
+     end
+    end
+  end
+
+  describe ".get_status" do
+    it "gets a project's status flag" do
+      @project.from_directory do
+        @project.get_status(:gathering).should be_false
+        `touch .gathering`
+        @project.get_status(:gathering).should be_true
+      end
+    end
+  end
+
+  describe ".clear_status" do
+    it "clears a project's status flag" do
+      @project.from_directory do
+        `touch .gathering`
+        @project.get_status(:gathering).should be_true
+
+        @project.clear_status(:gathering)
+        @project.get_status(:gathering).should be_false
+      end
+    end
+  end
+
+  describe ".commit_all" do
+    it "commits the project contents to git for later use" do
+      @project.from_directory do
+        `touch kit/test`
+
+         @project.commit_all "test"
+
+        `git rev-list --all`.split("\n").length.should eq 2
+      end
+    end
+  end
+  
+  describe ".gather" do
+    it "starts a gathering phase" do
+
+      @project.from_directory do
+        `touch src/test`
+      end
+
+      @project.gather.should eq :done
+
+      @project.from_directory do
+        @project.get_status(:gathering).should be_true
+        `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
+  end
+
+  describe ".finish" do
+    it "ends the current gathering phase" do
+      @project.gather.should eq :done
+
+      @project.from_directory do
+        Dir.mkdir("src/a_b_c")
+        `touch src/a_b_c/test`
+        `touch kit/test`
+      end
+
+      @project.finish.should eq :gathering
+      @project.get_status(:gathering).should be_false
+
+      @project.from_directory do
+        `git rev-list --all`.split("\n").length.should eq 5
+        `git diff-tree --no-commit-id --name-only -r HEAD~2`.split("\n").should include("src/a_b_c/test")
+        File.readlines("gjp_a_b_c_file_list").should include("test\n")
+        File.readlines("gjp_kit_file_list").should include("test\n")
+      end
+    end
+
+    it "ends the current dry-run phase" do
+      @project.gather.should eq :done
+
+      @project.from_directory do
+        Dir.mkdir("src/a_b_c")
+        `echo A > src/a_b_c/test`
+      end
+
+      @project.finish.should eq :gathering
+
+      @project.dry_run.should eq :done
+
+      @project.from_directory do
+        `echo B > src/a_b_c/test`
+        `touch src/a_b_c/test2`
+        `touch kit/test`
+      end
+
+      @project.finish.should eq :dry_running
+      @project.get_status(:dry_running).should be_false
+
+      @project.from_directory do
+        `git rev-list --all`.split("\n").length.should eq 10
+        File.read("src/a_b_c/test").should eq "A\n"
+        File.readlines("gjp_a_b_c_produced_file_list").should include("test2\n")
+        File.readlines("gjp_a_b_c_file_list").should_not include("test2\n")
+
+        `git diff-tree --no-commit-id --name-only -r HEAD~2`.split("\n").should_not include("src/a_b_c/test2")
+        File.exists?("src/a_b_c/test2").should be_false
+        File.readlines("gjp_kit_file_list").should include("test\n")
+      end
+    end
+  end
+
+  describe ".dry_run" do
+    it "starts a dry running phase" do
+
+      @project.from_directory do
+        `touch src/test`
+      end
+
+      @project.dry_run.should eq :done
+
+      @project.from_directory do
+        @project.get_status(:dry_running).should be_true
+        `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
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gjp
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -157,14 +157,17 @@ files:
 - gjp.gemspec
 - lib/gjp.rb
 - lib/gjp/cli.rb
-- lib/gjp/get_parent_pom.rb
-- lib/gjp/get_pom.rb
-- lib/gjp/get_source.rb
-- lib/gjp/get_source_address.rb
 - lib/gjp/jar_table.rb
+- lib/gjp/limited_network_user.rb
 - lib/gjp/logger.rb
+- lib/gjp/maven_runner.rb
 - lib/gjp/maven_website.rb
+- lib/gjp/parent_pom_getter.rb
 - lib/gjp/pom.rb
+- lib/gjp/pom_getter.rb
+- lib/gjp/project.rb
+- lib/gjp/source_address_getter.rb
+- lib/gjp/source_getter.rb
 - lib/gjp/version.rb
 - lib/gjp/version_matcher.rb
 - spec/data/ant-super-simple-code/build.xml
@@ -183,13 +186,16 @@ files:
 - spec/data/nailgun/pom.xml
 - spec/data/struts-apps/pom.xml
 - spec/data/tomcat/pom.xml
-- spec/lib/get_parent_pom_spec.rb
-- spec/lib/get_pom_spec.rb
-- spec/lib/get_source_address_spec.rb
-- spec/lib/get_source_spec.rb
 - spec/lib/jar_table_spec.rb
+- spec/lib/limited_network_user_spec_interactive.rb
+- spec/lib/maven_runner_spec.rb
 - spec/lib/maven_website_spec.rb
+- spec/lib/parent_pom_getter_spec.rb
+- spec/lib/pom_getter_spec.rb
 - spec/lib/pom_spec.rb
+- spec/lib/project_spec.rb
+- spec/lib/source_address_getter_spec.rb
+- spec/lib/source_getter_spec.rb
 - spec/lib/version_matcher_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/SilvioMoioli/gjp
@@ -233,12 +239,15 @@ test_files:
 - spec/data/nailgun/pom.xml
 - spec/data/struts-apps/pom.xml
 - spec/data/tomcat/pom.xml
-- spec/lib/get_parent_pom_spec.rb
-- spec/lib/get_pom_spec.rb
-- spec/lib/get_source_address_spec.rb
-- spec/lib/get_source_spec.rb
 - spec/lib/jar_table_spec.rb
+- spec/lib/limited_network_user_spec_interactive.rb
+- spec/lib/maven_runner_spec.rb
 - spec/lib/maven_website_spec.rb
+- spec/lib/parent_pom_getter_spec.rb
+- spec/lib/pom_getter_spec.rb
 - spec/lib/pom_spec.rb
+- spec/lib/project_spec.rb
+- spec/lib/source_address_getter_spec.rb
+- spec/lib/source_getter_spec.rb
 - spec/lib/version_matcher_spec.rb
 - spec/spec_helper.rb