dorsal 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b142bf4c6b5a14321f07c27e1de317bbe7bec8e
-  data.tar.gz: 31bbcd213f7c18aac8671d0041c00b6d7657e499
+  metadata.gz: 4e82d933806e0255c66968fe5f2fe7f701a02a0d
+  data.tar.gz: a27db6a906a821a5e9533b114da2033333c24b9b
 SHA512:
-  metadata.gz: 6dead18e0122a5999e7d6276e709ec05492e3a7abcea00759ab6851bc8bdc1d2f58190225e830e1bbfa5e82a9ce0ac18de4bc8a9e011f270cc715b757a6cde63
-  data.tar.gz: da7218d7a318d41d98ccd3dc814c7f90c0a6f5c4d8f755dbbd703c0150a17684518b8762343f425ccf25e548ec43d8d3a5ec21d01e18171a93ab814b1b5c6b06
+  metadata.gz: daeb92cb458fcb8e3a8f9e81a5ebcf508b35b06927653c922bc9064f3811bfb0bcae597f33bb29eb96b8a2d8d97e5203a7aaef45e59bffa6dfd7b72f0ec37028
+  data.tar.gz: 291620ac39e58b59f991599c4bc91c73a18b1997101626162b3094ffa31776078bc853d6d366d1a180b9d187bf84075a700890bff9ebcc50c3ce0df937c4a8f6

data/lib/dorsal/controller.rb

@@ -72,7 +72,7 @@ module Dorsal
     def bind_to_ring
       if ring_server_status then
         DRb.start_service
-        return DRbObject.new nil, @options[:uri]
+        return DRbObject.new_with_uri @options[:uri]
       else
         return nil
       end

data/lib/dorsal/exceptions.rb

@@ -9,5 +9,5 @@
 # the Dorsal Namespace
 module Dorsal
   # Exception class override from servers errors
-  class ServerError < Exception; end
+  class RingServerError < Exception; end
 end

data/lib/dorsal/privates.rb

@@ -120,7 +120,7 @@ module Dorsal
       options.specify_presences_of :description, :pid_file
       options.validate
       raise Dorsal::RingServerError::new('already running, pid file exist') if File::exist?(options[:pid_file])
-      raise Dorsal::RingServerError::new('already running') unless `ps aux|grep ruby|grep -v grep |grep '#{options[:description]}'`.empty?
+      raise Dorsal::RingServerError::new('already running, process found') unless `ps aux|grep -v grep |grep '#{options[:description]}'`.empty?
       return daemonize(options) do
         yield
       end
@@ -171,7 +171,7 @@ module Dorsal
       options = Methodic::get_options(_options)
       options.specify_presences_of :description, :pid_file
       options.validate
-      pid = `COLUMNS=160 ps aux|grep ruby|grep -v grep |grep '#{options[:description]}'|awk '{ print $2}'`
+      pid = `COLUMNS=160 ps aux|grep -v grep |grep '#{options[:description]}'|awk '{ print $2}'`
       if pid.empty? then
         return false
       else

data/lib/dorsal/version.rb

@@ -10,5 +10,5 @@
 module Dorsal
 
   # global version of Dorsal
-  VERSION = "1.1"
+  VERSION = "1.2"
 end

data/spec/dorsal_spec.rb

@@ -15,12 +15,19 @@ RSpec.configure do |config|
   config.mock_with :rspec do |c|
     c.syntax = :should
   end
+
+  if $stdout.isatty then
+    config.color = true
+    config.tty = true
+  end
+  config.formatter = :documentation # :progress, :html, :textmate
 end
 
 
+
 describe "Dorsal" do
   before :all do
-    File::unlink('/tmp/dorsal_ringserver.pid') if File::exist?('/tmp/dorsal_ringserver.pid')
+    File::unlink('/tmp/dorsal/ringserver.pid') if File::exist?('/tmp/dorsal/ringserver.pid')
     pid = `ps aux|grep ruby|grep -v grep |grep 'Dorsal Ring Server'|awk '{ print $2}'`
     unless pid.empty? then
       res = `kill -TERM #{pid.chomp}`
@@ -53,10 +60,11 @@ describe "Dorsal" do
         it { should respond_to :start_ring_server }
         it { subject.start_ring_server.should be_an_instance_of Fixnum }
         it "should return false if try to start twice" do
+#          lambda { subject.start_ring_server}.should raise_error Dorsal::RingServerError
           subject.start_ring_server.should be false
         end
         it "should exist an instance process of the Ring server" do 
-          pid = `ps aux|grep ruby|grep -v grep |grep 'Dorsal Ring Server'|awk '{ print $2}'`.chomp
+          pid = `ps aux|grep -v grep |grep 'Dorsal Ring Server'|awk '{ print $2}'`.chomp
           pid.should_not be_empty
         end
         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsal
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methodic