doubleshot 0.3.0-java → 0.4.0-java

data/Doubleshot

@@ -4,7 +4,7 @@ Doubleshot.new do |config|
 
   config.project = "doubleshot"
   config.group   = "org.sam.doubleshot"
-  config.version = "0.3.0"
+  config.version = "0.4.0"
 
   config.gem "minitest", ">= 3.0.1"
   config.gem "minitest-wscolor", ">= 0"
@@ -18,13 +18,13 @@ Doubleshot.new do |config|
     config.mvn_repository "http://maven.mirrors.travis-ci.org/nexus/content/repositories/codehaus-snapshots/"
     config.mvn_repository "http://maven.mirrors.travis-ci.org/nexus/content/shadows/central-m1/"
     config.mvn_repository "http://maven.mirrors.travis-ci.org/nexus/content/repositories/central/"
-  else
-    config.mvn_repository "https://nexus.codehaus.org/content/groups/public/"
-    config.mvn_repository "https://oss.sonatype.org/content/groups/public/"
-    config.mvn_repository "http://mirrors.ibiblio.org/pub/mirrors/maven2"
-    config.mvn_repository "http://repo1.maven.org/maven2"
   end
-  
+
+  config.mvn_repository "https://nexus.codehaus.org/content/groups/public/"
+  config.mvn_repository "https://oss.sonatype.org/content/groups/public/"
+  config.mvn_repository "http://mirrors.ibiblio.org/pub/mirrors/maven2"
+  config.mvn_repository "http://repo1.maven.org/maven2"
+
   config.jar "org.sonatype.aether:aether-api:jar:1.13.1"
   config.jar "org.sonatype.aether:aether-util:jar:1.13.1"
   config.jar "org.sonatype.aether:aether-impl:jar:1.13.1"

data/README.textile

@@ -55,17 +55,13 @@ end
 
 h2. Development
 
-Here's how to get Doubleshot running locally yourself. You'll need Java, Maven, JRuby (1.7.x or -head) and Bundler installed. Then, clone the repo:
+Here's how to get Doubleshot running locally yourself. You'll need Java, Maven and JRuby (1.7.x or -head) installed. Then, clone the repo:
 
 bc. git clone git://github.com/sam/doubleshot.git
 
-The last milestone we're currently working on is Gem resolution. For right now, you'll need to bootstrap the build with Bundler:
-
-bc. bundle install
-
 Doubleshot bootstraps it's own build using a slightly different process than used for projects actually using it. It's a chicken and egg situation. Since Doubleshot depends on some Java code to resolve JAR dependencies, and we can't compile without our dependencies, we can't use Doubleshot's normal code to resolve it's own JAR dependencies. That's why Doubleshot has a @pom.xml@ (generated with the @doubleshot pom@ command). We shell out to the Maven command line while bootstrapping the build.
 
-All that just to clarify the process. Once you've installed your Gem dependencies with Bundler, the only thing left you actually need to do at this point is run one of the @doubleshot@ commands to package or test. The internal bootstrapping will take care of the rest:
+All that just to clarify the process. The only thing left you actually need to do at this point is run one of the @doubleshot@ commands to package or test. The internal bootstrapping will take care of the rest:
 
 bc. bin/doubleshot test --ci
 

data/ext/java/Aether.java

@@ -50,9 +50,6 @@ public class Aether {
         installer = locator.getService( Installer.class );
 
         session = newSession( repoSystem, localRepo, verbose, offline );
-
-        RemoteRepository central = new RemoteRepository( "central", "default", "http://repo1.maven.org/maven2/" );
-        repos.add(central);
     }
 
     private ServiceLocator newServiceLocator() {

data/lib/doubleshot/commands/build.rb

@@ -39,8 +39,6 @@ class Doubleshot::CLI::Commands::Build < Doubleshot::CLI
       doubleshot.config.target.rmtree
     end
 
-    compiler = Doubleshot::Compiler.new(doubleshot.config.source.java, doubleshot.config.target)
-
     if doubleshot.config.project == "doubleshot"
       puts "Bootstrapping Doubleshot build with Maven..."
       doubleshot.bootstrap!
@@ -49,22 +47,26 @@ class Doubleshot::CLI::Commands::Build < Doubleshot::CLI
       doubleshot.setup!
     end
 
-    if options.classpath.empty?
-      doubleshot.classpath
-    else
-      options.classpath
-    end.each do |path|
-      compiler.classpath << path
-    end
+    if doubleshot.config.source.java.exist?
+      compiler = Doubleshot::Compiler.new(doubleshot.config.source.java, doubleshot.config.target)
 
-    puts "[INFO] Using #{compiler.classpath}"
-    puts
+      if options.classpath.empty?
+        doubleshot.classpath
+      else
+        options.classpath
+      end.each do |path|
+        compiler.classpath << path
+      end
 
-    if compiler.pending? || !options.conditional
-      puts "Compiling..."
-      compiler.build!
-    else
-      puts "Conditional build: No source changes."
+      puts "[INFO] Using #{compiler.classpath}"
+      puts
+
+      if compiler.pending? || !options.conditional
+        puts "Compiling..."
+        compiler.build!
+      else
+        puts "Conditional build: No source changes."
+      end
     end
 
     return 0

data/lib/doubleshot/configuration.rb

@@ -283,8 +283,10 @@ class Doubleshot
         @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? && @whitelist.include?(path.extname)
+        if @source.tests.exist?
+          @source.tests.find do |path|
+            test_files << path.to_s if path.file? && @whitelist.include?(path.extname)
+          end
         end
         @gemspec.test_files = test_files
 
@@ -296,12 +298,16 @@ class Doubleshot
           end
         end
 
-        @source.ruby.find do |path|
-          files << path.to_s if path.file? && @whitelist.include?(path.extname)
+        if @source.ruby.exist?
+          @source.ruby.find do |path|
+            files << path.to_s if path.file? && @whitelist.include?(path.extname)
+          end
         end
 
-        @source.java.find do |path|
-          files << path.to_s if path.file? && @whitelist.include?(path.extname)
+        if @source.java.exist?
+          @source.java.find do |path|
+            files << path.to_s if path.file? && @whitelist.include?(path.extname)
+          end
         end
 
         if @target.exist?

data/lib/doubleshot/resolver/gem_resolver/solver.rb

@@ -96,6 +96,10 @@ class Doubleshot
           while unbound_variable = variable_table.first_unbound
             possible_values_for_unbound = possible_values_for(unbound_variable)
             trace("Searching for a value for #{unbound_variable.artifact}")
+            trace("Constraints are")
+            constraint_table.constraints_on_artifact(unbound_variable.artifact).each do |constraint|
+              trace("\t#{constraint}")
+            end
             trace("Possible values are #{possible_values_for_unbound}")
 
             while possible_value = possible_values_for_unbound.shift
@@ -233,9 +237,19 @@ class Doubleshot
               constraint_table.add(dependency, source)
               dependency_domain = graph.versions(dependency.name, dependency.constraint)
               domain[dependency.name] = [(domain[dependency.name] || []), dependency_domain]
-                .flatten
-                .uniq
-                .sort { |left, right| right.version <=> left.version }
+              .flatten
+              .uniq
+              .sort { |left, right| right.version <=> left.version }
+
+              #if the variable we are constraining is still unbound, we want to filter
+              #its possible values, if its already bound, we know its ok to add this constraint because
+              #we can never change a previously bound value without removing this constraint and we check above
+              #whether or not its ok to add this constraint given the current value
+
+              variable = variable_table.find_artifact(dependency.name)
+              if variable.value.nil?
+                reset_possible_values_for(variable)
+              end
             end
           end
 

data/test/resolver/gem_resolver/solver_spec.rb

@@ -337,8 +337,6 @@ describe Doubleshot::Resolver::GemResolver::Solver do
     end
 
     it "must correctly resolve when one resolution exists but it is not the latest" do
-      skip "pending: https://github.com/reset/solve/pull/7"
-      
       @graph.artifacts("get-the-old-one", "1.0")
         .depends("locked-mid-1", ">= 0")
         .depends("locked-mid-2", ">= 0")
@@ -360,9 +358,9 @@ describe Doubleshot::Resolver::GemResolver::Solver do
       Doubleshot::Resolver::GemResolver::Solver.new(@graph, ["get-the-old-one"]).resolve.must_equal(
         {
           "get-the-old-one" => "1.0",
-          "locked-mid-1" => "1.3",
-          "locked-mid-2" => "1.4",
-          "old-bottom" => "0.5"
+          "locked-mid-1" => "2.0",
+          "locked-mid-2" => "1.0",
+          "old-bottom" => "2.0"
         })
     end
 
@@ -446,4 +444,4 @@ describe Doubleshot::Resolver::GemResolver::Solver do
 
     end
   end
-end
+end

data/test/resolver/gem_resolver_spec.rb

@@ -70,16 +70,15 @@ describe Doubleshot::Resolver::GemResolver do
         end
 
         it "should correctly resolve dependencies when one resolution exists but it is not the latest" do
-          skip "pending: https://github.com/reset/solve/pull/7"
           @dependencies.fetch "get-the-old-one"
 
           @resolver.resolve! @dependencies
 
           @dependencies.size.must_equal 4
           @dependencies.fetch("get-the-old-one").version.must_equal "1.0"
-          @dependencies.fetch("locked-mid-1").version.must_equal "1.3"
-          @dependencies.fetch("locked-mid-2").version.must_equal "1.4"
-          @dependencies.fetch("old-bottom").version.must_equal "0.5"
+          @dependencies.fetch("locked-mid-1").version.must_equal "2.0"
+          @dependencies.fetch("locked-mid-2").version.must_equal "1.0"
+          @dependencies.fetch("old-bottom").version.must_equal "2.0"
         end
       end
 

data/test/resolver/jar_resolver_spec.rb

@@ -6,15 +6,13 @@ require_relative "../helper"
 
 describe Doubleshot::Resolver::JarResolver do
   before do
-    @resolver = Doubleshot::Resolver::JarResolver.new(Doubleshot::Resolver::JarResolver::DEFAULT_REPOSITORY)
+    @resolver = Doubleshot::Resolver::JarResolver.new(*Doubleshot::current.config.mvn_repositories)
   end
 
   describe "fetch" do
     before do
       @dependencies = Doubleshot::Dependencies::JarDependencyList.new
-      @dependencies.fetch("com.pyx4j:maven-plugin-log4j:jar:1.0.1")
-      @dependencies.fetch("org.springframework:spring-core:jar:3.1.2.RELEASE")
-      @dependencies.fetch("org.hibernate:hibernate-core:jar:4.1.7.Final")
+      @dependencies.fetch("ch.qos.logback:logback-core:jar:1.0.6")
     end
 
     it "must return the same JarDependencyList" do
@@ -26,9 +24,5 @@ describe Doubleshot::Resolver::JarResolver do
         dependency.path.wont_be_nil
       end
     end
-
-    it "must populate transitive dependencies" do
-      @resolver.resolve!(@dependencies).size.must_equal 16
-    end
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: doubleshot
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.3.0
+  version: 0.4.0
 platform: java
 authors:
 - Sam Smoot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest