backup-pcs 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ebcf35902015043bb5553060f30656a92097f66
-  data.tar.gz: 4aea4a4a9c582803a3a8cfb151fb7fed3cc30d58
+  metadata.gz: de274b823183c233c391023617bf094b6406140e
+  data.tar.gz: dbf975611cfa085310a9fae2dc855dd2cb60474f
 SHA512:
-  metadata.gz: ab5c7a9629c8b181164e5a2f28622f985f898bb230cc440792e30be64110c2b3190c24511493b9997f29df10356a7be55cdbf8868ece47cdae2a1eb72eb6ae8d
-  data.tar.gz: ecd95cc14b3d017d449a73ffae5702159e084ecb336a877f1398fc5a88eb39f8e65c29215999cd271e8b4fe4bbbfcea89270aeb52894eb3c9e12550a54abb573
+  metadata.gz: 5df5182c7e80a3b366df2c6680454893bc308c47c89104c3c0eaf8c18a172184c17457e6beb5755b1d26d1ec2ea2d1932c4f0fc778d5640836428d0102ff1c4f
+  data.tar.gz: 79e9c98d5d765e8803478b73e613a9cf5607dcee9eea7e2cc4269934e949cc507738d4fa4aa1bb6ea6a49690c16fb11f26f7ac896bc1ed951f78cf3edf6386a1

data/README.md

@@ -13,6 +13,8 @@ $ gem install backup-pcs
 ```
 `backup-pcs` 当前支持 Ruby(MRI) 版本：1.9.3, 2.0, 2.1
 
+如果你使用的是 `Backup 3.x` 版，请对应使用 `backup-pcs` 的 `0.0.3` 版本
+
 ## 用法
 
 此说明只提供了本 Gem 的配置使用方法，关于 Backup 的详细使用方法，请参考 [Backup GitHub Page](https://github.com/meskyanichi/backup)
@@ -37,6 +39,7 @@ store_with :PCS do |p|
   p.client_secret = 'a_cliet_secret'
   p.dir_name      = 'Backups'         # 开通 PCS API 权限时所设置的文件目录
   p.path          = 'data'            # 保存路径，从 dir_name 算起
+  # p.cache_path    = '.cache'        # 授权文件保存目录，默认在 Backup 的 .cache 下，可以设置为绝对路径
   # p.keep          = 2
   # p.max_retries   = 10              # 出错后重试次数，默认 10 次
   # p.retry_waitsec = 30              # 出错后重试等待秒数，默认 30 秒

data/backup-pcs.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency     "baidu-sdk", "~> 0.0.4"
-  spec.add_runtime_dependency     "backup",    "~> 3.9"
+  spec.add_runtime_dependency     "backup",    "~> 4.0"
   spec.add_development_dependency "bundler",   "~> 1.3"
 end

data/lib/backup/pcs/version.rb

@@ -1,5 +1,5 @@
 module Backup
   module PCS
-    VERSION = "0.0.3"
+    VERSION = "1.0.0"
   end
 end

data/lib/backup/storage/pcs.rb

@@ -6,14 +6,16 @@ require 'baidu/pcs'
 module Backup
   module Storage
     class PCS < Base
+      include Storage::Cycler
       class Error < Backup::Error; end
 
-      attr_accessor :client_id, :client_secret, :dir_name, :max_retries, :retry_waitsec
+      attr_accessor :client_id, :client_secret, :cache_path, :dir_name, :max_retries, :retry_waitsec
 
       def initialize(model, storage_id=nil)
         super
 
         @path          ||= 'backups'
+        @cache_path    ||= '.cache'
         @max_retries   ||= 10
         @retry_waitsec ||= 30
       end
@@ -94,11 +96,12 @@ module Backup
       end
 
       def cached_file
-        File.join(Config.cache_path, "pcs_#{storage_id}_#{client_id}")
+        path = cache_path.start_with?('/') ? cache_path : File.join(Config.root_path, cache_path)
+        File.join(path, "pcs_#{storage_id}_#{client_id}")
       end
 
       def write_cache!(session)
-        FileUtils.mkdir_p(Config.cache_path)
+        FileUtils.mkdir_p(File.dirname(cached_file))
         File.open(cached_file, "w") do |cache_file|
           cache_file.write(Base64.encode64(Marshal.dump(session)))
         end

data/spec/pcs_spec.rb

@@ -12,6 +12,10 @@ module Backup
         expect(storage).to be_a(Storage::Base)
       end
 
+      it 'includes Storage::::Cycler' do
+        expect(storage).to be_a(Storage::Cycler)
+      end
+
       it 'has default config' do
         expect(storage.storage_id   ).to be_nil
         expect(storage.keep         ).to be_nil
@@ -19,6 +23,7 @@ module Backup
         expect(storage.client_secret).to be_nil
         expect(storage.dir_name     ).to be_nil
         expect(storage.path         ).to eq 'backups'
+        expect(storage.cache_path   ).to eq '.cache'
         expect(storage.max_retries  ).to be 10
         expect(storage.retry_waitsec).to be 30
       end
@@ -30,6 +35,7 @@ module Backup
           c.client_secret = 'cs'
           c.dir_name      = 'dn'
           c.path          = 'myback'
+          c.cache_path    = '.mycache_path'
           c.max_retries   = 2
           c.retry_waitsec = 3
         end
@@ -40,9 +46,22 @@ module Backup
         expect(storage.client_secret).to eq('cs')
         expect(storage.dir_name     ).to eq('dn')
         expect(storage.path         ).to eq 'myback'
+        expect(storage.cache_path   ).to eq '.mycache_path'
         expect(storage.max_retries  ).to be(2)
         expect(storage.retry_waitsec).to be(3)
       end
+
+      it 'inits with absolute cache path' do
+        storage = Storage::PCS.new(model, 'sid') do |c|
+          c.client_id     = 'ci'
+          c.client_secret = 'cs'
+          c.cache_path    = '/tmp/pcs_tmp'
+          c.dir_name      = 'dn'
+          c.path          = 'myback'
+        end
+
+        expect(storage.cache_path).to eq '/tmp/pcs_tmp'
+      end
     end
 
     describe '#transfer!' do
@@ -339,14 +358,15 @@ module Backup
     describe '#cached_file' do
       it 'has right cached file path' do
         path1 = Storage::PCS.new(model, 'sid') do |c|
-          c.client_id     = 'ci'
+          c.client_id = 'ci'
         end.send(:cached_file)
-        expect(path1).to eq(Config.cache_path + '/pcs_sid_ci')
+        expect(path1).to eq("#{Config.root_path}/.cache/pcs_sid_ci")
 
         path2 = Storage::PCS.new(model) do |c|
-          c.client_id     = 'ci2'
+          c.client_id  = 'ci2'
+          c.cache_path = '/tmp/pcs'
         end.send(:cached_file)
-        expect(path2).to eq(Config.cache_path + '/pcs__ci2')
+        expect(path2).to eq('/tmp/pcs/pcs__ci2')
       end
     end
 
@@ -356,12 +376,13 @@ module Backup
 
       before do
         storage.client_id = 'ci'
+        allow(File).to receive(:dirname).and_return(File.join(Config.root_path, '.cache'))
         allow(FileUtils).to receive(:mkdir_p)
         allow(storage).to receive(:cached_file).and_return(cached_file)
       end
 
       it 'writes cached file' do
-        expect(FileUtils).to receive(:mkdir_p).with(Config.cache_path)
+        expect(FileUtils).to receive(:mkdir_p).with(File.join(Config.root_path, '.cache'))
         expect(File).to receive(:open).with(cached_file, 'w').and_yield(cached_file)
         data = Base64.encode64(Marshal.dump(session))
         expect(cached_file).to receive(:write).with(data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup-pcs
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Lonre Wang
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement