bender 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f32b0c267f5bbe09aa2f2e9086d527472377058
-  data.tar.gz: d0312fd51224042abf70b87131b210a253a06072
+  metadata.gz: 580e6b56f042783fddf80a417c3002560a418321
+  data.tar.gz: bb53551dcde5a039f504022b09c0182cca4cc5e9
 SHA512:
-  metadata.gz: 86f5403add8df3806f95f23b2f385f937021b01b0604d54fae8eed426d77b8b8c9bf4b7f253b18c349d47c07227fb40dbb4002e3db9083dc21f34492e23879a1
-  data.tar.gz: 977ae1806e6f4a9b97546a70a366d2742621c817d1330cb6f55d41e9382ddc6980882805c349673251565a477da96295bb9c96d811f3276747ab88525d5cfcf5
+  metadata.gz: 9731aff9b37a7e4c02cdb47664657312d66f7fcc7a6e7804e5e3fdda2222e69844c732a08788326eecb28dffdab4668a2eda6fbf7a21b62b0445dfb0c3ec7679
+  data.tar.gz: eb50f5f57ca44478c66ff809e0e4ada7be3a49be81de2227d30ce47b57d6d604b47910273e777a6453d272aee9bbd76eb8dbbe55a291c2a3c13bb17b7860c230

data/.gitignore

@@ -9,11 +9,6 @@
 /test/version_tmp/
 /tmp/
 
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-
 ## Documentation cache and generated files:
 /.yardoc/
 /_yardoc/
@@ -24,12 +19,8 @@ build/
 /.bundle/
 /lib/bundler/man/
 
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
 # Gemfile.lock
 .ruby-version
 .ruby-gemset
 
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
 .env

data/lib/bender/cli.rb

@@ -36,11 +36,12 @@ module Bender
     desc "publish", "Publish a message."
     option :watcher, :aliases => ["-w"], :type => :string, :required => true
     option :message, :aliases => ["-m"], :type => :string, :required => true
+    option :ack,     :aliases => ["-a"], :type => :boolean, :required => false, :default => false
 
     def publish
       load_enviroment(options[:require])
       opts = @options.symbolize_keys.slice(:timeout, :interval, :daemon, :pid_file)
-      Bender::Client.new(@options).publish options[:watcher], options[:message]
+      Bender::Client.new(@options).publish(options[:watcher], options[:message], options[:ack])
     end
 
     protected

data/lib/bender/client.rb

@@ -3,6 +3,7 @@ require 'thwait'
 require 'dotenv'
 require 'active_support/inflector'
 require 'bender/watcher'
+require 'securerandom'
 
 Dotenv.load
 
@@ -22,6 +23,14 @@ module Bender
       def queue_prefix
         @@queue_prefix ||= "#{ENV['QUEUE_PREFIX']}-#{Socket.gethostname}"
       end
+
+      def sqs
+        @@sqs ||= AWS::SQS.new({
+          :access_key_id => ENV['AWS_ACCESS_KEY'],
+          :secret_access_key => ENV['AWS_SECRET_ACCESS'],
+          :region => ENV['AWS_REGION']
+        })
+      end
     end
 
     def initialize(config)
@@ -57,9 +66,15 @@ module Bender
       ThreadsWait.all_waits(*@threads)
     end
 
-    def publish(watcher, message)
+    def publish(watcher, message, ack = false)
       sent = @watchers.select{|w| w.class.to_s.underscore == watcher}.collect do |watcher|
-        watcher.publish(message)
+        if ack
+          with_confirmation do |cq|
+            watcher.publish(message, cq)
+          end
+        else
+          watcher.publish(message)
+        end
       end
       Bender.logger.info("Sent #{sent.size} message(s)")
     end
@@ -81,5 +96,25 @@ module Bender
       end
     end
 
+    def with_confirmation
+      name = "#{Bender::Client.queue_prefix}-cq-#{SecureRandom.uuid}"
+      cq = Bender::Client.sqs.queues.create(name, self.config[:create_options])
+
+      # send message
+      yield({:ack_queue_name => name})
+
+      Bender.logger.info("Polling #{cq.arn} for ack")
+      # TODO: Add timeout
+      cq.poll(wait_time_seconds: 2) do |received_message|
+        # ack'd
+        break
+      end
+
+    rescue Exception => ex
+      Bender.logger.error("#{ex.message}#{ex.backtrace.join("\n")}")
+    ensure
+      cq.delete if cq
+    end
+
   end
 end

data/lib/bender/version.rb

@@ -1,3 +1,3 @@
 module Bender
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/bender/watcher.rb

@@ -7,13 +7,6 @@ module WatcherFactory
 end
 
 class Watcher
-  def self.sqs
-    @@sqs ||= AWS::SQS.new({
-      :access_key_id => ENV['AWS_ACCESS_KEY'],
-      :secret_access_key => ENV['AWS_SECRET_ACCESS'],
-      :region => ENV['AWS_REGION']
-    })
-  end
 
   def name
     @name ||= "#{Bender::Client.queue_prefix}-#{self.class.to_s.underscore}"
@@ -29,7 +22,7 @@ class Watcher
   end
 
   def load_queue
-    @queue ||= Watcher.sqs.queues.create(
+    @queue ||= Bender::Client.sqs.queues.create(
       self.name,
       @options[:create_options]
     )
@@ -48,9 +41,14 @@ class Watcher
     Bender.logger.error("#{self.class}: #{ex.message}#{ex.backtrace.join("\n")}")
   end
 
-  def publish(message)
-    message = message.to_json if message.is_a? Hash
-    @queue.send_message(message)
+  def publish(message, ack = nil)
+    unless message.is_a?(Hash)
+      message = JSON.parse(message)
+    end
+
+    message.merge!(ack) if ack
+
+    @queue.send_message(message.to_json)
   rescue Exception => ex
     Bender.logger.error("#{self.class}: #{ex.message}#{ex.backtrace.join("\n")}")
   end
@@ -62,7 +60,13 @@ class Watcher
     if message == :invalid
       Bender.logger.error("#{self.class}: Unable to parse message: #{json}")
     else
+      # requires an ack ?
+      ack = message.delete(:ack_queue_name)
       self.perform(message)
+      if ack
+        Bender.logger.info("#{self.class}: Ack'ing on #{ack}")
+        Bender::Client.sqs.queues.named(ack).send_message({:ack => true}.to_json)
+      end
     end
   rescue Exception => ex
     Bender.logger.error("#{self.class}: Perform : #{ex.message}#{ex.backtrace.join("\n")}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bender
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Anthony Leak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler