iron_mq 1.4.0 → 1.4.1

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 1
 :minor: 4
-:patch: 0
-:build: 
+:patch: 1
+:build: !!null 

data/iron_mq.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "iron_mq"
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Reeder"]
-  s.date = "2012-01-05"
+  s.date = "2012-02-08"
   s.description = "Ruby client for IronMQ"
   s.email = "travis@iron.io"
   s.extra_rdoc_files = [
@@ -24,7 +24,10 @@ Gem::Specification.new do |s|
     "lib/iron_mq/client.rb",
     "lib/iron_mq/messages.rb",
     "lib/iron_mq/queues.rb",
+    "test/Gemfile",
+    "test/Gemfile.lock",
     "test/long_run.rb",
+    "test/long_run_worker.rb",
     "test/quick_run.rb",
     "test/test_base.rb",
     "test/test_iron_mq.rb"
@@ -32,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://www.iron.io"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.15"
   s.summary = "Ruby client for IronMQ"
 
   if s.respond_to? :specification_version then

data/lib/iron_mq/client.rb

@@ -6,7 +6,8 @@ module IronMQ
 
   class Client
 
-    attr_accessor :token, :project_id, :queue_name, :logger
+    attr_accessor :token, :project_id, :queue_name, :logger,
+        :scheme, :host, :port
 
     def initialize(options={})
       @logger = Logger.new(STDOUT)

data/lib/iron_mq/queues.rb

@@ -60,7 +60,15 @@ module IronMQ
       return @size if @size
       q = @queues.get(:name=>name)
       @size = q.size
-      return @size
+      @size
+    end
+
+    def total_messages
+      return raw["total_messages"] if raw["total_messages"]
+      return @total_messages if @total_messages
+      q = @queues.get(:name=>name)
+      @total_messages = q.total_messages
+      @total_messages
     end
 
     # def delete

data/test/Gemfile

@@ -0,0 +1,4 @@
+source 'http://rubygems.org'
+gem 'beanstalk-client'
+gem 'test-unit'
+gem 'concur'

data/test/Gemfile.lock

@@ -0,0 +1,38 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.6)
+    beanstalk-client (1.1.1)
+    concur (0.1.2)
+      em-http-request
+      em-http-request
+      eventmachine
+      eventmachine
+      faraday
+      faraday
+    cookiejar (0.3.0)
+    em-http-request (1.0.1)
+      addressable (>= 2.2.3)
+      cookiejar
+      em-socksify
+      eventmachine (>= 1.0.0.beta.4)
+      http_parser.rb (>= 0.5.3)
+    em-socksify (0.1.0)
+      eventmachine
+    eventmachine (1.0.0.beta.4)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
+      rack (>= 1.1.0, < 2)
+    http_parser.rb (0.5.3)
+    multipart-post (1.1.4)
+    rack (1.4.0)
+    test-unit (2.4.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  beanstalk-client
+  concur
+  test-unit

data/test/long_run.rb

@@ -7,51 +7,24 @@ rescue Exception => ex
   raise ex
 end
 
+require_relative 'long_run_worker'
+
 @config = YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "iron_mq_ruby", "test", "config.yml")))
-@client = IronMQ::Client.new(@config['ironmq'])
-@client.queue_name = 'ironmq-gem-long'
 @num_to_add = @config['count']
 
-start = Time.now
-puts "Queuing #{@num_to_add} items at #{start}..."
-executor = Concur::Executor.new_thread_pool_executor(50)
-@num_to_add.times do |i|
-  task = executor.execute do
-    begin
-      puts "POST #{i}..."
-      res = @client.messages.post("hello world! #{i}")
-    rescue => ex
-      puts "ERROR! #{ex.class.name}: #{ex.message} -- #{ex.backtrace.inspect}"
-      raise ex
-    end
-  end
-end
-
-i = 0
-while executor.queue_size > 0 do
-  i += 1
-  puts "waiting #{i}, queue size=#{executor.queue_size}"
-  sleep 0.5
+IronWorker.configure do |c|
+  c.token = @config['iron_mq']['token']
+  c.project_id = @config['iron_mq']['project_id']
 end
 
+worker = LongRunWorker.new
+worker.config = @config
+worker.num_to_add = @num_to_add
+#worker.run_local
+worker.queue
+status = worker.wait_until_complete
+p status
+puts worker.get_log
 
-put_time = (Time.now.to_f - start.to_f)
-puts "Finished pushing in #{put_time} seconds"
-
-exit if true
-
-start = Time.now
-puts "Getting and deleting #{@num_to_add} items at #{start}..."
-@num_to_add.times do |i|
-  puts "GET #{i}..."
-  res = @client.messages.get()
-  p res
-  puts "DELETE #{i}..."
-  res = @client.messages.delete(res["id"])
-  p res
-end
 
-puts "Finished pushing #{@num_to_add} items in #{put_time} seconds."
-puts "Finished getting and deleting #{@num_to_add} items in #{(Time.now.to_f - start.to_f)} seconds."
 
-executor.shutdown

data/test/long_run_worker.rb

@@ -0,0 +1,61 @@
+require 'iron_worker'
+
+class LongRunWorker < IronWorker::Base
+
+  merge_gem 'concur'
+  merge_gem 'iron_mq'
+
+  attr_accessor :config, :num_to_add
+
+  def run
+
+    @client = IronMQ::Client.new(@config['iron_mq'])
+    @client.queue_name = 'ironmq-gem-long'
+
+    start = Time.now
+    puts "Queuing #{@num_to_add} items at #{start}..."
+    executor = Concur::Executor.new_thread_pool_executor(20)
+    @num_to_add.times do |i|
+      task = executor.execute do
+        begin
+          puts "POST #{i}..."
+          res = @client.messages.post("hello world! #{i}")
+        rescue => ex
+          puts "ERROR! #{ex.class.name}: #{ex.message} -- #{ex.backtrace.inspect}"
+          raise ex
+        end
+      end
+    end
+
+    i = 0
+    while executor.queue_size > 0 do
+      i += 1
+      puts "waiting #{i}, queue size=#{executor.queue_size}"
+      sleep 0.5
+    end
+
+
+    put_time = (Time.now.to_f - start.to_f)
+    puts "Finished pushing in #{put_time} seconds"
+
+    #exit if true
+
+    start = Time.now
+    puts "Getting and deleting #{@num_to_add} items at #{start}..."
+    @num_to_add.times do |i|
+      puts "GET #{i}..."
+      res = @client.messages.get()
+      p res
+      puts "DELETE #{i}..."
+      res = @client.messages.delete(res["id"])
+      p res
+    end
+
+    puts "Finished pushing #{@num_to_add} items in #{put_time} seconds."
+    puts "Finished getting and deleting #{@num_to_add} items in #{(Time.now.to_f - start.to_f)} seconds."
+
+    executor.shutdown
+
+  end
+
+end

data/test/test_iron_mq.rb

@@ -4,6 +4,7 @@
 
 gem 'test-unit'
 require 'test/unit'
+require 'beanstalk-client'
 require 'yaml'
 require_relative 'test_base'
 
@@ -15,11 +16,13 @@ class IronMQTests < TestBase
 
   end
 
-
   def test_basics
     @client.queue_name = 'test_basics'
     clear_queue
 
+    queue = @client.queues.get(:name=>@client.queue_name)
+    total_messages = queue.total_messages
+
     res = @client.messages.post("hello world!")
     p res
     assert res["id"]
@@ -28,7 +31,7 @@ class IronMQTests < TestBase
 
     queue = @client.queues.get(:name=>@client.queue_name)
     assert queue.size == 1
-
+    assert queue.total_messages == (total_messages+1)
     res = @client.messages.get()
     p res
     assert res["id"]
@@ -155,9 +158,39 @@ class IronMQTests < TestBase
     msgs.each do |m|
       m.delete
     end
-
-
   end
 
+  def test_beanstalk
+    puts 'test_beanstalk'
+    config = @config['iron_mq']
+    h = "#{config['host']||"mq-aws-us-east-1.iron.io"}:#{config['beanstalkd_port']||11300}"
+    beanstalk = Beanstalk::Connection.new(h)
+    beanstalk.put("oauth #{config['token']} #{config['project_id']}")
+    beanstalk.use(@client.queue_name)
+    beanstalk.watch(@client.queue_name)
+
+    msg = "hello #{Time.now}"
+    beanstalk.put(msg)
+    job = beanstalk.reserve
+    assert_equal msg, job.body, "body not the same as message."
+    job.delete
+    job = assert_raise(Beanstalk::TimedOut) {
+      beanstalk.reserve(1)
+    }
+
+    hasher = {:x=>1, :y=>"hello", "yo"=>"scooby doo"}
+    beanstalk.put(hasher.to_json)
+    job = beanstalk.reserve(1)
+    got = JSON.parse(job.body)
+    assert got.is_a?(Hash)
+    assert_equal hasher[:x], got['x']
+    job.delete
+
+    msg = "hello there\nthis is a new line"
+    beanstalk.put(msg)
+    job = beanstalk.reserve(1)
+    assert_equal msg, job.body, "#{job.body} does not equal #{msg}"
+    job.delete
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mq
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000 Z
+date: 2012-02-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &24074940 !ruby/object:Gem::Requirement
+  requirement: &22831660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24074940
+  version_requirements: *22831660
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &24074340 !ruby/object:Gem::Requirement
+  requirement: &22830400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24074340
+  version_requirements: *22830400
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &24073540 !ruby/object:Gem::Requirement
+  requirement: &22829360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24073540
+  version_requirements: *22829360
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &24072540 !ruby/object:Gem::Requirement
+  requirement: &22828720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24072540
+  version_requirements: *22828720
 description: Ruby client for IronMQ
 email: travis@iron.io
 executables: []
@@ -70,7 +70,10 @@ files:
 - lib/iron_mq/client.rb
 - lib/iron_mq/messages.rb
 - lib/iron_mq/queues.rb
+- test/Gemfile
+- test/Gemfile.lock
 - test/long_run.rb
+- test/long_run_worker.rb
 - test/quick_run.rb
 - test/test_base.rb
 - test/test_iron_mq.rb
@@ -94,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby client for IronMQ