given_filesystem 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a37adf41c7d8b7794308031e8b4a8ea85fef4f93
-  data.tar.gz: 0bbe94f7a57c0f418b8a5f321047e95f50e7ff03
+  metadata.gz: 06be97bc39f061126037e6f7ed7e21581bdce16b
+  data.tar.gz: 1abc20b941f24f30f7caea95065126f286bb99f6
 SHA512:
-  metadata.gz: be97672d47aee8a66d4cd06b6e649fc1a67cc95414841de7d6c6abc0c9cba0011ac83dbb312002b37fb2773193036389dc5180e9f827c85a3f41241fc6327971
-  data.tar.gz: edfb0e6c40550d33ea19bc4ca0ffe718cdc05050e2e954da38aaac0a5bb50a3e2bd40a4addf89911e087790a28af8c34246102538950b5ee62bad12610a38013
+  metadata.gz: 2bc0d5f0bb84bcdc9b8c512942c894640eeb76b7eff4546401775fe57c073a7f6ea3ef9deb9298fccc642a45e0d275b4e8e65a9af60e88faa641f02362d8675f
+  data.tar.gz: 548e6eb38db34e22bd4ffee2577466dd20d7c14ea93ee37043734b4a6f064f6f5d8f81670ec13ba35b03b79478ceec42d4da369cb1b678b2b3b3f8bc2f84af46

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - "1.9.3"
   - "2.1.1"
-  - jruby-19mode # JRuby in 1.9 mode
+  - "2.3.1"
 script: bundle exec rspec spec

data/given_filesystem.gemspec

@@ -1,6 +1,8 @@
+require_relative "lib/version.rb"
+
 Gem::Specification.new do |s|
   s.name        = 'given_filesystem'
-  s.version     = '0.1.2'
+  s.version     = VERSION
   s.license     = 'MIT'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Cornelius Schumacher']

data/lib/given_filesystem.rb

@@ -35,16 +35,19 @@ class GivenFilesystem
     end
   end
 
-  def directory dir_name = nil
+  def directory user_provided_directory = nil
     create_random_base_path unless path_has_base?
 
-    @path_elements.push dir_name || random_name
+    directory_to_create = user_provided_directory || random_name
+
+    @path_elements.push directory_to_create
 
     created_path = path
     FileUtils.mkdir_p created_path
     yield if block_given?
     @path_elements.pop
-    created_path
+
+    File.join path, first_segment_of_path(directory_to_create)
   end
   
   def directory_from_data to, from = nil
@@ -110,4 +113,8 @@ class GivenFilesystem
   def test_data_path name
     File.expand_path('spec/data/' + name)
   end
+
+  def first_segment_of_path path
+    path.split(File::SEPARATOR).reject(&:empty?).first
+  end
 end

data/spec/given_filesystem_spec.rb

@@ -10,11 +10,13 @@ describe GivenFilesystem do
     @given.cleanup
   end
 
+  let(:os_specific_tmp_path) { Dir.tmpdir }
+
   it "creates directory" do
     path = @given.directory
     expect( File.exists? path ).to be(true)
     expect( File.directory? path ).to be(true)
-    expect( path ).to match /tmp/
+    expect( path ).to be_located_under os_specific_tmp_path
     expect( path.split("/").length).to be > 3
   end
 
@@ -30,7 +32,7 @@ describe GivenFilesystem do
   it "creates named directory" do
     path = @given.directory "abc"
     expect( File.exists? path ).to be(true)
-    expect( path ).to match /tmp/
+    expect( path ).to be_located_under os_specific_tmp_path
     expect( path.split("/").length).to be > 4
     expect( path ).to match /abc$/
   end
@@ -40,12 +42,12 @@ describe GivenFilesystem do
     deep_path = @given.directory "x/y/z"
     expect( File.exists? deep_path ).to be(true)
     expect( File.directory? deep_path ).to be(true)
-    expect( deep_path.split("/").count ).to eq path.split("/").count + 2
+    expect( deep_path.split("/").count ).to eq path.split("/").count
   end
 
   it "creates file" do
     path = @given.file
-    expect( path ).to match /tmp/
+    expect( path ).to be_located_under os_specific_tmp_path
     expect( path.split("/").length).to be > 3
     expect( File.exists? path ).to be(true)
     expect( File.directory? path ).to be(false)
@@ -53,7 +55,7 @@ describe GivenFilesystem do
 
   it "creates named file" do
     path = @given.file "def"
-    expect( path ).to match /tmp/
+    expect( path ).to be_located_under os_specific_tmp_path
     expect( path.split("/").length).to be > 4
     expect( path ).to match /def$/
   end
@@ -72,7 +74,7 @@ describe GivenFilesystem do
 
   it "creates file with content" do
     path = @given.file "def", :from => "testcontent"
-    expect( path ).to match /tmp/
+    expect( path ).to be_located_under os_specific_tmp_path
     expect( path.split("/").length).to be > 4
     expect( path ).to match /def$/
     expect( File.read(path) ).to eq "This is my test content.\n"
@@ -81,11 +83,11 @@ describe GivenFilesystem do
   it "creates directory tree" do
     path = @given.directory do
       @given.directory "one" do
-	@given.file "first"
+        @given.file "first"
       end
       @given.directory "two" do
-	@given.file "second"
-	@given.file "third"
+        @given.file "second"
+        @given.file "third"
       end
     end
 
@@ -140,15 +142,15 @@ describe GivenFilesystem do
 
   it "returns paths" do
     path1 = @given.directory "one"
-    expect( path1 ).to match /^\/tmp\/given_filesystem\/[\d-]+\/one$/
+    expect( path1 ).to match /^#{Regexp.quote os_specific_tmp_path}\/given_filesystem\/[\d-]+\/one$/
 
     path2 = @given.directory "two"
-    expect( path2 ).to match /^\/tmp\/given_filesystem\/[\d-]+\/two$/
+    expect( path2 ).to match /^#{Regexp.quote os_specific_tmp_path}\/given_filesystem\/[\d-]+\/two$/
 
     path3 = @given.directory "three" do
       @given.file "first"
     end
-    expect( path3 ).to match /^\/tmp\/given_filesystem\/[\d-]+\/three$/
+    expect( path3 ).to match /^#{Regexp.quote os_specific_tmp_path}\/given_filesystem\/[\d-]+\/three$/
   end
 
   it "cleans up directory tree" do

data/spec/given_filesystem_spec_helpers_spec.rb

@@ -56,6 +56,11 @@ describe GivenFilesystemSpecHelpers do
         expect( path ).to match /\/hello$/
       end
 
+      it "creates entire directory structure" do
+        path = given_directory "some/directory/structure"
+        expect( path ).to match /\/some$/
+      end
+
       it "creates nested directory" do
         path = nil
         given_directory "hello" do

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 require 'coveralls'
 Coveralls.wear!
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  Coveralls::SimpleCov::Formatter,
-  SimpleCov::Formatter::HTMLFormatter
-]
 
 require_relative('../lib/given_filesystem/spec_helpers')
+
+require_relative 'support/matchers/file_location_matcher'

data/spec/support/matchers/file_location_matcher.rb

@@ -0,0 +1,8 @@
+require 'pathname'
+require 'rspec/expectations'
+
+RSpec::Matchers.define :be_located_under do |expected|
+  match do |actual|
+    Pathname.new(actual).fnmatch? File.join(expected, '**')
+  end
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: given_filesystem
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Cornelius Schumacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: GivenFilesystem is a set of helpers for testing code which operates on
@@ -32,9 +32,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
@@ -49,6 +49,7 @@ files:
 - spec/given_filesystem_spec.rb
 - spec/given_filesystem_spec_helpers_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/file_location_matcher.rb
 homepage: https://github.com/cornelius/given_filesystem
 licenses:
 - MIT
@@ -59,17 +60,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: given_filesystem
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library for setting up files as test data