fspath 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26721162b01f79487fb1b452b3e00563c8c02428
-  data.tar.gz: c39238fa94c0decd977c58c7d54b1c6b01b2d933
+  metadata.gz: 24453324aa20066ac43d90e423d410d039b3a6c5
+  data.tar.gz: ada2095a627c2435835da929aa502d68d73f3873
 SHA512:
-  metadata.gz: 5870e1c093ef606e6dfb714212866627208795690083e5e4a9ec2b6b8d2cd1289f8510716f150aa976f5cca9d10e7a4b4ad6a1d28c89438d5d636f8c0b8948d3
-  data.tar.gz: be026afeedaa9d37879a808cfa6c76fab9374c39bc240357103eb0c881de60e6c842e7d641d337abcc980dda3277556e0fa08cfc6753fc401922840a1084da73
+  metadata.gz: 6504c1b0e7e3e17d41938bc77a8c90f0736bacbcbf7ce004fcb70a17ab030c751d58031177d1cc5010c5d401424282e5a2bd0f9f0f5ef080affa69576cdd37a8
+  data.tar.gz: eb41f49e89b0f9d4b41501aca5b2752597cea4014dec67f7e126479e7f3f4c8c83539091773e276e3d286f80eaefdbc94f5da75e7d90b524543ca162371dc953

data/.rubocop.yml

@@ -10,7 +10,7 @@ Metrics/BlockLength:
     - spec/**/*_spec.rb
 
 Metrics/ClassLength:
-  Max: 200
+  Max: 250
 
 Metrics/MethodLength:
   Max: 15

data/.travis.yml

@@ -3,24 +3,22 @@ language: ruby
 before_install:
   - if [[ $TRAVIS_RUBY_VERSION =~ ^2\.[34] ]]; then gem update --system; fi
 rvm:
-  - '1.8'
-  - '1.9'
-  - '2.0'
-  - '2.1'
-  - '2.2'
+  - '1.8.7-p371'
+  - '1.9.3-p551'
+  - '2.0.0-p648'
+  - '2.1.10'
+  - '2.2.6'
   - '2.3.3'
   - '2.4.0'
-  - jruby-18mode
-  - jruby-19mode
-  - ree
-script:
-  if [ -n "$RUBOCOP" ]; then
-    bundle exec rubocop
-  ; else
-    bundle exec rspec
-  ; fi
+  - 'jruby-1.7.26'
+  - 'jruby-9.0.5.0'
+  - 'jruby-9.1.5.0'
+script: bundle exec rspec
 matrix:
-  fast_finish: true
   include:
-    - env: RUBOCOP=true
-      rvm: '2'
+    - env: RUBOCOP=✓
+      rvm: '2.4.0'
+      script: bundle exec rubocop
+    - env: CHECK_RUBIES=✓
+      rvm: '2.4.0'
+      script: bundle exec travis_check_rubies

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+if RUBY_VERSION >= '2.0'
+  gem 'travis_check_rubies', '~> 0.2'
+end

data/README.markdown

@@ -84,6 +84,10 @@ Path parts:
 
     FSPath('/a/b/c').parts # => ['/', 'a', 'b', 'c']
 
+Basename and extension:
+
+    FSPath('some/dir/name.ext').prefix_suffix # => [FSPath('name'), '.ext']
+
 ## Copyright
 
 Copyright (c) 2010-2017 Ivan Kuchin. See LICENSE.txt for details.

data/fspath.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'fspath'
-  s.version     = '3.0.3'
+  s.version     = '3.1.0'
   s.summary     = %q{Better than Pathname}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/fspath.rb

@@ -55,22 +55,22 @@ class FSPath < Pathname
 
     # Returns or yields temp file created by Tempfile.new with path returning
     # FSPath
-    def temp_file(*args, &block)
-      args = %w[f] if args.empty?
-      Tempfile.open(self, *args, &block)
+    def temp_file(prefix_suffix = nil, *args, &block)
+      prefix_suffix = fix_prefix_suffix(prefix_suffix || 'f')
+      Tempfile.open(self, prefix_suffix, *args, &block)
     end
 
     # Returns or yields path as FSPath of temp file created by Tempfile.new
     # WARNING: loosing reference to returned object will remove file on nearest
     # GC run
-    def temp_file_path(*args)
+    def temp_file_path(prefix_suffix = nil, *args)
       if block_given?
-        temp_file(*args) do |file|
+        temp_file(prefix_suffix, *args) do |file|
           file.close
           yield file.path
         end
       else
-        file = temp_file(*args)
+        file = temp_file(prefix_suffix, *args)
         file.close
         path = file.path
         path.instance_variable_set(:@__temp_file, file)
@@ -79,13 +79,24 @@ class FSPath < Pathname
     end
 
     # Returns or yields FSPath with temp directory created by Dir.mktmpdir
-    def temp_dir(*args)
+    def temp_dir(prefix_suffix = nil, *args)
+      prefix_suffix = fix_prefix_suffix(prefix_suffix || 'd')
       if block_given?
-        Dir.mktmpdir(*args) do |dir|
+        Dir.mktmpdir(prefix_suffix, *args) do |dir|
           yield new(dir)
         end
       else
-        new(Dir.mktmpdir(*args))
+        new(Dir.mktmpdir(prefix_suffix, *args))
+      end
+    end
+
+  private
+
+    def fix_prefix_suffix(prefix_suffix)
+      if prefix_suffix.is_a?(Array)
+        prefix_suffix.map(&:to_s)
+      else
+        prefix_suffix.to_s
       end
     end
   end
@@ -102,6 +113,27 @@ class FSPath < Pathname
     end
   end
 
+  # Return basename without ext and ext as two-element array
+  def prefix_suffix
+    ext = extname
+    [basename(ext), ext]
+  end
+
+  # Calls class method with prefix and suffix set using prefix_suffix
+  def temp_file(*args, &block)
+    self.class.temp_file(prefix_suffix, *args, &block)
+  end
+
+  # Calls class method with prefix and suffix set using prefix_suffix
+  def temp_file_path(*args, &block)
+    self.class.temp_file_path(prefix_suffix, *args, &block)
+  end
+
+  # Calls class method with prefix and suffix set using prefix_suffix
+  def temp_dir(*args, &block)
+    self.class.temp_dir(prefix_suffix, *args, &block)
+  end
+
   # Fixing Pathname.relative_path_from
   def relative_path_from(other)
     self.class.new(super(self.class.new(other)))

data/spec/fspath_spec.rb

@@ -55,6 +55,28 @@ describe FSPath do
     end
   end
 
+  shared_examples 'converts prefix_suffix' do |options|
+    it "passes default (#{options[:default].inspect}) without arguments" do
+      expect(result_path_for.basename.to_s).
+        to match(/^#{options[:default]}/)
+    end
+
+    it 'passes default when receives nil' do
+      expect(result_path_for(nil).basename.to_s).
+        to match(/^#{options[:default]}/)
+    end
+
+    it 'passes each member of Array converted to String' do
+      expect(result_path_for(FSPath('bar')).basename.to_s).
+        to match(/^bar/)
+    end
+
+    it 'passes non String converted to string' do
+      expect(result_path_for([FSPath('foo'), FSPath('.bar')]).basename.to_s).
+        to match(/^foo.*\.bar$/)
+    end
+  end
+
   describe '.temp_file' do
     [FSPath, ZPath].each do |klass|
       context "when called on #{klass}" do
@@ -81,6 +103,12 @@ describe FSPath do
         FSPath.temp_file('abc', '.'){}
       end.not_to raise_error
     end
+
+    include_examples 'converts prefix_suffix', :default => 'f' do
+      def result_path_for(*args)
+        FSPath.temp_file(*args).path
+      end
+    end
   end
 
   describe '.temp_file_path' do
@@ -129,6 +157,12 @@ describe FSPath do
         end
       end
     end
+
+    include_examples 'converts prefix_suffix', :default => 'f' do
+      def result_path_for(*args)
+        FSPath.temp_file_path(*args)
+      end
+    end
   end
 
   describe '.temp_dir' do
@@ -147,6 +181,12 @@ describe FSPath do
       FSPath.temp_dir{ |y| yielded = y }
       expect(yielded).to eq(FSPath('/tmp/a/b/2'))
     end
+
+    include_examples 'converts prefix_suffix', :default => 'd' do
+      def result_path_for(*args)
+        FSPath.temp_dir(*args)
+      end
+    end
   end
 
   describe '#/' do
@@ -177,6 +217,75 @@ describe FSPath do
     end
   end
 
+  describe '#prefix_suffix' do
+    context 'when path has ext' do
+      it 'returns basename and ext' do
+        expect(FSPath('dir/name.foo').prefix_suffix).
+          to eq([FSPath('name'), '.foo'])
+      end
+    end
+
+    context 'when path has multiple exts' do
+      it 'returns basename and last ext' do
+        expect(FSPath('dir/name.foo.bar').prefix_suffix).
+          to eq([FSPath('name.foo'), '.bar'])
+      end
+    end
+
+    context 'when path has no ext' do
+      it 'returns basename and empty string' do
+        expect(FSPath('dir/just_name').prefix_suffix).
+          to eq([FSPath('just_name'), ''])
+      end
+    end
+
+    context 'when path starts with dot and has ext' do
+      it 'returns basename and ext' do
+        expect(FSPath('dir/.name.foo').prefix_suffix).
+          to eq([FSPath('.name'), '.foo'])
+      end
+    end
+
+    context 'when path starts with dot and has no ext' do
+      it 'returns basename and empty string' do
+        expect(FSPath('dir/.just_name').prefix_suffix).
+          to eq([FSPath('.just_name'), ''])
+      end
+    end
+  end
+
+  describe 'instance temp_* methods' do
+    let(:block){ proc{ 'x' } }
+    let(:args){ [[FSPath('path'), '.name'], FSPath('.')] }
+
+    describe '#temp_file' do
+      it 'calls class method with prefix_suffix as first argument' do
+        expect(FSPath).to receive(:temp_file).
+          with(*args){ |&b| expect(b).to be(block) }
+
+        FSPath('some/path.name').temp_file(FSPath('.'), &block)
+      end
+    end
+
+    describe '#temp_file_path' do
+      it 'calls class method with prefix_suffix as first argument' do
+        expect(FSPath).to receive(:temp_file_path).
+          with(*args){ |&b| expect(b).to be(block) }
+
+        FSPath('some/path.name').temp_file_path(FSPath('.'), &block)
+      end
+    end
+
+    describe '#temp_dir' do
+      it 'calls class method with prefix_suffix as first argument' do
+        expect(FSPath).to receive(:temp_dir).
+          with(*args){ |&b| expect(b).to be(block) }
+
+        FSPath('some/path.name').temp_dir(FSPath('.'), &block)
+      end
+    end
+  end
+
   describe '#relative_path_from' do
     it 'returns instance of FSPath' do
       expect(FSPath('a').relative_path_from('b')).to be_instance_of(FSPath)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fspath
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-11 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fspath
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Better than Pathname