s3-wrapper 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a8d7dd2086141bb4f09dc2de3e72354d43cf73f
-  data.tar.gz: d7ececcb3e5b8c57205052a2513d74597c30183f
+  metadata.gz: 3edd1f247b2163ba9637531a55c1a830693a7149
+  data.tar.gz: e706e5a26484056932380e8069a03bc5e80455b4
 SHA512:
-  metadata.gz: 945cb7e7a791e782af043bc6e7585cd7299ea43e01eba05bb39d4f879b9696128594716b09fc8131ed4b8315838285957ecff6c32d450348d8dfca8c3ca156cf
-  data.tar.gz: fc13d6c8a82eb7203d5ce1fbc95d9bba26dd7dfc87abe422e17930c556476302bb0db40bba04a3aeae1cc75f71b7e8235b4b5c97d228b194f86442cc02306d64
+  metadata.gz: 1ab6353e7da0d12f7c09dfebb342e5265362a3ced9dec28dc05c4cc4467e0572728e07b2f5d47b3d0eb6f2b6df5de799863828c1366af01c0d16020dd831d987
+  data.tar.gz: 810389b9147742adbc1393ec80d08f2b7ed7c4fcb9d10c999c284059f79d969ba13075d1bcad6ac068ba0d3338ca32af28d07ae31827b0db9c7089d58f74faff

data/README.md

@@ -20,17 +20,25 @@ Or install it yourself as:
 
 ## Usage
 
-Make your profile and upload files to s3.
+Commands to manage the configuration file
 
 ```bash
 s3-wrapper config-default aws_access_key='aws-access-key' aws_secret_key='aws-secret-key' bucket_name='some-bucket-to-use' host_name='name-of-host-to-backup'
-s3-wrapper create-profile 'profile-name' key1=value1 key2=value2
-s3-wrapper update-profile 'profile-name' key1=value1 key2=value2
+s3-wrapper create-profile 'profile-name' aws_access_key=value1 aws_secret_key=value2
+s3-wrapper update-profile 'profile-name' host_name=value1
+s3-wrapper get-profile 'profile-name'
 s3-wrapper delete-profile 'profile-name'
+```
+
+Commands to upload files
 
+```bash
 s3-wrapper upload 'profile-name' file1 file2
 ```
 
+This tool uploads files under following hierachy. The bucket needs to be created beforehand and directories are automatically created by the tool.
+s3://@bucket_name@/@host_name@/@profile-name@/@curr_yy_mm@/@filename@
+
 ## Contributing
 
 1. Fork it ( https://github.com/carl8899/s3-wrapper/fork )

data/lib/s3-wrapper/profile.rb

@@ -10,7 +10,7 @@ class S3Wrapper
     end
 
     def self.create(name, params)
-      config = read_config(name)
+      config = read_config(name, false)
       params.each do |key, value|
         config[name][key] = value
       end
@@ -19,13 +19,13 @@ class S3Wrapper
     end
 
     def self.delete(name)
-      config = read_config(name)
+      config = read_config(name, false)
       config.delete(name)
       self::write_config(config)
     end
 
     def self.get(name)
-      config = read_config(name)
+      config = read_config(name, true)
       S3Wrapper::Profile.new(name, config[name])
     end
 
@@ -43,7 +43,7 @@ class S3Wrapper
     end
 
     private
-    def self.read_config(name)
+    def self.read_config(name, with_default)
       config = {}
       begin
         config = File.open(ENV['HOME'] + '/' + CONFIG_FILE) { |f| YAML.load(f) }
@@ -52,6 +52,11 @@ class S3Wrapper
       end
       config = {} unless config
       config[name] = {} unless config[name]
+      if with_default && config['default'] && name != 'default'
+        config['default'].each do |key, value|
+          config[name][key] = value unless config[name][key] && value;
+        end
+      end
       config
     end
 

data/lib/s3-wrapper/version.rb

@@ -1,3 +1,3 @@
 class S3Wrapper
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3-wrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Carl Blomberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler