smartguard 0.3.12 → 0.4.1

data/lib/smartguard/applications/smartkiosk.rb

@@ -43,7 +43,8 @@ module Smartguard
       end
 
       def reboot
-        system 'reboot'
+        stop_services
+        Process.spawn 'reboot'
       end
 
       def reboot_async
@@ -62,6 +63,7 @@ module Smartguard
         raise "Release doesn't exist: #{release.to_s}" unless File.exist? release
 
         FileUtils.mkdir_p "#{release}/tmp/pids"
+        FileUtils.mkdir_p "#{release}/log"
 
         FileUtils.cd(release) do
           Logging.logger.info "Symlinking"
@@ -84,12 +86,6 @@ module Smartguard
           end
         end
 
-        begin
-         yield if block_given?
-        rescue Exception => e
-          Logging.logger.warn "Switch handler failed: #{e}"
-        end
-
         self.stop_services
 
         Logging.logger.info "Switching symlink from `#{@active_path}` to `#{release}`"
@@ -105,6 +101,8 @@ module Smartguard
           FileUtils.ln_s @active_path, @current_path
 
           self.start_services
+
+          raise "startup failed"
         end
       end
 

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

@@ -5,6 +5,8 @@ module Smartguard
         def start
           super
 
+          Logging.logger.info "Starting smartware"
+
           log_file    = @path.join('log/smartware.log')
           config_file = @path.join('config/services/smartware.yml')
 
@@ -13,7 +15,6 @@ module Smartguard
             opts << "--log=#{log_file}"
           end
 
-          Logging.logger.info "Starting smartware"
           if !run(@path, {}, "bundle", "exec", "smartware", "--config=#{config_file}", *opts)
             return false
           end

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

@@ -23,7 +23,7 @@ module Smartguard
                   'RACK_ENV' => Smartguard.environment.to_s
                 },
                   "bundle", "exec",
-                  "smartkiosk-client", "web", *opts
+                  "smartkiosk-client", *opts
                  )
             return false
           end

data/lib/smartguard/client.rb

@@ -1,12 +1,13 @@
 module Smartguard
-  class Client
-    def initialize(port=10000)
-      DRb.start_service
-      @instance = DRbObject.new_with_uri("druby://localhost:#{port}")
-    end
+  module Client
+
+    DRb.start_service
+    @instance = DRbObject.new_with_uri('druby://localhost:10000')
 
-    def method_missing(method, *args, &block)
-      @instance.send method, *args, &block
+    class << self
+      def method_missing(method, *args, &block)
+        @instance.send method, *args, &block
+      end
     end
   end
 end

data/lib/smartguard/version.rb

@@ -1,3 +1,3 @@
 module Smartguard
-  VERSION = "0.3.12"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartguard
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
-  requirement: &70316762256400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70316762256400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70316762255200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70316762255200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70316762253960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70316762253960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70316762252580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70316762252580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70316762251460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70316762251460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70316762250820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70316762250820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Smartguard is the Smartkiosk services control daemon
 email:
 - boris@roundlake.ru
@@ -126,9 +156,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Smartguard is the Smartkiosk services control daemon
 test_files: []
-has_rdoc: