elastic-backup-2s3 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b0edbad64d4b3d88a4b8930ccdc322d095a50a6
-  data.tar.gz: 7f038e5b440d1869f1ce0a34602b36459de43c9a
+  metadata.gz: 77699d024d5d9f82da71fb7c22fcc643216be7ac
+  data.tar.gz: 12987b551dad9dccfca651dff0ba584e624c366a
 SHA512:
-  metadata.gz: a924475b768ba81d75ac833613fbfbc0373326c0c6f700f4ba0269e2a8ee2a5df029b51550939b85e89009e62c0b06f7b6170fe4c3dae8b4fc44741d30c3102e
-  data.tar.gz: 70bdd3efbd2983874b57a8cbbd09b9485d9c9466d80c366524531c9213c0de31278e3dedb7aa9796dc011f69c49ba18a1f348a4f404d9c8323eec0ab7eb9e932
+  metadata.gz: af3402692b145675cf711e9310f9866ab2d9b4b058f08b16e21a1020b2a170f010ecf32f71d98a4ce760b59e5e11785d802aad3c2cdbdce58e272e80c013633b
+  data.tar.gz: e3ae8d1b149427dbaadf93581c8cb6bf9e08740b8fd11628a5ab160f66c83c072b59774dde7a4349bafd0f113419cf3967e6fada2e3d75c8c1107573d6e81d61

data/.semver

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 1
-:patch: 1
+:patch: 2
 :special: ''

data/README.org

@@ -125,8 +125,9 @@
 ** Release Notes
    |       Date | Version | Description                                                             |
    |------------+---------+-------------------------------------------------------------------------|
-   | 2016-04-17 | v0.0.3  | Added a delete snapshot option to allow deletion of a running snapshot. |
+   | 2016-05-02 | v0.1.2  | Fixed a couple of minor issues with the restore from shared volume.     |
    | 2016-04-22 | v0.1.0  | Support for FS volume backups added                                     |
+   | 2016-04-17 | v0.0.3  | Added a delete snapshot option to allow deletion of a running snapshot. |
    |            |         |                                                                         |
 ** Known Issues
    |       Date | Version | Description                                                                                                                                                                                   |

data/Rakefile

@@ -31,10 +31,8 @@ Juwelier::Tasks.new do |gem|
   without any fuss or having to dilly around with
   curl -XPUTS and friends.
 
-  So here it is, and I make no apologies about not 
-  supporting the "shared volume" option of Elasticsearch
-  snapshots. I may add support at a later date. Or
-  feel free to add it and do a pull request.
+  So here it is, and we now support Shared Volumes. See
+  the docs on the --fs flag.
 
   There are many features I wish to add to this, and
   if you have any suggestions, please feel free to send

data/elastic-backup-2s3.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: elastic-backup-2s3 0.1.1 ruby lib
+# stub: elastic-backup-2s3 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "elastic-backup-2s3"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Fred Mitchell"]
   s.date = "2016-05-02"
-  s.description = "\n  I simply want to be able to control the backup and\n  restoration of the Elasticsearch cluster to S3\n  without any fuss or having to dilly around with\n  curl -XPUTS and friends.\n\n  So here it is, and I make no apologies about not \n  supporting the \"shared volume\" option of Elasticsearch\n  snapshots. I may add support at a later date. Or\n  feel free to add it and do a pull request.\n\n  There are many features I wish to add to this, and\n  if you have any suggestions, please feel free to send\n  them my way!"
+  s.description = "\n  I simply want to be able to control the backup and\n  restoration of the Elasticsearch cluster to S3\n  without any fuss or having to dilly around with\n  curl -XPUTS and friends.\n\n  So here it is, and we now support Shared Volumes. See\n  the docs on the --fs flag.\n\n  There are many features I wish to add to this, and\n  if you have any suggestions, please feel free to send\n  them my way!"
   s.email = "fred.mitchell@gmx.de"
   s.executables = ["es-snapshot"]
   s.extra_rdoc_files = [

data/lib/elastic-backup-2s3/snapshot.rb

@@ -37,7 +37,7 @@ module ElasticBackup
 
       # Take the s3 url and break it down to
       # its components [BUCKET, PATH, SNAPSHOT]
-      def s3url_splice(surl)
+      def snapurl_splice(surl)
         protocol, b, snapshot = surl.split(':')
         empty, empty, bucket, path = b.split('/', 4)
         raise "Protocol must be 's3' in #{surl}" unless protocol.downcase == 's3'
@@ -57,8 +57,8 @@ module ElasticBackup
 
       # For now, this will overwrite the repo if it is
       # there already.
-      def set_repository s3url, opt
-        bucket, base_path, _ignore = opt[:fs] ? [nil, nil, nil] : s3url_splice(s3url)
+      def set_repository snapurl, opt
+        bucket, base_path, _ignore = opt[:fs] ? [nil, nil, nil] : snapurl_splice(snapurl)
         cmd = { repository: opt[:repo], 
           body: unless opt[:fs]
                   {
@@ -85,9 +85,9 @@ module ElasticBackup
         end
       end
 
-      def initiate_snapshot s3url
-        _ignore, _ignore, snapname = (opt[:fs] ? [nil, nil, s3url] : s3url_splice(s3url))
-        raise "Must specify :SNAPSHOTNAME at the end of your S3URL #{s3url}" if snapname.nil?
+      def initiate_snapshot snapurl
+        _ignore, _ignore, snapname = (opt[:fs] ? [nil, nil, snapurl] : snapurl_splice(snapurl))
+        raise "Must specify :SNAPSHOTNAME at the end of your S3URL #{snapurl}" if snapname.nil?
 
         cmd = { 
           repository: opt[:repo], 
@@ -104,9 +104,9 @@ module ElasticBackup
         end
       end
 
-      def initiate_restore s3url
-        _ignore, _ignore, snapname = (opt[:fs] ? [nil, nil, s3url] : s3url_splice(s3url))
-        raise "Must specify :SNAPSHOTNAME at the end of your S3URL #{s3url}" if snapname.nil?
+      def initiate_restore snapurl
+        _ignore, _ignore, snapname = (opt[:fs] ? [nil, nil, snapurl] : snapurl_splice(snapurl))
+        raise "Must specify :SNAPSHOTNAME at the end of your S3URL #{snapurl}" if snapname.nil?
 
         cmd = {
           repository: opt[:repo], 
@@ -123,18 +123,18 @@ module ElasticBackup
       end
 
       # Do a snapshot of an elasticsearch cluster
-      def snapshot esurl, s3url, options
+      def snapshot esurl, snapurl, options
         elastic esurl
         set_opts(options)
-        set_repository s3url, options
-        initiate_snapshot s3url
+        set_repository snapurl, options
+        initiate_snapshot snapurl
       end
       
-      def restore s3url, esurl, options
+      def restore snapurl, esurl, options
         elastic esurl
         set_opts(options)
-        set_repository s3url
-        initiate_restore s3url
+        set_repository snapurl, options
+        initiate_restore snapurl
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-backup-2s3
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Fred Mitchell
@@ -318,13 +318,19 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: "\n  I simply want to be able to control the backup and\n  restoration
-  of the Elasticsearch cluster to S3\n  without any fuss or having to dilly around
-  with\n  curl -XPUTS and friends.\n\n  So here it is, and I make no apologies about
-  not \n  supporting the \"shared volume\" option of Elasticsearch\n  snapshots. I
-  may add support at a later date. Or\n  feel free to add it and do a pull request.\n\n
-  \ There are many features I wish to add to this, and\n  if you have any suggestions,
-  please feel free to send\n  them my way!"
+description: |2-
+
+    I simply want to be able to control the backup and
+    restoration of the Elasticsearch cluster to S3
+    without any fuss or having to dilly around with
+    curl -XPUTS and friends.
+
+    So here it is, and we now support Shared Volumes. See
+    the docs on the --fs flag.
+
+    There are many features I wish to add to this, and
+    if you have any suggestions, please feel free to send
+    them my way!
 email: fred.mitchell@gmx.de
 executables:
 - es-snapshot