gem_suit 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = GemSuit CHANGELOG
 
-== Version 0.1.0 (March xxx, 2011)
+== Version 0.1.1 (April 23, 2011)
+
+* Added suit test {functional,integration,all}
+* Improved `suit bundle` (running bundle install within gem dir and rails dummy app dirs only when required)
+* Corrected generated suit_application.rb comment
+
+== Version 0.1.0 (April 13, 2011)
 
 * Initial release

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/gem_suit/cli/application.rb

@@ -10,6 +10,13 @@ module GemSuit
 
       module InstanceMethods
 
+        def test_all(file_or_pattern = nil)
+          test_unit
+          test_functional
+          test_integration
+          test_suit
+        end
+
         def test_suit(file_or_pattern = nil)
           assert_suit_dir
 
@@ -29,6 +36,22 @@ module GemSuit
         end
 
         def test_unit(file_or_pattern = nil)
+          run_tests :unit, file_or_pattern
+        end
+
+        def test_functional(file_or_pattern = nil)
+          run_tests :functional, file_or_pattern
+        end
+
+        def test_integration(file_or_pattern = nil)
+          run_tests :integration, file_or_pattern
+        end
+
+      private
+
+        def run_tests(type, file_or_pattern)
+          raise ArgumentError, "Only :unit, :functional and :integration are allowed" unless [:unit, :functional, :integration].include? type
+
           assert_suit_dir
 
           loader = File.expand_path "../application/test_loader.rb", __FILE__
@@ -37,34 +60,36 @@ module GemSuit
             buffer.execute "suit restore"
 
             match = Dir[File.join(path, "**", "#{file_or_pattern || "*"}.rb")]
-            match = Dir[File.join(path, file_or_pattern)] if match.empty?
-            files = match.collect{|x| x.inspect}.join " "
+            match = Dir[File.join(path, file_or_pattern)] if match.empty? && !file_or_pattern.nil?
+            match.reject!{|x| x.include? "test/integration/suit/"}
 
-            section    = path.match(/suit\/([^\/]*)\//).captures[0].capitalize.gsub "-", " "
-            files_desc = match.size == 1 ?
-                           match.first.gsub(path, "") :
-                           "#{file_or_pattern.nil? ? "All" : "Multiple"} tests"
+            unless match.empty?
+              files = match.collect{|x| x.inspect}.join " "
 
-            buffer.log     "#{section} - #{files_desc}"
-            buffer.execute "ruby #{loader} #{"-I" if match.size > 1}#{files}"
-            buffer.execute "suit restore"
+              section    = path.match(/suit\/([^\/]*)\//).captures[0].capitalize.gsub "-", " "
+              files_desc = match.size == 1 ?
+                             match.first.gsub(path, "") :
+                             "#{file_or_pattern.nil? ? "All" : "Multiple"} tests"
+
+              buffer.log     "#{section} - #{files_desc}"
+              buffer.execute "ruby #{loader} #{"-I" if match.size > 1}#{files}"
+              buffer.execute "suit restore"
+            end
           end
 
           data = IOBuffer.capture do |buffer|
             if options.rails_versions == ["0"]
-              proc.call buffer, "suit/shared/test/unit/"
+              proc.call buffer, "suit/shared/test/#{type}/"
             else
               (options.rails_versions || major_rails_versions).each do |rails_version|
-                proc.call buffer, "suit/rails-#{rails_version}/dummy/test/unit/"
+                proc.call buffer, "suit/rails-#{rails_version}/dummy/test/#{type}/"
               end
             end
           end
 
-          print_test_results "Unit", data
+          print_test_results type.to_s.capitalize, data
         end
 
-      private
-
         def files(action)
           assert_suit_dir
 

data/lib/gem_suit/cli/base/utils.rb

@@ -30,27 +30,39 @@ module GemSuit
         private
 
           def assert_gem_dir(non_gemsuit = false)
-            if Dir["*.gemspec"].empty?
+            unless gem_dir?
               raise Error, "Missing *.gemspec in current directory. Is this really a gem directory?"
             end
-            if non_gemsuit && !Dir[".suit"].empty?
+            if non_gemsuit && suit_dir?
               raise Error, "Found .suit in current directory. Is this gem already provided with GemSuit?"
             end
           end
 
           def assert_suit_dir
             assert_gem_dir
-            if Dir[".suit"].empty?
+            unless suit_dir?
               raise Error, "Missing .suit in current directory. Is this really a GemSuit directory?"
             end
           end
 
           def assert_rails_dir
-            unless File.expand_path("").match /suit\/rails-\d\/dummy$/
+            unless rails_dir?
               raise Error, "Current directory path does not match \"/suit/rails-{2,3}/dummy\". Is this really a GemSuit dummy app?"
             end
           end
 
+          def gem_dir?
+            !Dir["*.gemspec"].empty?
+          end
+
+          def suit_dir?
+            gem_dir? && !Dir[".suit"].empty?
+          end
+
+          def rails_dir?
+            !!File.expand_path("").match(/suit\/rails-\d\/dummy$/)
+          end
+
           def major_rails_versions
             Dir["suit/rails-*"].collect{|dir| dir.match(/rails-(\d)/); $1}
           end

data/lib/gem_suit/cli.rb

@@ -128,10 +128,15 @@ module GemSuit
 
     desc "bundle", "Run `bundle install` (should be invoked from a Rails dummy application) only when necessary (used for testing)"
     def bundle
-      assert_rails_dir
-      if `bundle check`.any?{|line| line.include? "`bundle install`"}
-        puts "Running `bundle install` (this can take several minutes...)".yellow
-        system "bundle install"
+      raise Error, "Current directory path does not match either a GemSuit directory or a Rails dummy app. Quitting." unless suit_dir? || rails_dir?
+
+      dirs = [File.expand_path("")]
+      dirs.concat Dir["suit/rails-*/dummy"] if suit_dir?
+      dirs.each do |dir|
+        if `cd #{dir} && bundle check`.any?{|line| line.include? "`bundle install`"}
+          puts "Running `bundle install` (this can take several minutes...)".yellow
+          system "cd #{dir} && bundle install"
+        end
       end
     end
 

data/lib/gem_suit/version.rb

@@ -2,7 +2,7 @@ module GemSuit
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join(".")
   end

data/templates/static/suit/shared/test/suit_application.rb

@@ -11,10 +11,10 @@ class SuitApplication < GemSuit::Application
   #   generate_something
   # end
 
-  # def config_for_template(path)
+  # def locals_for_template(path)
   #   case path
   #   when "Gemfile"
-  #     {"rails_gem_version" => "3.0.5"}
+  #     {:rails_gem_version => "3.0.6"}
   #   end
   # end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem_suit
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Paul Engel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +02:00
+date: 2011-04-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency