sacback 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83bc1c9dd28613bc0b8d1cea52f5b184dcb3f973
-  data.tar.gz: 46b2464c5306818f8b6652c2e4bd7ac3ea31196c
+  metadata.gz: b29b43b3754e3d2c1152aa1884368451e811fac6
+  data.tar.gz: f61ef765666d5896aaad258dae43c252f3410f37
 SHA512:
-  metadata.gz: a4b0938d093e2eef1fa4d06d8e771285d5f59c4919f7ee94cd0bda09bcc786fa8e8e73ff32b506a0c9f59b1fffcaad74556808bc8fe7484d64180912b62efb42
-  data.tar.gz: c109d33c5978ec2398b36604cf5f4eac339ffd2934aeeb13375872856bbadd0d4b1a219cb1552d3c3df4dc503430c90f95e58a485d84e47bac2ba202407d5c1d
+  metadata.gz: 1b8bc5f02f49fd94b2bfbec9e4f29bf7d0d20520c1f4ed2437430969037fe05ca2e32fd7a0e50352c0fab2572e427d8f20bc59b2718ca93d4fc7e134c65d58a3
+  data.tar.gz: 7da585361326a37f87c0911601c803ac2690af1ce7f360d9f1a6ec42d66430a06e59799701e258da4c3b3da04257870f81da763026154ddb7cf01af0fd1933bc

data/README.md

@@ -12,12 +12,8 @@ Sacbackはさくらのクラウドのディスクをローカルホストにバ
 
 ## セットアップ
 
-まだgem化していないため、プロジェクトをクローンしてください。
-
 ```
-$ git clone https://github.com/shimotori/sacback.git
-$ cd sacback
-$ bundle install
+$ gem install sacback
 ```
 
 さくらのクラウドの認証情報とゾーン名を以下の環境変数にセットします。
@@ -33,7 +29,7 @@ $ bundle install
 ## 使い方
 
 ```
-$ bundle exec bin/sacback
+$ sacback
 Commands:
   sacback a DISK_NAME [LOCAL_DIR_PATH]   # Run all through with the disk (def...
   sacback c DISK_NAME                    # Create an archive from the disk
@@ -49,17 +45,13 @@ Options:
                                  # Default: 512
 ```
 
-まだgem化していないため、直接 `sacback` コマンドを使うことはできません。
-
-実行する時にはプロジェクトディレクトリーに移動して、`bundle exec bin/sacback` で実行してください。
-
 
 
 #### コマンド
 
 * a: すべての処理を一気に実行します。（以降のc, g, r, z）
 
-  例： `bundle exec bin/sacback a disk1 /backup`
+  例： `sacback a disk1 /backup`
 
 * c: さくらのクラウド上でディスクからアーカイブを作成します。
 

data/lib/sacback/cli.rb

@@ -6,7 +6,6 @@ require 'zlib'
 require 'double_bag_ftps'
 require 'saklient/cloud/api'
 require 'sacback'
-require 'sacback/sacloud_request'
 
 
 module Sacback
@@ -79,9 +78,10 @@ module Sacback
     desc "r ARCHIVE_ID", "Remove the archive"
     def r(archive_id)
       log "r: Remove the archive: archive id=#{archive_id}"
-      request = create_rest_api_request
-      result = request.send :delete, "/archive/#{archive_id}"
-      if result['Success'] && result['is_ok']
+      @api = authorize
+      archive = @api.archive.get_by_id archive_id
+      result = archive.destroy
+      if result[:Success] && result[:is_ok]
         log "The archive #{archive_id} was removed."
       else
         abort "Error: removing the archive #{archive_id} failed"
@@ -152,11 +152,6 @@ module Sacback
     end
 
 
-    def create_rest_api_request
-      Sacback::SacloudRequest.new(ENV['SACLOUD_TOKEN'], ENV['SACLOUD_SECRET'], ENV['SACLOUD_ZONE'], SACLOUD_API_VERSION)
-    end
-    
-    
     def download_with_doublebugftps(ftp_info, local_file)
       BasicSocket.do_not_reverse_lookup = true
       ftps = DoubleBagFTPS.new

data/lib/sacback/version.rb

@@ -1,3 +1,3 @@
 module Sacback
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sacback
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Eiichi Shimotori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,6 @@ files:
 - bin/sacback
 - lib/sacback.rb
 - lib/sacback/cli.rb
-- lib/sacback/sacloud_request.rb
 - lib/sacback/version.rb
 - sacback.gemspec
 homepage: https://github.com/shimotori/sacback
@@ -119,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Sakura Cloud disk backup tool

data/lib/sacback/sacloud_request.rb

@@ -1,53 +0,0 @@
-# coding: utf-8
-
-require 'net/https'
-require 'uri'
-
-
-module Sacback
-  class SacloudRequest
-  
-    def initialize(token, secret, zone, api_version = '1.1')
-      @token = token
-      @secret = secret
-      @base_url = "https://secure.sakura.ad.jp/cloud/zone/#{zone}/api/cloud/#{api_version}"
-    end
-  
-  
-    # Send a request
-    def send(method, path, params = {})
-      uri = URI.parse(@base_url + path)
-  
-      # HTTPS setting
-      https = Net::HTTP.new(uri.host, uri.port)
-      https.use_ssl = true
-      https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-  
-      # Set the request class
-      request_class = case method
-                        when :get     then Net::HTTP::Get
-                        when :post    then Net::HTTP::Post
-                        when :delete  then Net::HTTP::Delete
-                        when :put     then Net::HTTP::Put
-                        else
-                          raise ArgumentError, 'invalid method'
-                      end
-  
-      # Basic Auth setting
-      request = request_class.new(uri.path)
-      request.basic_auth @token, @secret
-  
-      # Parameter setting
-      request.body = JSON.generate(params)  if (method == :post) || (method == :put)
-  
-      # Send the request
-      response = https.start do |x|
-        x.request request
-      end
-
-      # Return the body as JSON 
-      JSON.parse response.body
-    end
-    
-  end
-end