doubleshot 0.2.0-java → 0.3.0-java

data/lib/doubleshot.rb

@@ -18,6 +18,7 @@ require "doubleshot/readonly_collection"
 require "doubleshot/configuration"
 require "doubleshot/compiler"
 require "doubleshot/lockfile"
+require "doubleshot/resolver"
 
 class Doubleshot
 
@@ -85,9 +86,72 @@ class Doubleshot
     end
     # END: Cleanup tasks
 
+    load_gems! unless @config.runtime.gems.empty? && @config.development.gems.empty?
     load_jars! unless @config.runtime.jars.empty? && @config.development.jars.empty?
   end
 
+  def load_gems!
+    if lockfile.gems.empty?
+      dependencies = @config.runtime.gems + @config.development.gems
+      
+      puts "Dependencies not locked. Resolving the following:"
+      dependencies.each do |dependency|
+        puts "  #{dependency.name}: #{dependency.requirements.map(&:to_s).join(", ")}"
+      end
+      
+      unless dependencies.empty?
+        resolver = Resolver::GemResolver.new *@config.gem_repositories
+        puts "Using repositories: #{@config.gem_repositories.map(&:to_s).join(",")}"
+        
+        resolver.resolve! dependencies
+      
+        puts "Resolved dependencies:"
+        dependencies.each do |dependency|
+          puts "  #{dependency.name}: #{dependency.version}"
+        end
+        
+        require "rubygems/dependency_installer"
+        Gem::sources = @config.gem_repositories.entries
+        installer = Gem::DependencyInstaller.new domain: :both
+        dependencies.each do |dependency|
+          begin
+            puts "Activating: #{dependency.name} #{dependency.version}"
+            gem dependency.name, dependency.version
+          rescue LoadError
+            puts "Gem not installed! Installing: #{dependency.name} #{dependency.version}"
+            installer.install dependency.name, dependency.version
+            gem dependency.name, dependency.version
+          end
+          lockfile.add dependency
+        end
+        
+        dependencies.each { |dependency| lockfile.add dependency }
+        lockfile.flush!
+      end
+    else
+      missing_dependencies = []
+      lockfile.gems.each do |dependency|
+        begin
+          gem dependency.name, dependency.version
+        rescue LoadError
+          missing_dependencies << dependency
+        end
+      end
+
+      unless missing_dependencies.empty?
+        # TODO: Figure out how to use #gem_repositories here
+        require "rubygems/dependency_installer"
+        Gem::sources = @config.gem_repositories.entries
+        installer = Gem::DependencyInstaller.new domain: :both
+
+        missing_dependencies.each do |dependency|
+          installer.install dependency.name, dependency.version
+          gem dependency.name, dependency.version
+        end
+      end
+    end
+  end
+
   def load_jars!
     if classpath_cache.exist?
       # We survived the cleanup checks, go ahead and just load
@@ -100,7 +164,7 @@ class Doubleshot
           require jar.path
           self.classpath << jar.path
         rescue LoadError
-          warn "Could not load: #{jar.path.inspect}"
+          warn "Could not load: #{jar.to_s.inspect}"
           raise
         end
       end
@@ -108,46 +172,41 @@ class Doubleshot
       # No classpath_cache exists, we must resolve the paths
       # to our dependencies, then store the results in
       # classpath_cache for future processes to use.
-      require "doubleshot/resolver"
-
-      if @config.mvn_repositories.empty?
-        @config.mvn_repository Resolver::JarResolver::DEFAULT_REPOSITORY
-      end
-
-      resolver = Resolver::JarResolver.new(*@config.mvn_repositories)
-      jars = nil
-
-      if lockfile.exist?
-        jars = Dependencies::JarDependencyList.new
-        lockfile.jars.each do |jar|
-          jars.add jar
+      jars = @config.runtime.jars + @config.development.jars
+      unless jars.empty?
+      
+        resolver = Resolver::JarResolver.new(*@config.mvn_repositories)
+  
+        if lockfile.exist? && !lockfile.jars.empty?
+          jars = Dependencies::JarDependencyList.new
+          lockfile.jars.each do |jar|
+            jars.add jar
+          end
         end
-      else
-        jars = @config.runtime.jars + @config.development.jars
-      end
-
-      resolver.resolve! jars
-
-      jars.each { |jar| lockfile.add jar }
-      lockfile.flush!
-
-      cache = {}
-      jars.each do |jar|
-        cache[jar.to_s] = jar.path
-        begin
-          require jar.path
-          self.classpath << jar.path
-        rescue LoadError
-          warn "Could not load: #{jar.path.inspect}"
-          raise
+  
+        resolver.resolve! jars
+  
+        jars.each { |jar| lockfile.add jar }
+        lockfile.flush!
+  
+        cache = {}
+        jars.each do |jar|
+          cache[jar.to_s] = jar.path.to_s
+          begin
+            require jar.path
+            self.classpath << jar.path
+          rescue LoadError
+            warn "Could not load: #{jar.to_s.inspect}"
+            raise
+          end
         end
-      end
-
-      classpath_cache.open("w+") do |file|
-        file << cache.to_yaml
-      end
-    end
-  end
+  
+        classpath_cache.open("w+") do |file|
+          file << cache.to_yaml
+        end
+      end # unless jars.empty?
+    end # if classpath_cache.exist?
+  end # def load_jars!
 
   def classpath_cache
     @classpath_cache ||= Pathname(".classpath.cache")
@@ -169,6 +228,7 @@ class Doubleshot
         jar = Dependencies::JarDependency.new(coordinate)
         jar.path = path
         lockfile.add jar
+        # puts "Added coordinate: #{coordinate.inspect} as #{jar.to_s.inspect}"
       end
 
       lockfile.flush!
@@ -177,6 +237,7 @@ class Doubleshot
         file << resolved.to_yaml
       end
     else
+      # TODO: This is problematic since Maven and Aether resolve different dependencies...
       setup!
     end
   end

data/lib/doubleshot/commands/gem.rb

@@ -37,22 +37,25 @@ class Doubleshot::CLI::Commands::Gem < Doubleshot::CLI
       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"
+    target = doubleshot.config.target
+    jarfile = target + "#{doubleshot.config.project}.jar"
+    jarfile.delete if jarfile.exist?
+    
+    begin
+      unless Pathname::glob(doubleshot.config.source.java + "**/*.java").empty?
+        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
+    ensure
+      jarfile.delete if jarfile.exist?
     end
 
-    # WARN: This is version specific since in HEAD they've changed this to Gem::Package::build.
-    ::Gem::Builder.new(doubleshot.config.gemspec).build
-
     puts("  Size: %.2fM" % (Pathname(doubleshot.config.gemspec.file_name).size.to_f / 1024 / 1024))
 
     return 0

data/lib/doubleshot/commands/test.rb

@@ -22,6 +22,11 @@ class Doubleshot::CLI::Commands::Test < Doubleshot::CLI
         options.build = true
       end
 
+      options.force_tests = false
+      options.on "--force", "Run tests, even if doubleshot_test.pid exists." do
+        options.force_tests = true
+      end
+
       options.separator ""
       options.separator "Summary: #{summary}"
     end
@@ -29,6 +34,24 @@ class Doubleshot::CLI::Commands::Test < Doubleshot::CLI
 
   def self.start(args)
     options = self.options.parse!(args)
+
+    @@pid_file = Pathname(".doubleshot_test.pid")
+    if @@pid_file.exist? && !options.force_tests
+      
+      begin
+        if Process.getpgid(@@pid_file.read.to_i)
+          puts ".doubleshot_test.pid exists: Are you running tests elsewhere? (Use --force to override.)"
+          exit 1
+        end
+      rescue Errno::ESRCH
+        @@pid_file.delete
+      end
+    end
+
+    @@pid_file.open("w") do |pid|
+      pid << $$
+    end
+
     doubleshot = Doubleshot::current
 
     if Pathname::glob(doubleshot.config.source.tests + "**/*_{spec,test}.rb").empty?
@@ -53,21 +76,25 @@ class Doubleshot::CLI::Commands::Test < Doubleshot::CLI
       end
     end
 
-    require "listen"
-
-    watcher = new(doubleshot.config, options.ci_test)
+    watcher = new(doubleshot.config, options.ci_test, options.force_tests)
     watcher.run
   end
 
-  def initialize(config, ci_test)
+  def initialize(config, ci_test, force_tests)
     @config = config
     @interrupted = false
     @ci_test = ci_test
+    @force_tests = force_tests
 
     # Hit Ctrl-C once to re-run all specs; twice to exit the program.
     Signal.trap("INT") do
       if @interrupted
         puts "\nShutting down..."
+
+        unless @force_tests
+          @@pid_file.delete if @@pid_file.exist?
+        end
+
         exit 0
       else
         @interrupted = true
@@ -79,7 +106,11 @@ class Doubleshot::CLI::Commands::Test < Doubleshot::CLI
 
   def run
     if @ci_test
-      run_all_specs
+      exit_status = run_all_specs
+      unless @force_tests
+        @@pid_file.delete if @@pid_file.exist?
+      end
+      exit_status
     else
       Doubleshot::CLI::Commands::Build.start([ "--conditional" ])
       # Output here just so you know when changes will be
@@ -91,6 +122,8 @@ class Doubleshot::CLI::Commands::Test < Doubleshot::CLI
 
   private
   def listener
+    require "listen"
+    
     # This creates a MultiListener
     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|

data/lib/doubleshot/configuration.rb

@@ -179,7 +179,7 @@ class Doubleshot
     end
 
     def gem_repositories
-      ReadonlyCollection.new(@gem_repositories)
+      ReadonlyCollection.new(@gem_repositories.empty? ? [ Resolver::GemResolver::DEFAULT_REPOSITORY ] : @gem_repositories)
     end
 
     def mvn_repository(uri)
@@ -188,7 +188,7 @@ class Doubleshot
     end
 
     def mvn_repositories
-      ReadonlyCollection.new(@mvn_repositories)
+      ReadonlyCollection.new(@mvn_repositories.empty? ? [ Resolver::JarResolver::DEFAULT_REPOSITORY ] : @mvn_repositories)
     end
 
     def source

data/lib/doubleshot/dependencies/dependency.rb

@@ -1,7 +1,7 @@
 class Doubleshot
   class Dependencies
     class Dependency
-      attr_reader :name
+      attr_reader :name, :version
 
       def initialize(name)
         @name = name.dup.freeze

data/lib/doubleshot/dependencies/gem_dependency.rb

@@ -24,20 +24,12 @@ class Doubleshot
       end
 
       def to_s(long_form = false)
-        if long_form && !@requirements.empty?
-          "#{name} (#{@requirements.sort.map(&:to_s).join(", ")})"
+        if long_form && @version
+          "#{name}:#{version}"
         else
           @name
         end
       end
-
-      # def gemspec
-      # end
-
-      # def dependencies
-      #   #gemspec.runtime_dependencies
-      # end
-
     end
   end
 end

data/lib/doubleshot/dependencies/jar_dependency.rb

@@ -6,7 +6,7 @@ class Doubleshot
 
       PACKAGE_TYPES = [ "pom", "jar", "maven-plugin", "ejb", "war", "ear", "rar", "par", "bundle" ]
 
-      attr_reader :group, :artifact, :packaging, :classifier, :version, :path
+      attr_reader :group, :artifact, :packaging, :classifier, :version, :path, :exclusions
 
       def initialize(maven_coordinate)
         # This is Maven's default package type, if unspecified.
@@ -32,11 +32,13 @@ class Doubleshot
           @classifier = classifier
         end
 
-        @name = "#{@group}:#{@artifact}:#{@packaging}#{":#{@classifier}" if @classifier}:#{@version}"
+        @name = "#{@group}:#{@artifact}:#{@packaging}:#{@version}"
 
         if [ @group, @artifact, @packaging, @version ].any? &:blank?
           raise ArgumentError.new("Invalid coordinate: #{@name}")
         end
+
+        @exclusions = []
       end
 
       def to_s(long_form = false)
@@ -47,6 +49,14 @@ class Doubleshot
         @path = Pathname(path.to_s)
       end
 
+      def exclude(coordinate)
+        if coordinate.split(":").size != 2
+          raise ArgumentError.new("JarDependency#exclude takes a string of format \"groupId:artifactId\", you provided #{coordinate.inspect}")
+        end
+        @exclusions << coordinate
+        self
+      end
+
       private
 
       def packaging=(value = "jar")

data/lib/doubleshot/lockfile.rb

@@ -69,14 +69,17 @@ class Doubleshot
 
     def load
       unless @loaded
-        (data["JARS"] || []).each do |buildr_string|
-          @jars.add Dependencies::JarDependency.new(buildr_string)
+        (data["JARS"] || []).each do |coordinate|
+          @jars.add Dependencies::JarDependency.new(coordinate)
         end
 
-        # TODO: add gems to this method
-        # (data["GEMS"] || []).each do |gem_string|
-        #   @gems.add Dependencies::GemDependency.new(gem_string)
-        # end
+        (data["GEMS"] || []).each do |spec|
+          name, version = *spec.split(":")
+          dependency = Dependencies::GemDependency.new(name)
+          dependency.lock(version)
+
+          @gems.add dependency
+        end
       end
 
       @loaded = true

data/lib/doubleshot/pom.rb

@@ -29,7 +29,20 @@ class Doubleshot
               <type>#{jar.packaging}</type>
               #{
               "<classifier>#{jar.classifier}</classifier>" unless jar.classifier.blank?
-              }<version>#{jar.version}</version>
+              }<version>#{jar.version}</version>#{
+              unless jar.exclusions.empty?
+                "\n              <exclusions>\n                " +
+                  jar.exclusions.map do |exclusion|
+                  groupId, artifactId = exclusion.split(":")
+                <<-EXCLUSION.strip
+                <exclusion>
+                  <groupId>#{groupId}</groupId>
+                  <artifactId>#{artifactId}</artifactId>
+                </exclusion>
+                EXCLUSION
+                  end.join("\n                ") +
+                "\n              </exclusions>"
+              end}
             </dependency>
                 JAR
               end.join("\n            ") +
@@ -39,4 +52,4 @@ class Doubleshot
       EOS
     end
   end
-end
+end