fog-local 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6de6094d73b2a0014751ef203cc33a8d590ce990
-  data.tar.gz: cfa04eef4ac8c4a770416c898c06ac16878b9dca
+  metadata.gz: 0e0b4af75c75344097e40217e3f1ec9e84c3043d
+  data.tar.gz: 7d9e80f6f2e4ccc7f33d2fa2f5e51b700d4dfe0d
 SHA512:
-  metadata.gz: 06ab581be51ec5b35aaf9490b8009875adb9144e984969f7ae2847523ad34b3a9e174779cf7471a6c5610ba7f6c41da84223c6c0b907abe4f6e11babd612e153
-  data.tar.gz: f2df07d4bb2ff57f19eed3663560050fd864c56eb443414f0ad20ba76bc7b58e96a943ed62c3860ff32be8870875106a98a07b0a011ba81a9eb34fb00bd4ed58
+  metadata.gz: 4f32c1dc249f2bc2a88b9f631b9c65a39cf2752f2ab721a1424d9a683e77be4e9d30f7b43236fe55d27a6b92a4797d5d8911ff2728f3b5a1d0bb6af9537a5c78
+  data.tar.gz: 63f0bf2753a1d7ad7ee77cad0179768d6906bdbef7d6cc71b881aa3bb82a38eaf3c157f6aef373162cbc64e9c9b71e88e855109cf2ef357886ab80e9c47eabe3

data/.travis.yml

@@ -4,9 +4,11 @@ script: bundle exec rake test
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.5
-  - 2.2.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - jruby-19mode
+  - jruby-9.0.5.0
 env:
   - FOG_MOCK=true
   - FOG_MOCK=false

data/lib/fog/local.rb

@@ -1,5 +1,6 @@
 require 'fog/core'
 require 'fileutils'
+require 'tempfile'
 require File.expand_path('../local/version', __FILE__)
 
 module Fog

data/lib/fog/local/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Local
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/lib/fog/storage/local/models/file.rb

@@ -55,7 +55,7 @@ module Fog
               break
             end
             pwd = Dir.pwd
-            if ::File.exist?(dir_path) && ::File.directory?(dir_path)
+            if ::File.directory?(dir_path)
               Dir.chdir(dir_path)
               if Dir.glob('*').empty?
                 Dir.rmdir(dir_path)
@@ -85,20 +85,16 @@ module Fog
 
         def save(options = {})
           requires :body, :directory, :key
+
+          # Once 1.9.3 support is dropped, the following two lines
+          # can be replaced with `File.dirname(path)`
           dirs = path.split(::File::SEPARATOR)[0...-1]
-          dirs.length.times do |index|
-            dir_path = dirs[0..index].join(::File::SEPARATOR)
-            if dir_path.empty? # path starts with ::File::SEPARATOR
-              next
-            end
-            # create directory if it doesn't already exist
-            begin
-              Dir.mkdir(dir_path)
-            rescue Errno::EEXIST
-              raise unless ::File.directory?(dir_path)
-            end
-          end
-          if body.kind_of? ::File and ::File.exist?(body.path)
+          dir_path = dirs.join(::File::SEPARATOR)
+
+          # Create all directories in file path that do not yet exist
+          FileUtils.mkdir_p(dir_path)
+
+          if (body.is_a?(::File) || body.is_a?(Tempfile)) && ::File.exist?(body.path)
             FileUtils.cp(body.path, path)
           else
             write_file(path, body)

data/tests/local/models/file_tests.rb

@@ -44,4 +44,36 @@ Shindo.tests('Storage[:local] | file', ["local"]) do
         file.public_url
       end
   end
+
+  tests('#save') do
+    tests('creates non-existent subdirs') do
+      returns(true) do
+        connection = Fog::Storage::Local.new(@options)
+        directory = connection.directories.new(:key => 'path1')
+        file = directory.files.new(:key => 'path2/file.rb', :body => "my contents")
+        file.save
+        File.exists?(@options[:local_root] + "/path1/path2/file.rb")
+      end
+    end
+
+    tests('with tempfile').returns('tempfile') do
+      connection = Fog::Storage::Local.new(@options)
+      directory = connection.directories.create(:key => 'directory')
+
+      tempfile = Tempfile.new(['file', '.txt'])
+      tempfile.write('tempfile')
+      tempfile.rewind
+
+      tempfile.instance_eval do
+        def read
+          raise 'must not be read'
+        end
+      end
+      file = directory.files.new(:key => 'tempfile.txt', :body => tempfile)
+      file.save
+      tempfile.close
+      tempfile.unlink
+      directory.files.get('tempfile.txt').body
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-local
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Wesley Beary
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support local filesystem storage.