spex 0.5.0 → 0.5.1

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/bruce/spex"
     gem.authors = ["Bruce Williams"]
     gem.add_dependency "colored"
+    gem.add_dependency "diff-lcs"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/spex/assertions/modified_assertion.rb

@@ -1,13 +1,18 @@
 require 'digest/md5'
+require 'diff/lcs'
+require 'diff/lcs/array'
 
 module Spex
 
   # With no option, just verifies a change occurs
   class ModifiedAssertion < FileAssertion
     as :modified, 'file modification'
+    option :added, "Added content (string or regexp)"
+    option :removed, "Removed content (string or regexp)"
 
     def prepare
       track_checksum!
+      track_contents! if options[:added] || options[:removed]
     end
 
     def before
@@ -19,6 +24,7 @@ module Spex
       checksum = current_checksum
       if active?
         assert_not_equal @before_checksum, checksum, "Checksum did not change"
+        check_added_and_removed if options[:added] || options[:removed]
       else
         assert_equal @before_checksum, checksum, "Checksum changed"
       end
@@ -26,10 +32,47 @@ module Spex
 
     private
 
+    def check_added_and_removed
+      diff = generate_diff
+      if options[:added]
+        assert_diff_match(diff,
+                          '+', options[:added],
+                          "Did not add: #{options[:added]}")
+      end
+      if options[:removed]
+        assert_diff_match(diff,
+                          '-', options[:removed],
+                          "Did not remove: #{options[:removed]}")
+      end          
+    end
+
+    def assert_diff_match(diff, action, content, message)
+      found = diff.any? do |change|
+        if change.action == action
+          case content
+          when String
+            change.element.include?(content)
+          when Regexp
+            change.element.match(content)
+          end
+        end
+      end
+      assert found, message
+    end
+
+    def generate_diff
+      contents = File.readlines(target)
+      @before_contents.diff(contents).flatten
+    end
+
     def track_checksum!
       @before_checksum = current_checksum
     end
 
+    def track_contents!
+      @before_contents = File.readlines(target)
+    end
+
     def current_checksum
       if File.exist?(target)
         generate_checksum

data/test/helper.rb

@@ -1,10 +1,12 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'stringio'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'spex'
+require 'fakefs/safe'
 
 class Test::Unit::TestCase
 
@@ -13,5 +15,18 @@ class Test::Unit::TestCase
   def script(&block)
     @script = Spex::Script.evaluate(&block)
   end
+
+  def assertion_passes(&block)
+    @assertion.prepare
+    @assertion.before
+    yield if block_given?
+    @assertion.after
+  end
+
+  def assertion_fails(&block)
+    assert_raises Test::Unit::AssertionFailedError do
+      assertion_passes(&block)
+    end
+  end
   
 end

data/test/test_modified_assertion.rb

@@ -0,0 +1,140 @@
+require 'helper'
+
+class TestAssertion < Test::Unit::TestCase
+
+  def set_assertion(options = {})
+    @assertion = Spex::ModifiedAssertion.new(@filename, options)
+  end
+
+  def non_blank_file!(text = 'test')
+    File.open(@filename, 'w') { |f| f.puts text }
+  end
+
+  def blank_file!
+    File.open(@filename, 'w') { |f| f.puts }
+  end
+  
+  context "Modified Assertion" do
+    setup do
+      FakeFS.activate!
+      @filename = '/tmp/modified-test'
+    end
+
+    teardown do
+      FakeFS.deactivate!
+    end
+
+    context "instances" do
+      context "without options" do
+        setup do
+          set_assertion
+          blank_file!
+        end
+        should "pass when modifications happen" do
+          assertion_passes { non_blank_file! }
+        end
+        should "when modifications don't happen" do
+          assertion_fails
+        end
+      end
+      context "with :added" do
+        context "as a string" do
+          setup do
+            set_assertion(:added => 'test')
+            blank_file!
+          end
+          context "when the text is added" do
+            should "pass" do
+              assertion_passes { non_blank_file! }
+            end
+          end
+          context "when different text is added" do
+            should "fail" do
+              assertion_fails { non_blank_file!('other') }
+            end
+          end
+          context "when modifications don't happen" do
+            should "fail when modifications don't happen" do
+              assertion_fails
+            end
+          end
+        end
+        context "as a regexp" do
+          setup do
+            set_assertion(:added => /t.st/)
+            blank_file!
+          end
+          context "when the text is added" do
+            should "pass" do
+              assertion_passes { non_blank_file! }
+            end
+          end
+          context "when different text is added" do
+            should "fail" do
+              assertion_fails { non_blank_file!('other') }
+            end
+          end
+          context "when modifications don't happen" do
+            should "fail when modifications don't happen" do
+              assertion_fails
+            end
+          end
+        end
+      end
+      context "with :removed" do
+        context "as a string" do
+          setup do
+            set_assertion(:removed => 'test')
+          end
+          context "when the text is removed" do
+            setup do
+              non_blank_file!
+            end
+            should "pass" do
+              assertion_passes { blank_file! }
+            end
+          end
+          context "when different text is removed" do
+            setup do
+              non_blank_file!('other')
+            end
+            should "fail" do
+              assertion_fails { blank_file! }
+            end
+          end
+          context "when modifications don't happen" do
+            should "fail when modifications don't happen" do
+              assertion_fails
+            end
+          end
+        end
+        context "as a regexp" do
+          setup do
+            set_assertion(:removed => /t.st/)
+          end
+          context "when the text is removed" do
+            setup do
+              non_blank_file!
+            end
+            should "pass" do
+              assertion_passes { blank_file! }
+            end
+          end
+          context "when different text is removed" do
+            setup do
+              non_blank_file!('other')
+            end
+            should "fail" do
+              assertion_fails { blank_file! }
+            end
+          end
+          context "when modifications don't happen" do
+            should "fail when modifications don't happen" do
+              assertion_fails
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Bruce Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -07:00
+date: 2010-04-14 00:00:00 -07:00
 default_executable: spex
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,6 +29,18 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: An easy-to-use test harness that runs assertions before and after and executable is run
 email: bruce@codefluency.com
 executables: 
@@ -68,6 +80,7 @@ files:
 - lib/spex/script.rb
 - test/helper.rb
 - test/test_assertion.rb
+- test/test_modified_assertion.rb
 - test/test_script.rb
 has_rdoc: true
 homepage: http://github.com/bruce/spex
@@ -102,6 +115,7 @@ summary: A test harness for executables
 test_files: 
 - test/helper.rb
 - test/test_assertion.rb
+- test/test_modified_assertion.rb
 - test/test_script.rb
 - examples/chgrp.rb
 - examples/chmod.rb