maestro_common 0.0.1 → 0.0.2

data/.gitignore

@@ -11,6 +11,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock
 
 # YARD artifacts
 .yardoc

data/.ruby-version

@@ -0,0 +1 @@
+jruby-1.6.8

data/lib/maestro_common/logging/maestro_logging.rb

@@ -0,0 +1,93 @@
+# Copyright 2011© MaestroDev.  All rights reserved.
+
+require 'logging'
+
+module Maestro
+
+  if !Maestro.const_defined?("Logging")
+
+    module Logging
+
+      DEFAULT_EMAIL_CONFIG = {
+        :level => :error,
+        :from => "noreply@maestrodev.com",
+        :to => "maestro-commits@maestrodev.com",
+        :server => "localhost",
+        :port => 25,
+        #:domain => "localhost.localdomain"
+        #:acct => "user",
+        #:passwd => "password",
+        #:authtype => :cram_md5,
+        :subject => "[#{$0}] LOG NOTIFICATION", # $0 is the name of the program used in the cmdline
+        :buffer_size => 1 # send emails immediately
+      }
+
+      def setup_logging(log_file, log_pattern="%d [Thread-%t] %-5l - %m\n", date_pattern = "%Y-%m-%d %H:%M:%S,%L")
+        @@log_path = File.dirname(log_file)
+        FileUtils.mkdir_p @@log_path
+        puts "Logging to #{File.expand_path(log_file)}"
+
+        # define a rolling file log
+        rolling_file = ::Logging.appenders.rolling_file(
+          log_file,
+          :age    => 'daily',
+          :layout => ::Logging::Layouts::Pattern.new(:date_pattern => date_pattern, :pattern => log_pattern))
+
+
+        # Setup a module-wide logger
+        @@log = ::Logging::Logger.new(log_file)
+        @@log.additive = false
+        @@log.add_appenders(rolling_file)
+
+        # logging of the 'logging' framework itself. Useful for debugging 'log by email' issues
+        ::Logging::Logger[::Logging].level=:info
+        ::Logging::Logger[::Logging].add_appenders(rolling_file)
+
+        # unless in production or test
+        unless (ENV['MAESTRO_ENV'] == 'production' || ENV['MAESTRO_ENV'] == 'test')
+
+          # show "debug" or higher messages on STDOUT using the Basic layout
+          stdout = ::Logging.appenders.stdout(
+            :level => :debug,
+            :layout => ::Logging::Layouts::Pattern.new(:date_pattern => date_pattern, :pattern => log_pattern))
+
+          @@log.add_appenders(stdout)
+          ::Logging::Logger[::Logging].add_appenders(stdout)
+
+          # For some reason not having this line causes "warning: syswrite for buffered IO" messages
+          # in the Logging gem.
+          puts "Logging configured"
+        end
+      end
+
+      def setup_logging_email(config)
+        # send high priority logs via e-mail
+        # options from logging https://github.com/TwP/logging/blob/master/lib/logging/appenders/email.rb
+        # and net/smtp http://www.ruby-doc.org/stdlib-1.9.3/libdoc/net/smtp/rdoc/Net/SMTP.html#method-i-start
+
+        # remove nils in config passed, change keys to be symbols instead of strings
+        myconfig = config.delete_if { |k, v| v.nil? }.inject({}) { |h, (k, v)| h[k.to_sym] = v; h }
+        # merge defaults with config values
+        email_config = DEFAULT_EMAIL_CONFIG.merge(myconfig)
+        email = ::Logging.appenders.email('email', email_config)
+        @@log.add_appenders(email)
+      end
+
+      def log
+        return @@log
+      end
+
+      def log_level=(level)
+        @@log.level = level.is_a?(Symbol) ? level : level.downcase.to_sym
+      end
+
+      def log_level
+        @@log.level
+      end
+
+      def log_path
+        @@log_path
+      end
+    end
+  end
+end

data/lib/maestro_common/version.rb

@@ -1,5 +1,5 @@
 module Maestro
   module Common
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/maestro_common.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'onstomp'
-  spec.add_dependency 'logging', '1.8.0'
-  spec.add_dependency 'rubyzip', '0.9.8'
+  spec.add_dependency 'logging', '>= 1.8.0'
+  spec.add_dependency 'rubyzip', '>= 0.9.8'
   spec.add_dependency 'json', '>= 1.4.6'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler', '>= 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'jruby-openssl'
-  spec.add_development_dependency 'rspec', '~> 2.13.0'
+  spec.add_development_dependency 'rspec', '>= 2.13.0'
 
 end

metadata

@@ -2,7 +2,7 @@
 name: maestro_common
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
   - Doug Henderson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-12 00:00:00 Z
+date: 2013-07-16 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: onstomp
@@ -28,7 +28,7 @@ dependencies:
     version_requirements: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - "="
+        - - ">="
           - !ruby/object:Gem::Version 
             version: 1.8.0
     requirement: *id002
@@ -39,7 +39,7 @@ dependencies:
     version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - "="
+        - - ">="
           - !ruby/object:Gem::Version 
             version: 0.9.8
     requirement: *id003
@@ -61,7 +61,7 @@ dependencies:
     version_requirements: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
             version: "1.3"
     requirement: *id005
@@ -94,7 +94,7 @@ dependencies:
     version_requirements: &id008 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
             version: 2.13.0
     requirement: *id008
@@ -111,13 +111,13 @@ extra_rdoc_files: []
 
 files: 
   - .gitignore
-  - .rvmrc
+  - .ruby-version
   - Gemfile
-  - Gemfile.lock
   - README.md
   - Rakefile
   - lib/maestro_common/common.rb
   - lib/maestro_common/helpers/mq_helper.rb
+  - lib/maestro_common/logging/maestro_logging.rb
   - lib/maestro_common/utils/retryable.rb
   - lib/maestro_common/version.rb
   - maestro_common.gemspec

data/.rvmrc

@@ -1 +0,0 @@
-rvm use jruby-1.6.8

data/Gemfile.lock

@@ -1,43 +0,0 @@
-PATH
-  remote: .
-  specs:
-    maestro_common (0.0.1)
-      json (>= 1.4.6)
-      logging (= 1.8.0)
-      onstomp
-      rubyzip (= 0.9.8)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    bouncy-castle-java (1.5.0147)
-    diff-lcs (1.2.4)
-    jruby-openssl (0.8.8)
-      bouncy-castle-java (>= 1.5.0147)
-    json (1.8.0-java)
-    little-plugger (1.1.3)
-    logging (1.8.0)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.3.6)
-    multi_json (1.7.6)
-    onstomp (1.0.5)
-    rake (10.0.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rubyzip (0.9.8)
-
-PLATFORMS
-  java
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  jruby-openssl
-  maestro_common!
-  rake
-  rspec (~> 2.13.0)