smartguard 0.2.9 → 0.2.10

data/bin/smartguard

@@ -1,8 +1,11 @@
 #!/usr/bin/env ruby
 
 require 'smartguard'
+require 'colored'
 require 'dante'
 
+Smartkiosk::Common::Patches.dante_should_log_with Smartguard::Logging.logger
+
 runner = Dante::Runner.new('smartguard')
 runner.description = "Smartkiosk services control daemon"
 

data/lib/smartguard.rb

@@ -2,7 +2,9 @@ require 'active_support/all'
 require 'pathname'
 require 'fileutils'
 require 'drb'
-require "socket"
+require 'socket'
+
+require 'smartkiosk/common'
 
 require 'smartguard/version'
 require 'smartguard/logging'

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

@@ -5,18 +5,17 @@ module Smartguard
         def start
           super
 
-          Logging.logger.info "Starting thin"
-
           if Smartguard.environment == :development
-            port = 3001
+            Logging.logger.info "Skipping thin; Please run manually".black_on_white.bold
+            return true
           else
-            port = 3000
+            Logging.logger.info "Starting thin"
           end
 
           if !run(@path,
                   {},
                   "bundle", "exec",
-                  "thin", "-e", Smartguard.environment.to_s, "-p", port.to_s,
+                  "thin", "-e", Smartguard.environment.to_s, "-p", 3000,
                   "start"
                  )
             return false

data/lib/smartguard/logging.rb

@@ -1,32 +1,5 @@
-require 'logger'
-
 module Smartguard
-  module Logging
-
-    def self.logdir=(dir)
-      @logdir = dir
-    end
-
-    def self.logger
-      @logger ||= begin
-        log = Logger.new(STDOUT)
-        log.level = Logger::DEBUG
-        log.formatter = Logger::Formatter.new
-        log
-      end
-    end
-
-    def self.logger=(val)
-      @logger = (val ? val : Logger.new('/dev/null'))
-    end
-
-    def self.logfile=(val)
-      @logfile = val
-    end
-
-    def self.logfile
-      @logfile
-    end
-
+  module Logging extend Smartkiosk::Common::Logging
+    self.service = 'Smartguard'
   end
 end

data/lib/smartguard/version.rb

@@ -1,3 +1,3 @@
 module Smartguard
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/smartguard.gemspec

@@ -17,9 +17,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "i18n"
-  gem.add_runtime_dependency "activesupport"
-  gem.add_runtime_dependency "dante"
+  gem.add_dependency 'smartkiosk-common'
+  gem.add_dependency 'i18n'
+  gem.add_dependency 'activesupport'
+  gem.add_dependency 'dante'
+  gem.add_dependency 'colored'
 
-  gem.add_development_dependency "pry"
+  gem.add_development_dependency 'pry'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartguard
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: smartkiosk-common
+  requirement: &70155562307000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70155562307000
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70259522045200 !ruby/object:Gem::Requirement
+  requirement: &70155562306420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259522045200
+  version_requirements: *70155562306420
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70259522044780 !ruby/object:Gem::Requirement
+  requirement: &70155562305820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259522044780
+  version_requirements: *70155562305820
 - !ruby/object:Gem::Dependency
   name: dante
-  requirement: &70259522044320 !ruby/object:Gem::Requirement
+  requirement: &70155562304860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70155562304860
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: &70155562304200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259522044320
+  version_requirements: *70155562304200
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70259522043880 !ruby/object:Gem::Requirement
+  requirement: &70155562303400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259522043880
+  version_requirements: *70155562303400
 description: Smartguard is the Smartkiosk services control daemon
 email:
 - boris@roundlake.ru