doubleshot 0.1.0-java → 0.2.0-java

data/lib/doubleshot/cli.rb

@@ -81,4 +81,5 @@ require_relative "commands/test"
 require_relative "commands/build"
 require_relative "commands/gem"
 require_relative "commands/jar"
-require_relative "commands/install"
+require_relative "commands/install"
+require_relative "commands/pom"

data/lib/doubleshot/cli/options.rb

@@ -13,7 +13,9 @@ class Doubleshot
         end
       end
 
-      __forward__ :banner, :separator, :on
+      OptionParser.instance_methods(false).each do |method_name|
+        __forward__ method_name
+      end
 
       def initialize
         super

data/lib/doubleshot/commands/build.rb

@@ -13,6 +13,18 @@ class Doubleshot::CLI::Commands::Build < Doubleshot::CLI
   def self.options
     Options.new do |options|
       options.banner = "Usage: doubleshot build"
+      options.separator ""
+      options.separator "Options"
+
+      options.classpath = []
+      options.on "--classpath CLASSPATH", "Manually set the CLASSPATH the compiler should use." do |classpath|
+        options.classpath = classpath.to_s.split(":")
+      end
+
+      options.conditional = false
+      options.on "--conditional", "Perform a conditional build (determine if there are pending files)." do
+        options.conditional = true
+      end
 
       options.separator ""
       options.separator "Summary: #{summary}"
@@ -20,15 +32,41 @@ class Doubleshot::CLI::Commands::Build < Doubleshot::CLI
   end
 
   def self.start(args)
-    config = Doubleshot::current.config
+    options = self.options.parse!(args)
+    doubleshot = Doubleshot::current
+
+    if options.conditional && doubleshot.config.target.exist?
+      doubleshot.config.target.rmtree
+    end
+
+    compiler = Doubleshot::Compiler.new(doubleshot.config.source.java, doubleshot.config.target)
 
-    # TODO:
-    # download JAR dependencies
-    # setup correct class-path
-    # download Gem dependencies
-    # compile Java
-    # exit
+    if doubleshot.config.project == "doubleshot"
+      puts "Bootstrapping Doubleshot build with Maven..."
+      doubleshot.bootstrap!
+    else
+      puts "Performing Doubleshot setup to resolve dependencies..."
+      doubleshot.setup!
+    end
+
+    if options.classpath.empty?
+      doubleshot.classpath
+    else
+      options.classpath
+    end.each do |path|
+      compiler.classpath << path
+    end
+
+    puts "[INFO] Using #{compiler.classpath}"
+    puts
+
+    if compiler.pending? || !options.conditional
+      puts "Compiling..."
+      compiler.build!
+    else
+      puts "Conditional build: No source changes."
+    end
 
-    return true
+    return 0
   end
-end
+end

data/lib/doubleshot/commands/gem.rb

@@ -14,7 +14,7 @@ class Doubleshot::CLI::Commands::Gem < Doubleshot::CLI
       options.separator "Options"
 
       options.test = true
-      options.on "--no-test", "Disable testing as a build prerequisite." do
+      options.on "--no-test", "Disable testing as a packaging prerequisite." do
         options.test = false
       end
 
@@ -25,15 +25,36 @@ class Doubleshot::CLI::Commands::Gem < Doubleshot::CLI
 
   def self.start(args)
     options = self.options.parse!(args)
+    doubleshot = Doubleshot::current
 
-    # TODO:
-    # compile Java
-    # download Jars and add them to the gemspec require_paths (I THINK).
-    config = Doubleshot::current.config
+    if options.test
+      puts "Executing tests..."
+      if Doubleshot::CLI::Commands::Test.start([ "--ci" ]) != 0
+        STDERR.puts "Test failed, aborting Gem creation."
+        return 1
+      end
+    else
+      Doubleshot::CLI::Commands::Build.start(args)
+    end
+
+    unless Pathname::glob(doubleshot.config.source.java + "**/*.java").empty?
+      target = doubleshot.config.target
+
+      jarfile = (target + "#{doubleshot.config.project}.jar")
+      jarfile.delete if jarfile.exist?
+
+      ant.jar jarfile: jarfile, basedir: target do
+        doubleshot.lockfile.jars.each do |jar|
+          zipfileset src: jar.path.expand_path, excludes: "META-INF/*.SF"
+        end
+      end
+    end
+
+    # WARN: This is version specific since in HEAD they've changed this to Gem::Package::build.
+    ::Gem::Builder.new(doubleshot.config.gemspec).build
 
-    # TODO: This is version specific since in HEAD they've changed this to Gem::Package::build.
-    ::Gem::Builder.new(config.gemspec).build
+    puts("  Size: %.2fM" % (Pathname(doubleshot.config.gemspec.file_name).size.to_f / 1024 / 1024))
 
-    return true
+    return 0
   end
-end
+end

data/lib/doubleshot/commands/init.rb

@@ -1,3 +1,5 @@
+require 'rexml/document'
+
 class Doubleshot::CLI::Commands::Init < Doubleshot::CLI
 
   def self.summary
@@ -19,6 +21,7 @@ class Doubleshot::CLI::Commands::Init < Doubleshot::CLI
 
   def self.start(args)
     session = new(args)
+
     if session.doubleshot_file.exist?
       return puts <<-EOS.margin
         ERROR: A Doubleshot file already exists.
@@ -27,6 +30,9 @@ class Doubleshot::CLI::Commands::Init < Doubleshot::CLI
     end
     session.import_gemspec!
     session.mark_gemspec_for_deletion!
+
+    session.import_pom! if session.pom_file.exist?
+
     session.generate_doubleshot_file!
 
     puts <<-EOS.margin
@@ -35,7 +41,7 @@ class Doubleshot::CLI::Commands::Init < Doubleshot::CLI
       Please review it and make changes as you see fit. It will
       be used for all the things.
     EOS
-    return true
+    return 0
   end
 
   def initialize(args)
@@ -47,6 +53,10 @@ class Doubleshot::CLI::Commands::Init < Doubleshot::CLI
     Pathname(@path + "Doubleshot")
   end
 
+  def pom_file
+    Pathname(@path + "pom.xml")
+  end
+
   def gemspec
     @gemspec ||= Pathname::glob(@path + "*.gemspec").first
   end
@@ -54,16 +64,17 @@ class Doubleshot::CLI::Commands::Init < Doubleshot::CLI
   def import_gemspec!
     original = gemspec ? eval_gemspec(gemspec.read) : ::Gem::Specification.new
 
+    @config.project = default original.name,    "THE PROJECT NAME"
+    @config.version = default original.version, "9000.1"
+
     @config.gemspec do |spec|
-      spec.name         = default original.name,        "THE PROJECT NAME"
-      spec.summary      = default original.summary,     "SUMMARIZE ME"
-      spec.description  = default original.description, "A VERY DETAILED DESCRIPTION"
-      spec.author       = default original.author,      "WHOAMI"
-      spec.homepage     = default original.homepage,    "I AM FROM THE INTERNET"
-      spec.email        = default original.email,       "ME@EXAMPLE.COM"
-      spec.version      = default original.version,     "9000.1"
-      spec.license      = default original.license,     "MIT-LICENSE"
-      spec.executables  = original.executables
+      spec.summary     = default original.summary,     "SUMMARIZE ME"
+      spec.description = default original.description, "A VERY DETAILED DESCRIPTION"
+      spec.author      = default original.author,      "WHOAMI"
+      spec.homepage    = default original.homepage,    "I AM FROM THE INTERNET"
+      spec.email       = default original.email,       "ME@EXAMPLE.COM"
+      spec.license     = default original.license,     "MIT-LICENSE"
+      spec.executables = original.executables
     end
 
     original.runtime_dependencies.each do |dependency|
@@ -77,6 +88,26 @@ class Doubleshot::CLI::Commands::Init < Doubleshot::CLI
     end
   end
 
+  def import_pom!
+    pom_document = REXML::Document.new pom_file.open
+
+    project = pom_document.get_text("project/artifactId")
+    @config.project = project if (@config.project.nil? or @config.project == "THE PROJECT NAME") and not project.nil?
+
+    @config.group = pom_document.get_text("project/groupId")
+
+    version = pom_document.get_text("project/version")
+    @config.version = version if (@config.version.nil? or @config.version == "9000.1") and not version.nil?
+
+    pom_document.elements.each("project/dependencies/dependency") do |pom_dependency|
+      group_id = pom_dependency.get_text("groupId")
+      artifact_id = pom_dependency.get_text("artifactId")
+      version = pom_dependency.get_text("version")
+
+      @config.jar "#{group_id}:#{artifact_id}:jar:#{version}"
+    end
+  end
+
   def eval_gemspec(contents)
     puts "Importing Gemspec..."
     begin

data/lib/doubleshot/commands/install.rb

@@ -13,7 +13,7 @@ class Doubleshot::CLI::Commands::Install < Doubleshot::CLI
       options.separator "Options"
 
       options.test = true
