alephant-harness 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e44f5190ecab68c2e9b31e07b9c431922a75b21e
-  data.tar.gz: 4be42c40689f4aa9cf16d40bc1340b610d6b3d33
+  metadata.gz: c7c2f7020c1df1e241c8aeba1d979b6cfd18ea5e
+  data.tar.gz: 5a7a8a2302d20af4cef6be3eddf91fce8b0417cf
 SHA512:
-  metadata.gz: ef13d337d3af7d18a86662e7ef1142a902aab924dcb852781255feb28d36204d4a11deea19268cd98b9a691c38c81bdd8ffdba8b206465a842d9b098744c5f2b
-  data.tar.gz: 2729ab1692a3e49849199bbdb597deb4204292a590b18d5daa49c034c55d9946eee49c84b6b7fb4299893211f58136254a3b95574c72375435e9f7b3a5b3ec74
+  metadata.gz: 192d57c3bd1e1d02f9357462cb53fdd619cfb78a6b5f1195b5fd9042a4dc3113dd34607dced786d7b652f06b09a878bbef82498769b80459531ae23201d72387
+  data.tar.gz: 91d9bc269c4b79d232e8281e5c89df7d011087c7f9bbf8e60d2e56d0e6bdc957ccd9b50987298215b9f2b2864f09e36054b5990176cc3ff814bca4f9be73e9a1

data/lib/alephant/harness/service/dynamo_db.rb

@@ -10,21 +10,18 @@ module Alephant
           @@client ||= ::AWS::DynamoDB::Client::V20120810.new
         end
 
-        def self.create(table_name, schema_name)
-          schema = load_schema(schema_name).tap { |s| s[:table_name] = table_name }
+        def self.create(table_name, schema)
+          schema.tap { |s| s[:table_name] = table_name }
           client.create_table schema
         end
 
-        def self.remove(tables)
-          tables.each do |table_name|
-            begin
-              client.delete_table({ :table_name => table_name })
-            rescue Exception => e
-              #If table doesn't exist fail silently
-            end
-          end
+        def self.remove(table_name)
+          client.delete_table({ :table_name => table_name })
+        rescue Exception => e
+          #If table doesn't exist fail silently
         end
 
+
         def self.load_schema(schema_name)
           YAML::load_file(File.join([File.dirname(__FILE__), *(%w'..' * 4), 'schema', "#{schema_name}.yaml"]))
         end

data/lib/alephant/harness/service/s3.rb

@@ -37,6 +37,18 @@ module Alephant
           get_object(id, object_id).delete
         end
 
+        def self.bucket_exists?(bucket_id)
+          begin
+            exists = client.buckets[bucket_id].exists?
+          rescue ::AWS::S3::Errors::NoSuchKey => e
+            exists = false
+          end
+
+          exists.tap do |e|
+            yeild if e && block_given?
+          end
+        end
+
         def self.exists?(id, object_id)
           if get_object(id, object_id)
             yield

data/lib/alephant/harness/setup.rb

@@ -2,51 +2,67 @@ require "alephant/harness/service/dynamo_db"
 require "alephant/harness/service/s3"
 require "alephant/harness/service/sqs"
 require "alephant/harness/aws"
+require "logger"
 
 module Alephant
   module Harness
     module Setup
 
+      def self.logger
+        @@logger ||= ::Logger.new(STDOUT)
+      end
+
       def self.configure(opts = {}, env = nil)
         AWS.configure(env)
 
-        opts[:queues].each do |queue_name|
-          recreate_sqs queue_name
+        unless opts[:queues].nil?
+          logger.info "Adding #{opts[:queues].length} queue(s)"
+          opts[:queues].each do |queue_name|
+            recreate_sqs queue_name
+          end
         end
 
-        bucket = opts[:bucket_id] and recreate_s3 bucket
-
-        tables = {
-          :lookup    => opts[:lookup_table_name],
-          :sequencer => opts[:sequencer_table_name],
-        } and recreate_dynamo_db tables
+        unless opts[:buckets].nil?
+          logger.info "Adding #{opts[:buckets].length} bucket(s)"
+          opts[:buckets].each do |bucket|
+            recreate_s3 bucket
+          end
+        end
 
+        unless opts[:tables].nil?
+          logger.info "Adding #{opts[:tables].length} table(s)"
+          opts[:tables].each do |data|
+            recreate_dynamo_db(data[:name], data[:schema])
+          end
+        end
       end
 
       def self.recreate_sqs(queue_name)
         Service::SQS.exists?(queue_name) do
+          logger.warn "SQS queue #{queue_name} exists, removing"
           Service::SQS.delete(queue_name)
         end
 
+        logger.info "Adding SQS queue #{queue_name}"
         Service::SQS.create(queue_name)
       end
 
       def self.recreate_s3(bucket)
-        Service::S3.exists?(bucket) do
+        Service::S3.bucket_exists?(bucket) do
+          logger.warn "S3 bucket #{bucket} exists, removing"
           Service::S3.delete(bucket)
         end
 
-        Service::S3.create(queue_name)
+        logger.info "Adding S3 bucket #{bucket}"
+        Service::S3.create(bucket)
       end
 
-      def self.recreate_dynamo_db(tables)
-        Service::DynamoDB.remove(tables.values)
-
-        tables.each do |schema_name, table_name|
-          Service::DynamoDB.create(table_name, schema_name)
-        end
+      def self.recreate_dynamo_db(table_name, schema)
+        logger.info "Adding DynamoDB table #{table_name}"
+        Service::DynamoDB.remove(table_name)
+        schema = schema.is_a?(Hash) ? schema : Service::DynamoDB.load_schema(schema)
+        Service::DynamoDB.create(table_name, schema)
       end
-
     end
   end
 end

data/lib/alephant/harness/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Harness
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/spec/service/dynamo_db_spec.rb

@@ -7,12 +7,13 @@ describe Alephant::Harness::Service::DynamoDB do
 
       table_name = 'test_lookup'
       schema_name = 'lookup'
+      schema = subject.load_schema(schema_name)
 
       expected_schema = YAML::load_file(File.join(File.dirname(__FILE__), *[%w'..' * 2], 'schema', "#{schema_name}.yaml"))
       expected_schema[:table_name] = table_name
 
       expect_any_instance_of(AWS::DynamoDB::Client::V20120810).to receive(:create_table).with(expected_schema)
-      subject.create(table_name, schema_name)
+      subject.create(table_name, schema)
 
     end
   end
@@ -23,14 +24,16 @@ describe Alephant::Harness::Service::DynamoDB do
     context "When tables exist" do
       it "removes specified tables" do
         expect_any_instance_of(AWS::DynamoDB::Client::V20120810).to receive(:delete_table).twice
-        subject.remove(tables)
+        tables.each do |table|
+          subject.remove(table)
+        end
       end
     end
 
     context "When tables don't exist" do
       it "Fails silently" do
-        expect_any_instance_of(AWS::DynamoDB::Client::V20120810).to receive(:delete_table).twice.and_raise(Exception)
-        expect { subject.remove(tables) }.to_not raise_error(Exception)
+        expect_any_instance_of(AWS::DynamoDB::Client::V20120810).to receive(:delete_table).and_raise(Exception)
+        expect { subject.remove('blah') }.to_not raise_error(Exception)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-harness
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk