fog-local 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aa87f144c0161b011bf8b98de92dc71384bd116
-  data.tar.gz: 2c12c547029f47e8f05b4e142c436da8baa557f9
+  metadata.gz: a95da8ab33a335e4bb68e9c3fdf3715a6aec3305
+  data.tar.gz: 4d93eee4372f1c7110dcfc6014a61c7cb08bb28b
 SHA512:
-  metadata.gz: 5191d18d28bfaff0193029a1d098f1481369e0fedd2a8e103770d5c341070383887d4858a8c36b7218bd8f060f372dbf680745d96ca157522a049c28dc4591af
-  data.tar.gz: 4396615bc48dac3976ffbcd26a85588868e7cb0d982befcbcc602f7707cd85e11e476faa772c45b440e31d07407f88e79a1fb91d917faff256364540cc098283
+  metadata.gz: e4d85e10b6ebe75cf458ccf0bda70b9f76e697d0befbe08f748d75ae4b561cf95d3163fa4b1231adbb0cf9acf73f05e7be0e95bf8534c309abd399cb05395e48
+  data.tar.gz: 6f7da030400de9f2de428e34ce487d1c79fa6bafdc3bbb9dc4bf588f21572ce62917d750f8252d7aa43146d6754604412166b89ec4f5cfc10c56674329763618

data/.travis.yml

@@ -7,3 +7,6 @@ rvm:
   - 2.1.5
   - 2.2.0
   - jruby-19mode
+env:
+  - FOG_MOCK=true
+  - FOG_MOCK=false

data/Rakefile

@@ -2,7 +2,7 @@ require "bundler/gem_tasks"
 
 task :default => :test
 
-mock = ENV['FOG_MOCK'] || 'true'
+mock = ENV['FOG_MOCK'] || 'false'
 task :test do
   sh("export FOG_MOCK=#{mock} && bundle exec shindont")
 end

data/lib/fog/local.rb

@@ -1 +1,15 @@
-require 'fog/local/storage'
+require 'fog/core'
+require 'fileutils'
+require File.expand_path('../local/version', __FILE__)
+
+module Fog
+  module Storage
+    autoload :Local, File.expand_path('../storage/local', __FILE__)
+  end
+
+  module Local
+    extend Fog::Provider
+
+    service(:storage, 'Storage')
+  end
+end

data/lib/fog/local/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Local
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/fog/{local/storage.rb → storage/local.rb}

@@ -1,12 +1,15 @@
-require 'fog/local/core'
-
 module Fog
   module Storage
     class Local < Fog::Service
+      autoload :Directories, ::File.expand_path('../local/models/directories', __FILE__)
+      autoload :Directory, ::File.expand_path('../local/models/directory', __FILE__)
+      autoload :File, ::File.expand_path('../local/models/file', __FILE__)
+      autoload :Files, ::File.expand_path('../local/models/files', __FILE__)
+
       requires :local_root
       recognizes :endpoint, :scheme, :host, :port, :path
 
-      model_path 'fog/local/models/storage'
+      model_path 'fog/storage/local/models'
       collection  :directories
       model       :directory
       model       :file
@@ -77,7 +80,6 @@ module Fog
         end
 
         def copy_object(source_directory_name, source_object_name, target_directory_name, target_object_name, options={})
-          require 'fileutils'
           source_path = path_to(::File.join(source_directory_name, source_object_name))
           target_path = path_to(::File.join(target_directory_name, target_object_name))
           ::FileUtils.mkdir_p(::File.dirname(target_path))

data/lib/fog/{local/models/storage → storage/local/models}/directories.rb

@@ -1,6 +1,3 @@
-require 'fog/core/collection'
-require 'fog/local/models/storage/directory'
-
 module Fog
   module Storage
     class Local

data/lib/fog/{local/models/storage → storage/local/models}/directory.rb

@@ -1,6 +1,3 @@
-require 'fog/core/model'
-require 'fog/local/models/storage/files'
-
 module Fog
   module Storage
     class Local

data/lib/fog/{local/models/storage → storage/local/models}/file.rb

@@ -1,6 +1,3 @@
-require 'fileutils'
-require 'fog/core/model'
-
 module Fog
   module Storage
     class Local

data/lib/fog/{local/models/storage → storage/local/models}/files.rb

@@ -1,6 +1,3 @@
-require 'fog/core/collection'
-require 'fog/local/models/storage/file'
-
 module Fog
   module Storage
     class Local

data/tests/helper.rb

@@ -8,6 +8,7 @@ end
 require File.expand_path('../../lib/fog/local', __FILE__)
 
 Bundler.require(:test)
+require 'tmpdir'
 
 Excon.defaults.merge!(:debug_request => true, :debug_response => true)
 

data/tests/local/models/directories_tests.rb

@@ -2,16 +2,17 @@ Shindo.tests('Storage[:local] | directories', ["local"]) do
 
   pending if Fog.mocking?
 
-  @options = { :local_root => "/tmp/fogtests" }
+  @options = { :local_root => Dir.mktmpdir('fog-tests') }
   @collection = Fog::Storage::Local.new(@options).directories
 
   collection_tests(@collection, {:key => "fogdirtests"}, true)
 
   tests("#all") do
     tests("succeeds when :local_root does not exist").succeeds do
-      FileUtils.rm_rf(@options[:local_root])
+      FileUtils.remove_entry_secure(@options[:local_root])
       @collection.all
     end
   end
 
+  FileUtils.remove_entry_secure(@options[:local_root]) if File.directory?(@options[:local_root])
 end

data/tests/local/models/directory_tests.rb

@@ -3,14 +3,18 @@ Shindo.tests('Storage[:local] | directory', ["local"]) do
   pending if Fog.mocking?
 
   before do
-    @options = { :local_root => '~/.fog' }
+    @options = { :local_root => Dir.mktmpdir('fog-tests') }
+  end
+
+  after do
+    FileUtils.remove_entry_secure @options[:local_root]
   end
 
   tests('save') do
-    returns(true) do
+    returns('directory') do
       connection = Fog::Storage::Local.new(@options)
       connection.directories.create(:key => 'directory')
-      connection.directories.create(:key => 'directory')
+      connection.directories.create(:key => 'directory').key
     end
   end
 end

data/tests/local/models/file_tests.rb

@@ -3,7 +3,11 @@ Shindo.tests('Storage[:local] | file', ["local"]) do
   pending if Fog.mocking?
 
   before do
-    @options = { :local_root => '~/.fog' }
+    @options = { :local_root => Dir.mktmpdir('fog-tests') }
+  end
+
+  after do
+    FileUtils.remove_entry_secure @options[:local_root]
   end
 
   tests('#public_url') do

data/tests/local/storage_tests.rb

@@ -3,7 +3,11 @@ Shindo.tests('Local | storage') do
   pending if Fog.mocking?
 
   before do
-    @options = { :local_root => "~/.fog" }
+    @options = { :local_root => Dir.mktmpdir('fog-tests') }
+  end
+
+  after do
+    FileUtils.remove_entry_secure @options[:local_root]
   end
 
   tests('#endpoint') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-local
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Wesley Beary
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,16 +86,14 @@ files:
 - README.md
 - Rakefile
 - fog-local.gemspec
-- lib/fog-local.rb
 - lib/fog/bin/local.rb
 - lib/fog/local.rb
-- lib/fog/local/core.rb
-- lib/fog/local/models/storage/directories.rb
-- lib/fog/local/models/storage/directory.rb
-- lib/fog/local/models/storage/file.rb
-- lib/fog/local/models/storage/files.rb
-- lib/fog/local/storage.rb
 - lib/fog/local/version.rb
+- lib/fog/storage/local.rb
+- lib/fog/storage/local/models/directories.rb
+- lib/fog/storage/local/models/directory.rb
+- lib/fog/storage/local/models/file.rb
+- lib/fog/storage/local/models/files.rb
 - tests/helper.rb
 - tests/helpers/collection_helper.rb
 - tests/helpers/formats_helper.rb

data/lib/fog-local.rb

@@ -1 +0,0 @@
-require 'fog/local'

data/lib/fog/local/core.rb

@@ -1,9 +0,0 @@
-require 'fog/core'
-
-module Fog
-  module Local
-    extend Fog::Provider
-
-    service(:storage, 'Storage')
-  end
-end