-      options.on "--no-test", "Disable testing as a build prerequisite." do
+      options.on "--no-test", "Disable testing as a packaging prerequisite." do
         options.test = false
       end
 
@@ -29,7 +29,7 @@ class Doubleshot::CLI::Commands::Install < Doubleshot::CLI
 
     installer = ::Gem::DependencyInstaller.new
     installer.install Doubleshot::current.config.gemspec.file_name
-    
-    return true
+
+    return 0
   end
-end
+end

data/lib/doubleshot/commands/jar.rb

@@ -1,7 +1,65 @@
 class Doubleshot::CLI::Commands::Jar < Doubleshot::CLI
+
   def self.summary
     <<-EOS.margin
-      TODO
+      Package your project as a JAR.
     EOS
   end
-end
+
+  def self.options
+    Options.new do |options|
+      options.banner = "Usage: doubleshot jar"
+      options.separator ""
+      options.separator "Options"
+
+      options.test = true
+      options.on "--no-test", "Disable testing as a packaging prerequisite." do
+        options.test = false
+      end
+
+      options.sparse = false
+      options.on "--sparse", "Don't include JAR dependencies in your JAR. (For example, if you want to use Maven.)" do
+        options.sparse = true
+      end
+
+      options.separator ""
+      options.separator "Summary: #{summary}"
+    end
+  end
+
+  def self.start(args)
+    options = self.options.parse!(args)
+    doubleshot = Doubleshot::current
+
+    if options.test
+      puts "Executing tests..."
+      if Doubleshot::CLI::Commands::Test.start([ "--ci" ]) != 0
+        STDERR.puts "Test failed, aborting JAR creation."
+        return 1
+      end
+    else
+      Doubleshot::CLI::Commands::Build.start(args)
+    end
+
+    unless Pathname::glob(doubleshot.config.source.java + "**/*.java").empty?
+      target = doubleshot.config.target
+
+      jarfile = (target + "#{doubleshot.config.project}.jar")
+      jarfile.delete if jarfile.exist?
+
+      ant.jar jarfile: jarfile, basedir: target do
+        manifest{
+          attribute(:name => "Main-Class", :value => doubleshot.config.java_main)
+        }
+        fileset dir: doubleshot.config.source.ruby.parent, includes: doubleshot.config.source.ruby.to_s + "/**/*"
+        unless options.sparse
+          doubleshot.lockfile.jars.each do |jar|
+            zipfileset src: jar.path.expand_path, excludes: "META-INF/*.SF"
+          end
+        end
+      end
+    end
+
+    return 0
+  end
+end

data/lib/doubleshot/commands/pom.rb

@@ -0,0 +1,29 @@
+class Doubleshot::CLI::Commands::Pom < Doubleshot::CLI
+
+  def self.summary
+    <<-EOS.margin
+      Generate a pom.xml based on your Doubleshot file.
+    EOS
+  end
+
+  def self.options
+    Options.new do |options|
+      options.banner = "Usage: doubleshot pom"
+
+      options.separator ""
+      options.separator "Summary: #{summary}"
+    end
+  end
+
+  def self.start(args)
+    require "doubleshot/pom"
+
+    pom = Pathname("pom.xml")
+    pom.rename("pom.xml.#{Time.now.to_i}") if pom.exist?
+    pom.open("w+") do |file|
+      file << Doubleshot::Pom.new(Doubleshot::current.config).to_s
+    end
+
+    return 0
+  end
+end

data/lib/doubleshot/commands/test.rb

@@ -8,26 +8,62 @@ class Doubleshot::CLI::Commands::Test < Doubleshot::CLI
       attribute of your Doubleshot configuration.
     EOS
   end
-  
+
   def self.options
     Options.new do |options|
-      options.banner = "Usage: doubleshot test"
-    
+      options.banner = "Usage: doubleshot test [options]"
+
+      options.separator ""
+      options.separator "Options:"
+
+      options.ci_test = false
+      options.on "--ci", "Run all tests, then exit. (No continuous listening for file changes.)" do
+        options.ci_test = true
+        options.build = true
+      end
+
       options.separator ""
       options.separator "Summary: #{summary}"
     end
   end
-  
+
   def self.start(args)
+    options = self.options.parse!(args)
+    doubleshot = Doubleshot::current
+
+    if Pathname::glob(doubleshot.config.source.tests + "**/*_{spec,test}.rb").empty?
+      puts "No tests found"
+      return 0
+    end
+
+    if options.ci_test
+      if doubleshot.lockfile.exist?
+        puts "--ci: Removing lockfile"
+        doubleshot.lockfile.delete
+      end
+
+      if doubleshot.classpath_cache.exist?
+        puts "--ci: Removing .classpath.cache"
+        doubleshot.classpath_cache.delete
+      end
+
+      if doubleshot.config.target.exist?
+        puts "--ci: Removing target build directory"
+        doubleshot.config.target.rmtree
+      end
+    end
+
     require "listen"
