sploder 1.0.1 → 1.3.1

data/bin/sploder

@@ -12,7 +12,7 @@ rescue LoadError
 end
 
 # This line is what prints the running message
-puts "Main Sploder executable running."
+puts "Sploder is sploding..."
 
 opts = Trollop::options do
 	opt :upload, "Upload a file to S3"
@@ -27,7 +27,7 @@ opts = Trollop::options do
 	opt :delete, "Delete an existing bucket. WARNING: This deletes the entire contents of your bucket"
 	opt :website, "Enables webhosting for the specified bucket"
 	opt :options, "Use optional settings. Not all operations support this flag"
-
+	opt :file, "Get information about a file and delete or download it"
 end
 
 # Initialize the settings class to later check for .sploder file
@@ -72,7 +72,8 @@ when opts[:explore]
 when opts[:create]
 	settings.settings_exist # Check that Sploder has been set up
 	unless opts[:name]
-		puts "Please enter a name for your new bucket"
+		puts "Please enter a name for your new bucket using the -n flag"
+		puts "Example: sploder --create -n my_new_bucket"
 		exit 1
 	end
 	name = opts[:name]
@@ -98,17 +99,17 @@ when opts[:website]
 	key 		= settings.load_settings['key']
 	secret 		= settings.load_settings['secret']
 	bucket_name = opts[:name]
-	index 		= ARGV[0]
-	error 		= ARGV[1]
+	index_doc 		= ARGV[0]
+	error_doc 		= ARGV[1]
 	if opts[:options]
-		unless index && error
+		unless index_doc && error_doc
 			puts "Please enter BOTH an index AND error page to enable hosting."
 			puts "Example: sploder --website -n mybucket index.html error.html"
 			exit 1
 		end
 	end
 	website = Sploder::Bucket.new
-	website.host_website(bucket_name, index, error, key, secret)
+	website.host_website(bucket_name, index_doc, error_doc, key, secret)
 when opts[:nohost]
 	settings.settings_exist # Make sure settings are set
 	key 			= settings.load_settings['key']
@@ -116,14 +117,30 @@ when opts[:nohost]
 	bucket_name 	= opts[:name]
 	disable = Sploder::Bucket.new
 	disable.end_hosting(bucket_name, index, error, key, secret)
+when opts[:file]
+	settings.settings_exist # Make sure Sploder is set up
+	key 		= settings.load_settings['key']
+	secret 		= settings.load_settings['secret']
+	bucket_name = ARGV[0]
+	file 		= ARGV[1]
+	operation 	= ARGV[2]
+	unless operation.nil?
+		if operation == 'download'
+			download = Sploder::Object.new
+			download.download_file(bucket_name, file, key, secret)
+		elsif operation == 'delete'
+			delete = Sploder::Object.new
+			delete.delete_file(bucket_name, file, key, secret)
+		end
+		exit 0
+	end
+	url = Sploder::Object.new
+	url.get_url(bucket_name, file, key, secret)
 else
 	puts "USAGE:"
-	puts "Run setup and enter your AWS credentials before using:"
-	puts "    sploder --setup OR sploder -s"
-	puts " "
-	puts "Upload a file:"
-	puts "    sploder --upload <BUCKET_NAME> <FILE> (Optional: -p <PATH> -a <ACL_POLICY>)"
-	puts " "
-	puts "List available buckets:"
-	puts "    sploder --list"
+	puts "Available flags: --list, --upload, --create, --delete , --setup, --explore"
+	puts ""
+	puts "Full documentation:"
+	puts "http://sploder.cleverlabs.info"
+	puts "or run `sploder -h`"
 end

data/lib/sploder.rb

@@ -2,3 +2,4 @@ require "sploder/upload"
 require "sploder/setup"
 require "sploder/list"
 require "sploder/bucket"
+require "sploder/object"

data/lib/sploder/bucket.rb

@@ -20,7 +20,7 @@ module Sploder
 		end
 
 		# The following methods do nothing. They will in the future.
-		def host_website (bucket_name, index, error, key, secret)
+		def host_website (bucket_name, index_doc, error_doc, key, secret)
 			s3 = AWS::S3.new(
 				:access_key_id => key,
 				:secret_access_key => secret)
@@ -28,18 +28,25 @@ module Sploder
 			# Get the bucket
 			bucket = s3.buckets[bucket_name]
 
+			unless bucket.exists?
+				puts "Looks like that bucket does not exist in your account."
+				puts "Would you like to create it?"
+				puts "Just run 'sploder --create -n #{bucket_name}'"
+				exit 1
+			end
+
 			# Set default index and error documents
