s3ranger 0.1.0 → 0.2.0

data/Gemfile.lock

@@ -1,16 +1,18 @@
 PATH
   remote: .
   specs:
-    s3ranger (0.1.0)
+    s3ranger (0.2.0)
       aws-sdk
+      cmdparse
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (1.15.0)
+    aws-sdk (1.16.0)
       json (~> 1.4)
       nokogiri (< 1.6.0)
       uuidtools (~> 2.1)
+    cmdparse (2.0.5)
     columnize (0.3.6)
     debugger (1.6.1)
       columnize (>= 0.3.1)

data/bin/s3ranger

@@ -4,7 +4,7 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(_
 
 require "s3ranger/exceptions"
 require "s3ranger/config"
-require "s3ranger/cmd"
+require "s3ranger/cli"
 
 conf = S3Ranger::Config.new
 
@@ -24,82 +24,16 @@ rescue S3Ranger::NoConfigFound => exc
   end
 end
 
-
 # Step aside, the star of this show is here. Let's try to create the
 # environment to run the requested command. And feed the user back if
 # information needed was not enough
 begin
-  S3Ranger::Cmd.new(conf)
-
+  S3Ranger::CLI::run conf
 rescue S3Ranger::FailureFeedback => exc
   $stderr.puts exc.message
   exit 1
-
 rescue S3Ranger::WrongUsage => exc
   name = $0.split('/').last
-
-  $stderr.puts <<"ENDUSAGE"
-Usage: #{name} [options] <command> [arg(s)]
-
-Global Options:
-  -h, --help
-  -v, --verbose
-  -n, --dryrun
-  -d, --debug
-      --progress
-
-#{name} listbuckets
-  List all available buckets
-
-#{name} createbucket <bucket>
-  Creates a new bucket
-
-  Options:
-
-    -a <ACL>, --acl=(private|public_read|public_read_write)
-
-#{name} deletebucket [options] <bucket>
-  Removes an existing bucket
-
-  Options:
-    -f, --force  Deletes non-empty buckets (BE CAREFUL)
-
-#{name} list <bucket>[:prefix]
-  List content inside of bucket
-
-  if `prefix' is present, only content under `prefix' will be listed.
-
-#{name} delete <bucket>:<key>
-  Removes `key` from `bucket`
-
-#{name} url [options] <bucket>:<key>
-  Generates a presigned URL for an operation on the object named `key' found on
-  `bucket'.
-
-  Options:
-    --no-ssl
-    --expires-in=(<# of seconds> | [#d|#h|#m|#s])
-
-#{name} get <bucket>:<key> <file>
-  Retrieves the remote `key` object from `bucket` and saves to the local path
-  specified in `file`
-
-#{name} put <bucket>[:<key>] <file>
-  Uploads the file `file` to the `bucket` under the path `key`
-
-#{name} sync <source> <destination>
-
-  One of source or destination must be remote and the other must be local,
-  where local points to a folder in the file system and remote conform to the
-  format `<bucket>[:<key>]`.
-
-  Options:
-    -e <pattern>, --exclude=<pattern>
-    -k, --keep
-    -d, --dry-run
-
-ENDUSAGE
-
-  $stderr.puts "\nCurrent error:\n  #{exc.msg}\n" if exc.msg
+  $stderr.puts "Error:\n  #{exc.msg}\n" if exc.msg
   exit exc.error_code
 end

data/lib/s3ranger/cli.rb

@@ -0,0 +1,344 @@
+require 's3ranger/exceptions'
+require 's3ranger/sync'
+require 'aws/s3'
+require 'cmdparse'
+
+
+module S3Ranger
+  module CLI
+
+    AVAILABLE_ACLS = [:public_read, :public_read_write, :private]
+
+    AVAILABLE_METHODS = ['read', 'get', 'put', 'write', 'delete']
+
+    class ListBuckets < CmdParse::Command
+      def initialize
+        super 'listbuckets', false, false, false
+
+        @short_desc = "List all available buckets for your user"
+      end
+
+      def run s3, bucket, key, file, args
+        s3.buckets.each do |bkt|
+          puts "#{bkt.name}"
+        end
+      end
+    end
+
+    class CreateBucket < CmdParse::Command
+      attr_accessor :acl
+
+      def initialize
+        super 'createbucket', false, false
+
+        @short_desc = "Create a new bucket under your user account"
+
+        @acl = nil
+
+        self.options = CmdParse::OptionParserWrapper.new do |opt|
+          opt.on("-a", "--acl=ACL", "Options: #{AVAILABLE_ACLS.join ', '}") {|acl|
+            @acl = acl.to_sym
+          }
+        end
+      end
+
+      def run s3, bucket, key, file, args
+        raise WrongUsage.new(nil, "You need to inform a bucket") if not bucket
+
+        begin
+          params = {}
+          if @acl
+            raise WrongUsage.new(nil, "Invalid ACL `#{@acl}'. Should be any of #{AVAILABLE_ACLS.join ', '}") if not AVAILABLE_ACLS.include? @acl
+            params.merge!({:acl => @acl})
+          end
+
+          s3.buckets.create bucket, params
+        rescue AWS::S3::Errors::BucketAlreadyExists => exc
+          raise FailureFeedback.new("Bucket `#{bucket}' already exists")
+        end
+      end
+    end
+
+    class DeleteBucket < CmdParse::Command
+      attr_accessor :force
+
+      def initialize
+        super 'deletebucket', false, false
+
+        @short_desc = "Remove a bucket from your account"
+
+        @force = false
+
+        self.options = CmdParse::OptionParserWrapper.new do |opt|
+          opt.on("-f", "--force", "Clean the bucket then deletes it") {|f|
+            @force = f
+          }
+        end
+      end
+
+      def run s3, bucket, key, file, args
+        raise WrongUsage.new(nil, "You need to inform a bucket") if not bucket
+
+        # Getting the bucket
+        bucket_obj = s3.buckets[bucket]
+
+        # Do not kill buckets with content unless explicitly asked
+        if not @force and bucket_obj.objects.count > 0
+          raise FailureFeedback.new("Cowardly refusing to remove non-empty bucket `#{bucket}'. Try with -f.")
+        end
+
+        bucket_obj.delete!
+      end
+    end
+
+    class List < CmdParse::Command
+      attr_accessor :max_entries
+
+      def initialize
+        super 'list', false, false
+
+        @short_desc = "List items filed under a given bucket"
+
+        @max_entries = 0
+
+        self.options = CmdParse::OptionParserWrapper.new do |opt|
+          opt.on("-m", "--max-entries=NUM", "Limit the number of entries to output") {|m|
+            @max_entries = m
+          }
+        end
+      end
+
+      def run s3, bucket, key, file, args
+        raise WrongUsage.new(nil, "You need to inform a bucket") if not bucket
+
+        collection = s3.buckets[bucket].objects.with_prefix(key || "")
+
+        if @max_entries > 0
+          collection = collection.page(:per_page => max = @max_entries)
+        end
+
+        collection.each {|object|
+          puts "#{object.key}\t#{object.content_length}\t#{object.last_modified}"
+        }
+      end
+    end
+
+    class Delete < CmdParse::Command
+      def initialize
+        super 'delete', false, false, false
+
+        @short_desc = "Delete a key from a bucket"
+      end
+
+      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
+        s3.buckets[bucket].objects[key].delete
+      end
+    end
+
+    class Url < CmdParse::Command
+      attr_accessor :method
+      attr_accessor :secure
+
+      def initialize
+        super 'url', false, false
+
+        @short_desc = "Generates a url pointing to the given key"
+        @method = 'read'
+        @secure = true
+        @expires_in = false
+
+        self.options = CmdParse::OptionParserWrapper.new do |opt|
+          opt.on("-m", "--method", "Options: #{AVAILABLE_METHODS.join ', '}") {|m|
+            @method = m
+          }
+
+          opt.on("--no-ssl", "Generate an HTTP link, no HTTPS") {
+            @secure = false
+          }
+
+          opt.on("--expires-in=EXPR", "How long the link takes to expire. Format: <# of seconds> | [#d|#h|#m|#s]") { |expr|
+            val = 0
+            expr.scan /(\d+\w)/ do |track|
+              _, num, what = /(\d+)(\w)/.match(track[0]).to_a
+              num = num.to_i
+
+              case what
+              when "d"; val += num * 86400
+              when "h"; val += num * 3600
+              when "m"; val += num * 60
+              when "s"; val += num
+              end
+            end
+            @expires_in = val > 0 ? val : expr.to_i
+          }
+        end
+      end
+
+      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
+
+        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
+      end
+    end
+
+    class Put < CmdParse::Command
+      def initialize
+        super 'put', false, false
+
+        @short_desc = 'Upload a file to a bucket under a certain prefix'
+      end
+
+      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 file") if not file
+
+        name = S3Ranger.safe_join [key, File.basename(file)]
+        s3.buckets[bucket].objects[name].write Pathname.new(file)
+      end
+    end
+
+    class Get < CmdParse::Command
+      def initialize
+        super 'get', false, false
+        @short_desc = "Retrieve an object and save to the specified file"
+      end
+
+      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, "You need to inform a file") if not file
+
+        # Saving the content to be downloaded to the current directory if the
+        # destination is a directory
+        path = File.absolute_path file
+        path = S3Ranger.safe_join [path, File.basename(key)] if File.directory? path
+        File.open(path, 'wb') do |f|
+          s3.buckets[bucket].objects[key].read do |chunk| f.write(chunk) end
+        end
+      end
+    end
+
+    class Sync < CmdParse::Command
+      attr_accessor :s3
+      attr_accessor :exclude
+      attr_accessor :keep
+      attr_accessor :dry_run
+      attr_accessor :verbose
+
+      def initialize
+        super 'sync', false, false
+
+        @short_desc = "Synchronize an S3 and a local folder"
+        @s3 = nil
+        @exclude = nil
+        @keep = false
+        @dry_run = false
+        @verbose = false
+
+        self.options = CmdParse::OptionParserWrapper.new do |opt|
+          opt.on("-x EXPR", "--exclude=EXPR", "") {|v|
+            @exclude = v
+          }
+
+          opt.on("-k", "--keep", "Keep files even if they don't exist in source") {
+            @keep = true
+          }
+
+          opt.on("-d", "--dry-run", "Do not download or exclude anything, just show what was planned. Implies `verbose`.") {
+            @dry_run = true
+            @verbose = true
+          }
+
+          opt.on("-v", "--verbose", "Show file names") {
+            @verbose = true
+          }
+        end
+      end
+
+      def run s3, bucket, key, file, args
+        @s3 = s3
+        cmd = SyncCommand.new self, *args
+        cmd.run
+      end
+    end
+
+    def run conf
+      cmd = CmdParse::CommandParser.new true
+      cmd.program_version = S3Ranger::VERSION
+
+      cmd.options = CmdParse::OptionParserWrapper.new do |opt|
+        opt.separator "Global options:"
+      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" \
+
+      # Commands used more often
+      cmd.add_command List.new
+      cmd.add_command Delete.new
+      cmd.add_command Url.new
+      cmd.add_command Put.new
+      cmd.add_command Get.new
+      cmd.add_command Sync.new
+
+      # Bucket related options
+      cmd.add_command ListBuckets.new
+      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
+
+      # Defining the `execute` method as a closure, so we can forward the
+      # arguments needed to run the instance of the chosen command.
+      CmdParse::Command.class_eval do
+        define_method :execute, lambda { |args|
+
+          # Connecting to amazon
+          s3 = AWS::S3.new(
+            :access_key_id => conf[:AWS_ACCESS_KEY_ID],
+            :secret_access_key => conf[:AWS_SECRET_ACCESS_KEY],
+          )
+
+          # From the command line
+          key, file = args
+
+          # Parsing the bucket name
+          bucket = nil
+          bucket, key = key.split(':') if key
+
+          # Running our custom method inside of the command class, taking care
+          # of the common errors here, saving duplications in each command;
+          begin
+            run s3, bucket, key, file, args
+          rescue AWS::S3::Errors::AccessDenied
+            raise FailureFeedback.new("Access Denied")
+          rescue AWS::S3::Errors::NoSuchBucket
+            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}'")
+          end
+        }
+      end
+
+      cmd.parse
+    end
+
+    module_function :run
+
+  end
+end

data/lib/s3ranger/sync.rb

@@ -138,19 +138,19 @@ module S3Ranger
       # Removing the items matching the exclude pattern if requested
       to_add.select! { |e|
         begin
-          (e.path =~ /#{@args[:options]["--exclude"]}/).nil?
+          (e.path =~ /#{@args.exclude}/).nil?
         rescue RegexpError => exc
           raise WrongUsage.new nil, exc.message
         end
-      } if @args[:options]["--exclude"]
+      } if @args.exclude
 
       # Calling the methods that perform the actual IO
       if source.local?
         upload_files destination, to_add
-        remove_files destination, to_remove unless @args[:options]["--keep"]
+        remove_files destination, to_remove unless @args.keep
       else
         download_files destination, source, to_add
-        remove_local_files destination, source, to_remove unless @args[:options]["--keep"]
+        remove_local_files destination, source, to_remove unless @args.keep
       end
     end
 
@@ -246,7 +246,7 @@ module S3Ranger
       begin
         dir = location.path
         dir += '/' if not (dir.empty? or dir.end_with? '/')
-        @args[:s3].buckets[location.bucket].objects.with_prefix(dir || "").to_a.collect {|obj|
+        @args.s3.buckets[location.bucket].objects.with_prefix(dir || "").to_a.collect {|obj|
           Node.new location.path, obj.key, obj.content_length
         }
       rescue AWS::S3::Errors::NoSuchBucket
@@ -272,13 +272,13 @@ module S3Ranger
 
     def upload_files remote, list
       list.each do |e|
-        if @args[:options]["--dry-run"] or @args[:options]["--verbose"]
+        if @args.verbose
           puts " + #{e.full} => #{remote}#{e.path}"
         end
 
-        unless @args[:options]["--dry-run"]
+        unless @args.dry_run
           if File.file? e.path
-            @args[:s3].buckets[remote.bucket].objects[e.path].write Pathname.new e.path
+            @args.s3.buckets[remote.bucket].objects[e.path].write Pathname.new e.path
           end
         end
       end
@@ -286,14 +286,14 @@ module S3Ranger
 
     def remove_files remote, list
 
-      if @args[:options]["--dry-run"] or @args[:options]["--verbose"]
+      if @args.verbose
         list.each {|e|
           puts " - #{remote}#{e.path}"
         }
       end
 
-      unless @args[:options]["--dry-run"]
-        @args[:s3].buckets[remote.bucket].objects.delete_if { |obj| list.include? obj.key }
+      unless @args.dry_run
+        @args.s3.buckets[remote.bucket].objects.delete_if { |obj| list.include? obj.key }
       end
     end
 
@@ -301,12 +301,12 @@ module S3Ranger
       list.each {|e|
         path = File.join destination.path, e.path
 
-        if @args[:options]["--dry-run"] or @args[:options]["--verbose"]
+        if @args.verbose
           puts " + #{source}#{e.path} => #{path}"
         end
 
-        unless @args[:options]["--dry-run"]
-          obj = @args[:s3].buckets[source.bucket].objects[e.path]
+        unless @args.dry_run
+          obj = @args.s3.buckets[source.bucket].objects[e.path]
 
           # Making sure this new file will have a safe shelter
           FileUtils.mkdir_p File.dirname(path)
@@ -325,11 +325,11 @@ module S3Ranger
       list.each {|e|
         path = File.join destination.path, e.path
 
-        if @args[:options]["--dry-run"] or @args[:options]["--verbose"]
+        if @args.verbose
           puts " * #{e.path} => #{path}"
         end
 
-        unless @args[:options]["--dry-run"]
+        unless @args.dry_run
           FileUtils.rm_rf path
         end
       }

data/lib/s3ranger/util.rb

@@ -2,4 +2,13 @@ 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,3 @@
 module S3Ranger
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/s3ranger.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   # Library requirements
   spec.add_dependency "aws-sdk"
+  spec.add_dependency "cmdparse"
 
   # Development requirements
   spec.add_development_dependency "debugger"

data/spec/main_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper.rb'
-require 's3ranger/cmd'
+require 's3ranger/cli'
 require 's3ranger/config'
-require 's3ranger/commands'
 require 's3ranger/sync'
 
 include S3Ranger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3ranger
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cmdparse
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
@@ -125,8 +141,7 @@ files:
 - Rakefile
 - bin/s3ranger
 - lib/s3ranger.rb
-- lib/s3ranger/cmd.rb
-- lib/s3ranger/commands.rb
+- lib/s3ranger/cli.rb
 - lib/s3ranger/config.rb
 - lib/s3ranger/exceptions.rb
 - lib/s3ranger/sync.rb
@@ -153,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1810460057693170184
+      hash: -223614671279918114
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1810460057693170184
+      hash: -223614671279918114
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/s3ranger/cmd.rb

@@ -1,112 +0,0 @@
-# (c) 2013  Lincoln de Sousa <lincoln@clarete.li>
-# (c) 2007 s3sync.net
-#
-# 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.
-
-require 'getoptlong'
-require 's3ranger/commands'
-require 's3ranger/util'
-
-module S3Ranger
-
-  class Cmd
-
-    def initialize(conf = conf)
-      # The chain that initializes our command and find the right action
-      options, command, bucket, key, file = read_info_from_args(parse_args())
-
-      # Finding the right command to run
-      (cmd = find_cmd(command)) || (raise WrongUsage.new(nil, "Command `#{command}' does not exist"))
-
-      # Now that we're sure we have things to do, we need to connect to amazon
-      s3 = AWS::S3.new(
-        :access_key_id => conf[:AWS_ACCESS_KEY_ID],
-        :secret_access_key => conf[:AWS_SECRET_ACCESS_KEY],
-      )
-
-      # Calling the actuall command
-      cmd.call({
-        :options => options,
-        :s3 => s3,
-        :bucket => bucket,
-        :key => key,
-        :file => file,
-      })
-    end
-
-    def find_cmd name
-      sym = "_cmd_#{name}".to_sym
-      return nil unless Commands.public_methods.include? sym
-      return Commands.method sym
-    end
-
-    def parse_args
-      options = Hash.new
-
-      args = [
-        ['--help',       '-h', GetoptLong::NO_ARGUMENT],
-        ['--force',      '-f', GetoptLong::NO_ARGUMENT],
-        ['--acl',        '-a', GetoptLong::REQUIRED_ARGUMENT],
-        ['--method',     '-m', GetoptLong::REQUIRED_ARGUMENT],
-        ['--exclude',    '-e', GetoptLong::REQUIRED_ARGUMENT],
-        ['--keep',       '-k', GetoptLong::NO_ARGUMENT],
-        ['--dry-run',    '-d', GetoptLong::NO_ARGUMENT],
-        ['--verbose',    '-v', GetoptLong::NO_ARGUMENT],
-        ['--no-ssl',           GetoptLong::NO_ARGUMENT],
-        ['--expires-in',       GetoptLong::REQUIRED_ARGUMENT],
-      ]
-
-      begin
-        GetoptLong.new(*args).each {|opt, arg| options[opt] = (arg || true)}
-      rescue StandardError => exc
-        raise WrongUsage.new nil, exc.message
-      end
-
-      # Let's just show the help to the user
-      raise WrongUsage.new(0, nil) if options['--help']
-
-      # Returning the options to the next level
-      options
-    end
-
-    def read_info_from_args(options)
-      # Parsing expre date
-      if options['--expires-in'] =~ /d|h|m|s/
-
-        val = 0
-
-        options['--expires-in'].scan(/(\d+\w)/) do |track|
-          _, num, what = /(\d+)(\w)/.match(track[0]).to_a
-          num = num.to_i
-
-          case what
-          when "d"; val += num * 86400
-          when "h"; val += num * 3600
-          when "m"; val += num * 60
-          when "s"; val += num
-          end
-        end
-
-        options['--expires-in'] = val
-      end
-
-      # Reading what to do from the user
-      command = ARGV.shift
-      raise WrongUsage.new(nil, "Need a command (eg.: `list', `listbuckets', etc)") if not command
-
-      key, file = ARGV
-
-      # Parsing the bucket name
-      bucket = nil
-      bucket, key = key.split(':') if key
-
-      # Returning things we need in the next level
-      [options, command, bucket, key, file]
-    end
-  end
-end

data/lib/s3ranger/commands.rb

@@ -1,114 +0,0 @@
-require 's3ranger/exceptions'
-require 's3ranger/sync'
-require 'aws/s3'
-
-
-module Commands
-
-  include S3Ranger
-
-  AVAILABLE_ACLS = [:public_read, :public_read_write, :private]
-
-  AVAILABLE_METHODS = ['read', 'get', 'put', 'write', 'delete']
-
-  def Commands._cmd_listbuckets args
-    args[:s3].buckets.each do |bkt|
-      puts "#{bkt.name}"
-    end
-  end
-
-  def Commands._cmd_createbucket args
-    raise WrongUsage.new(nil, "You need to inform a bucket") if not args[:bucket]
-
-    begin
-      params = {}
-      if acl = args[:options]['--acl']
-        raise WrongUsage.new(nil, "Invalid ACL. Should be any of #{EXISTING_ACLS.join ', '}") if not AVAILABLE_ACLS.include? acl
-        params.merge!({:acl => acl.to_sym})
-      end
-
-      args[:s3].buckets.create args[:bucket], params
-    rescue AWS::S3::Errors::BucketAlreadyExists => exc
-      raise FailureFeedback.new("Bucket `#{bucket}' already exists")
-    end
-  end
-
-  def Commands._cmd_deletebucket args
-    raise WrongUsage.new(nil, "You need to inform a bucket") if not args[:bucket]
-
-    # Getting the bucket
-    bucket_obj = args[:s3].buckets[args[:bucket]]
-
-    # Do not kill buckets with content unless explicitly asked
-    if not args[:options]['--force'] and bucket_obj.objects.count > 0
-      raise FailureFeedback.new("Cowardly refusing to remove non-empty bucket `#{bucket}'. Try with -f.")
-    end
-
-    begin
-      bucket_obj.delete!
-    rescue AWS::S3::Errors::AccessDenied => exc
-      raise FailureFeedback.new("Access Denied")
-    end
-  end
-
-  def Commands._cmd_list args
-    raise WrongUsage.new(nil, "You need to inform a bucket") if not args[:bucket]
-    args[:s3].buckets[args[:bucket]].objects.with_prefix(args[:key] || "").each do |object|
-      puts "#{object.key}\t#{object.content_length}\t#{object.last_modified}"
-    end
-  end
-
-  def Commands._cmd_delete args
-    raise WrongUsage.new(nil, "You need to inform a bucket") if not args[:bucket]
-    raise WrongUsage.new(nil, "You need to inform a key") if not args[:key]
-    args[:s3].buckets[args[:bucket]].objects[args[:key]].delete
-  end
-
-  def Commands._cmd_url args
-    raise WrongUsage.new(nil, "You need to inform a bucket") if not args[:bucket]
-    raise WrongUsage.new(nil, "You need to inform a key") if not args[:key]
-
-    method = args[:options]['--method'] || 'read'
-    raise WrongUsage.new(nil, "") unless AVAILABLE_METHODS.include? method
-
-    opts = {}
-    opts.merge!({:secure => args[:options]["--no-ssl"].nil?})
-    opts.merge!({:expires => args[:options]["--expires-in"]}) if args[:options]["--expires-in"]
-    p (args[:s3].buckets[args[:bucket]].objects[args[:key]].url_for method.to_sym, opts).to_s
-  end
-
-  def Commands._cmd_put args
-    raise WrongUsage.new(nil, "You need to inform a bucket") if not args[:bucket]
-    raise WrongUsage.new(nil, "You need to inform a file") if not args[:file]
-
-    # key + file name
-    name = S3Ranger.safe_join [args[:key], File.basename(args[:file])]
-    args[:s3].buckets[args[:bucket]].objects[name].write Pathname.new(args[:file])
-  end
-
-  def Commands._cmd_get args
-    raise WrongUsage.new(nil, "You need to inform a bucket") if not args[:bucket]
-    raise WrongUsage.new(nil, "You need to inform a key") if not args[:key]
-    raise WrongUsage.new(nil, "You need to inform a file") if not args[:file]
-
-    # Saving the content to be downloaded to the current directory if the
-    # destination is a directory
-    path = File.absolute_path args[:file]
-    path = S3Ranger.safe_join [path, File.basename(args[:key])] if File.directory? path
-
-    File.open(path, 'wb') do |f|
-      begin
-        args[:s3].buckets[args[:bucket]].objects[args[:key]].read do |chunk| f.write(chunk) end
-      rescue AWS::S3::Errors::NoSuchBucket
-        raise FailureFeedback.new("There's no bucket named `#{args[:bucket]}'")
-      rescue AWS::S3::Errors::NoSuchKey
-        raise FailureFeedback.new("There's no key named `#{args[:key]}' in the bucket `#{args[:bucket]}'")
-      end
-    end
-  end
-
-  def Commands._cmd_sync args
-    cmd = SyncCommand.new args, *ARGV
-    cmd.run
-  end
-end