s3ranger 0.2.1 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    s3ranger (0.2.1)
+    s3ranger (0.3.0)
       aws-sdk
       cmdparse
 

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Lincoln de Sousa
+Copyright (c) 2013 Lincoln de Sousa <lincoln@clarete.li>
 
 MIT License
 

data/bin/s3ranger

@@ -1,4 +1,28 @@
 #!/usr/bin/env ruby 
+#
+# s3ranger - Tool belt for managing your S3 buckets
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2013  Lincoln de Sousa <lincoln@clarete.li>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 
@@ -13,15 +37,26 @@ begin
   conf.read
 rescue S3Ranger::NoConfigFound => exc
   # We can't proceed without having those two vars set
-  if not (conf.has_key? "AWS_ACCESS_KEY_ID" and conf.has_key? "AWS_SECRET_ACCESS_KEY")
-    $stderr.puts "You didn't set up your environment variables :("
-    $stderr.puts "I tried the following paths:"
-    exc.paths_checked.each {|path| $stderr.puts " * #{path}/s3config.yml"}
+  $stderr.puts "You didn't set up the following environment variables:"
+  $stderr.puts
+  exc.missing_vars.each {|var| $stderr.puts "   * #{var}"}
+  $stderr.puts
 
-    $stderr.puts "You could try to set the `S3CONF' environment variable."
-    $stderr.puts "Learn how to do that here: https://github.com/clarete/s3ranger"
-    exit
-  end
+  $stderr.puts "I tried to load a config file from the following paths:"
+  $stderr.puts
+  exc.paths_checked.each {|path| $stderr.puts "   * #{path}"}
+  $stderr.puts
+
+  $stderr.puts "You could try to set the `S3RANGER_PATH' environment variable"
+  $stderr.puts "pointing to a file to be loaded as your config file or just"
+  $stderr.puts "export those variables to your environment like this:"
+  $stderr.puts
+  exc.missing_vars.each {|var|
+    $stderr.puts "    $ export #{var}=<value-provided-by-amazon>"
+  }
+  $stderr.puts
+  $stderr.puts "Learn how to do that here: https://github.com/clarete/s3ranger"
+  exit
 end
 
 # Step aside, the star of this show is here. Let's try to create the
@@ -33,7 +68,6 @@ rescue S3Ranger::FailureFeedback => exc
   $stderr.puts exc.message
   exit 1
 rescue S3Ranger::WrongUsage => exc
-  name = $0.split('/').last
   $stderr.puts "Error:\n  #{exc.msg}\n" if exc.msg
   exit exc.error_code
 end

data/lib/s3ranger/cli.rb

@@ -1,3 +1,27 @@
+# s3ranger - Tool belt for managing your S3 buckets
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2013  Lincoln de Sousa <lincoln@clarete.li>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 require 's3ranger/version'
 require 's3ranger/exceptions'
 require 's3ranger/sync'
@@ -12,7 +36,35 @@ module S3Ranger
 
     AVAILABLE_METHODS = ['read', 'get', 'put', 'write', 'delete']
 
-    class ListBuckets < CmdParse::Command
+    class BaseCmd < CmdParse::Command
+
+      @has_prefix = false
+
+      def has_options?
+        not options.instance_variables.empty?
+      end
+
+      def has_prefix?
+        @has_prefix
+      end
+
+      def usage
+        u = []
+        u << "Usage: #{File.basename commandparser.program_name} #{name} "
+        u << "[options] " if has_options?
+        u << "bucket" if has_args?
+
+        if has_prefix? == 'required'
+          u << ':prefix'
+        elsif has_prefix?
+          u << "[:prefix]"
+        end
+
+        u.join ''
+      end
+    end
+
+    class ListBuckets < BaseCmd
       def initialize
         super 'listbuckets', false, false, false
 
@@ -26,7 +78,7 @@ module S3Ranger
       end
     end
 
-    class CreateBucket < CmdParse::Command
+    class CreateBucket < BaseCmd
       attr_accessor :acl
 
       def initialize
@@ -60,7 +112,7 @@ module S3Ranger
       end
     end
 
-    class DeleteBucket < CmdParse::Command
+    class DeleteBucket < BaseCmd
       attr_accessor :force
 
       def initialize
@@ -92,7 +144,7 @@ module S3Ranger
       end
     end
 
-    class List < CmdParse::Command
+    class List < BaseCmd
       attr_accessor :max_entries
 
       def initialize
@@ -102,10 +154,18 @@ module S3Ranger
 
         @max_entries = 0
 
+        @delimiter = "\t"
+
+        @has_prefix = true
+
         self.options = CmdParse::OptionParserWrapper.new do |opt|
           opt.on("-m", "--max-entries=NUM", "Limit the number of entries to output") {|m|
             @max_entries = m
           }
+
+          opt.on("-d", "--delimiter=D", "Charactere used to separate columns") {|d|
+            @delimiter = d
+          }
         end
       end
 
@@ -119,16 +179,24 @@ module S3Ranger
         end
 
         collection.each {|object|
-          puts "#{object.key}\t#{object.content_length}\t#{object.last_modified}"
+          o = []
+          o << object.key
+          o << @delimiter
+          o << object.content_length
+          o << @delimiter
+          o << object.last_modified
+          puts o.join
         }
       end
     end
 
-    class Delete < CmdParse::Command
+    class Delete < BaseCmd
       def initialize
-        super 'delete', false, false, false
+        super 'delete', false, false
 
         @short_desc = "Delete a key from a bucket"
+
+        @has_prefix = 'required'
       end
 
       def run s3, bucket, key, file, args
@@ -138,23 +206,30 @@ module S3Ranger
       end
     end
 
-    class Url < CmdParse::Command
+    class Url < BaseCmd
       attr_accessor :method
       attr_accessor :secure
 
       def initialize
         super 'url', false, false
 
-        @short_desc = "Generates a url pointing to the given key"
-        @method = 'read'
+        @short_desc = "Generates public urls or authenticated endpoints for the object"
+        @description = "Notice that --method and --public are mutually exclusive"
+        @method = false
+        @public = false
         @secure = true
         @expires_in = false
+        @has_prefix = 'required'
 
         self.options = CmdParse::OptionParserWrapper.new do |opt|
-          opt.on("-m", "--method", "Options: #{AVAILABLE_METHODS.join ', '}") {|m|
+          opt.on("-m", "--method=METHOD", "Options: #{AVAILABLE_METHODS.join ', '}") {|m|
             @method = m
           }
 
+          opt.on("-p", "--public", "Generates a public (not authenticated) URL for the object") {|p|
+            @public = p
+          }
+
           opt.on("--no-ssl", "Generate an HTTP link, no HTTPS") {
             @secure = false
           }
@@ -180,20 +255,29 @@ module S3Ranger
       def run s3, bucket, key, file, args
         raise WrongUsage.new(nil, "You need to inform a bucket") if not bucket
         raise WrongUsage.new(nil, "You need to inform a key") if not key
-        raise WrongUsage.new(nil, "Unknown method #{@method}") unless AVAILABLE_METHODS.include? @method
+        raise WrongUsage.new(nil, "Params --method and --public are mutually exclusive") if (@method and @public)
+        if not AVAILABLE_METHODS.include? method = @method || 'read'
+          raise WrongUsage.new(nil, "Unknown method #{method}")
+        end
 
         opts = {}
         opts.merge!({:secure => @secure})
-        opts.merge!({:expires => @expires_in}) if @expires_in
-        puts (s3.buckets[bucket].objects[key].url_for @method.to_sym, opts).to_s
+
+        if @public
+          puts (s3.buckets[bucket].objects[key].public_url opts).to_s
+        else
+          opts.merge!({:expires => @expires_in}) if @expires_in
+          puts (s3.buckets[bucket].objects[key].url_for method.to_sym, opts).to_s
+        end
       end
     end
 
-    class Put < CmdParse::Command
+    class Put < BaseCmd
       def initialize
         super 'put', false, false
 
         @short_desc = 'Upload a file to a bucket under a certain prefix'
+        @has_prefix = true
       end
 
       def run s3, bucket, key, file, args
@@ -205,10 +289,11 @@ module S3Ranger
       end
     end
 
-    class Get < CmdParse::Command
+    class Get < BaseCmd
       def initialize
         super 'get', false, false
         @short_desc = "Retrieve an object and save to the specified file"
+        @has_prefix = 'required'
       end
 
       def run s3, bucket, key, file, args
@@ -226,7 +311,7 @@ module S3Ranger
       end
     end
 
-    class Sync < CmdParse::Command
+    class Sync < BaseCmd
       attr_accessor :s3
       attr_accessor :exclude
       attr_accessor :keep
@@ -244,7 +329,7 @@ module S3Ranger
         @verbose = false
 
         self.options = CmdParse::OptionParserWrapper.new do |opt|
-          opt.on("-x EXPR", "--exclude=EXPR", "") {|v|
+          opt.on("-x EXPR", "--exclude=EXPR", "Skip copying files that matches this pattern. (Ruby REs)") {|v|
             @exclude = v
           }
 
@@ -263,6 +348,33 @@ module S3Ranger
         end
       end
 
+      def usage
+        "Usage: #{File.basename commandparser.program_name} #{name} source destination"
+      end
+
+      def description
+        @description =<<END.strip
+
+Where `source' and `description' might be either local or remote
+addresses. A local address is simply a path in your local file
+system. e.g:
+
+    /tmp/notes.txt
+
+A remote address is a combination of the `bucket` name and
+an optional `prefix`:
+
+    disc.company.com:reports/2013/08/30.html
+
+So, a full example would be something like this
+
+    $ #{File.basename commandparser.program_name} sync Work/reports disc.company.com:reports/2013/08
+
+The above line will update the remote folder `reports/2013/08` with the
+contents of the local folder `Work/reports`.
+END
+      end
+
       def run s3, bucket, key, file, args
         @s3 = s3
         cmd = SyncCommand.new self, *args
@@ -272,6 +384,7 @@ module S3Ranger
 
     def run conf
       cmd = CmdParse::CommandParser.new true
+      cmd.program_name = File.basename $0
       cmd.program_version = S3Ranger::VERSION
 
       cmd.options = CmdParse::OptionParserWrapper.new do |opt|
@@ -279,13 +392,13 @@ module S3Ranger
       end
 
       cmd.main_command.short_desc = 'Tool belt for managing your S3 buckets'
-      cmd.main_command.description = [] \
-        << "Below you have a list of commands will allow you to manage your content" \
-        << "stored in S3 buckets. For more information on each command, you can always" \
-        << "use the `--help' parameter, just like this:" \
-        << "" \
-        << "   $ #{$0} sync --help" \
+      cmd.main_command.description =<<END.strip
+S3Ranger provides a list of commands that will allow you to manage your content
+stored in S3 buckets. To learn about each feature, please use the `help`
+command:
 
+    $ #{File.basename $0} help sync"
+END
       # Commands used more often
       cmd.add_command List.new
       cmd.add_command Delete.new
@@ -299,7 +412,6 @@ module S3Ranger
       cmd.add_command CreateBucket.new
       cmd.add_command DeleteBucket.new
 
-
       # Built-in commands
       cmd.add_command CmdParse::HelpCommand.new
       cmd.add_command CmdParse::VersionCommand.new
@@ -332,6 +444,8 @@ module S3Ranger
             raise FailureFeedback.new("There's no bucket named `#{bucket}'")
           rescue AWS::S3::Errors::NoSuchKey
             raise FailureFeedback.new("There's no key named `#{key}' in the bucket `#{bucket}'")
+          rescue AWS::S3::Errors::Base => exc
+            raise FailureFeedback.new("Error: `#{exc.message}'")
           end
         }
       end

data/lib/s3ranger/config.rb

@@ -1,3 +1,30 @@
+# s3ranger - Tool belt for managing your S3 buckets
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2013  Lincoln de Sousa <lincoln@clarete.li>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# Part of this software was inspired by the original s3sync, so here's their
+# copyright notice:
+
 # This software code is made available "AS IS" without warranties of any
 # kind.  You may copy, display, modify and redistribute the software
 # code either by itself or as incorporated into your code; provided that
@@ -15,10 +42,15 @@ require 's3ranger/exceptions'
 module S3Ranger
 
   class Config < Hash
-    def read
+
+    REQUIRED_VARS = [:AWS_ACCESS_KEY_ID, :AWS_SECRET_ACCESS_KEY]
+
+    CONFIG_PATHS = ["#{ENV['S3RANGER_PATH']}", "#{ENV['HOME']}/.s3ranger.yml", "/etc/s3ranger.yml"]
+
+    def read_from_file
       paths_checked = []
 
-      ["#{ENV['S3CONF']}", "#{ENV['HOME']}/.s3conf", "/etc/s3conf"].each do |path|
+      CONFIG_PATHS.each do |path|
 
         # Filtering some garbage
         next if path.nil? or path.strip.empty?
@@ -28,16 +60,39 @@ module S3Ranger
 
         # Time for the dirty work, let's parse the config file and feed our
         # internal hash
-        if File.exists?("#{path}/s3config.yml")
-          config = YAML.load_file("#{path}/s3config.yml")
+        if File.exists? path
+          config = YAML.load_file path
           config.each_pair do |key, value|
             self[key.upcase.to_sym] = value
           end
-          return
+          return 
         end
       end
 
-      raise NoConfigFound.new paths_checked
+      return paths_checked
+    end
+
+    def read_from_env
+      REQUIRED_VARS.each do |v|
+        self[v] = ENV[v.to_s] unless ENV[v.to_s].nil?
+      end
+    end
+
+    def read
+      # Reading from file and then trying from env
+      paths_checked = read_from_file
+      read_from_env
+
+      # Checking which variables we have
+      not_found = []
+
+      REQUIRED_VARS.each {|v|
+        not_found << v if self[v].nil?
+      }
+
+      # Cleaning possibly empty env var from CONFIG_PATH
+      paths = (paths_checked || CONFIG_PATHS).select {|e| !e.empty?}
+      raise NoConfigFound.new(not_found, paths) if not_found.count > 0
     end
   end
 end

data/lib/s3ranger/exceptions.rb

@@ -1,11 +1,26 @@
-# (c) 2013  Lincoln de Sousa <lincoln@clarete.li>
+# s3ranger - Tool belt for managing your S3 buckets
 #
-# This software code is made available "AS IS" without warranties of any
-# kind.  You may copy, display, modify and redistribute the software
-# code either by itself or as incorporated into your code; provided that
-# you do not remove any proprietary notices.  Your use of this software
-# code is at your own risk and you waive any claim against the author
-# with respect to your use of this software code.
+# The MIT License (MIT)
+#
+# Copyright (c) 2013  Lincoln de Sousa <lincoln@clarete.li>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 module S3Ranger
 
@@ -14,9 +29,11 @@ module S3Ranger
 
   class NoConfigFound < SyncException
 
+    attr_accessor :missing_vars
     attr_accessor :paths_checked
 
-    def initialize(paths_checked)
+    def initialize missing_vars, paths_checked
+      @missing_vars = missing_vars
       @paths_checked = paths_checked
     end
   end

data/lib/s3ranger/sync.rb

@@ -1,4 +1,30 @@
-# (c) 2013  Lincoln de Sousa <lincoln@clarete.li>
+# s3ranger - Tool belt for managing your S3 buckets
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2013  Lincoln de Sousa <lincoln@clarete.li>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# Part of this software was inspired by the original s3sync, so here's their
+# copyright notice:
+
 # (c) 2007 s3sync.net
 #
 # This software code is made available "AS IS" without warranties of any

data/lib/s3ranger/util.rb

@@ -1,14 +1,29 @@
+# s3ranger - Tool belt for managing your S3 buckets
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2013  Lincoln de Sousa <lincoln@clarete.li>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 module S3Ranger
   def S3Ranger.safe_join(parts)
     File.join *(parts.select {|v| !v.nil? && !v.empty? })
   end
-
-# class Object
-#   # note that this method is already defined in Ruby 1.9
-#   def define_singleton_method(name, callable = nil, &block)
-#     block ||= callable
-#     metaclass = class << self; self; end
-#     metaclass.send(:define_method, name, block)
-#   end
-# end
 end

data/lib/s3ranger/version.rb

@@ -1,3 +1,27 @@
+# s3ranger - Tool belt for managing your S3 buckets
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2013  Lincoln de Sousa <lincoln@clarete.li>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 module S3Ranger
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/s3ranger.yml.example

@@ -0,0 +1,2 @@
+AWS_ACCESS_KEY_ID: 11111111111111111111111
+AWS_SECRET_ACCESS_KEY: 222222222222222222222

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3ranger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -136,10 +136,10 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - README.md
-- README.txt
-- README_s3cmd.txt
 - Rakefile
 - bin/s3ranger
+- doc/old/README.txt
+- doc/old/README_s3cmd.txt
 - lib/s3ranger.rb
 - lib/s3ranger/cli.rb
 - lib/s3ranger/config.rb
@@ -147,8 +147,8 @@ files:
 - lib/s3ranger/sync.rb
 - lib/s3ranger/util.rb
 - lib/s3ranger/version.rb
-- s3config.yml.example
 - s3ranger.gemspec
+- s3ranger.yml.example
 - spec/fixtures/nodes/1.txt
 - spec/local_source_spec.rb
 - spec/main_spec.rb
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4070124136594756981
+      hash: 1697485139363659678
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4070124136594756981
+      hash: 1697485139363659678
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/s3config.yml.example

@@ -1,3 +0,0 @@
-aws_access_key_id: 11111111111111111111111
-aws_secret_access_key: 222222222222222222222
-ssl_cert_dir: /home/user/s3ranger/certs