ponyhost 0.3.0 → 0.3.1

data/README.md

@@ -12,12 +12,12 @@ account and the [access key id and secret](https://aws-portal.amazon.com/gp/aws/
 
 The installation is as simple as:
 
-      gem install ponyhost
+      $ gem install ponyhost
 
 ## Commands ##
 ### Create ###
 
-      ponyhost create your-site
+      $ ponyhost create your-site
 
   Will create the S3 bucket with a website configuration.
   Per default index.html will be the index document and 404.html the error document.
@@ -27,7 +27,7 @@ The installation is as simple as:
   
   If you prefer to use a custom domain just pass the name accordingly.
   
-      ponyhost create foo.yoursite.com
+      $ ponyhost create foo.yoursite.com
       
   You'll have to setup a DNS CNAME record for foo.yoursite.com to s3-website-us-east-1.amazonaws.com.
   It's also possible to use a naked domain like yoursite.com. 
@@ -36,20 +36,26 @@ The installation is as simple as:
 
 ### Push ###
 
+      $ ponyhost push your-site
+
   Will compare the md5 sum for each file in the current directory with the remote file and push the file if necessary.
   Currently it won't delete files in the bucket.
 
 ### Server ###
+
+      $ ponyhost server
   
   Runs a very basic HTTP server for the current directory on http://localhost:9090
   
 ### Destroy ###
+      
+      $ ponyhost destroy your-site
 
   Will delete the bucket and all files on S3.
 
 ## ToDo ##
 
-* Implement a autopush command
+* Implement an autopush command
 * Implement a robust HTTP server
-* Support other availability zones
-* Delete files in bucket
+* Support other AWS availability zones
+* Delete files in bucket on push

data/bin/ponyhost

@@ -10,29 +10,32 @@ if command == "server"
   PonyHost.server()
 elsif command == "list" || (["create", "push",  "destroy", "show", "version"].include?(command) && bucketname != nil)
   credentials = PonyHost.obtain_credentials
-  
-  AWS::S3::Base.establish_connection!({
-      :access_key_id     => credentials[:access_key_id],
-      :secret_access_key => credentials[:access_key_secret]
-  })
-  
-  if(command == "create")
-    PonyHost.create(bucketname)
-  elsif(command == "push")
-    PonyHost.push(bucketname, ".")
-  elsif(command == "autopush")
-    puts "Not Yet Implemented"
-  elsif(command == "destroy")
-    print "Do you really wanna destroy '#{bucketname}' (type 'YES'):"
-    PonyHost.destroy(bucketname) if STDIN.gets.chop == "YES"
-  elsif(command == "list")
-    puts "Your sites:"
-    PonyHost.list.each do |name|
-      puts "http://#{name}"
+  begin 
+    AWS::S3::Base.establish_connection!({
+        :access_key_id     => credentials[:access_key_id],
+        :secret_access_key => credentials[:access_key_secret]
+    })
+    
+    if(command == "create")
+      PonyHost.create(bucketname)
+    elsif(command == "push")
+      PonyHost.push(bucketname, ".")
+    elsif(command == "autopush")
+      puts "Not Yet Implemented"
+    elsif(command == "destroy")
+      print "Do you really wanna destroy '#{bucketname}' (type 'YES'):"
+      PonyHost.destroy(bucketname) if STDIN.gets.chop == "YES"
+    elsif(command == "list")
+      puts "Your sites:"
+      PonyHost.list.each do |name|
+        puts "http://#{name}"
+      end
+    elsif(command == "version")
+      puts "ponyhost version #{PonyHost::VERSION}"
+      puts "created by Johannes Wagener http://johannes.wagener.cc"
     end
-  elsif(command == "version")
-    puts "ponyhost version #{PonyHost::VERSION}"
-    puts "created by Johannes Wagener http://johannes.wagener.cc"
+  rescue Exception => e
+    puts "Ooops: #{e.message}"
   end
 else
   puts <<-EOF

data/lib/ponyhost.rb

@@ -15,7 +15,7 @@ class PonyHost
   S3_CREDENTIAL_FILES = ["~/.ponyhost.yml"]
   S3_CREDENTIAL_LINK = "https://aws-portal.amazon.com/gp/aws/developer/account/index.html?ie=UTF8&action=access-key"
   DEFAULT_DOMAIN = "ponyho.st"
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
   class << self 
     
 
@@ -24,9 +24,9 @@ class PonyHost
       if File.exists?(credential_file)
         return YAML.load_file(credential_file)
       else
-        puts "AWS Credentials file '#{credential_file}' missing. We'll create one."
-        puts "You'll find your Amazon AWS credentials here:"
-        puts S3_CREDENTIAL_LINK
+        puts "AWS Credentials file '#{credential_file}' is missing."
+        puts "Please insert your Amazon AWS S3 credentials. You can look them up on http://j.mp/aws-keys"
+        puts "In case you don't have signed up for S3 yet you can do that on http://j.mp/s3-signup"
 
         credentials = {}
         print "Your AWS Access Key ID: "

metadata

@@ -2,7 +2,7 @@
 name: ponyhost
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Johannes Wagener
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 +02:00
+date: 2011-06-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency