jcangas-datagateway 1.2.2 → 1.4.4

data/lib/datagateway.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'optparse' 
+require 'optparse'
 require 'rdoc/usage'
 require 'ostruct'
 require 'date'
@@ -19,7 +19,7 @@ class LogFormatter < Logger::Formatter
 end
 
 class AppConfig
-	ROOT = File.join(File.dirname(__FILE__), '')
+	GEMROOT =  File.expand_path(File.join(File.dirname(__FILE__), '..'))
   class << self
 		attr :config
 
@@ -28,12 +28,12 @@ class AppConfig
     end
 
 		def run
-			if parsed_options? && arguments_valid? 
+			if parsed_options? && arguments_valid?
 				puts "Start at #{DateTime.now}\\n\\n" if @options.verbose
 
 				output_options if @options.verbose # [Optional]
 
-				process_arguments            
+				process_arguments
 				process_command
 
 				puts "\\nFinished at #{DateTime.now}" if @options.verbose
@@ -53,8 +53,7 @@ class AppConfig
 			@options = OpenStruct.new
 			@options.verbose = false
 			@options.quiet = false
-			@options.debug_on = false
-			@options.environment = (ENV['APP_ENV'] || 'production').dup
+			@options.log_level = nil
 			@options.generate = false
 
 			# Specify options
@@ -63,43 +62,49 @@ class AppConfig
 				opts.separator "----------------------"
 				opts.separator "opciones:"
 
-				opts.on("-h", "--help", "Muestra es mensaje de ayuda.") do
-					ouput_version
-					puts opts
-					exit
-				end
-
-				opts.on("-e", "--environment [ENVIRONMENT]", %w[development production test],
-						"(development | production | test)") { |env|	@options.environment = env }
-
-				opts.on("-g", '--generate [prj_name]', "Genera un proyecto nuevo") { |project|	
+				opts.on("-g", '--generate [PROYECTO]', "Genera un proyecto nuevo en la carpeta PROYECTO") { |project|
 					@options.project = project
-					@options.generate = true 
+					@options.generate = true
+				}
+
+				opts.on("-t", '--template [PLANTILLA]', "Usa PLANTILLA al generar un proyecto") { |template|
+					@options.template =  template
 				}
 
+				opts.on('-j', '--job [FICHERO]', String, 'ejecuta el fichero de trabajos') { |file|
+					@options.file = file
+          @options.job = true
+				}
+
 				opts.on("-q", '--quiet', 'Modo "silencioso": no muestra nada en pantalla durante la ejecución') { @options.quiet = true }
 
 				opts.on('-v', '--version', 'Muestra la version y termina') { output_version ; exit 0 }
 
-				opts.on('-d', '--debug', 'Modo depuración') { @options.debug_on = true }
-
-				opts.on('-f', '--file [FICHERO]', String, 'procesao el fichero') { |file|
-					@options.file = file
+				opts.on('-l', '--level [LEVEL]', [:debug, :warn, :info], 'Nivel de detalle informativo (debug | warn | info)') { |level|
+					@options.log_level = level
 				}
+
+				opts.on_tail("-h", "--help", "Muestra este mensaje de ayuda.") do
+					output_version
+					puts opts
+					exit
+				end
+
 			end
 
 			opts.parse!(ARGV) rescue puts opts; return false
 
 			process_options
-			true      
+			true
 		end
 
 		# Performs post-parse processing on options
 		def process_options
+			@options.template ||= 'nexus' if @options.generate
 		end
 
 		# True if required arguments were provided
-				def arguments_valid?
+		def arguments_valid?
 			# TO DO - implement your real logic here
 			true
 		end
@@ -113,7 +118,7 @@ class AppConfig
 			exit
 			puts "Options:\\n"
 
-			@options.marshal_dump.each do |name, val|        
+			@options.marshal_dump.each do |name, val|
 				puts "  #{name} = #{val}"
 			end
 		end
@@ -129,48 +134,38 @@ class AppConfig
 		end
 
 		def output_version
-			puts "#{Application::VERSION::PRODUCT} version #{Application::VERSION::STRING}"
+			puts version_msg
+		end
+
+		def version_msg
+			"#{Application::VERSION::PRODUCT} version #{Application::VERSION::STRING}"
 		end
 
 		def process_command
-			dir = @options.file ? File.dirname(@options.file) : Dir.pwd
+			dir = @options.job ? File.dirname(@options.file) : Dir.pwd
 			Module.const_set('APP_ROOT', dir) unless Module.const_defined?('APP_ROOT')
-			Module.const_set('APP_ENV', AppConfig.options.environment) unless Module.const_defined?('APP_ENV')
 
-			if @options.generate
-				target = File.expand_path(@options.project)
-				FileUtils.mkdir target
-				puts "generating #{target}"
-				FileUtils.cp_r(File.expand_path(File.join(AppConfig::ROOT, '..', 'template-prj'))+'/.', target, :verbose => !@options.quiet)
-				elsif @options.file
-					run_app(@options.file)
+			if @options.generate
+				command_generate
+				elsif @options.job
+					command_job
 			end
 
 			#process_standard_input # [Optional]
 		end
+
+		def command_generate
+				target = File.expand_path(@options.project)
+				FileUtils.mkdir target
+				puts "generating #{target}"
+				FileUtils.cp_r(File.join(AppConfig::GEMROOT, '..', 'template-prj', "#{@options.template}/."), target, :verbose => !@options.quiet)
+		end
 
-		def process_standard_input
-			input = @stdin.read      
-			# TO DO - process input
-
-			# [Optional]
-			# @stdin.each do |line| 
-			#  # TO DO - process each line
-			#end
-		end
-
-		def logger
-      @logger ||= setup_logger
-    end
-
-    def path(filename='')
-      File.expand_path(filename, APP_ROOT)
-    end
-
-		def run_app(file)
+		def command_job
+			echo version_msg
 			AppConfig.logger.info echo("Data Gateway started")
-			#AppConfig.logger.debug echo("Entorno: #{APP_ENV} \n configuración: #{AppConfig.config.inspect}")
-	
+			#AppConfig.logger.debug echo("configuración: #{AppConfig.config.inspect}")
+
 			require 'activerecord'
 			require 'data_gateway'
 			ActiveRecord::Base.logger = AppConfig.logger
@@ -180,31 +175,52 @@ class AppConfig
 			DataGateway.inbox = AppConfig.path(AppConfig.data['inbox'])
 			DataGateway.outbox = AppConfig.path(AppConfig.data['outbox'])
 			DataGateway.donebox = AppConfig.path(AppConfig.data['donebox'])
-			DataGateway.use_resources = AppConfig.data['use_resources']
+			DataGateway.use_resources = AppConfig.data['use_resources']
+			
+			DataGateway.last_time = AppConfig.last_time
 			DataGateway.resource_path(AppConfig.path(AppConfig.data['resource_path']))
-
 			DataGateway.logger.info "using resources #{DataGateway.use_resources} | #{DataGateway.resource_path}"
-			
+
+			file = @options.file
 			require file
 			## Porque no va:?
-			##eval(File.read(File.expand_path(file))) 
-			
+			##eval(File.read(File.expand_path(file)))
+
+			AppConfig.last_time = DataGateway.last_time
+			save
 			AppConfig.logger.info echo("Data Gateway finished ok")
 
 		rescue Exception => e
 			puts "Error:\n#{e}\n."
-			AppConfig.logger.error "#{e}\n" + e.backtrace.join("\n")	
+			AppConfig.logger.error "#{e}\n" + e.backtrace.join("\n")
+		end
+
+		def process_standard_input
+			input = @stdin.read
+			# TO DO - process input
+
+			# [Optional]
+			# @stdin.each do |line|
+			#  # TO DO - process each line
+			#end
 		end
 
+		def logger
+      @logger ||= setup_logger
+    end
+
+    def path(filename='')
+      File.expand_path(filename, APP_ROOT)
+    end
+
     def log_path
       path('log/application.log')
     end
-    
+
     def settings(name)
-      env  = (Module::APP_ENV == 'production' ? '' : '.' + Module::APP_ENV)
-      path("config#{env}/#{name}.yml")
+      path("config/#{name}.yml")
     end
-    
+
     def connections
       unless @connections
         @connections = yaml_load(settings('database'))
@@ -216,22 +232,34 @@ class AppConfig
       end
       return @connections
     end
-  
+
+    def last_time
+      unless @last_time
+        @last_time = yaml_load(settings('last_time'))  || {'export' => Time.at(0), 'import' => Time.at(0)}
+        class << @last_time
+          def [](name)
+            super(name.to_s)
+          end
+        end
+      end
+      return @last_time
+    end
+
     def [](name)
       method_missing(name.to_sym)
     end
 
   private
-  
+
     def setup_logger
       load
       FileUtils.mkpath(File.dirname(log_path))
       @logger = Logger.new(log_path, log_options['rotate'] )
       @logger.progname = ''
       @logger.formatter = LogFormatter.new
-      @logger.datetime_format = log_options['time_format']
-      @logger.level = (options.debug_on ? Logger::DEBUG : Logger.const_get(log_options['level'].upcase))
-      #@logger.level = Logger.const_get(log_options['level'].upcase)
+      @logger.datetime_format = log_options['time_format']
+			level = options.log_level || log_options['level']
+      @logger.level = Logger.const_get(level.upcase)
       @logger
       rescue StandardError => e
         @logger = Logger.new(STDERR)
@@ -241,20 +269,25 @@ class AppConfig
         @logger.warn e.message
         @logger.warn(
           "Unable to access log file. Please ensure that #{self.log_path} exists and has correct permissions. " +
-          "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
+          "\nThe log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
         )
         @logger
     end
 
     def yaml_load(file_name)
-      YAML::load(ERB.new(IO.read(file_name)).result)
-    end
+      YAML::load(ERB.new(IO.read(file_name)).result) if File.exist?(file_name)
+    end
+
 
     def load
       return if @config
       @config = yaml_load(settings('settings'))
-    end
-
+    end
+
+		def save
+			File.open(settings('last_time'), "w") {|f| YAML.dump(@last_time, f)}
+		end
+
 		def echo(msg)
 			puts msg unless AppConfig.options.quiet
 			msg
@@ -268,11 +301,12 @@ class AppConfig
 				else
         	@config.send(name, *args)
 				end
-      elsif @config.has_key?(name.to_s) #@config.instance_variable_defined?(var_name)
-         @config[name.to_s] #@config.instance_variable_get(var_name)
+      elsif @config.has_key?(name.to_s)
+         @config[name.to_s]
       else
         super
       end
     end
   end
 end
+

data/template-prj/nexus/config/database.yml

@@ -0,0 +1,17 @@
+
+nexusdb:
+  adapter: sqlserver
+  host: '.\NEXUS'
+  mode: ado # or odbc
+  username: sa
+  password: sie48
+  autocommit: true
+  
+  # required for ado:
+  database: 'TRADE_SL'
+  nax_empresa: 'VTRADE'
+  
+  #required for odbc:
+  #dsn:
+  #provider: SQLOLEDB
+

data/template-prj/{config → nexus/config}/settings.yml

@@ -16,5 +16,3 @@ data:
   donebox: data/donebox
   use_resources: false
   resource_path: C:/Archivos de programa/SIE/NEXUS/shopin/img/
-
-  

data/template-prj/nexus/export-data.rb

@@ -0,0 +1,9 @@
+
+include DataGateway
+
+# we can use built-in jobs
+require 'datagateway/jobs/nexus_export' 
+
+
+nexus_export.run
+upload_to AppConfig.sftp

data/template-prj/nexus/import-data.rb

@@ -0,0 +1,14 @@
+
+include DataGateway
+
+# we can use built-in jobs
+require 'datagateway/jobs/nexus_import' 
+
+
+
+download_from AppConfig.sftp
+begin
+	nexus_import.run
+ensure
+	NAX::ActiveRecord::Base.close
+end

data/template-prj/nexus/sistema.ini

@@ -0,0 +1,4 @@
+[sistema]
+; BaseDatos=nexus$sistema6
+Servidor=SERVIDOR\GESTION
+Listados=\\servidor\Users\Nexus Listados\

data/template-prj/shopin/README

@@ -0,0 +1,2 @@
+== Use
+datagw

data/template-prj/shopin/config/README

@@ -0,0 +1,4 @@
+Carpeta para ficheros de configuracion:
+  - database.yml: conexiones a bases de datos en formato YAML.
+  - settings.yml: parametros de configuración generales en formato YAML.
+

data/template-prj/shopin/config/database.yml

@@ -0,0 +1,8 @@
+shopindb:
+  adapter: mysql
+  encoding: utf8
+  database: shopin
+  timeout: 5000
+  user: root
+  password: masterkey
+  socket: /var/run/mysqld/mysqld.sock

data/template-prj/shopin/config/settings.yml

@@ -0,0 +1,13 @@
+---
+log_options:
+  level: info
+  rotate: daily
+  time_format: %H:%M:%S
+  
+data:
+  inbox: data/inbox
+  outbox: data/outbox
+  donebox: data/donebox
+  use_resources: true
+  resource_path: /datos/app/shopIn/public/images
+  

data/template-prj/shopin/data/donebox/README

@@ -0,0 +1 @@
+Esta carpeta contine los ficheros que han sido recibidos y procesados

data/template-prj/shopin/data/inbox/README

@@ -0,0 +1 @@
+Esta carpeta contine los ficheros que han sido recibidos y estan pendientes de procesarse

data/template-prj/shopin/data/outbox/README

@@ -0,0 +1 @@
+Esta carpeta contine los ficheros que han sido pendientes de ser enviados

data/template-prj/shopin/export-data.rb

@@ -0,0 +1,6 @@
+
+include DataGateway
+
+require 'datagateway/jobs/shopin_export'
+
+shopin_export.run

data/template-prj/shopin/import-data.rb

@@ -0,0 +1,6 @@
+
+include DataGateway
+
+require 'datagateway/jobs/shopin_import'
+
+shopin_import.run

data/template-prj/shopin/log/README

@@ -0,0 +1,2 @@
+Carpeta para contener ficheros de historial de ejecucion. El numero de ficheros 
+variara segun la configuracion

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jcangas-datagateway
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.4.4
 platform: ruby
 authors: 
 - Jorge L. Cangas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-02 00:00:00 -08:00
+date: 2009-02-12 00:00:00 -08:00
 default_executable: datagw
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,7 @@ files:
 - bin/datagw
 - lib/version.rb
 - lib/datagateway
+- lib/datagateway/job.rb
 - lib/datagateway/dbchange_point.rb
 - lib/datagateway/ssh_transfer.rb
 - lib/datagateway/jobs
@@ -48,29 +49,49 @@ files:
 - lib/datagateway/nexus/nax_ar.rb
 - lib/datagateway/nexus/nax_tlb.rb
 - lib/datagateway/nexus/nexus_ar.rb
+- lib/datagateway/mapper.rb
 - lib/datagateway/data_gateway.rb
+- lib/datagateway/encoder.rb
 - lib/datagateway/folder_writer.rb
 - lib/datagateway.rb
 - test/test_helper.rb
 - test/datagateway_test.rb
-- template-prj/log
-- template-prj/log/README
-- template-prj/dgw-job.rb
-- template-prj/data
-- template-prj/data/outbox
-- template-prj/data/outbox/README
-- template-prj/data/donebox
-- template-prj/data/donebox/README
-- template-prj/data/inbox
-- template-prj/data/inbox/README
-- template-prj/config
-- template-prj/config/settings.yml
-- template-prj/config/README
-- template-prj/config/database.yml
-- template-prj/ruby.exe
-- template-prj/README
-- template-prj/sistema.ini
-- template-prj/run.bat
+- template-prj/nexus
+- template-prj/nexus/log
+- template-prj/nexus/log/README
+- template-prj/nexus/data
+- template-prj/nexus/data/outbox
+- template-prj/nexus/data/outbox/README
+- template-prj/nexus/data/donebox
+- template-prj/nexus/data/donebox/README
+- template-prj/nexus/data/inbox
+- template-prj/nexus/data/inbox/README
+- template-prj/nexus/config
+- template-prj/nexus/config/settings.yml
+- template-prj/nexus/config/README
+- template-prj/nexus/config/database.yml
+- template-prj/nexus/ruby.exe
+- template-prj/nexus/README
+- template-prj/nexus/sistema.ini
+- template-prj/nexus/import-data.rb
+- template-prj/nexus/export-data.rb
+- template-prj/shopin
+- template-prj/shopin/log
+- template-prj/shopin/log/README
+- template-prj/shopin/data
+- template-prj/shopin/data/outbox
+- template-prj/shopin/data/outbox/README
+- template-prj/shopin/data/donebox
+- template-prj/shopin/data/donebox/README
+- template-prj/shopin/data/inbox
+- template-prj/shopin/data/inbox/README
+- template-prj/shopin/config
+- template-prj/shopin/config/settings.yml
+- template-prj/shopin/config/README
+- template-prj/shopin/config/database.yml
+- template-prj/shopin/README
+- template-prj/shopin/import-data.rb
+- template-prj/shopin/export-data.rb
 has_rdoc: true
 homepage: http://github.com/jcangas/datagateway
 post_install_message: 

data/template-prj/config/database.yml

@@ -1,32 +0,0 @@
-
-nexusdb:
-  adapter: sqlserver
-  host: '.\NEXUS'
-  mode: ado # or odbc
-  username: sa
-  password: sie48
-  autocommit: true
-  
-  # required for ado:
-  database: 'TRADE_SL'
-  nax_empresa: 'VTRADE'
-  
-  #required for odbc:
-  #dsn:
-  #provider: SQLOLEDB
-
-
-shopindb_production: &shopin_production
-  adapter: mysql
-  database: shopin
-  timeout: 5000
-  user: root
-  password: masterkey
-  socket: /var/run/mysqld/mysqld.sock
-
-shopindb_development: &shopin_development
-  adapter: sqlite3
-  database: '../db/development.sqlite3'
-  timeout: 5000
-
-shopindb: *shopin_development

data/template-prj/dgw-job.rb

@@ -1,25 +0,0 @@
-
-## Sample job file for datagateway
-include DataGateway
-
-# we can use built-in jobs
-require 'datagateway/jobs/nexus_export' 
-require 'datagateway/jobs/nexus_import' 
-require 'datagateway/jobs/shopin_export'
-require 'datagateway/jobs/shopin_export'
-
-
-nexus_export.run
-upload_to AppConfig.sftp
-
-download_from AppConfig.sftp
-begin
-	nexus_import.run
-ensure
-	NAX::ActiveRecord::Base.close
-end
-
-
-resource_path AppConfig.path('../public/images/db/')
-
-

data/template-prj/run.bat

@@ -1 +0,0 @@
-datagw -f dgw-job

data/template-prj/sistema.ini

@@ -1,3 +0,0 @@
-[sistema]
-servidor=.\nexus
-BaseDatos=nexus$sistema6