asir 1.2.10 → 1.2.11

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjlhNjgyMDRmYjU4ZDkwYTFmMzUzYjUzNGQwODkzMDBjYzgzOTIzOQ==
+  data.tar.gz: !binary |-
+    M2JiODU1OGU1NzUyZDY0NDE4ZDkyNTYwMTYzZjFiMTI5Zjc0Njg0Yg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODZmMmIyMGNmOGY1MmU4MTVkMGY0NDYwNDE5YTYyNzE2NTQ5NDI0ZDBmYTg0
+    ODliMDQ0ZjEwY2ZkNGZjNzA0MGQzODljNWNkMzI3NDA3ZTZmNDEwMjBhN2Rk
+    NzZmM2QzZDJjMzkyOGQxZWM4NTVlOGJhM2YxMDdhZmIwYmRhM2M=
+  data.tar.gz: !binary |-
+    N2Q5MmY0ZTI4NmE3NGY3OGMxMjI1NTAzNmE3MjU2MTg4YWE5YzYzOTljYjM5
+    ZDZkOTEzOGM2MGY3MmI2YTRhNWYzNDQxMGViOWM2MThiNTI0MjMzODIzMWYy
+    ZDM3M2Q5MDA0OGVjMGE2ODI2NTMzNzRmNzgxYTAwYjIxZjkzMGE=

data/ChangeLog

@@ -1,32 +1,38 @@
-2012-06-20  Kurt A. Stephens  <ks.github@kurtstephens.com>
+2013-09-26  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.2.11: New Version: Bug Fixes.
+	* bin/asir: Wrap Transport#run_server! with signal handlers.
+	* bin/asir: Fix handling of pid files.
+
+2013-06-20  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.10: New Version: New Functionality.
 	* Transport#around_serve_message callback.
 
-2012-06-19  Kurt A. Stephens  <ks.github@kurtstephens.com>
+2013-06-19  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.9: New Version: Fixes, New Functionality.
 	* ASIR::Error::Unforwardable.unforwardable is deprecated; use .modules.
 	* ASIR::AdaptiveValue: refactor ASIR::RetryBehavior sleep values.
 	* BUG: Transport#after_receive_message.call takes a Message::State.
 
-2012-03-14  Kurt A. Stephens  <ks.github@kurtstephens.com>
+2013-03-14  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.8: New Version: Additional functionality.
 	* Support #conduit_host.
 
-2012-03-14  Kurt A. Stephens  <ks.github@kurtstephens.com>
+2013-03-14  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.7: New Version: Fixed for 1.9.2-p320.
 	* YAML/Syck protocol changes.
 	* New API: Transport#conduit_status.
 
-2012-03-13  Kurt A. Stephens  <ks.github@kurtstephens.com>
+2013-03-13  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.6: New Version: additional functionality.
 	* PayloadIO::UnexpectedResponse has #expected, #received attributes.
 
-2012-03-12  Kurt A. Stephens  <ks.github@kurtstephens.com>
+2013-03-12  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.5: New Version: bin/asir.
 	* Do not log error if pid_file does not exist.
@@ -35,7 +41,7 @@
 	* export ASIR_CONDUIT=1 for asir start KIND conduit.
 	* Remove pid_file if process is not running after asir stop.
 
-2012-02-01  Kurt A. Stephens  <ks.github@kurtstephens.com>
+2013-02-01  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.4: New Version: Bug fixes.
 	* Handle STDIO properly in potentially daemonized processes.

data/Guardfile

@@ -0,0 +1,7 @@
+# -*- ruby -*-
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/asir.gemspec

@@ -27,8 +27,11 @@ Gem::Specification.new do |s|
   s.add_dependency "rack", "~> 1.4.1"
 
   s.add_development_dependency 'rake', '>= 0.9.0'
-  s.add_development_dependency 'rspec', '~> 2.12.0'
+  s.add_development_dependency 'rspec', '~> 2.14.1'
+  s.add_development_dependency 'rspec-mocks', '~> 2.14.3'
   s.add_development_dependency 'simplecov', '>= 0.1'
+  s.add_development_dependency 'guard', '~> 1.8'
+  s.add_development_dependency 'guard-rspec', '~> 3.1'
   if (RUBY_ENGINE rescue 'UNKNOWN') =~ /jruby/i
     s.add_development_dependency 'spoon', '>= 0.0.1'
   end

data/example/asir_control.sh

@@ -3,7 +3,8 @@ set -x
 dir="$(cd "$(dirname $0)" && /bin/pwd)"
 PATH="$dir/../bin:$PATH"
 export RUBYLIB="$dir/../example:$dir/../lib"
-asir="asir verbose=9 config_rb=$dir/config/asir_config.rb" 
+asir="asir config_rb=$dir/config/asir_config.rb"
+# asir="$asir verbose=9"
 args="$*"
 args="${args:-ALL}"
 # set -e
@@ -28,6 +29,9 @@ $asir stop webrick worker
 sleep 1
 $asir pid webrick worker
 
+log_file="$($asir log webrick worker)"
+echo log_file="$log_file"
+cat $log_file
 ;;
 esac
 

data/lib/asir/main.rb

@@ -98,7 +98,7 @@ class Main
       $stderr.puts "  sel       = #{sel.inspect}"
     end
     send(sel)
-  rescue ::Exception => exc
+  rescue ::StandardError => exc
     $stderr.puts "#{log_str} ERROR\n#{exc.inspect}\n  #{exc.backtrace * "\n  "}"
     self.exit_code += 1
     raise
@@ -261,6 +261,7 @@ END
   end
 
   def write_pid_file! pid
+    log "pid_file #{pid_file}"
     File.open(pid_file, "w+") { | o | o.puts pid }
     File.chmod(0666, pid_file) rescue nil
   end
@@ -299,7 +300,7 @@ END
       File.unlink(pid_file) rescue nil
     end
     self
-  rescue ::Exception => exc
+  rescue ::StandardError => exc
     msg = "ERROR pid #{$$}\n#{exc.inspect}\n  #{exc.backtrace * "\n  "}"
     log msg, :stderr
     raise
@@ -307,8 +308,9 @@ END
   end
 
   def kill_server!
-    log "#{log_str} kill"
     pid = server_pid
+    log "#{log_str} pid_file #{pid_file}"
+    log "#{log_str} kill pid #{pid}"
     case stop_pid! pid
     when :not_running
       File.unlink(pid_file) rescue nil
@@ -328,8 +330,11 @@ END
   end
 
   def server_pid
-    File.exist?(pid_file) &&
-      File.read(pid_file).chomp!.to_i
+    File.exist?(pid_file) and
+      pid = File.read(pid_file).chomp! and
+      pid = pid.to_i and
+      pid > 1 and
+      pid
   end
 
   def _create_transport default_class
@@ -379,7 +384,9 @@ END
       $0 = "#{old_arg0} #{transport.message_count} #{message.identifier}"
       after_receive_message.call(transport, state)
     end
-    transport.run_server!
+    transport.with_server_signals! do
+      transport.run_server!
+    end
     self
   end
 
@@ -421,12 +428,12 @@ END
   def process_running? pid
     case pid
     when false, nil
+      pid
     when Integer
-      Process.kill(0, pid)
+      pid > 1 && Process.kill(0, pid) && pid
     else
       raise TypeError, "expected false, nil, Integer; given #{pid.inspect}"
     end
-    pid
   rescue ::Errno::ESRCH
     false
   rescue ::Exception => exc

data/lib/asir/transport.rb

@@ -211,36 +211,51 @@ module ASIR
     def stop! force = false
       @running = false
       stop_server! if respond_to?(:stop_server!)
-      raise Error::Terminate if force || @force_stop
+      if force || @force_stop
+        exc = @signal_exception || Error::Terminate.new("#{self} stop!")
+        @signal_exception = nil
+        raise exc
+      end
       self
     end
 
     def with_force_stop!
       force_stop_save = @force_stop
-      @force_stop = true
-      yield
-    ensure
-      @force_stop = force_stop_save
+      begin
+        @force_stop = true
+        yield
+      ensure
+        @force_stop = force_stop_save
+      end
     end
 
     def with_server_signals!
       old_trap = { }
-      [ "TERM", "HUP" ].each do | sig |
-        trap = proc do | *args |
-          stop!
-          @signal_exception = ::ASIR::Error::Terminate.new("#{self} by SIG#{sig} #{args.inspect} in #{__FILE__}:#{__LINE__}")
+      begin
+        in_with_server_signals = @in_with_server_signals
+        unless in_with_server_signals
+          @in_with_server_signals = true
+          [ "TERM", "HUP" ].each do | sig |
+            trap = proc do | *args |
+              @signal_exception = ::ASIR::Error::Terminate.
+                new("#{self} SIG#{sig} #{args.inspect} in #{__FILE__}:#{__LINE__}")
+              stop!
+            end
+            old_trap[sig] = Signal.trap(sig, trap)
+          end
+        end
+        yield
+        unless in_with_server_signals
+          if exc = @signal_exception
+            @signal_exception = nil
+            raise exc
+          end
+        end
+      ensure
+        # $stderr.puts "old_trap = #{old_trap.inspect}"
+        old_trap.each do | sig, trap |
+          Signal.trap(sig, trap) rescue nil
         end
-        old_trap[sig] = Signal.trap(sig, trap)
-      end
-      yield
-      if exc = @signal_exception
-        @signal_exception = nil
-        raise exc
-      end
-    ensure
-      # $stderr.puts "old_trap = #{old_trap.inspect}"
-      old_trap.each do | sig, trap |
-        Signal.trap(sig, trap) rescue nil
       end
     end
 

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "1.2.10"
+  VERSION = "1.2.11"
 end

data/spec/client_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require 'spec_helper'
 
 require 'asir'
 

data/spec/demux_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require 'spec_helper'
 
 require 'asir'
 require 'asir/transport/demux'

data/spec/example_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require 'spec_helper'
 
 $:.unshift File.expand_path('../../example', __FILE__)
 

data/spec/lib/asir/main_spec.rb

@@ -0,0 +1,57 @@
+require 'asir/main'
+
+describe ASIR::Main do
+  let(:main) { ASIR::Main.new }
+
+  context "#server_pid" do
+    let(:pid_file) do
+      pid_file = "/tmp/#{$$}.#{rand(10000)}.pid"
+      File.exist?(pid_file).should == false
+      pid_file
+    end
+    before(:each) { allow(main).to receive(:pid_file).and_return(pid_file) }
+    after(:each)  { File.unlink(pid_file) rescue nil }
+
+    it "should return non-true if pid_file does not exist" do
+      main.server_pid.should == false
+    end
+
+    it "should return non-true if pid_file is empty" do
+      File.open(pid_file, "w+") { | fh | }
+      main.server_pid.should == nil
+    end
+
+    it "should return non-true if pid_file is empty" do
+      File.open(pid_file, "w+") { | fh | }
+      main.server_pid.should == nil
+    end
+
+    it "should return non-true if pid_file has an empty line" do
+      File.open(pid_file, "w+") { | fh | fh.puts "" }
+      main.server_pid.should == false
+    end
+
+    it "should return non-true if pid_file is broken" do
+      File.open(pid_file, "w+") { | fh | "asdfsd" }
+      main.server_pid.should == nil
+    end
+
+    it "should return pid if pid_file contains a pid" do
+      File.open(pid_file, "w+") { | fh | fh.puts($$.to_s) }
+      main.server_pid.should == $$
+    end
+  end
+
+  context "#process_running?" do
+    it "should return false for invalid values." do
+      main.process_running?(nil).should == nil
+      main.process_running?(false).should == false
+      main.process_running?(0).should == false
+      main.process_running?(1).should == false
+    end
+
+    it "should return pid for a live process." do
+      main.process_running?($$).should == $$
+    end
+  end
+end

data/spec/message_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
-
-$:.unshift File.expand_path('../../example', __FILE__)
+require 'spec_helper'
 
 require 'asir'
 

data/spec/performance_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require 'spec_helper'
 
 require 'asir'
 
@@ -14,18 +14,19 @@ describe "ASIR Performance" do
     object.class.asir.transport = transport
   end
 
-  it 'Raw message time' do
+  it 'Message time using Transport::Local, Coder::Identity' do
+    @desc = 'Raw messaging'
     run! do
       object.return_argument :this_value
     end
-    $raw_t = @t # FIXME!
-  end
+    $raw_t = @t
 
-  it 'Message time using Transport::Local, Coder::Identity' do
+    @desc = 'Message using Transport::Local, Coder::Identity'
     run! do
       object.asir.return_argument :this_value
     end
-    that_t = $raw_t # FIXME!
+
+    that_t = $raw_t
     this_t = @t
     $stderr.puts "\nThis .vs. Raw: #{this_t[:ms_per_n] / that_t[:ms_per_n]} ms/msg / ms/msg"
   end

data/spec/spec_helper.rb

@@ -35,3 +35,10 @@ module ASIR
   end
 end
 
+gem 'rspec-mocks'
+require 'rspec/mocks'
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+  # config.order = "random" # ex04.rb before ex05.rb
+end

data/spec/transport_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require 'spec_helper'
 
 require 'asir'
 

data/spec/yaml_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require 'spec_helper'
 require 'asir/coder/yaml'
 
 describe "ASIR::Coder::Yaml" do

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: asir
 version: !ruby/object:Gem::Version
-  version: 1.2.10
-  prerelease: 
+  version: 1.2.11
 platform: ruby
 authors:
 - Kurt Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,23 +69,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,11 +104,38 @@ dependencies:
   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: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: Abstracting Services in Ruby
 email: ks.ruby@kurtstephens.com
 executables:
@@ -120,6 +149,7 @@ files:
 - .travis.yml
 - ChangeLog
 - Gemfile
+- Guardfile
 - README.textile
 - Rakefile
 - VERSION
@@ -248,6 +278,7 @@ files:
 - spec/debug_helper.rb
 - spec/demux_spec.rb
 - spec/example_spec.rb
+- spec/lib/asir/main_spec.rb
 - spec/message_spec.rb
 - spec/performance_spec.rb
 - spec/retry_behavior_spec.rb
@@ -260,34 +291,27 @@ files:
 - stylesheets/slides.css
 homepage: http://github.com/kstephens/abstracting_services_in_ruby
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2998837259913580415
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2998837259913580415
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Abstracting Services in Ruby
 test_files:
 - spec/adaptive_value_spec.rb
@@ -295,6 +319,7 @@ test_files:
 - spec/debug_helper.rb
 - spec/demux_spec.rb
 - spec/example_spec.rb
+- spec/lib/asir/main_spec.rb
 - spec/message_spec.rb
 - spec/performance_spec.rb
 - spec/retry_behavior_spec.rb