doubleshot 0.1.0-java → 0.2.0-java

data/lib/doubleshot/compiler.rb

@@ -1,5 +1,5 @@
-require "java"
 require "ant"
+require "doubleshot/compiler/classpath"
 
 class Doubleshot
   class Compiler
@@ -7,27 +7,30 @@ class Doubleshot
     def initialize(source, target)
       @source = Pathname(source.to_s)
       @target = Pathname(target.to_s)
+      @classpath = Classpath.new
     end
 
-    attr_reader :source, :target
+    attr_reader :source, :target, :classpath
 
-    def build!
+    def pending?
+      sources = Pathname::glob(@source + "**/*.java")
+      targets = Pathname::glob(@target + "**/*.class")
+      !sources.empty? && (targets.empty? || sources.map(&:mtime).max > targets.map(&:mtime).max)
+    end
+
+    def build!(add_target_to_current_classpath = false)
       @target.mkdir unless @target.exist?
-      
+
       # The JRuby ant integration throws JRuby Persistence
       # warnings that you can't supress, so we run it
       # inside of a Kernel#silence block.
       silence do
-        ant.path id: "classpath" do  
-          fileset dir: @target.to_s
-
-          $CLASSPATH.map do |path|
-            Pathname path.to_s.gsub(/file\:/, "")
-          end.select do |path|
-            path.exist?
-          end.map do |path|
-            (path.directory? ? path : path.dirname).to_s.ensure_ends_with("/")
-          end.uniq.each do |path|
+        # Since the ant.path block is instance_evaled,
+        # the following line is a hack to ensure we have
+        # access to the contents of @classpath.
+        classpath = @classpath
+        ant.path id: "classpath" do
+          classpath.each do |path|
             fileset dir: path
           end
         end
@@ -39,9 +42,9 @@ class Doubleshot
           classpathref:       "classpath"
       end
 
-      p $CLASSPATH
-      $CLASSPATH << @target.to_s unless $CLASSPATH.include?(@target.to_s)
+      $CLASSPATH << @target.to_url if add_target_to_current_classpath
+      self
     end
 
   end # class Compiler
-end # class Doubleshot
+end # class Doubleshot

data/lib/doubleshot/compiler/classpath.rb

@@ -0,0 +1,46 @@
+require "set"
+
+class Doubleshot
+  class Compiler
+    class Classpath
+
+      include Enumerable
+
+      def initialize
+        @set = Set.new
+      end
+
+      def add(path)
+        path = Pathname(path.to_s).expand_path
+
+        if path.directory?
+          @set << path
+        elsif path.file?
+          @set << path.dirname
+        else
+          raise ArgumentError.new("+path+ must be a file or directory with read permission: #{path}")
+        end
+
+        self
+      end
+      alias :<< :add
+
+      def size
+        @set.size
+      end
+      alias :length :size
+
+      def empty?
+       @set.empty?
+      end
+
+      def each
+        @set.each { |entry| yield entry }
+      end
+
+      def to_s
+        "CLASSPATH: #{@set.entries.sort.join(", ")}"
+      end
+    end
+  end
+end

data/lib/doubleshot/configuration.rb

@@ -12,12 +12,42 @@ class Doubleshot
       .erb .haml .rxml .builder .html
     ]
 
+    PROJECT_MESSAGE       = <<-EOS.margin
+    # The project name will be used as your JAR's
+    # artifactId and your Gem's name.
+    EOS
+
+    GROUP_MESSAGE         = <<-EOS.margin
+    # The groupId of your JAR. This will default to
+    # the project name if not supplied.
+    #
+    # NOTE: You are strongly encouraged to set this
+    # to something meaningful if you are planning to
+    # package your project as a JAR.
+    EOS
+
+    VERSION_MESSAGE       = <<-EOS.margin
+    # Version number that obeys the constraints of
+    # Gem::Version:
+    #
+    #   If any part contains letters, then the version
+    #     is considered pre-release.
+    EOS
+
+    GEM_REPOSITORY_MESSAGE = <<-EOS.margin
+    # TODO
+    EOS
+
+    MVN_REPOSITORY_MESSAGE = <<-EOS.margin
+    # TODO
+    EOS
+
     SOURCE_RUBY_MESSAGE   = <<-EOS.margin
     # Relative path to the folder containing your
     # Ruby source code (.rb files).
     # The default is "lib".
     EOS
-    
+
     SOURCE_JAVA_MESSAGE   = <<-EOS.margin
     # Relative path to the folder containing your
     # Java source code (.java files).
@@ -40,6 +70,11 @@ class Doubleshot
     # The default is "target".
     EOS
 
+    JAVA_MAIN_MESSAGE     = <<-EOS.margin
+    # Class to use for Ant's Main-Class attribute for
+    # a manifest. The default is "org.jruby.Main".
+    EOS
+
     WHITELIST_MESSAGE     = <<-EOS.margin
     # List of file extensions within source folders
     # that will be included during packaging.
@@ -85,12 +120,15 @@ class Doubleshot
     # file as it's added during the build process for you.
     EOS
 
+    attr_accessor :java_main
+
     def initialize
       @defaults                    = {}
       @gemspec                     = Gem::Specification.new
       @gemspec.platform            = Gem::Platform.new("java")
       @source                      = SourceLocations.new
       @target                      = default :target, Pathname("target")
+      @java_main                   = default :java_main, "org.jruby.Main"
 
       @runtime_dependencies        = Dependencies.new
       @development_dependencies    = Dependencies.new
@@ -98,6 +136,59 @@ class Doubleshot
 
       @paths                       = default :paths, DEFAULT_PATHS.dup
       @whitelist                   = default :whitelist, DEFAULT_WHITELIST.dup
+
+      @project                     = default :project, "hello_world"
+      @group                       = default :group, "org.world.hello"
+      @version                     = default :version, "0.1"
+
+      @gem_repositories            = default :gem_repositories, Set.new
+      @mvn_repositories            = default :mvn_repositories, Set.new
+    end
+
+    def group
+      @group || @project
+    end
+
+    def group=(name)
+      @group = name
+    end
+
+    def project
+      @project
+    end
+
+    def project=(name)
+      @gemspec.name = name
+      @project = name
+      @group = default :group, @project unless __changes__.include? :group
+      @project
+    end
+
+    def version
+      @version
+    end
+
+    def version=(version)
+      @gemspec.version = version
+      @version = version
+    end
+
+    def gem_repository(uri)
+      @gem_repositories << uri
+      uri
+    end
+
+    def gem_repositories
+      ReadonlyCollection.new(@gem_repositories)
+    end
+
+    def mvn_repository(uri)
+      @mvn_repositories << uri
+      uri
+    end
+
+    def mvn_repositories
+      ReadonlyCollection.new(@mvn_repositories)
     end
 
     def source
@@ -117,6 +208,14 @@ class Doubleshot
       self
     end
 
+    def classpath
+      @classpath
+    end
+
+    def classpath=(value)
+      @classpath = value
+    end
+
     def development
       if block_given?
         @development_environment = true
@@ -133,7 +232,7 @@ class Doubleshot
 
       dependency = dependencies.gems.fetch(name)
       dependencies.gems.add(dependency)
-      
+
       requirements.each do |requirement|
         dependency.add_requirement(requirement)
       end
@@ -141,6 +240,17 @@ class Doubleshot
       dependency
     end
 
+    def jar(coordinate)
+      dependencies = @development_environment ?
+        @development_dependencies :
+        @runtime_dependencies
+
+      dependency = dependencies.jars.fetch(coordinate)
+      dependencies.jars.add(dependency)
+
+      dependency
+    end
+
     def runtime
       @runtime_dependencies
     end
@@ -170,11 +280,11 @@ class Doubleshot
         yield @gemspec
       else
         @gemspec.rdoc_options = rdoc_options
-        @gemspec.require_paths = [ @source.ruby.to_s ]
+        @gemspec.require_paths = [ @source.ruby.to_s, @target.to_s ]
 
         test_files = []
         @source.tests.find do |path|
-          test_files << path.to_s if path.file?
+          test_files << path.to_s if path.file? && @whitelist.include?(path.extname)
         end
         @gemspec.test_files = test_files
 
@@ -196,7 +306,7 @@ class Doubleshot
 
         if @target.exist?
           @target.find do |path|
-            files << path.to_s if path.file?  
+            files << path.to_s if path.file? && path.extname != ".class"
           end
         end
 
@@ -210,6 +320,13 @@ class Doubleshot
           @gemspec.add_development_dependency dependency.name, *dependency.requirements
         end
 
+        bin = Pathname("bin").expand_path
+        if bin.directory?
+          bin.find do |path|
+            @gemspec.executables << path.relative_path_from(bin).to_s if path.file? && path.executable?
+          end
+        end
+
         @gemspec.add_development_dependency "doubleshot"
 
         @gemspec
@@ -218,7 +335,7 @@ class Doubleshot
 
     def to_ruby
       <<-EOS.margin
-        # encoding: UTF-8
+        # encoding: utf-8
 
         Doubleshot.new do |config|
 #{
@@ -248,6 +365,41 @@ class Doubleshot
       source_changes = @source.__changes__
 
       <<-EOS.margin
+        #{Doubleshot::Configuration::PROJECT_MESSAGE}
+        #{"#   " unless config_changes.include? :project}config.project = #{@project.inspect}
+
+        #{Doubleshot::Configuration::GROUP_MESSAGE}
+        #{"#   " unless config_changes.include? :group}config.group = #{@group.inspect}
+
+        #{Doubleshot::Configuration::VERSION_MESSAGE}
+        #{"#   " unless config_changes.include? :version}config.version = #{@version.to_s.inspect}
+
+
+        #{Doubleshot::Configuration::GEM_REPOSITORY_MESSAGE}
+        #{
+          if config_changes.include? :gem_repositories
+            (@gem_repositories).map do |repository|
+              "config.gem_repository #{repository.inspect}"
+            end.join("\n        ")
+          else
+            "#   config.gem_repository \"https://rubygems.org\"\n" +
+            "#   config.gem_repository \"http://gems.example.com\""
+          end
+        }
+
+        #{Doubleshot::Configuration::MVN_REPOSITORY_MESSAGE}
+        #{
+          if config_changes.include? :mvn_repositories
+            (@mvn_repositories).map do |repository|
+              "config.mvn_repository #{repository.inspect}"
+            end.join("\n        ")
+          else
+            "#   config.mvn_repository \"http://repo1.maven.org/maven2\"\n" +
+            "#   config.mvn_repository \"http://repository.jboss.com/maven2\""
+          end
+        }
+
+
         #{Doubleshot::Configuration::SOURCE_RUBY_MESSAGE}
         #{"#   " unless source_changes.include? :ruby}config.source.ruby    = #{@source.ruby.to_s.inspect}
 
@@ -321,8 +473,6 @@ class Doubleshot
 
         #{Doubleshot::Configuration::GEMSPEC_MESSAGE}
         config.gemspec do |spec|
-          spec.name           = #{spec.name.inspect}
-          spec.version        = #{spec.version.to_s.inspect}
           spec.summary        = #{spec.summary.inspect}
           spec.description    = <<-DESCRIPTION
         #{spec.description.strip}

data/lib/doubleshot/dependencies/dependency.rb

@@ -5,21 +5,10 @@ class Doubleshot
 
       def initialize(name)
         @name = name.dup.freeze
-        @requirements = Set.new
-      end
-
-      def requirements
-        ReadonlyCollection.new(@requirements)
-      end
-
-      def add_requirement(requirement)
-        requirement = Gem::Requirement.new(requirement)
-        @requirements << requirement
-        requirement
       end
 
       def eql?(other)
-        other.is_a?(Dependency) and other.name == @name
+        other.is_a?(self.class) and other.name == @name
       end
 
       def hash
@@ -27,11 +16,23 @@ class Doubleshot
       end
 
       def ==(other)
-        eql?(other) && requirements == other.requirements
+        eql?(other)
+      end
+
+      def lock(version)
+        @version = version
+      end
+
+      def locked?
+        !!@version
       end
 
-      def to_s
-        @name
+      def to_s(long_form = false)
+        if long_form && @version
+          "#{name} (#{@version})"
+        else
+          @name
+        end
       end
     end
   end

data/lib/doubleshot/dependencies/dependency_list.rb

@@ -1,8 +1,12 @@
+require "doubleshot/dependencies/dependency"
+
 class Doubleshot
   class Dependencies
     class DependencyList
       include Enumerable
 
+      DEPENDENCY_CLASS = Dependency
+
       def initialize
         @dependencies = Set.new
       end
@@ -12,6 +16,17 @@ class Doubleshot
       end
       alias :== :eql?
 
+      def +(other)
+        if other.class == self.class
+          list = self.class.new
+          (entries + other.entries).each { |item| list.add item }
+          list
+        else
+          raise ArgumentError.new("Only DependencyLists of the same type may be concatenated." +
+            "Expected +other+ to be a #{self.class.inspect} but was a #{other.class.inspect}.")
+        end
+      end
+
       def add(dependency)
         unless dependency.is_a? Dependency
           raise ArgumentError.new("+dependency+ must be a Doubleshot::Dependencies::Dependency")
@@ -22,24 +37,24 @@ class Doubleshot
 
       def fetch(name)
         raise ArgumentError.new("+name+ must be a String") unless name.is_a? String
-        
+
         unless dependency = @dependencies.detect { |entry| entry.name == name }
-          dependency = Dependency.new(name)
+          dependency = self.class::DEPENDENCY_CLASS.new(name)
           add dependency
         end
-        
+
         dependency
       end
 
       def size
         @dependencies.size
       end
-      alias :length :size 
+      alias :length :size
 
       def empty?
         @dependencies.empty?
       end
-      
+
       def each
         @dependencies.each do |dependency|
           yield dependency