doubleshot 0.1.0-java → 0.2.0-java

data/lib/ruby/pathname.rb

@@ -1,11 +1,15 @@
 class Pathname
   def touch(path)
     file = self + path
-    file.open("w+") { nil }
+    file.open("w+") { nil } unless file.exist?
     file
   end
-  
+
   def child_of?(p2)
-    expand_path.to_s.include? p2.expand_path.to_s
+    expand_path.to_s.include?(p2.expand_path.to_s)
   end
-end
+
+  def to_url
+    java.io.File.new(to_s).to_url.to_s
+  end
+end

data/lib/ruby/time.rb

@@ -1,8 +1,7 @@
 class Time
-  
   def self.measure
     start = now
     yield
     now - start
   end
-end
+end

data/test/compiler/classpath_spec.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/env jruby
+
+require_relative "../helper"
+
+describe Doubleshot::Compiler::Classpath do
+  before do
+    @classpath = Doubleshot::Compiler::Classpath.new
+  end
+
+  describe "add" do
+    it "must return self" do
+      Helper::tmp do |tmp|
+        @classpath.add(tmp.to_s).must_be_same_as @classpath
+      end
+    end
+
+    it "must raise an exception if the file does not exist" do
+      Helper::tmp do |tmp|
+        -> do
+          @classpath.add(tmp + "asdf")
+        end.must_raise(ArgumentError)
+      end
+    end
+
+    it "must alias to <<" do
+      @classpath.must_respond_to :<<
+      Helper::tmp do |tmp|
+        @classpath << tmp
+        @classpath.wont_be_empty
+      end
+    end
+  end
+
+  it "must return Pathnames" do
+    Helper::tmp do |tmp|
+      @classpath.add tmp
+
+      @classpath.entries.wont_be_empty
+      @classpath.each do |path|
+        path.must_be_kind_of Pathname
+      end
+    end
+  end
+
+  it "must return unique paths" do
+    Helper::tmp do |tmp|
+      @classpath.add(tmp.to_s)
+      @classpath.add(tmp.to_s)
+
+      @classpath.size.must_equal 1
+    end
+  end
+
+  it "must return only directories" do
+    Helper::tmp do |tmp|
+      dir1 = tmp + "dir1"
+      dir2 = tmp + "dir2"
+
+      dir1.mkdir
+      dir2.mkdir
+
+      jar1 = dir1.touch "some.jar"
+      jar2 = dir2.touch "other.jar"
+
+      @classpath.add dir1
+      @classpath.add jar1
+      @classpath.add jar2
+
+      @classpath.size.must_equal 2
+      @classpath.must_include(dir1.expand_path)
+      @classpath.must_include(dir2.expand_path)
+    end
+  end
+end

data/test/compiler_spec.rb

@@ -4,13 +4,7 @@ require_relative "helper"
 
 describe Doubleshot::Compiler do
 
-  it "must accept source and target paths" do
-    compiler = Doubleshot::Compiler.new "ext/java", "target"
-    compiler.source.must_equal Pathname("ext/java")
-    compiler.target.must_equal Pathname("target")
-  end
-
-  it "must compile a cow" do
+  def compile
     Helper::tmp do |tmp|
       source = tmp + "java"
       source.mkdir
@@ -32,13 +26,98 @@ describe Doubleshot::Compiler do
         EOS
       end
 
-      Doubleshot::Compiler.new(source, target).build!
+      sleep 1 # Sleep because file mtime does not
+      # have enough resolution to allow us to accurately
+      # detect changes quickly enough in tests. It's
+      # very unlikely you'd ever run into this in your
+      # actual work.
+      yield Doubleshot::Compiler.new(source, target)
+    end
+  end
+
+  it "must accept source and target paths" do
+    compiler = Doubleshot::Compiler.new "ext/java", "target"
+    compiler.source.must_equal Pathname("ext/java")
+    compiler.target.must_equal Pathname("target")
+  end
+
+  describe "#pending?" do
+
+    it "wont be pending after a build" do
+      compile do |compiler|
+        compiler.build!
+        compiler.wont_be :pending
+      end
+    end
+
+    it "must be pending if target has not been built" do
+      compile do |compiler|
+        compiler.must_be :pending
+      end
+    end
+
+    it "must be pending if existing source is modified" do
+      compile do |compiler|
+        compiler.build!
+        sleep 1 # Refer to comment for 'sleep 1' in #compile helper
+        (compiler.source + "Cow.java").open("w+") do |cow|
+          cow << <<-EOS.margin
+          package org.sam.doubleshot;
+
+          public class Cow {
+            public Cow() {}
 
-      cow = target + "org/sam/doubleshot/Cow.class"
-      cow.exist?.must_equal true
+            public String moo() {
+              return "FRANCIS!";
+            }
+          }
+          EOS
+        end
+
+        compiler.must_be :pending
+      end
+    end
+
+    it "must be pending if a new source file is added" do
+      compile do |compiler|
+        compiler.build!
+        sleep 1 # Refer to comment for 'sleep 1' in #compile helper
+        (compiler.source + "Moo.java").open("w+") do |cow|
+          cow << <<-EOS.margin
+          package org.sam.doubleshot;
+
+          public class Moo {
+            public Moo() {}
+
+            public String moo() {
+              return "COW!";
+            }
+          }
+          EOS
+        end
+
+        compiler.must_be :pending
+      end
+    end
+  end
+
+  it "must compile a cow" do
+    compile do |compiler|
+      # We pass the add_target_to_current_classpath=true option
+      # so that we can then load a Cow instance a few lines
+      # further down.
+      compiler.build!(true).must_be_same_as compiler
+
+      cow = compiler.target + "org/sam/doubleshot/Cow.class"
+      cow.must :exist
 
       org.sam.doubleshot.Cow.new.moo.must_equal "MOO!"
     end
   end
 
+  it "must have a classpath" do
+    compiler = Doubleshot::Compiler.new "ext/java", "target"
+    compiler.classpath.must_be_kind_of Doubleshot::Compiler::Classpath
+  end
+
 end

data/test/configuration/source_locations_spec.rb

@@ -37,7 +37,7 @@ describe Doubleshot::Configuration::SourceLocations do
     Doubleshot::Configuration::SourceLocations.send(:private, :validate_path)
   end
 
-  describe "validate_path" do    
+  describe "validate_path" do
     it "must call to_s on any passed object" do
       mock = MockWrapper.new
       mock.expect(:to_string, "test")
@@ -50,7 +50,7 @@ describe Doubleshot::Configuration::SourceLocations do
     end
 
     it "must return a valid path" do
-      @source.validate_path("lib").exist?.must_equal true
+      @source.validate_path("lib").must :exist
 
       assert_raises(IOError) do
         @source.validate_path "nothing"

data/test/configuration_spec.rb

@@ -8,6 +8,43 @@ describe Doubleshot::Configuration do
     @config = Doubleshot::Configuration.new
   end
 
+  describe "project" do
+    it "must accept a project name" do
+      @config.project = "doubleshot"
+      @config.project.must_equal "doubleshot"
+    end
+
+    it "must default the gem name to the project name" do
+      @config.project = "doubleshot"
+      @config.gemspec.name.must_equal "doubleshot"
+    end
+  end
+
+  describe "group" do
+    it "must allow you to set a group (for JAR packaging)" do
+      @config.group = "org.sam.doubleshot"
+      @config.group.must_equal "org.sam.doubleshot"
+    end
+
+    it "must default to the project name if none is provided" do
+      @config.project = "doubleshot"
+      @config.group.must_equal "doubleshot"
+    end
+  end
+
+  describe "version" do
+    it "must allow you to set the version" do
+      @config.version = "1.0"
+      @config.version.must_equal "1.0"
+    end
+
+    it "must default the gem version to the project version" do
+      @config.version = "1.0"
+      @config.gemspec.version.to_s.must_equal "1.0"
+    end
+
+  end
+
   describe "gem" do
     it "must accept a gem name" do
       @config.gem "listen"
@@ -17,9 +54,42 @@ describe Doubleshot::Configuration do
     it "must accept a list of requirements" do
       @config.gem "listen", ">0.4.0"
     end
-    
+
+    it "must return a dependency" do
+      @config.gem("listen").must_be_kind_of Doubleshot::Dependencies::GemDependency
+    end
+  end
+
+  describe "repositories" do
+    it "must add Maven repositories" do
+      @config.mvn_repository "http://repository.jboss.com/maven2/"
+      @config.mvn_repositories.must_include "http://repository.jboss.com/maven2/"
+    end
+
+    it "must return the passed value from mvn_repository" do
+      example = "http://repository.jboss.com/maven2/"
+      @config.mvn_repository(example).must_be_same_as example
+    end
+
+    it "must add Rubygems repositories" do
+      @config.gem_repository "http://rubyforge.org"
+      @config.gem_repositories.must_include "http://rubyforge.org"
+    end
+
+    it "must return the passed value from gem_repository" do
+      example = "http://rubyforge.org"
+      @config.gem_repository(example).must_be_same_as example
+    end
+  end
+
+  describe "jar" do
+    it "must accept a Buildr style JAR dependency string" do
+      @config.jar "org.sonatype.aether:aether-api:jar:1.13.1"
+      @config.runtime.jars.must_include "org.sonatype.aether:aether-api:jar:1.13.1"
+    end
+
     it "must return a dependency" do
-      @config.gem("listen").must_be_kind_of Doubleshot::Dependencies::Dependency
+      @config.jar("org.sonatype.aether:aether-api:jar:1.13.1").must_be_kind_of Doubleshot::Dependencies::JarDependency
     end
   end
 
@@ -45,13 +115,16 @@ describe Doubleshot::Configuration do
           spec.email         = "ssmoot@gmail.com"
           spec.version       = "1.0"
           spec.license       = "MIT-LICENSE"
-          spec.executables   = [ "doubleshot" ]
         end
       rescue Exception => e
         fail e
       end
 
-      @config.gemspec.validate.must_equal true
+      @config.gemspec.must :validate
+    end
+
+    it "must include executables from your bin folder" do
+      @config.gemspec.executables.must_equal [ "doubleshot" ]
     end
 
     it "must add dependencies to the gemspec" do
@@ -69,7 +142,7 @@ describe Doubleshot::Configuration do
     end
 
     it "must provide sane defaults for rdoc" do
-      @config.gemspec.name = "Doubleshot"
+      @config.project = "Doubleshot"
       @config.gemspec.rdoc_options.must_equal([
                                               "--line-numbers",
                                               "--main", "README.textile",
@@ -77,13 +150,13 @@ describe Doubleshot::Configuration do
                                               "lib", "README.textile" ])
     end
 
-    it "require_paths must default to the ruby source location" do
-      @config.gemspec.require_paths.must_equal [ "lib" ]
+    it "require_paths must include the ruby source location" do
+      @config.gemspec.require_paths.must_include "lib"
     end
 
     it "require_paths must be updated when ruby source location is modified" do
       @config.source.ruby = "test"
-      @config.gemspec.require_paths.must_equal [ "test" ]
+      @config.gemspec.require_paths.must_equal [ "test", "target" ]
     end
 
     it "should include test_files if present" do
@@ -102,6 +175,12 @@ describe Doubleshot::Configuration do
       end
     end
 
+    describe "java_main" do
+      it 'must default to "org.jruby.Main"' do
+        @config.java_main.must_equal "org.jruby.Main"
+      end
+    end
+
     describe "paths" do
       it "must return a readonly collection of paths" do
         @config.paths.must_be_kind_of Doubleshot::ReadonlyCollection
@@ -122,6 +201,7 @@ describe Doubleshot::Configuration do
     it "files must contain Ruby sources, Java sources, Doubleshot, LICENSE, README and any build files" do
       @config.gemspec.files.sort.must_equal(
         Dir[
+          "bin/doubleshot",
           "lib/**/*.rb",
           "ext/java/**/*.java",
           "Doubleshot",
@@ -129,7 +209,10 @@ describe Doubleshot::Configuration do
           "README*",
           "target/**/*",
           "test/**/*"
-      ].select { |path| Pathname(path).file? }.sort
+      ].select do |path|
+          path = Pathname(path)
+          path.file? && path.extname != ".class"
+        end.sort
       )
     end
 
@@ -192,8 +275,9 @@ describe Doubleshot::Configuration do
 
   describe "to_ruby" do
     before do
+      @config.project = "doubleshot"
+      @config.version = "9000.1"
       @config.gemspec do |spec|
-        spec.name          = "doubleshot"
         spec.summary       = "This is my summary."
         spec.description   = <<-DESCRIPTION.margin
         A very detailed description.
@@ -202,12 +286,10 @@ describe Doubleshot::Configuration do
         spec.author        = "Sam Smoot"
         spec.homepage      = "http://example.com/doubleshot"
         spec.email         = "ssmoot@gmail.com"
-        spec.version       = "9000.1"
         spec.license       = "MIT-LICENSE"
-        spec.executables   = [ "doubleshot" ]
       end
     end
-    
+
     it "must equal generated output" do
       @config.must_equal eval(@config.to_ruby).config
     end
@@ -215,6 +297,25 @@ describe Doubleshot::Configuration do
     describe "to_ruby_body" do
       before do
         @output = <<-EOS.margin
+          #{Doubleshot::Configuration::PROJECT_MESSAGE}
+          config.project = "doubleshot"
+
+          #{Doubleshot::Configuration::GROUP_MESSAGE}
+          #   config.group = "doubleshot"
+
+          #{Doubleshot::Configuration::VERSION_MESSAGE}
+          config.version = "9000.1"
+
+
+          #{Doubleshot::Configuration::GEM_REPOSITORY_MESSAGE}
+          #   config.gem_repository "https://rubygems.org"
+          #   config.gem_repository "http://gems.example.com"
+
+          #{Doubleshot::Configuration::MVN_REPOSITORY_MESSAGE}
+          #   config.mvn_repository "http://repo1.maven.org/maven2"
+          #   config.mvn_repository "http://repository.jboss.com/maven2"
+
+
           #{Doubleshot::Configuration::SOURCE_RUBY_MESSAGE}
           #   config.source.ruby    = "lib"
 
@@ -244,8 +345,6 @@ describe Doubleshot::Configuration do
 
           #{Doubleshot::Configuration::GEMSPEC_MESSAGE}
           config.gemspec do |spec|
-            spec.name           = "doubleshot"
-            spec.version        = "9000.1"
             spec.summary        = "This is my summary."
             spec.description    = <<-DESCRIPTION
           A very detailed description.
@@ -291,5 +390,4 @@ describe Doubleshot::Configuration do
       end
     end
   end
-
-end
+end