-			unless index
-				index = "index.html"
+			unless index_doc
+				index_doc = 'index.html'
 			end
 
-			unless error
-				error = "error.html"
+			unless error_doc
+				error_doc = 'error.html'
 			end
 
 			bucket.configure_website do |cfg|
-				cfg.index_document_suffix = index
-				cfg.error_document_key = error
+				cfg.index_document_suffix = index_doc
+				cfg.error_document_key = error_doc
 			end
 
 			puts "All set! #{bucket_name} is now configured as a web host"

data/lib/sploder/list.rb

@@ -19,6 +19,13 @@ module Sploder
 			# Access the specified bucket
 			bucket = s3.buckets[bucket_name]
 
+			unless bucket.exists?
+				puts "Looks like that bucket does not exist in your account."
+				puts "Would you like to create it?"
+				puts "Just run 'sploder --create -n #{bucket_name}'"
+				exit 1
+			end
+
 			if prefix.nil?
 				bucket.objects.each do |obj|
 					puts obj.key

data/lib/sploder/object.rb

@@ -0,0 +1,34 @@
+require 'aws-sdk'
+
+module Sploder
+	class Object
+		def get_url (bucket_name, file, key, secret)
+			s3 = AWS::S3.new(
+				:access_key_id => key,
+				:secret_access_key => secret)
+
+			bucket = s3.buckets[bucket_name].objects[file]
+			puts "Your file's public url:"
+			puts bucket.public_url
+		end
+
+		def download_file (bucket_name, file, key, secret)
+			s3 = AWS::S3.new(
+				:access_key_id => key,
+				:secret_access_key => secret)
+
+			puts "Download function is not available in Sploder stable versions currently."
+			puts "You can download the latest edge version from http://sploder.cleverlabs.info"
+		end
+
+		def delete_file (bucket_name, file, key, secret)
+			s3 = AWS::S3.new(
+				:access_key_id => key,
+				:secret_access_key => secret)
+
+			bucket = s3.buckets[bucket_name].objects[file]
+			bucket.delete
+			puts "Deleted #{file} from #{bucket_name}"
+		end
+	end
+end

data/lib/sploder/setup.rb

@@ -3,7 +3,6 @@ require 'yaml'
 module Sploder
 	class Setup
 		def run (key, secret)
-			puts "Setup class loaded?"
 			file = File.expand_path('.sploder', '~')
 			File.open(file, 'w') do |f|
 				f.puts "key: #{key}\nsecret: #{secret}"

data/lib/sploder/upload.rb

@@ -5,7 +5,8 @@ module Sploder
 	class Upload
 		def run (bucket, file, path, acl, key, secret)
 			unless bucket && file
-				puts "Usage: sploder <BUCKET_NAME> <FILE_NAME> | Optional: <S3_PATH> <ACL_POLICY>"
+				puts "You must at least enter a bucket name and relative or absolute path to the file to upload."
+				puts "USAGE: sploder --upload BUCKET_NAME FILE_NAME | Optional: -p S3_PATH -a ACL_POLICY"
 				exit 1
 			end
 
@@ -22,6 +23,13 @@ module Sploder
 				:secret_access_key => secret)
 
 			bucket = s3.buckets[bucket]
+			unless bucket.exists?
+				puts "Looks like that bucket does not exist in your account."
+				puts "Would you like to create it?"
+				puts "Just run 'sploder --create -n #{bucket}'"
+				exit 1
+			end
+
 			basename = File.basename(file)
 			upload = bucket.objects["#{path}#{basename}"]
 			upload.write(:file => file, :acl => acl)

data/lib/sploder/version.rb

@@ -1,3 +1,3 @@
 module Sploder
-  VERSION = "1.0.1"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sploder
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -59,7 +59,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Sploder is the S3 uploader
+description: Sploder lets you work with S3 buckets from the command line
 email:
 - bill@billpatrianakos.me
 executables:
@@ -70,6 +70,7 @@ files:
 - bin/sploder
 - lib/sploder/bucket.rb
 - lib/sploder/list.rb
+- lib/sploder/object.rb
 - lib/sploder/setup.rb
 - lib/sploder/upload.rb
 - lib/sploder/version.rb
@@ -94,8 +95,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Easily upload files to S3, create buckets, set ACL, and more
+summary: Easily upload files to S3, create buckets, delete them, see bucket contents,
+  set ACL, and more
 test_files: []