Bacon_FS_Matchers 0.1.2 → 0.2.0

data/Bacon_FS_Matchers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{Bacon_FS_Matchers}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{da99}]
-  s.date = %q{2011-08-22}
+  s.date = %q{2011-08-24}
   s.description = %q{Includes matchers: a_file, a_directory, etc.}
   s.email = %q{i-hate-spam-45671204@mailinator.com}
   s.extra_rdoc_files = [

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/Bacon_FS_Matchers.rb

@@ -1,5 +1,30 @@
 require 'Shell_Helpers'
 
+class Should
+  
+  class Exposed
+    def initalize shoulda
+      @negated = shoulda.instance_variable_get(:@negated)
+      @object  = shoulda.instance_variable_get(:@object)
+    end
+  end
+  
+  alias_method :be_not_array, :be
+  def be *raw_args, &blok
+    
+    args = raw_args.flatten
+    
+    if !block_given? && args.size == 2 && args.first.is_a?(Proc) && args.last.is_a?(Proc)
+      desc = args.first.call(Exposed.new self)
+      blok = args.last
+      return be_not_array( desc, &blok )
+    end
+
+    be_not_array(*raw_args, &blok)
+  end
+
+end # === class Should
+
 class Bacon_FS_Matchers
 
   module DSL
@@ -7,31 +32,21 @@ class Bacon_FS_Matchers
     include Shell_Helpers::DSL
 
     def have_key key
-      lambda { |obj|
-        if obj.has_key?(key)
-          true
-        else
-          should.flunk "#{obj.inspect} is missing key: #{key.inspect}"
-        end
+
+      matcher = lambda { |obj|
+        obj.has_key?(key)
       }
+      
     end
 
-    def a_file_containing msg, show_contents = false
+    def file_containing msg, show_contents = false
       lambda { |obj|
         if not File.file?(obj)
           should.flunk "Not a file: #{obj}"
         end
 
         contents = File.read(obj)
-
-        if contents[msg]
-          true
-        else
-          should.flunk "
-            Does not contain #{msg.inspect}: #{obj} 
-          #{show_contents ? contents : ''}
-          ".strip
-        end
+        !!contents[msg]
       }
     end
 
@@ -39,44 +54,32 @@ class Bacon_FS_Matchers
       lambda { |obj|
         actual = permissions(obj)[1,2]
         desired = [ user, user ]
-        if actual == desired
-          true
-        else
-          should.flunk "#{obj.inspect} owner/group: #{actual} Should be: #{desired.inspect}"
-        end
+        actual == desired
+        # should.flunk "#{obj.inspect} owner/group: #{actual} Should be: #{desired.inspect}"
       }
     end
 
     def have_permissions str
       lambda { |obj|
-        actual = permissions(obj).first 
+        actual  = permissions(obj).first
         desired = str
-        if actual == desired
-          true
-        else
-          should.flunk "#{obj.inspect} permissions: #{actual} Should be: #{desired}"
-        end
+        actual == desired
+        # should.flunk "#{obj.inspect} permissions: #{actual} Should be: #{desired}"
 
       }
     end
 
-    def a_directory
+    def directory
       lambda { |obj|
-        if File.directory?(obj)
-          true
-        else
-          should.flunk "#{obj.inspect} is not a directory."
-        end
+        File.directory?(obj)
+        # should.flunk "#{obj.inspect} is not a directory."
       }
     end
 
-    def a_file
+    def file
       lambda { |obj|
-        if File.file?(obj)
-          true
-        else
-          should.flunk "#{obj.inspect} is not a file."
-        end
+        File.file?(obj)
+        # should.flunk "#{obj.inspect} is not a file."
       }
     end
 

data/spec/tests/a_directory.rb

@@ -4,15 +4,12 @@ describe ":a_directory" do
   behaves_like 'box'
 
   it 'must return true if directory exists' do
-    @bx.a_directory.call(FOLDER).should.be == true
+    @bx.directory.call(FOLDER).should.be == true
   end
 
   it 'must return false if directory is a file' do
-    lambda {
-      @bx.a_directory.call(FILE)
-    }
-    .should.raise(Bacon::Error)
-    .message.should.match %r!#{FILE.inspect} is not a directory!
+    @bx.directory.call(FILE)
+    .should.be == false
   end
 
 end # === describe :a_directory

data/spec/tests/a_file.rb

@@ -5,15 +5,12 @@ describe ":a_file" do
   behaves_like 'box'
 
   it 'must return true if file exists' do
-    @bx.a_file.call(FILE).should.be == true
+    @bx.file.call(FILE).should.be == true
   end
 
   it 'must return false if file is a directory' do
-    lambda {
-      @bx.a_file.call(FOLDER)
-    }
-    .should.raise(Bacon::Error)
-    .message.should.match %r!#{FOLDER.inspect} is not a file!
+		@bx.file.call(FOLDER)
+    .should.be == false
   end
 
 end # === describe :a_file

data/spec/tests/a_file_containing.rb

@@ -4,15 +4,12 @@ describe ":a_file_containing" do
   behaves_like 'box'
 
   it 'must return true if file contains the String.' do
-    @bx.a_file_containing('dawn').call(FILE).should.be == true
+    @bx.file_containing('dawn').call(FILE).should.be == true
   end
 
   it 'must return false if file does not contains the String.' do
-    lambda {
-      @bx.a_file_containing('Wallace Thornhill').call(FILE)
-    }
-    .should.raise(Bacon::Error)
-    .message.should.match %r!Does not contain .Wallace!
+    @bx.file_containing('Wallace Thornhill').call(FILE)
+    .should.be == false
   end
 
 end # === describe :a_file_containing

data/spec/tests/have_key.rb

@@ -8,11 +8,8 @@ describe "have_key" do
   end
 
   it 'must return false if array has desired key' do
-    lambda {
-      @bx.have_key('KEY').call('GOZER'=>'master')
-    }
-    .should.raise(Bacon::Error)
-    .message.should.match %r!is missing key: .KEY!
+		@bx.have_key('KEY').call('GOZER'=>'master')
+    .should.be == false
   end
 
 end # === describe have_key

data/spec/tests/have_permissions.rb

@@ -9,11 +9,8 @@ describe ":have_permissions" do
   
   it 'must return false if file does not have the desired mode bits' do
     target = 'drwxr--r--'
-    lambda {
-      @bx.have_permissions(target).call(FILE)
-    }
-    .should.raise(Bacon::Error)
-    .message.should.match %r!Should be: #{target}!
+		@bx.have_permissions(target).call(FILE)
+    .should.be == false
   end
 
 end # === describe :have_permissions

data/spec/tests/owned_and_in.rb

@@ -13,11 +13,8 @@ describe ":owned_and_in" do
   
   it 'must return false if file is owned and in group of wrong user' do
     target = ['root', 'root']
-    lambda {
-      @bx.owned_and_in('root').call(FILE)
-    }
-    .should.raise(Bacon::Error)
-    .message.should.match %r!Should be: \[.root., .root.\]!
+		@bx.owned_and_in('root').call(FILE)
+    .should.be == false
   end
 
 end # === describe :owned_and_in

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Bacon_FS_Matchers
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-22 00:00:00.000000000Z
+date: 2011-08-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: Shell_Helpers
-  requirement: &6029140 !ruby/object:Gem::Requirement
+  requirement: &11152900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *6029140
+  version_requirements: *11152900
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &6028020 !ruby/object:Gem::Requirement
+  requirement: &11151860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6028020
+  version_requirements: *11151860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &6026860 !ruby/object:Gem::Requirement
+  requirement: &11149000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *6026860
+  version_requirements: *11149000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &6025280 !ruby/object:Gem::Requirement
+  requirement: &11146680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *6025280
+  version_requirements: *11146680
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &6023760 !ruby/object:Gem::Requirement
+  requirement: &11144600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6023760
+  version_requirements: *11144600
 - !ruby/object:Gem::Dependency
   name: Gem_Raker_da99
-  requirement: &6022240 !ruby/object:Gem::Requirement
+  requirement: &11143440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6022240
+  version_requirements: *11143440
 description: ! 'Includes matchers: a_file, a_directory, etc.'
 email: i-hate-spam-45671204@mailinator.com
 executables: []
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3141586923638519899
+      hash: 3989566519328336101
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: