shubox 0.9 → 0.9.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.9.1	2009-11-1
+
+* 1 minor enhancement:
+	* Clojure learning tests now auto-discovered; thanks, Stu.
+
 == 0.9	2009-10-22
 
 * 1 major enhancement:

data/Manifest.txt

@@ -8,16 +8,17 @@ app_generators/clojure/USAGE
 app_generators/clojure/clojure_generator.rb
 app_generators/clojure/templates/README.rdoc
 app_generators/clojure/templates/bin/repl.sh
-app_generators/clojure/templates/bin/runtests.sh
+app_generators/clojure/templates/build.xml
 app_generators/clojure/templates/lib/clojure-contrib.jar
 app_generators/clojure/templates/lib/clojure.jar
 app_generators/clojure/templates/lib/jline-0.9.94.jar
 app_generators/clojure/templates/project.iml
 app_generators/clojure/templates/project.ipr
 app_generators/clojure/templates/src/repl.clj
-app_generators/clojure/templates/test/core/about_clojure_testing.clj
-app_generators/clojure/templates/test/core/about_forms.clj
-app_generators/clojure/templates/test/tests.clj
+app_generators/clojure/templates/test/learning/about_clojure_testing.clj
+app_generators/clojure/templates/test/learning/about_forms.clj
+app_generators/clojure/templates/test/learning/about_sequences.clj
+app_generators/clojure/templates/test/test_runner.clj
 app_generators/java/USAGE
 app_generators/java/java_generator.rb
 app_generators/java/templates/Greeting.java

data/README.rdoc

@@ -32,11 +32,9 @@ on newgem, so extending the framework is as simple as creating new generator scr
 
 The <code>shubox</code> application is distributed as a RubyGem and is available immediately after installation.
 
-<code>$ gem sources -a http:http://gems.github.com</code>
+<code>$ gem sources -a http:http://gemcutter.org</code>
 
-<code>$ sudo gem install bobbyno-shubox</code>
-
-Alternately, download the gem and install manually from github.
+<code>$ sudo gem install shubox</code>
 
 == RUBY USAGE
 
@@ -81,7 +79,7 @@ shubox also supports Clojure:
 
 <code>$ cd /tmp/learn_clojure</code>
 
-<code>$ bin/runtests.sh</code>
+<code>$ ant</code>
 
 The Clojure command will also generate a <project name>.ipr file to allow the project to easily be
 opened in IntelliJ 8.

data/Rakefile

@@ -33,7 +33,7 @@ Dir['tasks/**/*.rake'].each { |t| load t }
 # task :default => [:spec, :features]
 
 desc "Create the gem and install it"
-task :dev => [:clean, :manifest, :clean_manifest, :gemspec, :package, :install_gem, :uat]
+task :dev => [:clean, :manifest, :gemspec, :package, :install_gem, :uat]
 
 desc "Strip out the entries in the .git folder for ppl who haven't updated .hoerc"
 task :clean_manifest do

data/app_generators/clojure/clojure_generator.rb

@@ -17,7 +17,7 @@ class ClojureGenerator < ShuboxAppGenerator
 
       # bin
       m.directory "bin"
-      m.file_copy_each %w(repl.sh runtests.sh), "bin", script_options
+      m.file "bin/repl.sh", "bin/repl.sh", script_options
 
       # lib
       m.directory "lib"
@@ -28,19 +28,16 @@ class ClojureGenerator < ShuboxAppGenerator
       m.file("src/repl.clj", "src/repl.clj")
 
       # test
-      m.directory "test/core"
-      m.file("test/core/about_clojure_testing.clj", "test/core/about_clojure_testing.clj")
-      m.file("test/core/about_forms.clj", "test/core/about_forms.clj")
-      m.file("test/tests.clj", "test/tests.clj")
+      m.directory "test/learning"
+      m.file("test/learning/about_clojure_testing.clj", "test/learning/about_clojure_testing.clj")
+      m.file("test/learning/about_forms.clj", "test/learning/about_forms.clj")
+      m.file("test/learning/about_sequences.clj", "test/learning/about_sequences.clj")
+      m.file("test/test_runner.clj", "test/test_runner.clj")
+      m.file("build.xml", "build.xml")
     end
   end
 
   protected
     # Installation skeleton.
-    BASEDIRS = %w(
-      build
-      lib
-      src
-      test
-    )
+    BASEDIRS = %w(bin lib src test)
 end

data/app_generators/clojure/templates/README.rdoc

@@ -4,21 +4,24 @@ Generated from http://www.github.com/bobbyno/shubox
 
 == Running via command line
 
-REPL: <code>bin/repl.sh</code>
+Run Tests: <code>ant</code>
 
-Tests: <code>bin/runtests.sh</code>
+Start REPL: <code>bin/repl.sh</code>
 
 == Running in IntelliJ
 
 * Install the La Clojure plugin
-* Create a run configuration for tests.clj
+* Create a run configuration for test/test-runner.clj
 * Check "Run script in REPL" and uncheck "Display settings before launching"
-* Run tests.clj - output displays in the run tab
+* Run test-runner.clj - output displays in the run tab
 * Enter <code>(. System exit 0)</code> or hit the stop button if the REPL doesn't exit.
+* Run src/repl.clj in the "Run script in REPL" option to keep the REPL running in the IDE.
 
 == Credits
 
-Project structure based on Stuart Halloway's clojure-bowling: http://github.com/stuarthalloway/clojure-bowling/
+Programming Clojure by Stuart Halloway: http://www.pragprog.com/titles/shcloj
+
+Project structure based on Stu's clojure-bowling: http://github.com/stuarthalloway/clojure-bowling/
 
 Note that this requires a post-1.0 version of Clojure and contrib to use the new 'are' syntax.
 

data/app_generators/clojure/templates/build.xml

@@ -0,0 +1,15 @@
+<project name="learn_clojure" default="test" basedir=".">
+
+  <path id="test.classpath">
+    <fileset dir="lib" includes="*.jar"/>
+  </path>
+
+  <target name="test">
+    <java classname="clojure.main" classpathref="test.classpath" dir="test" fork="true" failonerror="true">
+      <classpath path="test"/>
+      <arg value="-e"/>
+      <arg value="(use 'test-runner)"/>
+    </java>
+  </target>
+
+</project>

data/app_generators/clojure/templates/src/repl.clj

@@ -1,3 +1,2 @@
 ; making the REPL nicer
-(use '[clojure.contrib java-utils pprint seq-utils repl-utils duck-streams]
-     'sicp.week_one)
+(use '[clojure.contrib java-utils pprint seq-utils repl-utils duck-streams])

data/app_generators/clojure/templates/test/{core → learning}/about_clojure_testing.clj

@@ -1,4 +1,4 @@
-(ns core.about_clojure_testing
+(ns learning.about-clojure-testing
   (:use clojure.test))
 
 ; Define a simple "Hello, World" function to test

data/app_generators/clojure/templates/test/learning/about_forms.clj

@@ -0,0 +1,18 @@
+(ns learning.about-forms
+  (:use clojure.test))
+
+(deftest division
+  (are [desc expression expected] (= expression expected)
+    "do some simple division" (/ 6 2)   3
+    "show that ratio is a built-in type"  (/ 1 2)   1/2
+    "use a floating-point literal for the dividend for decimal division" (/ 1 2.0)   0.5
+    "obtain the integer quotient"  (quot 22 7)   3
+    "obtain the remainder" (rem 23 7)  2
+   ))
+
+(deftest strings
+  (are [desc expression expected] (= expression expected)
+    "convert a lowercase string to uppercase"  (.toUpperCase  "str")  "STR"   
+    "append several strings - show that nil is ignored" (str 1 nil "two") "1two"
+  ))
+

data/app_generators/clojure/templates/test/learning/about_sequences.clj

@@ -0,0 +1,24 @@
+(ns learning.about-sequences
+  (:use clojure.test))
+
+(deftest seq-functions-work-for-lists
+  (are [x expected] (= x expected)
+    ; first, rest, cons on lists
+    (first '(1 2 3))  1
+    (rest '(1 2 3)) '(2 3)
+    (cons 0 '(1 2 3)) '(0 1 2 3)
+   ))
+
+(deftest seq-functions-work-on-vectors
+  (are [x expected] (= x expected)
+    ; first, rest, cons on vectors
+    (first [1 2 3])  1
+    (rest [1 2 3]) [2 3]
+    (cons 0 [1 2 3]) [0 1 2 3]
+   ))
+
+(deftest rest-and-cons-returns-a-seq-not-a-vector
+  (are [x expected] (= x expected)
+    ; call class on rest to prove that lists and vectors are seqs
+    (class (rest [1 2 3])) clojure.lang.LazilyPersistentVector$ChunkedSeq
+    ))

data/app_generators/clojure/templates/test/test_runner.clj

@@ -0,0 +1,19 @@
+(ns test-runner
+  (:use clojure.test))
+
+(defn load-test-namespaces [directory]
+  (let [test-files
+        (for [f (file-seq (java.io.File. directory)) :when (re-find #".clj$" (.getPath f))]
+          (re-find #"[^.]+" (.getPath f)))]
+    (doseq [file test-files] (load file))))
+
+(defn run-learning-tests
+  "Finds, loads, and runs all tests."
+  []
+  (try
+   (load-test-namespaces "learning")
+   (run-all-tests #"^learning.*")
+   (finally
+    (shutdown-agents))))
+
+(run-learning-tests)

data/lib/shubox.rb

@@ -5,7 +5,7 @@ $:.unshift(File.dirname(__FILE__) + '/../cleaner_generators') unless
   $:.include?(File.dirname(__FILE__) + '/../cleaner_generators') || $:.include?(File.expand_path(File.dirname(__FILE__) + '../cleaner_generators'))
 
 module Shubox
-  VERSION = '0.9'
+  VERSION = '0.9.1'
 end
 
 require 'test_unit_cleaner/lib/test_unit_cleaner'

data/test/generators/test_clojure_generator.rb

@@ -19,11 +19,11 @@ class TestClojureGenerator < Test::Unit::TestCase
     assert_generated_file   "README.rdoc"
     assert_generated_file   "myproject.ipr"
     assert_generated_file   "myproject.iml"
+    assert_generated_file   "build.xml"
     assert_file_contains(PROJECT_NAME, "myproject.ipr")
     
     assert_directory_exists "bin"
     assert_generated_file   "bin/repl.sh"
-    assert_generated_file   "bin/runtests.sh"
     
     assert_directory_exists "lib"
     assert_generated_file   "lib/clojure.jar"
@@ -34,11 +34,11 @@ class TestClojureGenerator < Test::Unit::TestCase
     assert_generated_file   "src/repl.clj"
     
     assert_directory_exists "test"
-    assert_directory_exists "test/core"
-    assert_generated_file   "test/core/about_clojure_testing.clj"
-    assert_generated_file   "test/core/about_forms.clj"
-    assert_generated_file   "test/tests.clj"
+    assert_directory_exists "test/learning"
+    assert_generated_file   "test/learning/about_clojure_testing.clj"
+    assert_generated_file   "test/learning/about_forms.clj"
+    assert_generated_file   "test/test_runner.clj"
 
-    run_generated_build_script("bin/runtests.sh")
+    run_generated_build_script("ant")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shubox
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  version: 0.9.1
 platform: ruby
 authors: 
 - Bobby Norton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 -05:00
+date: 2009-11-01 01:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,16 +58,17 @@ files:
 - app_generators/clojure/clojure_generator.rb
 - app_generators/clojure/templates/README.rdoc
 - app_generators/clojure/templates/bin/repl.sh
-- app_generators/clojure/templates/bin/runtests.sh
+- app_generators/clojure/templates/build.xml
 - app_generators/clojure/templates/lib/clojure-contrib.jar
 - app_generators/clojure/templates/lib/clojure.jar
 - app_generators/clojure/templates/lib/jline-0.9.94.jar
 - app_generators/clojure/templates/project.iml
 - app_generators/clojure/templates/project.ipr
 - app_generators/clojure/templates/src/repl.clj
-- app_generators/clojure/templates/test/core/about_clojure_testing.clj
-- app_generators/clojure/templates/test/core/about_forms.clj
-- app_generators/clojure/templates/test/tests.clj
+- app_generators/clojure/templates/test/learning/about_clojure_testing.clj
+- app_generators/clojure/templates/test/learning/about_forms.clj
+- app_generators/clojure/templates/test/learning/about_sequences.clj
+- app_generators/clojure/templates/test/test_runner.clj
 - app_generators/java/USAGE
 - app_generators/java/java_generator.rb
 - app_generators/java/templates/Greeting.java

data/app_generators/clojure/templates/bin/runtests.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-java -Xmx1G -cp test:src:lib/clojure.jar:lib/clojure-contrib.jar:lib/hsqldb.jar:lib/ant.jar:lib/ant-launcher.jar clojure.lang.Script test/tests.clj

data/app_generators/clojure/templates/test/core/about_forms.clj

@@ -1,22 +0,0 @@
-(ns core.about_forms
-  (:use clojure.test))
-
-(deftest division-in-clojure-is-surprising
-  (are [expression expected] (= expression expected)
-    (/ 6 3)   2
-    ; Ratio is a built-in type
-    (/ 3 6)   1/2
-    ; use a floating-point literal for the dividend for decimal division
-    (/ 3.0 6)   0.5
-    ; integer quotient
-    (quot 22 7)  3
-    ; remainder
-    (rem 22 7)   1
-    ))
-
-(deftest strings
-  (are [expression expected] (= expression expected)
-    (.toUpperCase "str")  "STR"
-    (str 1 2 nil 3)       "123"
-  ))
-

data/app_generators/clojure/templates/test/tests.clj

@@ -1,11 +0,0 @@
-(ns test
-  (:use clojure.test))
-
-(def tests
-     ['core.about_clojure_testing 'core.about_forms])
-
-(doseq [test tests] (require test))
-
-(apply run-tests tests)
-
-(shutdown-agents)