smartguard 0.1.1 → 0.1.2

data/bin/smartguard

@@ -1,23 +1,51 @@
 #!/usr/bin/env ruby
 
 require 'smartguard'
-require 'trollop'
+require 'dante'
 
-opts = Trollop::options do
-  opt :application, "Application to use", :type => :string
-  opt :path, "Path to application", :type => :string
-  opt :port, "Port to run DRB", :type => :integer, :default => 10000
+runner = Dante::Runner.new('smartguard')
+runner.description = "Smartkiosk services control daemon"
+
+runner.with_options do |opts|
+  options[:port] = 10000
+
+  opts.on("-a", "--app APPLICATION", String, "Application to use") do |x|
+    options[:application] = x
+  end
+  opts.on("-x", "--path PATH", String, "Path to application") do |x|
+    options[:path] = x
+  end
+
+  opts.on("-p", "--port PORT", Integer, "Port to run DRB (default: #{options[:port]})") do |x|
+    options[:port] = x
+  end
+
+  opts.on("-s", "--start", "Start all services and exit") do |x|
+    options[:start] = x
+  end
+
+  opts.on("-S", "--stop", "Stop all services and exit") do |x|
+    options[:stop] = x
+  end
 end
 
-raise "You should specify application (--application)" if opts[:application].blank?
-raise "You should specify application path (--path)" if opts[:path].blank?
+runner.execute do |opts|
+  abort "You should specify application (--app)" if opts[:application].blank?
+  abort "You should specify application path (--path)" if opts[:path].blank?
 
-application = Smartguard::Applications.const_get(opts[:application].camelize) rescue nil
+  application = Smartguard::Applications.const_get(opts[:application].camelize) rescue nil
 
-raise "Application `#{opts[:application]}` not supported" if application.nil?
+  abort "Application `#{opts[:application]}` not supported" if application.nil?
 
-application = application.new(opts[:path])
-application.warm_up
+  application = application.new(opts[:path])
 
-DRb.start_service("druby://localhost:#{opts[:port]}", application)
-DRb.thread.join
+  if opts[:stop]
+    application.stop_services
+  elsif opts[:start]
+    application.start_services
+  else
+    application.warm_up
+    DRb.start_service("druby://localhost:#{opts[:port]}", application)
+    DRb.thread.join
+  end
+end

data/lib/smartguard/applications/smartkiosk/smartware.rb

@@ -3,18 +3,18 @@ module Smartguard
     class Smartkiosk
       class Smartware < Smartguard::Process
         def initialize(path)
-          @path      = path
-          @pids_path = path.join('tmp/pids')
-          @logs_path = path.join('log')
+          @path     = path
+          @pid_file = path.join('tmp/pids/smartware.pid')
+          @log_file = path.join('log/smartware.log')
         end
 
         def pid
-          File.read("#{@pids_path}/smartware.pid").to_i rescue nil
+          File.read(@pid_file).to_i rescue nil
         end
 
         def start
           Logging.logger.info "Starting smartware"
-          run @path, "bundle exec smartware piddir=#{@pids_path} logdir=#{@logs_path} &"
+          run @path, "bundle exec smartware -d --pid=#{@pid_file} --log=#{@log_file}"
         end
 
         def stop

data/lib/smartguard/applications/smartkiosk.rb

@@ -45,7 +45,7 @@ module Smartguard
         start_services(path)
       end
 
-      def restart_asyn(path=nil)
+      def restart_async(path=nil)
         Thread.new{ self.restart(path) }
         true
       end

data/lib/smartguard/version.rb

@@ -1,3 +1,3 @@
 module Smartguard
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/smartguard.rb

@@ -1,4 +1,5 @@
 require 'active_support/all'
+require 'pathname'
 require 'fileutils'
 require 'drb'
 

data/smartguard.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "i18n"
   gem.add_runtime_dependency "active_support"
-  gem.add_runtime_dependency "trollop"
+  gem.add_runtime_dependency "dante"
 
   gem.add_development_dependency "pry"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartguard
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70236313873140 !ruby/object:Gem::Requirement
+  requirement: &70350512255040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236313873140
+  version_requirements: *70350512255040
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70236313872100 !ruby/object:Gem::Requirement
+  requirement: &70350512253720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236313872100
+  version_requirements: *70350512253720
 - !ruby/object:Gem::Dependency
-  name: trollop
-  requirement: &70236313871280 !ruby/object:Gem::Requirement
+  name: dante
+  requirement: &70350512252860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236313871280
+  version_requirements: *70350512252860
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70236313870400 !ruby/object:Gem::Requirement
+  requirement: &70350512252360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236313870400
+  version_requirements: *70350512252360
 description: Smartguard is the Smartkiosk services control daemon
 email:
 - boris@roundlake.ru