Support Clojure 1.2.1

HISTORY

@@ -5,6 +5,7 @@
    https://github.com/marick/Midje/wiki/Tabular-facts
 * `fact` will now return true if all the checks succeed;
   false otherwise.
+* Can use either Clojure 1.2.0 or 1.2.1
 
 = 1.1.1 
 * Background prerequisites are now scoped to facts. That

NOTES

@@ -4,7 +4,11 @@ manual.
 * Update HISTORY
 * bin/update-project-files <midje-version>
 * Rake fresh
-* bin/version 1.2.0 <midje-version>
+* bin/version 1.2.0 1.2.0 <midje-version>
+* bin/run-tests
+
+* Rake fresh
+* bin/version 1.2.1 1.2.0 <midje-version>
 * bin/run-tests
 
 * Rake fresh

Rakefile

@@ -4,11 +4,14 @@ require 'rubygems'
 require 'rake'
 
 def jar_name
-    text = File.read('project.clj')
-    unless /midje\s+"(\d+\.\d+\.\d+(-[A-Z]+)?)"/ =~ text
-    	"Couldn't find version in project file."
-	exit 1
-   end
+  text = File.read('project.clj')
+  unless /midje\s+"(\d+\.\d+\.\d+(-[A-Z]+)?)"/ =~ text ||
+         /midje\s+"(\d+\.\d-alpha\d)"/ =~ text || 
+         /midje\s+"(\d+\.\d-beta\d)"/ =~ text || 
+    puts "Couldn't find version in project file."
+    exit 1
+  end
+  puts "jar name: #{$1}"
    "midje-#{$1}.jar"
 end
 
@@ -32,7 +35,9 @@ end
 
 desc "upload to clojars"
 task :upload do
-     doit("lein pom")
-     doit("mv midje.jar #{jar_name} ")
-     doit("scp pom.xml #{jar_name} clojars@clojars.org:")
+  doit("lein pom")
+  if File.exist?("midje.jar")
+    doit("mv midje.jar #{jar_name} ")
+  end
+  doit("scp pom.xml #{jar_name} clojars@clojars.org:")
 end

bin/version

@@ -13,11 +13,12 @@ end
 
 
 $clojure_version = arg(0, "clojure")
-$midje_version = arg(1, "midje")
+$clojure_contrib_version = arg(1, "clojure_contrib")
+$midje_version = arg(2, "midje")
 
 
 $clojure_jar="#{ENV['HOME']}/.m2/repository/org/clojure/clojure/#{$clojure_version}/clojure-#{$clojure_version}.jar"
-$contrib_jar="#{ENV['HOME']}/.m2/repository/org/clojure/clojure-contrib/#{$clojure_version}/clojure-contrib-#{$clojure_version}.jar"
+$contrib_jar="#{ENV['HOME']}/.m2/repository/org/clojure/clojure-contrib/#{$clojure_contrib_version}/clojure-contrib-#{$clojure_contrib_version}.jar"
 $midje_jar="midje-#{$midje_version}.jar"
 
 def remove_jars(*dirs)

examples/adder-webapp/project.clj

@@ -10,5 +10,5 @@
      [hiccup "0.2.6"]]
   :dev-dependencies
   [[lein-run "1.0.0"]
-   [midje "1.2-alpha2"]
+   [midje "1.2-alpha3"]
    ])

examples/basic/project.clj

@@ -2,6 +2,6 @@
   :description "An example of using Midje's sweet interface"
   :dependencies [[org.clojure/clojure "[1.1.0,1.2.0]"]
                  [org.clojure/clojure-contrib "[1.1.0,1.2.0]"]
-		 [midje "1.2-alpha2"]]
+		 [midje "1.2-alpha3"]]
   :dev-dependencies [[marginalia "0.3.2"]])
 

examples/basic/run

@@ -1,2 +1,2 @@
 cd test
-java -cp ../lib/clojure-1.2.0.jar:../lib/clojure-contrib-1.2.0.jar:../lib/core-1.3.0-20101126.151146-4.jar:../lib/def-1.3.0-20101219.140057-27.jar:../lib/dev:../lib/midje-1.2-alpha2.jar:../lib/unifycle-0.5.0.jar clojure.main -i basic/core_test.clj -e '(ns basic.core-test)(run-tests)'
+java -cp ../lib/clojure-1.2.0.jar:../lib/clojure-contrib-1.2.0.jar:../lib/core-1.3.0-20101126.151146-4.jar:../lib/def-1.3.0-20101219.140057-27.jar:../lib/dev:../lib/midje-1.2-alpha3.jar:../lib/unifycle-0.5.0.jar clojure.main -i basic/core_test.clj -e '(ns basic.core-test)(run-tests)'

examples/cake-midje/project.clj

@@ -2,4 +2,4 @@
   :description "TODO: add summary of your project"
   :dependencies [[clojure "1.2.0"]
 		 [clojure-contrib "1.2.0"]]
-  :dev-dependencies [[midje "1.2-alpha2"]])
+  :dev-dependencies [[midje "1.2-alpha3"]])

examples/compound-checkers/project.clj

@@ -4,4 +4,4 @@
     [[org.clojure/clojure "1.2.0"]
      [org.clojure/clojure-contrib "1.2.0"]]
   :dev-dependencies
-  [[midje "1.2-alpha2"]])
+  [[midje "1.2-alpha3"]])

examples/leiningen-midje/project.clj

@@ -2,4 +2,4 @@
   :description "FIXME: write"
   :dependencies [[org.clojure/clojure "1.2.0"]
                  [org.clojure/clojure-contrib "1.2.0"]
-		 [midje "1.2-alpha2"]])
+		 [midje "1.2-alpha3"]])

examples/leiningen-test/project.clj

@@ -2,4 +2,4 @@
   :description "FIXME: write"
   :dependencies [[org.clojure/clojure "1.2.0"]
                  [org.clojure/clojure-contrib "1.2.0"]
-		 [midje "1.2-alpha2"]])
+		 [midje "1.2-alpha3"]])

examples/semi-sweet-examples/project.clj

@@ -2,7 +2,7 @@
   :description "An example of using Midje semi-sweet mocking"
   :dependencies [[org.clojure/clojure "[1.1.0,1.2.0]"]
                  [org.clojure/clojure-contrib "[1.1.0,1.2.0]"]
-		 [midje "1.2-alpha2"]
+		 [midje "1.2-alpha3"]
 		 ]
 )
 

examples/semi-sweet-examples/run

@@ -1,2 +1,2 @@
 cd test
-java -cp ../lib/clojure-1.2.0.jar:../lib/clojure-contrib-1.2.0.jar:../lib/core-1.3.0-20101116.112441-56.jar:../lib/def-1.3.0-20101116.112441-56.jar:../lib/midje-1.2-alpha2.jar:../lib/unifycle-0.5.0.jar clojure.main -i semi_sweet_simple/core_test.clj -e '(ns semi-sweet-simple.core-test)(run-tests)'
+java -cp ../lib/clojure-1.2.0.jar:../lib/clojure-contrib-1.2.0.jar:../lib/core-1.3.0-20101116.112441-56.jar:../lib/def-1.3.0-20101116.112441-56.jar:../lib/midje-1.2-alpha3.jar:../lib/unifycle-0.5.0.jar clojure.main -i semi_sweet_simple/core_test.clj -e '(ns semi-sweet-simple.core-test)(run-tests)'

project.clj

@@ -1,6 +1,6 @@
-(defproject midje "1.2-alpha2"
+(defproject midje "1.2-alpha3"
   :description "A TDD library for Clojure, with an emphasis on mocks"
-  :dependencies [[org.clojure/clojure "1.2.0"]
+  :dependencies [[org.clojure/clojure "[1.2.0,1.2.1]"]
                  [org.clojure/clojure-contrib "1.2.0"]
 		 [unifycle "0.5.0"]]
   :dev-dependencies [[swank-clojure "1.2.1"]])