s3link 0.0.3 → 0.0.4

data/lib/s3link.rb

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'aws/s3'
 
+require 'usage'
+require 'command_line_parser'
+
 module S3Link
   class CmdLineArgsError < RuntimeError; end
 
@@ -10,10 +13,10 @@ module S3Link
     end
 
     def run_from_cmd_line
-      begin
-        parse_cmd_line
+      @options = begin
+        S3Link::CommandLineParser.new($ARGV).parse
       rescue CmdLineArgsError
-        usage
+        Usage.new
       end
 
       puts "Establishing Connection" unless @options[:silent]
@@ -27,41 +30,6 @@ module S3Link
       puts "#{url}"
     end
 
-    def parse_cmd_line
-      usage if $ARGV.include?("--help") || $ARGV.include?("--help") || $ARGV.length == 0
-
-      @options[:silent] == ! $ARGV.include?("--silent")    
-
-      if $ARGV.include?("--access-key")
-        @options[:access_key] = next_arg_after("--access-key")
-      end
-
-      if $ARGV.include?("--secret-key")
-        @options[:access_key] = next_arg_after("--secret-key")
-      end
-
-      if $ARGV.include?("--bucket")
-        @options[:bucket] = next_arg_after("--bucket")
-      end
-
-      if $ARGV.include?("--expires-in")
-        @options[:expires_in] = next_arg_after("--expires-in")
-      end
-
-      if $ARGV.include?("--never-expire")
-        @options[:never_expire] = true
-      end
-
-      # Last arg has to be filename
-      @options[:filename] = $ARGV[-1]
-    end
-
-    def next_arg_after(key)
-      index = $ARGV.index(key)
-      raise CmdLineArgsError if $ARGV.length <= index
-      $ARGV[index + 1]
-    end
-
     def establish_connection
       @aws = AWS::S3::Base.establish_connection!(:access_key_id => access_key, :secret_access_key => secret_key)
     end
@@ -98,34 +66,6 @@ module S3Link
         {:expires_in => 24 * 60 * 60}
       end
     end
-
-    def usage(msg=nil)
-      puts msg if msg
-      puts <<-EOF 
-Uploads a file up to Amazon's S3 Service, and provides a time limited URL to access.  
-
-Several options may be set via environment variables for ease of use.
-
-Options:
-  --access-key    <key>    [ENV: AMAZON_ACCESS_KEY_ID]     -- Amazon provided access key
-  --secret-key    <key     [ENV: AMAZON_SECRET_ACCESS_KEY] -- Amazon provided secret key
-  --bucket        <name>   [ENV: S3LINK_BUCKET_NAME]      -- Bucket to store the uploaded file
-  --expires-in    <hours>  [default: 24]                   -- How long the URL is valid for.
-  --never-expire                                           -- Never expire the URL. If both 
-                                                              expires commands are set, 
-                                                              --expires-in will win.
-  --silent                                                 -- Quiet mode outputs ONLY the url
-
-NOTE: This tool DOES NOT ever remove files from S3. Manually using the web
-interface, or the s3cmd tool to clean out your bucket is advised.
-
-WARNING: This tool will just silently overwrite a file that is already
-present. This is good to replace files with new versions, but bad if it
-destroys something.  Don't destroy anything please.
-
-      EOF
-      exit(1)
-    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3link
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Chris Schneider