trueandco_analytics 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef72a2fa99a4c541a73e17070841802585efe9d
-  data.tar.gz: cb5413156e06f8a00b70bdb1f9947a86c22cf204
+  metadata.gz: 9c5e7362fdc8ee18d920be56be5a5239c29c945d
+  data.tar.gz: 6cbb35319c7ba3e65da8f2ac2c26cd1dde7c4b06
 SHA512:
-  metadata.gz: 7376c24d0251350d458951104823150d897443d0a97000673a5042e8fc1acc9ba44ffc029466fc4cdc652815eb93f44540c017deb0552031764130a00d1fc7c2
-  data.tar.gz: 1559c7b5dc3838a0435144274afc2676ae24b4c96dc0616fafef10d0113c59a1d9b8cc9f885a9d96951c8b7595f6c176824355e9ffb3f7355120b6f9a19c7568
+  metadata.gz: bc3a1b923e3fcbdc2de474dd751ddc2360139b07f712acbb643b8c57fb0ed08553881e355bbaaf31915f9b310adf03a450d38eb304287d284df46ea04005ff80
+  data.tar.gz: c1df04195b4ed047a2258933db51642a6060d072736bc632777952a8ea0dd7130c154a089f9b6534c080ccc0155719b92104fbc2c9636262bbc428e72c6a3df4

data/exe/trueandco_analytics

@@ -1,17 +1,19 @@
 #!/usr/bin/env ruby
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
-CURRENT_PATH = Dir.pwd + '/'
+CURRENT_PATH = Dir.pwd
 
 require 'bundler/setup'
 require 'i18n'
 require 'optparse'
 require 'fileutils'
+require 'yaml'
 require 'active_record'
 require 'mysql2'
 require 'trueandco_analytics'
-require "#{CURRENT_PATH}config/initializers/trueandco_analytics"
+require "#{CURRENT_PATH}/config/initializers/trueandco_analytics"
 
-connect_db = TrueandcoAnalytics::Config::Params.connect_db
+current_db_mode = TrueandcoAnalytics::Config::Params.current_db_mode
+connect_db = TrueandcoAnalytics::Database::GetCurrentConfig.new(current_db_mode, "#{CURRENT_PATH}/config/database.yml").execute
 1.times do
   break if connect_db.nil?
   ActiveRecord::Base.establish_connection(connect_db)

data/lib/generators/trueandco_analytics/templates/trueandco_analytics.rb

@@ -10,9 +10,8 @@ TrueandcoAnalytics.setup do |config|
 
   # Specify the database where redis will store the statistics for the session site
   config.connect_redis = {
-    #url: "redis://your_host:6379",
+    url: "redis://localhost:6379/1",
     #redis_password: '',
-    redis_db: 1
   }
 
   # Specify Sidekiq config
@@ -20,18 +19,9 @@ TrueandcoAnalytics.setup do |config|
   config.sidekiq_configure_server_url      = 'redis://localhost:6379/1'
   config.sidekiq_configure_namespace       = 'metric'
 
-  #Log name in rails app
+  # Log name in rails app
   config.log = nil
 
-  #Specify the database to use in console mode
-=begin
-  config.connect_db = {
-      adapter: :mysql2,
-      database: 'development_db_name',
-      username: 'ivan',
-      password: '3443555',
-      host:     '127.0.0.1',
-      port: 3306
-  }
-=end
+  # Specify current database mode of config/database.yml to use in console mode
+  config.current_db_mode = 'development'
 end

data/lib/trueandco_analytics/config/params.rb

@@ -20,8 +20,8 @@ module TrueandcoAnalytics
       @sidekiq_configure_namespace_check = false
       @log                               = nil
       @log_check                         = false
-      @connect_db                        = nil
-      @connect_db_check                  = false
+      @current_db_mode                   = nil
+      @current_db_mode_check             = false
 
       class << self
 
@@ -42,12 +42,12 @@ module TrueandcoAnalytics
         end
 
         attr_reader :time_survey, :time_dead_session, :buy_selector,
-          :sidekiq_configure_client_url, :sidekiq_configure_server_url, :sidekiq_configure_namespace,
-          :connect_db, :connect_redis
-        
+          :sidekiq_configure_client_url, :sidekiq_configure_server_url, :sidekiq_configure_namespace, :connect_redis,
+          :current_db_mode
+
         attr_writer_only_once :time_survey, :user_method,
-          :sidekiq_configure_client_url, :sidekiq_configure_server_url, :sidekiq_configure_namespace,
-          :connect_db, :connect_redis
+          :sidekiq_configure_client_url, :sidekiq_configure_server_url, :sidekiq_configure_namespace, :connect_redis,
+          :current_db_mode
 
         def buy_selector=(value)
           return if value.nil?

data/lib/trueandco_analytics/console/commands/database/get_current_config.rb

@@ -0,0 +1,20 @@
+module TrueandcoAnalytics::Database
+  class GetCurrentConfig
+
+    def initialize(current_mode, path)
+      @current_mode = current_mode
+      @path = path
+    end
+
+    def execute
+      config = YAML.load_file(path)
+      config[current_mode]
+    rescue StandardError => e
+      return nil
+    end
+
+    private
+
+    attr_reader :current_mode, :path
+  end
+end

data/lib/trueandco_analytics/console/commands/report_c/generate.rb

@@ -7,7 +7,7 @@ module TrueandcoAnalytics::ReportC
       @format = format
       @datetime_start = datetime_start
       @datetime_end = datetime_end
-      @path = path || CURRENT_PATH
+      @path = path || (CURRENT_PATH + '/')
     end
 
     def execute

data/lib/trueandco_analytics/version.rb

@@ -1,3 +1,3 @@
 module TrueandcoAnalytics
-  VERSION = '0.4.10'
+  VERSION = '0.4.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trueandco_analytics
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Moroz Ivan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -204,6 +204,7 @@ files:
 - lib/trueandco_analytics/config/params.rb
 - lib/trueandco_analytics/console/cli/common.rb
 - lib/trueandco_analytics/console/cli/report.rb
+- lib/trueandco_analytics/console/commands/database/get_current_config.rb
 - lib/trueandco_analytics/console/commands/report_c/generate.rb
 - lib/trueandco_analytics/console/extension_string.rb
 - lib/trueandco_analytics/engine.rb