-    watcher = new(Doubleshot::current.config)
+
+    watcher = new(doubleshot.config, options.ci_test)
     watcher.run
   end
-  
-  def initialize(config)
+
+  def initialize(config, ci_test)
     @config = config
     @interrupted = false
-      
+    @ci_test = ci_test
+
     # Hit Ctrl-C once to re-run all specs; twice to exit the program.
     Signal.trap("INT") do
       if @interrupted
@@ -38,42 +74,56 @@ class Doubleshot::CLI::Commands::Test < Doubleshot::CLI
         run_all_specs
         @interrupted = false
       end
-    end  
+    end
   end
-  
+
   def run
-    # Output here just so you know when changes will be
-    # picked up after you start the program.
-    puts "Listening for changes..."
-    listener.start
+    if @ci_test
+      run_all_specs
+    else
+      Doubleshot::CLI::Commands::Build.start([ "--conditional" ])
+      # Output here just so you know when changes will be
+      # picked up after you start the program.
+      puts "Listening for changes..."
+      listener.start
+    end
   end
-  
+
   private
   def listener
     # This creates a MultiListener
-    Listen.to(@config.source.tests.to_s, @config.source.ruby.to_s).change do |modified, added, removed|      
+    Listen.to(@config.source.tests.to_s, @config.source.ruby.to_s, @config.source.java.to_s).change do |modified, added, removed|
       modified.each do |location|
         path = Pathname(location)
-        next unless path.extname == ".rb"
 
-        test = if path.child_of? @config.source.tests
+        next unless path.extname == ".rb" or path.extname == ".java"
+
+        test = if path.basename.to_s =~ /_(spec|test).rb/ && path.child_of?(@config.source.tests)
           path
         else
-          relative_path = path.relative_path_from(@config.source.ruby.expand_path)
-          matcher = relative_path.sub(/(\w+)\.rb/, "\\1_{spec,test}.rb")
+          relative_path = if path.extname == ".rb"
+                            path.relative_path_from(@config.source.ruby.expand_path)
+                          else
+                            path.relative_path_from(@config.source.java.expand_path)
+                          end
+          matcher = relative_path.sub(/(\w+)\.(rb|java)/, "\\1_{spec,test}.rb")
           matchers = [ matcher, Pathname(matcher.to_s.split("/")[1..-1].join("/")) ]
-          
+
           match = matchers.detect do |matcher|
             if match = Pathname::glob(@config.source.tests + matcher).first
-              break match 
+              break match
             end
           end
         end
-        
+
         if test && test.exist?
+          if path.extname == ".java"
+            Doubleshot::CLI::Commands::Build.start([])
+          end
+
           duration = Time::measure do
             puts "\n --- Running test for #{test.to_s} ---\n\n"
-        
+
             org.jruby.Ruby.newInstance.executeScript <<-RUBY, test.to_s
               begin
                 require #{test.to_s.inspect}
@@ -83,7 +133,7 @@ class Doubleshot::CLI::Commands::Test < Doubleshot::CLI
               end
             RUBY
           end
-          
+
           puts "Completed in #{duration}s"
         else
           puts "\nNo matching test for #{path.relative_path_from(@config.source.ruby.expand_path).to_s}"
@@ -91,12 +141,14 @@ class Doubleshot::CLI::Commands::Test < Doubleshot::CLI
       end
     end
   end
-  
+
   def run_all_specs
+    exit_status = false
     duration = Time::measure do
-  
       puts "\n --- Running all tests ---\n\n"
-    
+
+      Doubleshot::CLI::Commands::Build.start([ "--conditional" ])
+
       script = <<-RUBY
         begin
           #{
@@ -110,10 +162,11 @@ class Doubleshot::CLI::Commands::Test < Doubleshot::CLI
         end
       RUBY
       # puts "SCRIPT:", script
-      org.jruby.Ruby.newInstance.executeScript script, "all-specs"
+      exit_status = org.jruby.Ruby.newInstance.executeScript script, "all-specs"
     end
-    
+
     puts "Completed in #{duration}s"
+    return exit_status
   end
-  
-end # class Doubleshot::CLI::Commands::Test < Doubleshot::CLI
+
+end # class Doubleshot::CLI::Commands::Test < Doubleshot::CLI