rubysl-tempfile 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f82c47d38159bb53a71a207db4db87b6d0ace1d
-  data.tar.gz: 026e066a5774dbfb057f861cc78a9ae7717be308
+  metadata.gz: af1920c240a1890026d324d8daca84bccce9066e
+  data.tar.gz: ba657b18a8c5b558dc403d789b3b9caebe6a3bd7
 SHA512:
-  metadata.gz: daa1c9f4243df03b5f6266f0c451b6cba2fd1c499eab3e814575953a6c0124b3dbbe4d792c4c3e0ef11b852b41e88d24e8835ee7cb4c284027f573ee4f419b02
-  data.tar.gz: c6485ac719d85e2fd2ace909a61a52cccc0883752de27ab15e1ba53022745ced1d5d3388465a99366669ff4d255435577493226a7b49e7d050fb20a55e33b52e
+  metadata.gz: 2b9cc5eebdc3b04ebe2af6f2adf2e5f1f330e6fa9fb7fcaccc854edb734555b468fa0456d28e9ac8ab0198ddd41f62d185d38aefea966702b1e9b81d76e7050f
+  data.tar.gz: b887c155ef7804e60dc7cc8912350ca9e80900c44208e70405c51c44e88c393c9daf757a02b1d20d82de0d1a24c5e7fcd3f1ca75e47c6e4b04d9f65088bee897

data/.travis.yml

@@ -1,7 +1,14 @@
 language: ruby
 env:
   - RUBYLIB=lib
-script: bundle exec mspec
+  - RUBYLIB=
+script: mspec spec
 rvm:
-  - 1.9.3
-  - rbx-nightly-19mode
+  - 2.0.0
+  - rbx-2.1.1
+matrix:
+  exclude:
+    - rvm: 2.0.0
+      env: RUBYLIB=lib
+    - rvm: rbx-2.1.1
+      env: RUBYLIB=

data/lib/rubysl/tempfile/tempfile.rb

@@ -1,7 +1,7 @@
 #
 # tempfile - manipulates temporary files
 #
-# $Id: tempfile.rb 31768 2011-05-28 23:31:24Z yugui $
+# $Id$
 #
 
 require 'delegate'
@@ -39,7 +39,7 @@ require 'thread'
 # that's it's unnecessary to explicitly delete a Tempfile after use, though
 # it's good practice to do so: not explicitly deleting unused Tempfiles can
 # potentially leave behind large amounts of tempfiles on the filesystem
-# until they're garbage collected. The existance of these temp files can make
+# until they're garbage collected. The existence of these temp files can make
 # it harder to determine a new Tempfile filename.
 #
 # Therefore, one should always call #unlink or close in an ensure block, like
@@ -79,7 +79,6 @@ require 'thread'
 # same Tempfile object from multiple threads then you should protect it with a
 # mutex.
 class Tempfile < DelegateClass(File)
-  MAX_TRY = 10  # :nodoc:
   include Dir::Tmpname
 
   # call-seq:
@@ -127,12 +126,14 @@ class Tempfile < DelegateClass(File)
   # If Tempfile.new cannot find a unique filename within a limited
   # number of tries, then it will raise an exception.
   def initialize(basename, *rest)
+    if block_given?
+      warn "Tempfile.new doesn't call the given block."
+    end
     @data = []
     @clean_proc = Remover.new(@data)
     ObjectSpace.define_finalizer(self, @clean_proc)
 
     create(basename, *rest) do |tmpname, n, opts|
-      lock = tmpname + '.lock'
       mode = File::RDWR|File::CREAT|File::EXCL
       perm = 0600
       if opts
@@ -142,13 +143,8 @@ class Tempfile < DelegateClass(File)
       else
         opts = perm
       end
-      self.class.mkdir(lock)
-      begin
-        @data[1] = @tmpfile = File.open(tmpname, mode, opts)
-        @data[0] = @tmpname = tmpname
-      ensure
-        self.class.rmdir(lock)
-      end
+      @data[1] = @tmpfile = File.open(tmpname, mode, opts)
+      @data[0] = @tmpname = tmpname
       @mode = mode & ~(File::CREAT|File::EXCL)
       perm or opts.freeze
       @opts = opts
@@ -165,10 +161,13 @@ class Tempfile < DelegateClass(File)
     __setobj__(@tmpfile)
   end
 
-  def _close	# :nodoc:
-    @tmpfile.close if @tmpfile
-    @tmpfile = nil
-    @data[1] = nil if @data
+  def _close    # :nodoc:
+    begin
+      @tmpfile.close if @tmpfile
+    ensure
+      @tmpfile = nil
+      @data[1] = nil if @data
+    end
   end
   protected :_close
 
@@ -191,7 +190,6 @@ class Tempfile < DelegateClass(File)
   def close!
     _close
     unlink
-    ObjectSpace.undefine_finalizer(self)
   end
 
   # Unlinks (deletes) the file from the filesystem. One should always unlink
@@ -228,18 +226,18 @@ class Tempfile < DelegateClass(File)
   #                    # to do so again.
   #   end
   def unlink
-    # keep this order for thread safeness
     return unless @tmpname
     begin
-      if File.exist?(@tmpname)
-        File.unlink(@tmpname)
-      end
-      # remove tmpname from remover
-      @data[0] = @data[2] = nil
-      @tmpname = nil
+      File.unlink(@tmpname)
+    rescue Errno::ENOENT
     rescue Errno::EACCES
       # may not be able to unlink on Windows; just ignore
+      return
     end
+    # remove tmpname from remover
+    @data[0] = @data[1] = nil
+    @tmpname = nil
+    ObjectSpace.undefine_finalizer(self)
   end
   alias delete unlink
 
@@ -264,6 +262,10 @@ class Tempfile < DelegateClass(File)
   alias length size
 
   # :stopdoc:
+  def inspect
+    "#<#{self.class}:#{path}>"
+  end
+
   class Remover
     def initialize(data)
       @pid = $$
@@ -271,20 +273,22 @@ class Tempfile < DelegateClass(File)
     end
 
     def call(*args)
-      if @pid == $$
-        path, tmpfile = *@data
+      return if @pid != $$
 
-        STDERR.print "removing ", path, "..." if $DEBUG
+      path, tmpfile = *@data
 
-        tmpfile.close if tmpfile
+      STDERR.print "removing ", path, "..." if $DEBUG
 
-        # keep this order for thread safeness
-        if path
-          File.unlink(path) if File.exist?(path)
-        end
+      tmpfile.close if tmpfile
 
-        STDERR.print "done\n" if $DEBUG
+      if path
+        begin
+          File.unlink(path)
+        rescue Errno::ENOENT
+        end
       end
+
+      STDERR.print "done\n" if $DEBUG
     end
   end
   # :startdoc:
@@ -296,7 +300,7 @@ class Tempfile < DelegateClass(File)
     #
     # If a block is given, then a Tempfile object will be constructed,
     # and the block is run with said object as argument. The Tempfile
-    # oject will be automatically closed after the block terminates.
+    # object will be automatically closed after the block terminates.
     # The call returns the value of the block.
     #
     # In any case, all arguments (+*args+) will be passed to Tempfile.new.
@@ -316,22 +320,61 @@ class Tempfile < DelegateClass(File)
       tempfile = new(*args)
 
       if block_given?
-	begin
-	  yield(tempfile)
-	ensure
-	  tempfile.close
-	end
+        begin
+          yield(tempfile)
+        ensure
+          tempfile.close
+        end
       else
-	tempfile
+        tempfile
       end
     end
+  end
+end
 
-    def mkdir(*args)
-      Dir.mkdir(*args)
+# Creates a temporally file as usual File object (not Tempfile).
+# It don't use finalizer and delegation.
+#
+# If no block is given, this is similar to Tempfile.new except
+# creating File instead of Tempfile.
+# The created file is not removed automatically.
+# You should use File.unlink to remove it.
+#
+# If a block is given, then a File object will be constructed,
+# and the block is invoked with the object as the argument.
+# The File object will be automatically closed and
+# the temporally file is removed after the block terminates.
+# The call returns the value of the block.
+#
+# In any case, all arguments (+*args+) will be treated as Tempfile.new.
+#
+#   Tempfile.create('foo', '/home/temp') do |f|
+#      ... do something with f ...
+#   end
+#
+def Tempfile.create(basename, *rest)
+  tmpfile = nil
+  Dir::Tmpname.create(basename, *rest) do |tmpname, n, opts|
+    mode = File::RDWR|File::CREAT|File::EXCL
+    perm = 0600
+    if opts
+      mode |= opts.delete(:mode) || 0
+      opts[:perm] = perm
+      perm = nil
+    else
+      opts = perm
     end
-    def rmdir(*args)
-      Dir.rmdir(*args)
+    tmpfile = File.open(tmpname, mode, opts)
+  end
+  if block_given?
+    begin
+      yield tmpfile
+    ensure
+      tmpfile.close if !tmpfile.closed?
+      File.unlink tmpfile
     end
+  else
+    tmpfile
   end
 end
 

data/lib/rubysl/tempfile/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module Tempfile
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

data/rubysl-tempfile.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
+  spec.add_development_dependency "rubysl-prettyprint", "~> 2.0"
 end

data/spec/create_spec.rb

@@ -0,0 +1,38 @@
+describe "Tempfile#create" do
+  before do
+    @path = nil
+  end
+
+  describe "with block" do
+    it "should exist inside the block" do
+      Tempfile.create("tempfile-create") do |f|
+        @path = f.path
+        File.exist?(@path).should be_true
+      end
+    end
+
+    it "should be deleted after the block finishes" do
+      Tempfile.create("tempfile-create") do |f|
+        @path = f.path
+      end
+      File.exist?(@path).should_not be_true
+    end
+  end
+
+  describe "without block" do
+    before do
+      @tempfile = Tempfile.create("tempfile-create")
+    end
+
+    it "should not be deleted before closing" do
+      @path = @tempfile.path
+      File.exist?(@path).should be_true
+    end
+
+    it "should not be deleted after closing" do
+      @path = @tempfile.path
+      @tempfile.close
+      File.exist?(@path).should be_true
+    end
+  end
+end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-tempfile
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: mspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rubysl-prettyprint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Ruby standard library tempfile.
 email:
 - brixen@gmail.com
@@ -59,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -73,6 +87,7 @@ files:
 - spec/_close_spec.rb
 - spec/callback_spec.rb
 - spec/close_spec.rb
+- spec/create_spec.rb
 - spec/delete_spec.rb
 - spec/fixtures/common.rb
 - spec/initialize_spec.rb
@@ -93,12 +108,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -111,6 +126,7 @@ test_files:
 - spec/_close_spec.rb
 - spec/callback_spec.rb
 - spec/close_spec.rb
+- spec/create_spec.rb
 - spec/delete_spec.rb
 - spec/fixtures/common.rb
 - spec/initialize_spec.rb
@@ -121,3 +137,4 @@ test_files:
 - spec/shared/unlink.rb
 - spec/size_spec.rb
 - spec/unlink_spec.rb
+has_rdoc: