aebus 0.0.1 → 0.0.2

data/README

@@ -1,32 +1,35 @@
-# Aebus - Automatic EC2 BackUp Software
+= Aebus - Automatic EC2 BackUp Software
 
 A small gem that allows you to easily automate EC2 backups, included purging of old backups and checking the backup status
 
+=== Configuration
 
-==Sample
-
-default:
-  access_key_id: <your_access_key_id>
-  secret_access_key: <your_secret_access_key>
-  zone: eu-west1
-  backups:
-    daily:
-      enabled: true
-      keep: 7
-      when: 0 3 * * *
-    weekly:
-      enabled: true
-      keep: 5
-      when: 0 3 * * 1
-    monthly:
-      enabled: true
-      keep: all
-      when: 0 3 1 * *
-
-
-vol-1234567:
-
-vol-7654321:
-  backups:
-    daily:
-      enabled: false
+
+
+==== Sample
+
+  default:
+    access_key_id: <your_access_key_id>
+    secret_access_key: <your_secret_access_key>
+    zone: eu-west1
+    backups:
+      daily:
+        enabled: true
+        keep: 7
+        when: 0 3 * * *
+      weekly:
+        enabled: true
+        keep: 5
+        when: 0 3 * * 1
+      monthly:
+        enabled: true
+        keep: all
+        when: 0 3 1 * *
+
+
+  vol-1234567:
+
+  vol-7654321:
+    backups:
+      daily:
+        enabled: false

data/bin/aebus

@@ -5,6 +5,7 @@ require 'commander/import'
 require 'pathname'
 require_relative '../lib/aebus'
 
+
 DEFAULT_CONFIG_NAME = "./aebus.yaml"
 
 program :version, Aebus::VERSION

data/lib/aebus.rb

@@ -3,13 +3,12 @@
 require 'rubygems'
 require 'AWS'
 require_relative 'config/config'
-require_relative 'aebus_zones'
+require_relative 'aebus/version'
+require_relative 'ec2/zones'
 require_relative 'ec2/snapshot'
 
 module Aebus
 
-  VERSION = '0.0.1'
-
   class Aebus
 
     AWS_NAME_TAG = "Name"
@@ -20,7 +19,7 @@ module Aebus
       config = Config::Config.new(File.join(File.dirname("."), options.config), current_time_utc)
       @ec2 = AWS::EC2::Base.new(:access_key_id => config.defaults["access_key_id"],
                                :secret_access_key => config.defaults["secret_access_key"],
-                               :server => zone_to_url(config.defaults["zone"]))
+                               :server => EC2::zone_to_url(config.defaults["zone"]))
 
       target_volumes = calculate_target_volumes(config, args)
       snap_map = get_snapshots_map
@@ -48,7 +47,7 @@ module Aebus
       config = Config::Config.new(File.join(File.dirname("."), options.config), current_time_utc)
       @ec2 = AWS::EC2::Base.new(:access_key_id => config.defaults["access_key_id"],
                                :secret_access_key => config.defaults["secret_access_key"],
-                               :server => zone_to_url(config.defaults["zone"]))
+                               :server => EC2::zone_to_url(config.defaults["zone"]))
 
       target_volumes = calculate_target_volumes(config, args)
       if (options.manual) then
@@ -108,9 +107,7 @@ module Aebus
     end
 
 
-    def zone_to_url(zone)
-      ZONES[zone]
-    end
+
 
     def backup_volume(volume_id, current_time_utc, tags)
       begin
@@ -194,7 +191,7 @@ module Aebus
     def purge_snapshot(snapshot_id)
       begin
         response = @ec2.delete_snapshot(:snapshot_id => snapshot_id)
-        if (response[return]) then
+        if (response["return"]) then
           puts("[INFO] Purged snapshot #{snapshot_id}")
         end
       rescue AWS::Error => e

data/lib/aebus/version.rb

@@ -1,3 +1,3 @@
 module Aebus
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ec2/zones.rb

@@ -0,0 +1,19 @@
+module Aebus
+
+  module EC2
+
+    ZONES = {
+
+        "eu-west1" =>  "eu-west-1.ec2.amazonaws.com",
+        "us-east-1" =>  "ec2.us-east-1.amazonaws.com",
+        "us-west-1" =>  "ec2.us-west-1.amazonaws.com",
+        "ap-southeast-1" => "ec2.ap-southeast-1.amazonaws.com"
+    }
+
+    def self.zone_to_url(zone)
+      ZONES[zone]
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aebus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
+date: 2011-10-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70097059520900 !ruby/object:Gem::Requirement
+  requirement: &70320653233040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 4.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70097059520900
+  version_requirements: *70320653233040
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70097059520400 !ruby/object:Gem::Requirement
+  requirement: &70320653232540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70097059520400
+  version_requirements: *70320653232540
 - !ruby/object:Gem::Dependency
   name: amazon-ec2
-  requirement: &70097059519940 !ruby/object:Gem::Requirement
+  requirement: &70320653232080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.17
   type: :runtime
   prerelease: false
-  version_requirements: *70097059519940
+  version_requirements: *70320653232080
 description: A tool to automate snapshot management in EC2
 email:
 - nessche@gmail.com
@@ -60,10 +60,10 @@ files:
 - bin/aebus
 - lib/aebus.rb
 - lib/aebus/version.rb
-- lib/aebus_zones.rb
 - lib/config/config.rb
 - lib/config/volume.rb
 - lib/ec2/snapshot.rb
+- lib/ec2/zones.rb
 homepage: https://github.com/nessche/Aebus
 licenses: []
 post_install_message: 

data/lib/aebus_zones.rb

@@ -1,11 +0,0 @@
-module Aebus
-
-  ZONES = {
-
-      "eu-west1" =>  "eu-west-1.ec2.amazonaws.com",
-      "us-east-1" =>  "ec2.us-east-1.amazonaws.com",
-      "us-west-1" =>  "ec2.us-west-1.amazonaws.com",
-      "ap-southeast-1" => "ec2.ap-southeast-1.amazonaws.com"
-  }
-
-end