asir 1.0.5 → 1.0.6

data/.rspec

@@ -0,0 +1 @@
+--color -f d

data/ChangeLog

@@ -0,0 +1,9 @@
+2012-11-27  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.0.6: New version.
+	* lib/asir/transport/resque.rb: Fixed Resque::Worker initialization.
+	* lib/asir/transport/resque.rb: Support for redis-server 2.6 command line options.
+	* Changelog: Added Changelog
+	* asir.gemspec: Fixed Bundle and gemspec dependencies.
+	* Rakefile: Added rake prereq.
+

data/Gemfile

@@ -1,15 +1,6 @@
 # -*- ruby -*-
 source "http://rubygems.org"
-  gem 'uuid', '~> 2.3.5'
-  # gem 'json', '~> 1.6.5' # Fails to load under jruby 1.6.6
-  gem 'libxml-ruby', '~> 2.2.2'
-  gem 'httpclient', '~> 2.2.4'
-  gem 'zmq', '~> 2.1.4'
 
-group :development do
-  gem "bundler", ">= 1.0.0"
-  gem "rspec", "~> 2.0"
-
-  require File.expand_path('../spec/debug_helper', __FILE__)
-end
+# Specify your gem's dependencies in asir.gemspec
+gemspec
 

data/README.textile

@@ -50,3 +50,9 @@ h2. Platform support
 * CRuby 2.0-head
 * JRuby 1.6.x (with JRUBY_OPTS=--1.9) IN-PROGRESS
 
+h2. Dependencies
+
+* gem install zmq
+** zmq 2.1.4 needs a zmq 2.x library.
+** On OS X Macports: sudo port install zmq22.
+

data/Rakefile

@@ -49,6 +49,19 @@ task :irb do
   sh "irb -Ilib -rasir"
 end
 
+######################################################################
+
+desc "Install system prerequites"
+task :prereq do
+  case RUBY_PLATFORM
+  when /darwin/i
+    sh "sudo port install zmq22"
+  when /linux/i
+    sh "sudo apt-get install libzmq-dev"
+  end
+end
+
+######################################################################
 desc "Create slides."
 task :slides => 
   [

data/asir.gemspec

@@ -1,44 +1,48 @@
 # -*- encoding: utf-8 -*-
+# -*- ruby -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'asir/version'
 
 Gem::Specification.new do |s|
+  gem = s
   s.name = %q{asir}
-  s.version = "1.0.5"
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = ASIR::VERSION
   s.authors = ["Kurt Stephens"]
-  s.date = %q{2012-11-26}
-  s.description = %q{Abstracting Services in Ruby}
   s.email = %q{ks.ruby@kurtstephens.com}
-  s.extra_rdoc_files = [
-    "README.textile"
-  ]
-  s.files = `git ls-files`.split("\n")
-  s.executables.push(*`git ls-files bin`.split("\n").map{|f| f.gsub('bin/', '')})
+  s.description = %q{Abstracting Services in Ruby}
+  s.summary = %q{Abstracting Services in Ruby}
   s.homepage = %q{http://github.com/kstephens/abstracting_services_in_ruby}
-  s.rdoc_options = ["--charset=UTF-8"]
+
+  s.files         = `git ls-files`.split($/)
+  s.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Abstracting Services in Ruby}
-  s.test_files = `git ls-files spec`.split("\n")
 
-  s.add_dependency "uuid", "~> 2.3.5"
+  s.extra_rdoc_files = [ "README.textile" ]
+  s.rdoc_options = ["--charset=UTF-8"]
+
+  if RUBY_PLATFORM !~ /linux/i
+    # see lib/asir/uuid.rb
+    gem.add_dependency "uuid", "~> 2.3.6"
+  end
   s.add_dependency "redis", "~> 3.0.2"
   s.add_dependency "resque", "~> 1.23.0"
   s.add_dependency "httpclient", "~> 2.3.0"
   s.add_dependency "libxml-ruby", "~> 2.3.3"
   s.add_dependency "rack", "~> 1.4.1"
   s.add_dependency "zmq", "~> 2.1.4"
+  s.add_dependency "json", ">= 1.5.3"
 
+  s.add_development_dependency 'rake', '>= 0.9.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
-  # s.add_development_dependency 'simplecov', 
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
+  s.add_development_dependency 'simplecov', '>= 0.1'
+  case RUBY_VERSION
+  when /^1\.8/
+    gem.add_development_dependency 'ruby-debug', '>= 0.1'
   else
+    gem.add_development_dependency 'ruby-debug19', '>= 0.1'
   end
+  # s.add_development_dependency 'simplecov', 
 end
 

data/lib/asir/transport/resque.rb

@@ -105,7 +105,7 @@ module ASIR
         save = Thread.current[:asir_transport_resque_instance]
         Thread.current[:asir_transport_resque_instance] = self
         poll_throttle throttle do
-          $stderr.puts "  #{$$} #{self} serve_stream_message!: resque_worker = #{resque_worker} on queues #{resque_worker.queues}" if @verbose >= 3
+          $stderr.puts "  #{$$} #{self} serve_stream_message!: resque_worker = #{resque_worker} on queues #{resque_worker.queues.inspect}" if @verbose >= 3
           if job = resque_worker.reserve
             $stderr.puts "  #{$$} #{self} serve_stream_message! job=#{job.class}:#{job.inspect}" if @verbose >= 2
             resque_worker.process(job)
@@ -167,7 +167,7 @@ module ASIR
       end
 
       def resque_worker
-        @resque_worker ||= ::Resque::Worker.new(queues_)
+        @resque_worker ||= ::Resque::Worker.new(*queues_)
       end
 
       def server_on_start!
@@ -195,17 +195,45 @@ module ASIR
 
       #########################################
 
+      @@redis_server_version = nil
+      def redis_server_version
+        @@redis_server_version ||=
+          begin
+            case v = `redis-server --version`
+            when /v=([.0-9]+)/ # 3.x
+              v = $1
+            when / version ([.0-9]+)/ # 2.x
+              v = $1
+            else
+              v = 'UNKNOWN'
+            end
+            v
+          end
+      end
+
       def _start_conduit!
         @redis_dir ||= "/tmp"
         @redis_conf ||= "#{@redis_dir}/asir-redis-#{port}.conf"
         @redis_log ||= "#{@redis_dir}/asir-redis-#{port}.log"
-        ::File.open(@redis_conf, "w+") do | out |
-          out.puts "daemonize no"
-          out.puts "port #{port}"
-          out.puts "loglevel warning"
-          out.puts "logfile #{@redis_log}"
+        @redis_cmd = [ 'redis-server' ]
+        case redis_server_version
+        when /^2\.4/
+          ::File.open(@redis_conf, "w+") do | out |
+            out.puts "daemonize no"
+            out.puts "port #{port}"
+            out.puts "loglevel warning"
+            out.puts "logfile #{@redis_log}"
+          end
+          @redis_cmd << @redis_conf
+        else
+          @redis_cmd <<
+            '--port'     << port <<
+            '--loglevel' << 'warning' <<
+            '--logfile'  << @redis_log
         end
-        exec "redis-server", @redis_conf
+        @redis_cmd.map! { | x | x.to_s }
+        # $stderr.puts "  redis_cmd = #{@redis_cmd * ' '}" if @verbose >= 1
+        exec *@redis_cmd
       end
     end
     # !SLIDE END

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/spec/resque_spec.rb

@@ -4,8 +4,33 @@ gem 'resque'
 require 'asir'
 require 'asir/transport/resque'
 require 'asir/coder/marshal'
+require 'timeout'
 
 describe "ASIR::Transport::Resque" do
+  it "should be able to start/stop redis" do
+    with_cleanup! do
+      create_transport!
+      pid = Process.fork do
+        # exec "false" # simulate failure to start.
+        transport._start_conduit!
+      end
+      sleep 1
+      Process.kill('TERM', pid)
+      sleep 1
+      wpid, status = nil, nil
+      Timeout.timeout(5) do
+        wpid, status = Process.waitpid2(pid, Process::WUNTRACED)
+      end
+      # puts status.inspect
+      wpid.should == pid
+      status.stopsig.should == nil
+      status.termsig.should == nil
+      status.exited?.should == true
+      status.exitstatus.should == 0
+      status.success?.should == true
+    end
+  end
+
   it "should process and stop! gracefully" do
     with_cleanup! do
       create_transport!
@@ -14,12 +39,15 @@ describe "ASIR::Transport::Resque" do
 
       message_count = 0
       transport.after_receive_message = lambda do | t, message |
-        $stderr.write ">#{message_count += 1}" if verbose
+        message_count += 1
+        $stderr.write ">#{message_count}" if verbose
         if message_count >= 5
           t.stop!
         end
       end
-      start_server!
+      Timeout.timeout(20) do
+        start_server!
+      end
 
       message_count.should == 5
       exceptions.should == [ ]
@@ -32,12 +60,15 @@ describe "ASIR::Transport::Resque" do
       message_count = 0
       lambda do
         transport.after_receive_message = lambda do | t, message |
-          $stderr.write ">#{message_count += 1}" if verbose
+          message_count += 1
+          $stderr.write ">#{message_count}" if verbose
           if message_count >= 10
             t.stop!
           end
         end
-        start_server!
+        Timeout.timeout(20) do
+          start_server!
+        end
       end.should raise_error(Redis::CannotConnectError)
       message_count.should == 0
       exceptions.should == [ ]
@@ -54,7 +85,8 @@ describe "ASIR::Transport::Resque" do
       message_count = 0
       lambda do
         transport.after_receive_message = lambda do | t, message |
-          $stderr.write ">#{message_count += 1}" if verbose
+          message_count += 1
+          $stderr.write ">#{message_count}" if verbose
           if message_count >= 5
             stop_client!
             stop_conduit! :signal => 9
@@ -63,7 +95,9 @@ describe "ASIR::Transport::Resque" do
             t.stop!
           end
         end
-        start_server!
+        Timeout.timeout(20) do
+          start_server!
+        end
         raise "start_server! exited"
       end.should raise_error(Redis::CannotConnectError)
       message_count.should == 5
@@ -76,7 +110,7 @@ describe "ASIR::Transport::Resque" do
   before :each do
     @target = ASIR::Test::ResqueTarget.new
     @exceptions = [ ]
-    @verbose = true
+    @verbose = (ENV['ASIR_TEST_VERBOSE'] || 0).to_i > 0
   end
 
   def with_cleanup!
@@ -91,11 +125,13 @@ describe "ASIR::Transport::Resque" do
     @uri = "redis://localhost:23456"
     @transport = ASIR::Transport::Resque.new(:uri => @uri)
     transport.encoder = ASIR::Coder::Marshal.new
-    transport._logger = $stderr
-    transport._log_enabled = true
-    ASIR::Client::Proxy.config_callbacks[target.class] = lambda { | proxy |
+    if verbose
+      transport._logger = $stderr
+      transport._log_enabled = true
+    end
+    ASIR::Client::Proxy.config_callbacks[target.class] = lambda do | proxy |
       proxy.transport = transport
-    }
+    end
   end
 
   def start_conduit!
@@ -115,7 +151,8 @@ describe "ASIR::Transport::Resque" do
       # transport.verbose = 3
       i = 0
       loop do
-        $stderr.write "<#{i += 1}" if verbose
+        i += 1
+        $stderr.write "<#{i}" if verbose
         target.asir.eval! "2 + 2"
         sleep 0.25
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 2.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 2.3.6
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.4
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +171,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Abstracting Services in Ruby
 email: ks.ruby@kurtstephens.com
 executables:
@@ -148,6 +212,8 @@ extra_rdoc_files:
 - README.textile
 files:
 - .gitignore
+- .rspec
+- ChangeLog
 - Gemfile
 - README.textile
 - Rakefile