daemon-ogre 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e2e72f8f2cec1041946fbc40dc1fd0800440bfd
-  data.tar.gz: defa4621c6d460432298430ebebdf7b1bac598e0
+  metadata.gz: 6ac6b5568ddd979373abac556fb64eb9d0249870
+  data.tar.gz: 62a1d719cc292857bf29445d55ebd1beaa2c2ed2
 SHA512:
-  metadata.gz: 7c760ff529c3bffa637421be4ea440ea4fd66abf821c8d6fa0fcd548f07b0a173b456bb722cdedde245fa74034032008436e56e36ab20558b72885849ffdc2cf
-  data.tar.gz: a1991e7b9a9956737bd239a68587a334004fb234c492ecd5d5057b61cd7e8581a4547efbca8cb562bed24b6cfe3be25b078ae21c1fbc1756aee15cc00ec94d61
+  metadata.gz: 79113227fd66e6133a81baf23a93cc82a78b36eb0f4d77b8e1840356491247ac828e65de0c4441a4c357e874ecafe3f824d31d6412fcde710a4a9f7e52424e90
+  data.tar.gz: bda1cdf3945e0617029e7235cff99d629d714e3c1d7bf6ece52e9142aae20dc146c13ffaeca750eafbd9104096c9ab6ee776fa90b591f2cf4d19845d5d62dbda

data/Gemfile.lock

@@ -1,14 +1,16 @@
 PATH
   remote: .
   specs:
-    daemon-ogre (2.1.3)
-      tmp (>= 2.2.2)
+    daemon-ogre (2.2.0)
+      configer
+      tmp (>= 4.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    configer (2.1.0)
     rake (10.0.4)
-    tmp (3.1.0)
+    tmp (4.1.0)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.2.0

data/daemon-ogre.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |spec|
   spec.test_files     = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths  = ["lib"]
 
-  spec.add_dependency 'tmp',  '>= 2.2.2'
+  spec.add_dependency 'tmp',  '>= 4.1.0'
+  spec.add_dependency 'configer'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/example/daemonizable.rb

@@ -1,18 +1,20 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__),'..','lib'))
 require 'daemon-ogre'
 
 # start as
 #   ruby sample_daemon_app.rb --daemon
 # puts "app name: #{$0}"
+ARGV.unshift '--daemon'
+puts "ps aux | grep #{$0}"
+puts "tail -f #{DaemonOgre::OPTS.tmp_folder_path}/*"
 
 DaemonOgre.init
 
-60.times do
+10.times do
 
   puts Time.now
   sleep 1
 
 end
 
-sleep 1
-# to check it's running
-`ps aux | grep $0`
+raise('some err')

data/lib/daemon-ogre.rb

@@ -1,6 +1,5 @@
-
-require 'tmp'
-
-require 'daemon-ogre/opts'
-require 'daemon-ogre/argv'
-require 'daemon-ogre/daemon'
+module DaemonOgre
+  require 'daemon-ogre/opts'
+  require 'daemon-ogre/argv'
+  require 'daemon-ogre/daemon'
+end

data/lib/daemon-ogre/daemon.rb

@@ -1,11 +1,9 @@
 # use Daemon.daemonize or Process.daemonize
 module DaemonOgre
-
   module Daemon
 
     class << self
 
-
       # Checks to see if the current process is the child process and if not
       # will update the pid file with the child pid.
       def start pid
@@ -174,7 +172,6 @@ module DaemonOgre
     def init
       Daemon.init
     end
-    # alias :new :init
   end
 
 end

data/lib/daemon-ogre/opts.rb

@@ -1,35 +1,53 @@
+require 'tmp'
+require 'configer'
 module DaemonOgre
 
   module OPTS
-    class << self
 
-      def tmp_folder_path obj= nil
-        @@path  ||= nil
-        @@path    = obj unless obj.nil?
-        @@path  ||  "#{::TMP.folder_path.to_s}_daemon"
-      end
+    extend self
 
-      def pid *args
-        self.pidfile
-      end
+    def tmp_folder_path(obj= nil)
+      @path ||= nil
+      @path = obj unless obj.nil?
+      @path || __temp__.tmpdir
+    end
 
-      def pid= *args
-        self.pidfile= *args
-      end
 
-      def method_missing method_name, *args
+    def pid
+      pid_number = nil
+      __temp__.open('pid','r+'){|f| pid_number = f.read.chomp }
+      return pid_number
+    end
 
-        @@tmp_dsl ||= ::TMP.new( self.tmp_folder_path )
+    def pidfile=(pid_number)
+      __temp__.open('pid','w'){|f| f.write(pid_number.to_s) }
+    end
 
-        if method_name.to_s.reverse[0] == "="
-          @@tmp_dsl.__send__ method_name,args[0]
-        else
-          @@tmp_dsl.__send__ method_name
-        end
 
-      end
+    def out__path__
+      __temp__.path_for('out')
+    end
 
+    def err__path__
+      __temp__.path_for('err')
     end
-  end
 
+    private
+
+    def __temp__
+      @__temp__ ||= __get_temp_dir
+    end
+
+    def __get_temp_dir
+      require 'tmpdir'
+      temp_folder = File.join(::Dir.tmpdir.to_s, "#{__project_name__}_daemon")
+      Dir.mkdir(temp_folder) unless File.exist?(temp_folder)
+      TMP.new(temp_folder)
+    end
+
+    def __project_name__
+      ::Configer.pwd.split(File::Separator)[-1]
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemon-ogre
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tmp
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: configer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +86,6 @@ files:
 - lib/daemon-ogre/argv.rb
 - lib/daemon-ogre/daemon.rb
 - lib/daemon-ogre/opts.rb
-- test/example.rb
 homepage: http://github.com/adamluzsi/daemon-ogre
 licenses: []
 metadata: {}
@@ -92,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple to use app ARGV based daemonizer
-test_files:
-- test/example.rb
+test_files: []

data/test/example.rb

@@ -1,19 +0,0 @@
-require_relative "daemon-ogre"
-
-DaemonOgre.start :name      => "api_one",          #this will be the name of the application
-                 :log_path  => "./var/log/log_file_name",  #this will be the logfile place and name
-                 :pid_path  => "./var/pid/pid_file_name",  #this will be the pidfile place and name
-                 :terminate => true,                      #this command not let start your code if it's not started
-                 :clear     => true                        # with "start" arguments like :
-                                                           #                  ruby my_awsome_app.rb start
-
-
-
-#my awesome Hello App
-puts "hello App!"
-
-i=0
-until i > 1200
-  sleep 1
-  i+=1
-end