file-spec 0.1.4 → 0.1.5

data/Rakefile

@@ -1,3 +1,5 @@
+require 'psych'
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -7,10 +9,9 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/file-spec"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_development_dependency "rspec", ">= 2.0.1"
-
-    gem.add_dependency "rspec",         ">= 2.0.1"
+    gem.add_dependency "rspec",         ">= 2.4.1"
     gem.add_dependency "require_all",   "~> 1.2.0"
+    gem.add_dependency "sugar-high",    "~> 0.3.7"
     gem.add_dependency "activesupport", ">= 3.0.1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/file-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{file-spec}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-11-28}
+  s.date = %q{2011-03-01}
   s.description = %q{RSpec 2 matchers for files, directories and symlinks}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/kristianmandrup/file-spec}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{RSpec 2 matchers for files, directories and symlinks}
   s.test_files = [
     "spec/file-spec/matchers/multiple/have_directories_spec.rb",
@@ -56,24 +56,23 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.0.1"])
-      s.add_runtime_dependency(%q<rspec>, [">= 2.0.1"])
+      s.add_runtime_dependency(%q<rspec>, [">= 2.4.1"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.7"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.1"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.0.1"])
-      s.add_dependency(%q<rspec>, [">= 2.0.1"])
+      s.add_dependency(%q<rspec>, [">= 2.4.1"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.3.7"])
       s.add_dependency(%q<activesupport>, [">= 3.0.1"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.0.1"])
-    s.add_dependency(%q<rspec>, [">= 2.0.1"])
+    s.add_dependency(%q<rspec>, [">= 2.4.1"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.3.7"])
     s.add_dependency(%q<activesupport>, [">= 3.0.1"])
   end
 end

data/lib/file-spec.rb

@@ -3,6 +3,7 @@ require 'require_all'
 require 'fileutils'
 require 'tmpdir'
 require 'active_support/inflector'      
+require 'sugar-high'
 
 module RSpec
   module FileMatchers

data/lib/file_spec/file_helpers/test_dirs.rb

@@ -12,6 +12,10 @@ module FileHelper
       def test_dirs
         [test_dir, test_dir2]
       end
+
+      def nested_test_dirs
+        ['nested1', 'nested2']
+      end
     end
     
     module Make
@@ -27,10 +31,15 @@ module FileHelper
         test_dirs.each{|dir| make_dir dir}
       end
 
+      def make_nested_dirs
+        nested_test_dirs.each{|dir| make_dir dir}
+      end
+
+
       def make_nested_test_dirs
         make_test_dir
         FileUtils.chdir test_dir do          
-          make_test_dirs        
+          make_nested_dirs        
           make_test_files
         end
       end

data/lib/file_spec/matchers/abstract/have_file_item.rb

@@ -16,6 +16,8 @@ module RSpec::FileMatchers
       
       loc = if args.size > 1
         dir, name = *args
+        dir = dir.kind_of?(Dir) ? dir.path : dir
+        name = name.kind_of?(File) ? name.path : name        
         File.join(dir.to_s, name.to_s)
       else
         args[0].to_s
@@ -24,9 +26,12 @@ module RSpec::FileMatchers
 
     def matches? relative_path, &block
       case relative_path
-      when File, Dir
+      when File
         @location = relative_path if !@location
         Dir.chdir File.dirname(location)
+      when Dir  
+        @location = relative_path if !@location
+        Dir.chdir location
       when String                        
         if File.exist?(relative_path)      
           @location = relative_path if !@location
@@ -49,8 +54,9 @@ module RSpec::FileMatchers
       if block && match   
         case artifact
         when :directory
+          dir = location # Dir.new(location).path
           Dir.chdir location do
-            yield Dir.new(location)
+            yield dir
           end
         when :file        
           yield File.new(location)          

data/lib/file_spec/matchers/abstract/have_file_items.rb

@@ -1,3 +1,5 @@
+require 'sugar-high/kind_of'
+
 module RSpec::FileMatchers
   class HaveFileItems
     attr_accessor :file_items, :location, :symlink_type
@@ -8,24 +10,27 @@ module RSpec::FileMatchers
       when Hash
         self.symlink_type = items.last[:type]
       end
-      self.file_items = items.select{|item| !item.kind_of? Hash}
+      self.file_items = items.select{|item| !item.kind_of? Hash}.map {|f| f.any_kind_of?(File, Dir) ? f.path : f }
     end
 
     def matches? relative_path=nil, &block
       case relative_path
-      when File, Dir             
+      when File             
         full_path = File.expand_path(relative_path.path)
         @location = File.dirname(full_path) if !@location
+      when Dir
+        full_path = File.expand_path(relative_path.path)
+        @location = full_path if !@location
       when String                        
         begin
-          full_path = File.expand_path(relative_path)        
+          full_path = File.expand_path(relative_path)
           if File.directory?(full_path)
             @location = full_path if !@location
           end
         rescue
           raise ArgumentError, "The path string #{relative_path} could not be resolved to an existing directory on this filesystem."
         end
-      end      
+      end
       
       file_item_names.each do |loc|                  
         path = location ? File.join(location, loc) : loc

data/spec/file-spec/matchers/multiple/have_directories_spec.rb

@@ -26,6 +26,12 @@ module RSpec::FileMatchers
         make_test_dirs
         Dir.pwd.should have_dirs test_dirs
       end
+
+      it "should have 'test' dirs in the current Dir" do      
+        make_test_dirs 
+        dir = Dir.new(Dir.pwd)
+        dir.should have_dirs test_dirs
+      end
     end
   end
 end

data/spec/file-spec/matchers/single/have_directory_spec.rb

@@ -36,16 +36,19 @@ module RSpec::FileMatchers
         remove_all_test
       end
 
-      after :each do
-        remove_all_test
-      end
+      # after :each do
+      #   remove_all_test
+      # end
   
       it "should have nested test dirs" do      
         make_nested_test_dirs       
         nil.should have_dir :test
         nil.should_not have_dir :test2
         nil.should have_dir test_dir do |dir|
-          dir.should have_dirs test_dirs
+          # puts "directory: #{dir.path}"
+          # puts "directory: #{dir}"
+          # puts File.expand_path(dir.path)
+          dir.should have_dirs nested_test_dirs
           dir.should have_files test_files
         end      
         test_dir.should have_files test_files

metadata

@@ -1,92 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: file-spec
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+version: !ruby/object:Gem::Version
+  version: 0.1.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Kristian Mandrup
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-28 00:00:00 +01:00
+date: 2011-03-01 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157426200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 1
-        version: 2.0.1
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157426200
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: &2157425620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 1
-        version: 2.0.1
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: require_all
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2157425620
+- !ruby/object:Gem::Dependency
+  name: sugar-high
+  requirement: &2157425100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+      - !ruby/object:Gem::Version
+        version: 0.3.7
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2157425100
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2157424560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2157424560
 description: RSpec 2 matchers for files, directories and symlinks
 email: kmandrup@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
+files:
 - .document
 - .rspec
 - LICENSE
@@ -113,36 +90,29 @@ files:
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/file-spec
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: RSpec 2 matchers for files, directories and symlinks
-test_files: 
+test_files:
 - spec/file-spec/matchers/multiple/have_directories_spec.rb
 - spec/file-spec/matchers/multiple/have_files_spec.rb
 - spec/file-spec/matchers/multiple/have_symlinks_spec.rb