alephant-harness 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69b32c4c3242f203d078c5a7965505fa394f188b
-  data.tar.gz: 3964b65f56abd6e524c4cd6ecaa20047eb055897
+  metadata.gz: 78000956e367b55089f00f64ec5c18f673c77b31
+  data.tar.gz: f6eb7f0508515e6fd1882345eabe822045180d01
 SHA512:
-  metadata.gz: e2913a3cc82486bea58fd4cfd6f7116adb954157f4e834d4d450275058f25092f51de64de3432bcf1405a785d7cfc248fae0149495099f3048776769537aaadd
-  data.tar.gz: 123794109826d6b5e8ef1365578a3d393df3a5027fce89d5f321bdc58c0a82c1f3a502ca336d10811eaddd7a7632b887cab830eb6296e233b2365976d6e1a9f7
+  metadata.gz: 733e2041639c6927941b0e665dca64bd82874ac182a9bc68837cca36d9ca1d765128225e1e6f309f3079c6cef0f5a83b23b22bd918ef97b1b5f4a11045b90551
+  data.tar.gz: c8f3603539932f843e1162a0ef9b123fb5744fcc3b786e2171e5ff5c3fb6678661bdc94c295091b63da00101c42f53c856f776dbdd518770c0372e5300bc1fc8

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.17
+2.3

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
+  - "2.3"
   - "jruby"
 notifications:
   email:
     recipients:
-      - kenoir@gmail.com
-      - stevenmajack@gmail.com
+      - D&ENewsFrameworksTeam@bbc.co.uk
     on_failure: change
     on_success: never

data/alephant-harness.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "alephant-harness"
   spec.version       = Alephant::Harness::VERSION
   spec.authors       = ["BBC News"]
-  spec.email         = ["FutureMediaNewsRubyGems@bbc.co.uk"]
+  spec.email         = ["D&ENewsFrameworksTeam@bbc.co.uk"]
   spec.summary       = %q{Stuff}
   spec.description   = %q{More Stuff}
   spec.homepage      = ""
@@ -18,7 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "aws-sdk", "~> 1.0"
+  spec.add_runtime_dependency "aws-sdk-sqs"
+  spec.add_runtime_dependency "aws-sdk-s3"
+  spec.add_runtime_dependency "aws-sdk-dynamodb"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/alephant/harness/aws.rb

@@ -1,36 +1,70 @@
-require 'aws-sdk'
+require "aws-sdk-dynamodb"
+require "aws-sdk-s3"
+require "aws-sdk-sqs"
 
 module Alephant
   module Harness
     module AWS
+      class << self
+        def environment
+          aws_properties_from(@environment || ENV)
+        end
 
-      def self.configure(environment = nil)
+        def config=(environment)
+          @environment = environment
+        end
 
-        environment ||= ENV
+        def s3_config
+          environment.select do |key, _|
+            (ACCESS_CONFIG_KEYS + S3_CONFIG_KEYS).include?(key)
+          end.map do |key, value|
+            [key.to_s.gsub('s3_', '').to_sym, value]
+          end.to_h
+        end
 
-        ::AWS.config(aws_properties_from(environment))
-      end
+        def sqs_config
+          environment.select do |key, _|
+            (ACCESS_CONFIG_KEYS + SQS_CONFIG_KEYS).include?(key)
+          end.map do |key, value|
+            [key.to_s.gsub('sqs_', '').to_sym, value]
+          end.to_h
+        end
+
+        def dynamo_config
+          environment.select do |key, _|
+            (ACCESS_CONFIG_KEYS + DYNAMO_CONFIG_KEYS).include?(key)
+          end.map do |key, value|
+            [key.to_s.gsub('dynamo_db_', '').to_sym, value]
+          end.to_h
+        end
 
-      def self.aws_properties_from(env)
-        env.inject({}) do |hash, (key, value)|
-          hash.tap do |h|
-            h[config_key(key)] = sanitise_value(value) if key =~ /^AWS_/
+        private
+
+        ACCESS_CONFIG_KEYS = [:access_key_id, :secret_access_key, :region]
+        DYNAMO_CONFIG_KEYS = [:dynamo_db_endpoint]
+        S3_CONFIG_KEYS = [:s3_endpoint, :s3_force_path_style]
+        SQS_CONFIG_KEYS = [:sqs_endpoint]
+
+        def aws_properties_from(env)
+          env.inject({}) do |hash, (key, value)|
+            hash.tap do |h|
+              h[config_key(key)] = sanitise_value(value) if key =~ /^AWS_/
+            end
           end
         end
-      end
 
-      def self.config_key(original_key)
-        original_key[/AWS_(.*)/,1].downcase.to_sym
-      end
+        def config_key(original_key)
+          original_key[/AWS_(.*)/,1].downcase.to_sym
+        end
 
-      def self.sanitise_value(value)
-        if %w[ true false ].include?(value)
-          value == 'true'
-        else
-          value
+        def sanitise_value(value)
+          if %w[ true false ].include?(value)
+            value == 'true'
+          else
+            value
+          end
         end
       end
-
     end
   end
 end

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

@@ -1,31 +1,30 @@
-require 'aws-sdk'
+require "aws-sdk-dynamodb"
 require 'yaml'
 
 module Alephant
   module Harness
     module Service
       module DynamoDB
-
-        def self.client
-          @@client ||= ::AWS::DynamoDB::Client::V20120810.new
-        end
-
         def self.create(table_name, schema)
           schema.tap { |s| s[:table_name] = table_name }
-          client.create_table schema
+          client.create_table(schema)
         end
 
         def self.remove(table_name)
           client.delete_table({ :table_name => table_name })
-        rescue Exception => e
-          #If table doesn't exist fail silently
+        rescue Aws::DynamoDB::Errors::ResourceNotFoundException => 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
 
+        private
+
+        def self.client
+          @@client ||= ::Aws::DynamoDB::Client.new(AWS.dynamo_config)
+        end
       end
     end
   end

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

@@ -1,60 +1,50 @@
-require 'aws-sdk'
+require "aws-sdk-s3"
 
 module Alephant
   module Harness
     module Service
       module S3
-
-        def self.client
-          @@client ||= ::AWS::S3.new
-        end
-
         def self.create(id)
-          client.buckets.create id
+          client.create_bucket(bucket: id)
         end
 
         def self.delete(id)
-          client.buckets[id].tap do |bucket|
-            bucket.objects.each do |object|
-              object.delete
-            end
-            bucket.delete
-          end
+          s3 = Aws::S3::Resource.new(client: client)
+          s3.bucket(id).delete
         end
 
         def self.add_object(id, object_id, data)
-          client.buckets[id]
-                .objects[object_id]
-                .write(data)
+          client.put_object(
+            body: data,
+            bucket: id,
+            key: object_id
+          )
         end
 
         def self.get_object(id, object_id)
-          client.buckets[id]
-                .objects[object_id]
-        end
-
-        def self.delete_object(id, object_id)
-          get_object(id, object_id).delete
+          client.get_object(
+            bucket: id,
+            key: object_id
+          )
         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|
-            yield if e && block_given?
+            client.head_bucket(
+              bucket: bucket_id
+            )
+            yield if block_given?
+            true
+          rescue => e
+            false
           end
         end
 
-        def self.exists?(id, object_id)
-          if get_object(id, object_id)
-            yield
-          end
-        end
+        private
 
+        def self.client
+          @client ||= ::Aws::S3::Client.new(AWS.s3_config)
+        end
       end
     end
   end

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

@@ -1,38 +1,39 @@
-require 'aws-sdk'
+require "aws-sdk-sqs"
 
 module Alephant
   module Harness
     module Service
       module SQS
+        class << self
+          def create(queue_name)
+            client.create_queue(queue_name: queue_name)
+          end
 
-        def self.client
-          @@client ||= ::AWS::SQS.new
-        end
+          def exists?(queue_name)
+            if get_queue_url(queue_name)
+              yield
+            end
+          end
 
-        def self.create(queue)
-          client.queues.create queue_name(queue)
-        end
+          def delete(queue_name)
+            # @TODO: queue url not returned
+            queue_url = client.get_queue_url(queue_name: queue_name).queue_url
+            queue_url = 'http://www.bbc.co.uk/news'
+            client.delete_queue(queue_url: queue_url)
+          end
 
-        def self.get(queue)
-          client.queues.named(queue_name(queue))
-        rescue ::AWS::SQS::Errors::NonExistentQueue
-          false
-        end
+          private
 
-        def self.exists?(queue_name)
-          if get(queue_name)
-            yield
+          def client
+            @@client ||= ::Aws::SQS::Client.new(AWS.sqs_config)
           end
-        end
-
-        def self.delete(queue_name)
-          get(queue_name).delete
-        end
 
-        def self.queue_name(queue)
-          /(?<name>[^\/]+)$/.match(queue)[:name]
+          def get_queue_url(queue_name)
+            client.get_queue_url(queue_name: queue_name).queue_url
+          rescue ::Aws::SQS::Errors::NonExistentQueue
+            false
+          end
         end
-
       end
     end
   end

data/lib/alephant/harness/setup.rb

@@ -13,7 +13,7 @@ module Alephant
       end
 
       def self.configure(opts = {}, env = nil)
-        AWS.configure(env)
+        AWS.config = env
 
         unless opts[:queues].nil?
           logger.info "Adding #{opts[:queues].length} queue(s)"

data/lib/alephant/harness/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Harness
-    VERSION = "0.2.2"
+    VERSION = "1.0.0"
   end
 end

data/spec/aws_spec.rb

@@ -1,11 +1,65 @@
 require 'spec_helper'
 
 describe Alephant::Harness::AWS do
+  describe '.environment' do
+    it 'returns environment variables' do
+      ENV['AWS_FOO'] = 'BAR'
 
-  describe ".configure" do
+      expect(subject.environment[:foo]).to eq('BAR')
+    end
+
+    it 'sanitises boolean values when false' do
+      subject.config = {'AWS_USE_SSL' => 'false'}
+
+      expect(subject.environment[:use_ssl]).to eq(false)
+    end
+
+    it 'sanitises boolean values when true' do
+      subject.config = {'AWS_USE_SSL' => 'true'}
+
+      expect(subject.environment[:use_ssl]).to eq(true)
+    end
+
+    it 'ignores keys not starting with AWS' do
+      subject.config = {'CONFIG_KEY' => 'value'}
+
+      expect(subject.environment).to_not have_key(:config_key)
+      expect(subject.environment).to_not have_key(:aws_config_key)
+      expect(subject.environment).to_not have_key(:AWS_CONFIG_KEY)
+      expect(subject.environment).to_not have_key('AWS_CONFIG_KEY')
+    end
+
+    it 'kepps boolean values when true' do
+      subject.config = {'AWS_USE_SSL' => true}
+
+      expect(subject.environment[:use_ssl]).to eq(true)
+    end
+
+    it 'kepps boolean values when false' do
+      subject.config = {'AWS_USE_SSL' => false}
 
-    it "Configures the AWS global config based on environment variables" do
-      environment = {
+      expect(subject.environment[:use_ssl]).to eq(false)
+    end
+  end
+
+  describe '.config' do
+    it 'sets config overriding environment variables' do
+      subject.config = {'AWS_FOO': 'BAR2'}
+
+      expect(subject.environment).to include(foo: 'BAR2')
+    end
+
+    it 'sets config overriding existing environment variables' do
+      ENV['FOO'] = 'BAR3'
+      subject.config = {'AWS_FOO': 'BAZ'}
+
+      expect(subject.environment).to include(foo: 'BAZ')
+    end
+  end
+
+  describe '.s3_config' do
+    before do
+      subject.config = {
         'AWS_S3_ENDPOINT'         => 'localhost',
         'AWS_S3_PORT'             => '4569',
         'AWS_SQS_ENDPOINT'        => 'localhost',
@@ -15,32 +69,57 @@ describe Alephant::Harness::AWS do
         'AWS_USE_SSL'             => false,
         'AWS_S3_FORCE_PATH_STYLE' => true,
         'AWS_ACCESS_KEY_ID'       => 'access',
-        'AWS_SECRET_ACCESS_KEY'   => 'secret'
+        'AWS_SECRET_ACCESS_KEY'   => 'secret',
+        'AWS_REGION'              => 'eu-west-1'
       }
+    end
 
-      Alephant::Harness::AWS.configure(environment)
-
-      environment.each do |key, value|
-        key = key[/AWS_(.*)/,1].downcase.to_sym
-        config_value = AWS.config.send(key.to_sym)
-        expect(config_value).to eq(value)
-      end
-
+    it 'should filter to necessary S3 keys' do
+      expect(subject.s3_config.keys).to eq([:endpoint, :force_path_style, :access_key_id, :secret_access_key, :region])
     end
+  end
 
-    it "Sanitises boolean values" do
-      environment = {
-        'AWS_USE_SSL'             => 'false',
-        'AWS_S3_FORCE_PATH_STYLE' => 'true'
+  describe '.sqs_config' do
+    before do
+      subject.config = {
+        'AWS_S3_ENDPOINT'         => 'localhost',
+        'AWS_S3_PORT'             => '4569',
+        'AWS_SQS_ENDPOINT'        => 'localhost',
+        'AWS_SQS_PORT'            => '4568',
+        'AWS_DYNAMO_DB_ENDPOINT'  => 'localhost',
+        'AWS_DYNAMO_DB_PORT'      => '4570',
+        'AWS_USE_SSL'             => false,
+        'AWS_S3_FORCE_PATH_STYLE' => true,
+        'AWS_ACCESS_KEY_ID'       => 'access',
+        'AWS_SECRET_ACCESS_KEY'   => 'secret',
+        'AWS_REGION'              => 'eu-west-1'
       }
+    end
 
-      Alephant::Harness::AWS.configure(environment)
+    it 'should filter to necessary SQS keys' do
+      expect(subject.sqs_config.keys).to eq([:endpoint, :access_key_id, :secret_access_key, :region])
+    end
+  end
 
-      expect(AWS.config.use_ssl).to be_falsy
-      expect(AWS.config.s3_force_path_style).to be_truthy
+  describe '.dynamo_config' do
+    before do
+      subject.config = {
+        'AWS_S3_ENDPOINT'         => 'localhost',
+        'AWS_S3_PORT'             => '4569',
+        'AWS_SQS_ENDPOINT'        => 'localhost',
+        'AWS_SQS_PORT'            => '4568',
+        'AWS_DYNAMO_DB_ENDPOINT'  => 'localhost',
+        'AWS_DYNAMO_DB_PORT'      => '4570',
+        'AWS_USE_SSL'             => false,
+        'AWS_S3_FORCE_PATH_STYLE' => true,
+        'AWS_ACCESS_KEY_ID'       => 'access',
+        'AWS_SECRET_ACCESS_KEY'   => 'secret',
+        'AWS_REGION'              => 'eu-west-1'
+      }
     end
 
+    it 'should filter to necessary DynamoDB keys' do
+      expect(subject.dynamo_config.keys).to eq([:endpoint, :access_key_id, :secret_access_key, :region])
+    end
   end
 end
-
-

data/spec/service/dynamo_db_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe Alephant::Harness::Service::DynamoDB do
 
+  let(:fake_client) { Aws::DynamoDB::Client.new(stub_responses: true) }
+
+  before do
+    allow(subject).to receive(:client).and_return(fake_client)
+  end
+
   describe ".create" do
     it "creates a table based off a schema" do
 
@@ -12,9 +18,7 @@ describe Alephant::Harness::Service::DynamoDB do
       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)
-
+      expect(subject.create(table_name, schema).data).to be_a(Aws::DynamoDB::Types::CreateTableOutput)
     end
   end
 
@@ -23,21 +27,18 @@ 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
         tables.each do |table|
-          subject.remove(table)
+          expect(subject.remove(table).data).to be_a(Aws::DynamoDB::Types::DeleteTableOutput)
         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).and_raise(Exception)
+        fake_client.stub_responses(:delete_table, 'ResourceNotFoundException')
         expect { subject.remove('blah') }.to_not raise_error(Exception)
       end
     end
-
   end
-
 end
 

data/spec/service/s3_spec.rb

@@ -2,45 +2,30 @@ require 'spec_helper'
 
 describe Alephant::Harness::Service::S3 do
   let(:id) { 'my-bucket' }
-  let(:buckets)   { double("AWS::S3::BucketCollection") }
-  let(:bucket)    { double("AWS::S3::Bucket") }
-  let(:s3_object) { double("AWS::S3::S3Object") }
-  let(:s3_object_collection) { double('AWS::S3::ObjectCollection') }
+  let(:fake_client) { Aws::S3::Client.new(stub_responses: true) }
 
+  before do
+    allow(subject).to receive(:client).and_return(fake_client)
+  end
 
   describe ".create" do
     it "creates a bucket" do
-      allow(buckets).to receive(:create).with(id)
-      expect_any_instance_of(AWS::S3).to receive(:buckets).and_return(buckets)
-      subject.create id
+      expect(subject.create(id).data).to be_a(Aws::S3::Types::CreateBucketOutput)
     end
   end
 
   describe ".delete(id)" do
     it "deletes a bucket" do
-      bucket = double('AWS::S3::Bucket', :delete => nil)
-      s3_object = double('AWS::S3::S3Object', :delete => nil)
-
-      allow(buckets).to receive(:[]).with(id).and_return(bucket)
-      allow(bucket).to receive(:objects).and_return([s3_object])
-
-      expect_any_instance_of(AWS::S3).to receive(:buckets).and_return(buckets)
-      subject.delete id
+      expect(subject.delete(id)).to be_a(Aws::EmptyStructure)
     end
   end
 
   describe ".add_object(bucket_id, object_id, data)" do
     it "adds an object to the bucket" do
       object_id = 'foo/bar'
-      data = { :some => 'data' }
+      data = 'Some data'
 
-      allow(buckets).to receive(:[]).with(id).and_return(bucket)
-      allow(bucket).to receive(:objects).and_return(s3_object_collection)
-      allow(s3_object_collection).to receive(:[]).with(object_id).and_return(s3_object)
-      allow(s3_object).to receive(:write).with(data)
-
-      expect_any_instance_of(AWS::S3).to receive(:buckets).and_return(buckets)
-      subject.add_object(id, object_id, data)
+      expect(subject.add_object(id, object_id, data).data).to be_a(Aws::S3::Types::PutObjectOutput)
     end
   end
 
@@ -48,72 +33,39 @@ describe Alephant::Harness::Service::S3 do
     it "gets an object from the specified bucket" do
       object_id = 'foo/bar'
 
-      allow(buckets).to receive(:[]).with(id).and_return(bucket)
-      allow(bucket).to receive(:objects).and_return(s3_object_collection)
-      allow(s3_object_collection).to receive(:[]).with(object_id).and_return(s3_object)
-
-      expect_any_instance_of(AWS::S3).to receive(:buckets).and_return(buckets)
-      expect(subject.get_object(id, object_id)).to eq(s3_object)
-    end
-  end
-
-  describe ".delete_object(bucket_id, object_id)" do
-    it "deletes an object from the specified bucket" do
-      object_id = 'foo/bar'
-
-      allow(buckets).to receive(:[]).with(id).and_return(bucket)
-      allow(bucket).to receive(:objects).and_return(s3_object_collection)
-      allow(s3_object_collection).to receive(:[]).with(object_id).and_return(s3_object)
-      allow(s3_object).to receive(:delete)
-
-      expect_any_instance_of(AWS::S3).to receive(:buckets).and_return(buckets)
-      subject.delete_object(id, object_id)
+      expect(subject.get_object(id, object_id).data).to be_a(Aws::S3::Types::GetObjectOutput)
     end
   end
 
   describe ".bucket_exists?" do
-    before(:each) do
-      allow_any_instance_of(AWS::S3).to receive(:buckets).and_return(buckets)
-      allow(buckets).to receive(:[]).with(id).and_return(bucket)
-    end
-
     context "when bucket exists" do
-      it "yields control" do
-        allow(bucket).to receive(:exists?).and_return(true)
-        expect { |b| subject.bucket_exists?(id, &b) }.to yield_control
+      context 'with block' do
+        it 'should call block' do
+          expect { |b| subject.bucket_exists?(id, &b) }.to yield_control
+        end
       end
-    end
 
-    context "when bucket does not exist" do
-      it "does not yield control" do
-        allow(bucket).to receive(:exists?).and_return(false)
-        expect { |b| subject.bucket_exists?(id, &b) }.to_not yield_control
+      context 'with no block' do
+        it 'should return true' do
+          fake_client.stub_data(:head_bucket, {})
+          expect(subject.bucket_exists?(id)).to eq(true)
+        end
       end
     end
-  end
-
-  describe ".exists?" do
-    context "when queue exists" do
-      it "yields control" do
-        allow_any_instance_of(AWS::S3).to receive(:buckets).and_return(buckets)
 
-        allow(buckets).to receive(:[]).with(id).and_return(bucket)
-        allow(bucket).to receive(:objects).and_return(s3_object_collection)
-        allow(s3_object_collection).to receive(:[]).with(object_id).and_return(s3_object)
-
-        expect { |b| subject.exists?(id, object_id, &b) }.to yield_control
+    context "when bucket does not exist" do
+      context 'with block' do
+        it 'should not call block' do
+          fake_client.stub_responses(:head_bucket, Aws::EmptyStructure)
+          expect { |b| subject.bucket_exists?(id, &b) }.to_not yield_control
+        end
       end
-    end
-
-    context "when queue does not exist" do
-      it "does not yield control" do
-        allow_any_instance_of(AWS::S3).to receive(:buckets).and_return(buckets)
-
-        allow(buckets).to receive(:[]).with(id).and_return(bucket)
-        allow(bucket).to receive(:objects).and_return(s3_object_collection)
-        allow(s3_object_collection).to receive(:[]).with(object_id).and_return(nil)
 
-        expect { |b| subject.exists?(id, object_id, &b) }.to_not yield_control
+      context 'with no block' do
+        it 'should return false' do
+          fake_client.stub_responses(:head_bucket, Aws::EmptyStructure)
+          expect(subject.bucket_exists?(id)).to eq(false)
+        end
       end
     end
   end

data/spec/service/sqs_spec.rb

@@ -3,43 +3,33 @@ require 'spec_helper'
 describe Alephant::Harness::Service::SQS do
 
   let(:queue_name) { "queue" }
-  let(:queues) { double("AWS::SQS::QueueCollection") }
-  let(:queue)  { double("AWS::SQS::Queue") }
+  let(:fake_client) { Aws::SQS::Client.new(stub_responses: true) }
+
+  before do
+    allow(subject).to receive(:client).and_return(fake_client)
+  end
 
   describe ".create" do
-    it "creates a new queue" do
-      allow(queues).to receive(:create).with(queue_name)
+    it "creates a Aws::SQS::Types::CreateQueueResult" do
+      fake_client.stub_data(:create_queue)
 
-      expect_any_instance_of(AWS::SQS).to receive(:queues).and_return(queues)
-      subject.create queue_name
+      expect(subject.create(queue_name).data).to be_a(Aws::SQS::Types::CreateQueueResult)
     end
   end
 
   describe ".delete" do
     it "deletes a queue" do
-      allow_any_instance_of(AWS::SQS).to receive(:queues).and_return(queues)
-
-      allow(queues).to receive(:named).and_return(queue)
-
-      expect(queue).to receive(:delete)
-      subject.delete queue_name
-    end
-  end
+      fake_client.stub_data(:get_queue_url, { queue_url: 'http://sqs.aws.myqueue/id' })
+      fake_client.stub_data(:delete_queue)
 
-  describe ".get" do
-    it "gets a queue" do
-      allow_any_instance_of(AWS::SQS).to receive(:queues).and_return(queues)
-      allow(queues).to receive(:named).with(queue_name).and_return(queue)
-
-      expect(subject.get queue_name).to eq(queue)
+      expect(subject.delete(queue_name).data).to be_a(Aws::EmptyStructure)
     end
   end
 
   describe ".exists?" do
     context "when queue exists" do
       it "yields control" do
-        allow_any_instance_of(AWS::SQS).to receive(:queues).and_return(queues)
-        allow(queues).to receive(:named).with(queue_name).and_return(queue)
+        fake_client.stub_data(:get_queue_url, { queue_url: 'http://sqs.aws.myqueue/id' })
 
         expect { |b| subject.exists?(queue_name, &b) }.to yield_control
       end
@@ -47,12 +37,10 @@ describe Alephant::Harness::Service::SQS do
 
     context "when queue does not exist" do
       it "does not yield control" do
-        allow_any_instance_of(AWS::SQS).to receive(:queues).and_return(queues)
-        allow(queues).to receive(:named).with(queue_name).and_return(nil)
+        fake_client.stub_responses(:get_queue_url, 'NonExistentQueue')
 
         expect { |b| subject.exists?(queue_name, &b) }.to_not yield_control
       end
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -6,4 +6,6 @@ require 'alephant/harness/aws'
 require 'alephant/harness/service/dynamo_db'
 require 'alephant/harness/service/s3'
 require 'alephant/harness/service/sqs'
-require 'aws-sdk'
+require "aws-sdk-dynamodb"
+require "aws-sdk-s3"
+require "aws-sdk-sqs"

metadata

@@ -1,95 +1,123 @@
 --- !ruby/object:Gem::Specification
 name: alephant-harness
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - BBC News
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  name: aws-sdk
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: aws-sdk-dynamodb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-  name: bundler
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: More Stuff
 email:
-- FutureMediaNewsRubyGems@bbc.co.uk
+- D&ENewsFrameworksTeam@bbc.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -114,24 +142,24 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.12
+signing_key: 
 specification_version: 4
 summary: Stuff
 test_files: