internet_box_logger 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7afc0afd8ec9a4c5f37cfa6ed3dca992c7916a9
-  data.tar.gz: a4d00e7a5c1278c04d1583e94fadf2a05a5fae56
+  metadata.gz: a59ffcb1c5b1539ebbd924f9ab72bc88258d4f46
+  data.tar.gz: 36e2d9162001a46547a45967370391ff01a1ff00
 SHA512:
-  metadata.gz: 3eeee3f118d8da95c48118946a8e3355189c747ab26f7a8afdf0939b83a084678273e0290fbc29ab360a2485c2263ff3369f9a894a8aa96afa0a225959f2766f
-  data.tar.gz: 6585bc4a07e63529fb4c74d03d64682b33582d5aa74fb42dbab887d82fd1588bd0a934190e274ddeb2e0d6e86f46158f490eef5b2993a34d31b27317972c4983
+  metadata.gz: b680ac59f0250ec7f86ed70aef66203696d3eb5cd9d93436f2200779594a3b9503b2eb3cda37e23bcd79c1ad42e03398c9cf03e13c533b96328cd8584c026eb1
+  data.tar.gz: 33c31ae69d29a7ba714349e621d0fff4d4a514135530547424d7eda388dcc38b34a97fb3b521038eddffb68f73124f873bc7e4d051f0502c3205c38738e093df

data/bin/internet_box_logger

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'bundler/setup'
 require 'internet_box_logger'
 require 'tasks/internet_box_logger_tasks'
 
@@ -15,19 +13,14 @@ module InternetBoxLogger
     def initialize
       # Providing this data is optional but brings better logging and online help
       config.describes_application(app_name: APP_NAME, app_version: InternetBoxLogger::VERSION, app_description: DESCRIPTION)
-      # Ugly hack to fix issue with easy_app_helper way of managing gem config files
-      gem_conf_file = File.join EasyAppHelper::Core::Config::Places.gem_root_path(__FILE__), 'config', 'internet_box_logger.conf'
-      config.internal_configs[:gem] = {
-          content: Hash[YAML::load(File.open(gem_conf_file)).map { |k, v| [k.to_sym, v] }],
-          source: gem_conf_file,
-          origin: :internet_box_logger
-      }
+      add_cmd_line_options
+      logger.debug "Detailed configuration ->\n#{config.detailed_layers_info}"
+      logger.debug "Merged configuration ->\n#{config[].to_yaml}"
     end
 
     def run
-      add_cmd_line_options
       if config[:help]
-        puts config.help
+        puts config.command_line_help
         exit 0
       end
       begin
@@ -99,5 +92,4 @@ module InternetBoxLogger
 
   end
 end
-
-InternetBoxLogger::Script.new.run
+InternetBoxLogger::Script.new.run

data/internet_box_logger.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rake', '~> 10.4'
+  spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'pry'
 
-  spec.add_dependency 'activesupport'
-  spec.add_dependency 'whenever'
-  spec.add_dependency 'easy_app_helper'
-  spec.add_dependency 'elasticsearch'
+  spec.add_dependency 'activesupport', '~> 4.2'
+  spec.add_dependency 'whenever', '~> 0.9'
+  spec.add_dependency 'easy_app_helper', '~> 2.0'
+  spec.add_dependency 'elasticsearch', '~> 1.0'
 
 end

data/lib/internet_box_logger/version.rb

@@ -1,3 +1,3 @@
 module InternetBoxLogger
-  VERSION = "0.1.9"
+  VERSION = '0.2.0'
 end

data/lib/tasks/elastic_search.rb

@@ -29,10 +29,10 @@ module InternetBoxLogger
             yield f
           end
           pid = es_pid
-          raise "Invalid operation on pid file" if pid.nil? || pid < 1
+          raise 'Invalid operation on pid file' if pid.nil? || pid < 1
         else
-          raise "Specify a pid or a block !" if pid.nil?
-          raise "Invalid pid!" unless pid.is_a? Fixnum
+          raise 'Specify a pid or a block !' if pid.nil?
+          raise 'Invalid pid!' unless pid.is_a? Fixnum
           File.open(ES_PID_FILE, 'w+') do |f|
             f.puts pid
           end

data/lib/tasks/internet_box_logger_tasks.rake

@@ -10,7 +10,9 @@ namespace :internet_box_logger do
 
   task :booted_environment do
     require 'internet_box_logger'
-    EasyAppHelper.config.script_filename = "#{ibl_gem_path}/config/internet_box_logger.conf"
+    EasyAppHelper.config[:'config-file'] = "#{ibl_gem_path}/config/internet_box_logger.conf"
+    EasyAppHelper.config.provided_config_file_layer.managed
+    EasyAppHelper.config.reload_layers
     EasyAppHelper.config[:verbose] = true
   end
 

data/spec/spec_helper.rb

@@ -15,8 +15,11 @@
 #
 
 require 'internet_box_logger'
-EasyAppHelper.config.script_filename = File.expand_path '../../config/internet_box_logger.conf', __FILE__
+
+EasyAppHelper.config[:'config-file'] = File.expand_path '../../config/internet_box_logger.conf', __FILE__
+EasyAppHelper.config.provided_config_file_layer.managed
 EasyAppHelper.config[:freebox_alternate_url] = File.expand_path '../../test/freebox_page_example.txt', __FILE__
+EasyAppHelper.config.reload_layers
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: internet_box_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Laurent B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,30 +28,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -70,58 +70,58 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: whenever
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: easy_app_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Logs information gathered from your internet box and stores into ElasticSearch
   for display into Kibana.
 email: