jcangas-datagateway 1.1.0 → 1.2.2

data/VERSION.yml

@@ -1,4 +1,4 @@
---- 
-:major: 1
-:minor: 1
-:patch: 0
+--- 
+:patch: 2
+:major: 1
+:minor: 2

data/bin/datagw

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby -KU
-
 
 # == Sinopsis 
-#   DataGateway actua como una 'psarela de datos'. Permite trasnferir datos de 
+#   DataGateway actua como una 'pasarela de bases de datos'. Permite trasnferir datos de 
 #	un origen a un destino, incluso en maquinas diferentes usando el proteocolo
 #   sftp.
 #   
@@ -27,9 +26,10 @@
 #
 # == Copyright
 #   Copyright (c) 2008 Jorge L. Cangas
-
-require 'rubygems'
-require 'datagateway'
-
-AppConfig.run
-
+
+$KCODE = 'UTF8'
+require 'rubygems'
+require 'datagateway'
+
+AppConfig.run
+

data/lib/datagateway/data_gateway.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+
 require 'rubygems'
 require 'benchmark'
 require 'fileutils'
@@ -305,9 +305,7 @@ module DataGateway
 		
 		def initialize(name, &block)
 			@name = name
-			DataGateway.logger.info "DataGateway.use_resources #{DataGateway.use_resources}"
 			@use_resources = DataGateway.use_resources
-			DataGateway.logger.info "resources will be imported!" if @use_resources
 			@encoder = NullEncoder.new
 			@transfer = nil
 			instance_eval(&block) if block_given?
@@ -354,7 +352,7 @@ module DataGateway
 		end
 
 		def do_run
-			transfer.download if transfer
+			transfer.download if transfer and transfer.download_from
 
 			Dir.glob(File.join(DataGateway::inbox, '*.zip')).sort.each do |filename|
 			DataGateway.logger.info "Importing #{filename}"
@@ -368,7 +366,7 @@ module DataGateway
 			@mappers[table] ||= TableMapper.new(self, table)
 		end
 		
-	private # DSL
+	public # DSL
 
 		def download_from(options)
 			options.merge! 'local_files' => DataGateway.inbox
@@ -460,7 +458,6 @@ module DataGateway
 		end
 		
 		def do_run
-			DataGateway.logger.debug 'resource_path ' + DataGateway.resource_path
 			begin				
 				self.each { |cname, records|
 					file_name = "#{cname}.#{self.format_id}"
@@ -476,7 +473,7 @@ module DataGateway
 				close_export_folder
 			end
 			
-			transfer.upload if transfer				
+			transfer.upload if transfer and transfer.upload_to				
 		end
 	
 	private # DSL
@@ -498,7 +495,7 @@ module DataGateway
 			FileUtils.mkpath(outbox)
 			stamp = Time.now.strftime("%Y%m%d%H%M%S")
 			folder_name = File.join(outbox, "#{stamp}.#{self.format_id}")
-			(APP_ENV == 'development') ? FolderWriter.new(folder_name) :
+			#(APP_ENV == 'development') ? FolderWriter.new(folder_name) :
 										ZipFolderWriter.new(folder_name)
 		end
 
@@ -539,7 +536,7 @@ module DataGateway
 			end
 		end
 	end
-
+ public
 	# DataGateway DSL	
 	def resource_path(path= nil)
 		if path
@@ -549,8 +546,10 @@ module DataGateway
 		end
 	end
 	
+	module_function(:resource_path)
+	
 	def db_connection(conn)
-		ActiveRecord::Base.establish_connection conn
+		::ActiveRecord::Base.establish_connection conn
 		if conn['nax_empresa']
 			NAX::ActiveRecord::Base.establish_connection conn if NAX::ActiveRecord::Base.current_connection.nil?
 		end
@@ -579,4 +578,18 @@ module DataGateway
 		instance_variable_set('@' + name.to_s, new_job)
 		return  new_job
 	end
+	
+	def upload_to(options)
+		Export.new('upload') {
+			upload_to options
+		}.run
+
+	end
+
+	def download_from(options)
+		Import.new('download') {
+			download_from options
+		}.run
+
+	end
 end

data/lib/datagateway/jobs/nexus_export.rb

@@ -2,19 +2,12 @@ require 'nexus/nexus_ar'
 
 db_connection AppConfig.connections[:nexusdb]
 
-export(:transfer) do
-	upload_to AppConfig.sftp
-end
-
-export(:nexus_export) do
+export :nexus_export do
 	encode( :to => "UTF-8" , :from => "WINDOWS-1252")
 	export_to :csv
 	exporting :user, :conditions => 'CODCLI IS NOT NULL'
-	exporting :category #, :limit => 5
-	exporting :family #, :limit => 5
-	exporting :tarifa_venta,
-		:select => 'IDTARIFAV, CODART, FECMAX, PRECIO, TARIFA, UNIDADES',
-		:joins => 'as tarf inner join mmproducts p on code = tarf.codart'
+	exporting :category 
+	exporting :family
 
 	exporting :news,
 		:select => 'DESCRIPTION AS TITLE, FROMDATE AS PUBLISHED_AT, TODATE AS EXPIRES_AT, PRIORITY, NEWSTEXT BODY'
@@ -23,9 +16,8 @@ export(:nexus_export) do
 		:joins => 'as p left outer join ARTICULO as ar on CODE = ar.CODART left outer join DESCRIPA as da on CODE = da.CODART',
 		:conditions => "da.codidioma = 'CAS'"
 		
-	upload_to AppConfig.sftp
+	exporting :tarifa_venta,
+		:select => 'IDTARIFAV, CODART, FECMAX, PRECIO, TARIFA, UNIDADES',
+		:joins => 'as tarf inner join mmproducts p on code = tarf.codart'
 end
 
-nexus_export.run
-#transfer.run
-

data/lib/datagateway/jobs/nexus_import.rb

@@ -3,10 +3,7 @@ require 'nexus/nexus_ar'
 
 db_connection AppConfig.connections[:nexusdb]
 
-
-import(:nexus_import) do
-	download_from AppConfig.sftp
-	
+import(:nexus_import) do	
 	importing :User do
 		force_upcase
 		identity_by :USERID
@@ -53,9 +50,3 @@ import(:nexus_import) do
 						:special_instructions => :OBSERVACIONES
 	end
 end
-
-begin
-	nexus_import.run
-ensure
-	NAX::ActiveRecord::Base.close
-end

data/lib/datagateway/jobs/shopin_export.rb

@@ -1,6 +1,5 @@
 
 db_connection AppConfig.connections[:shopindb]
-resource_path AppConfig.path('../public/images/db/')
 
 export 'shopin_export' do
 	exporting :user,
@@ -14,6 +13,4 @@ export 'shopin_export' do
 	exporting :line_items,
     	:select => 'line.id as id, number as order_id, price, product_id, quantity',
 		:joins => 'as line left outer join orders as ord on line.order_id = ord.id'
-
-	run
 end

data/lib/datagateway/jobs/shopin_import.rb

@@ -47,6 +47,4 @@ import 'shopin_import' do
 			:TARIFA => :group,
 			:UNIDADES => :quantity		
 	end
-	
-	run
 end

data/lib/datagateway/nexus/nexus_ar.rb

@@ -1,4 +1,5 @@
-#--
+#--
+require 'activerecord'
 require 'nexus/nax_ar'
 NAX::ActiveRecord::Base.logger = ActiveRecord::Base.logger
 
@@ -142,4 +143,5 @@ class NAX_Pedido
 		self.AnadirLinea;
 		logger.debug "(NAX) fake_line_added"
 	end
-end
+end
+#++

data/lib/datagateway/ssh_transfer.rb

@@ -41,10 +41,9 @@ class SSHTransfer
 				sftp.download!(download_from, local_files,  :progress => self, :recursive => true)
 				sftp.dir.foreach(download_from) do |entry|
 					sftp.remove!(File.join(download_from, entry.name)) if entry.file?
-				end
-
+				end
 			rescue Net::SFTP::StatusException => e
-				on_file_error(file, e)
+				on_file_error(nil, e)
 			end
 		end
 	end

data/lib/datagateway.rb

@@ -1,6 +1,3 @@
-
-$KCODE = 'UTF8'
-
 require 'rubygems'
 require 'optparse' 
 require 'rdoc/usage'
@@ -11,14 +8,8 @@ require 'erb'
 require 'yaml'
 require 'logger'
 require 'version'
-
-$:.unshift File.join(File.dirname(__FILE__), 'datagateway')
-require 'data_gateway'
-
 
-unless defined? APP_ROOT
-	APP_ROOT = File.join(File.dirname(__FILE__), '')
-end
+$:.unshift File.join(File.dirname(__FILE__), 'datagateway')
 
 class LogFormatter < Logger::Formatter
     @@format = "%s #%d [%s] %5s: %s\n"
@@ -30,11 +21,11 @@ end
 class AppConfig
 	ROOT = File.join(File.dirname(__FILE__), '')
   class << self
-		attr :config
+		attr :config
 
-    def options
-    	@options
-    end
+    def options
+    	@options
+    end
 
 		def run
 			if parsed_options? && arguments_valid? 
@@ -50,57 +41,63 @@ class AppConfig
 				output_usage
 			end
 		end
-
-		def parsed_options?
-			parse_options unless @parsed_options
-			@parsed_options
-		end
-
-		def parse_options
-			@parsed_options = true
-			# Set defaults
+
+		def parsed_options?
+			parse_options unless @parsed_options
+			@parsed_options
+		end
+
+		def parse_options
+			@parsed_options = true
+			# Set defaults
 			@options = OpenStruct.new
 			@options.verbose = false
-			@options.quiet = false
+			@options.quiet = false
 			@options.debug_on = false
-			@options.environment = (ENV['APP_ENV'] || 'production').dup
+			@options.environment = (ENV['APP_ENV'] || 'production').dup
 			@options.generate = false
 
-
 			# Specify options
 			opts = OptionParser.new do |opts|
-				opts.banner = "\nUso: init.rb [options]"
+				opts.banner = "\nUso: #{File.basename($0)} [opciones]"
 				opts.separator "----------------------"
-				opts.separator "Opciones:"
+				opts.separator "opciones:"
+
+				opts.on("-h", "--help", "Muestra es mensaje de ayuda.") do
+					ouput_version
+					puts opts
+					exit
+				end
 
-				opts.on('-h', '--help') { output_help }
-
 				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|	
-					@options.project = project
-					@options.generate = true 
+
+				opts.on("-g", '--generate [prj_name]', "Genera un proyecto nuevo") { |project|	
+					@options.project = project
+					@options.generate = true 
 				}
 
-				opts.on("-q", '--quiet', 'Modo "silencioso": no muestra nada en pantalla durante la ejecución') { @options.quiet = 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('-v', '--version', 'Print version and exit') { output_version ; exit 0 }
-
 				opts.on('-d', '--debug', 'Modo depuración') { @options.debug_on = true }
-			end
-
-			opts.parse! rescue return false
-
+
+				opts.on('-f', '--file [FICHERO]', String, 'procesao el fichero') { |file|
+					@options.file = file
+				}
+			end
+
+			opts.parse!(ARGV) rescue puts opts; return false
+
 			process_options
 			true      
 		end
-
+
 		# Performs post-parse processing on options
 		def process_options
-
 		end
-
+
 		# True if required arguments were provided
 				def arguments_valid?
 			# TO DO - implement your real logic here
@@ -112,13 +109,15 @@ class AppConfig
 		end
 
 		def output_options
+			puts @options
+			exit
 			puts "Options:\\n"
 
 			@options.marshal_dump.each do |name, val|        
 				puts "  #{name} = #{val}"
 			end
 		end
-
+
 		def output_help
 			output_version
 			RDoc::usage #exits app
@@ -132,16 +131,19 @@ class AppConfig
 		def output_version
 			puts "#{Application::VERSION::PRODUCT} version #{Application::VERSION::STRING}"
 		end
-
-		def process_command
-			# TO DO - do whatever this app does
-			# TO DO - place in local vars, etc 
-			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)
-				
+
+		def process_command
+			dir = @options.file ? 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)
 			end
 
 			#process_standard_input # [Optional]
@@ -156,7 +158,7 @@ class AppConfig
 			#  # TO DO - process each line
 			#end
 		end
-
+
 		def logger
       @logger ||= setup_logger
     end
@@ -164,29 +166,42 @@ class AppConfig
     def path(filename='')
       File.expand_path(filename, APP_ROOT)
     end
-
-		def run_app
+
+		def run_app(file)
 			AppConfig.logger.info echo("Data Gateway started")
-			AppConfig.logger.debug echo("Entorno: #{APP_ENV} \n Opciones: #{AppConfig.config.inspect}")
-			AppConfig.logger.info echo("job list: #{AppConfig.jobs.join(',')}")
+			#AppConfig.logger.debug echo("Entorno: #{APP_ENV} \n configuración: #{AppConfig.config.inspect}")
 	
-			include DataGateway
-			AppConfig.jobs.each do |job|
-				require File.join('jobs', job)
-			end
+			require 'activerecord'
+			require 'data_gateway'
+			ActiveRecord::Base.logger = AppConfig.logger
+			ActiveRecord::Base.colorize_logging = false
+
+			DataGateway.logger = AppConfig.logger
+			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.resource_path(AppConfig.path(AppConfig.data['resource_path']))
+
+			DataGateway.logger.info "using resources #{DataGateway.use_resources} | #{DataGateway.resource_path}"
+			
+			require file
+			## Porque no va:?
+			##eval(File.read(File.expand_path(file))) 
+			
 			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")	
-		end
+		end
 
     def log_path
       path('log/application.log')
     end
     
     def settings(name)
-      env  = (APP_ENV == 'production' ? '' : '.' + APP_ENV)
+      env  = (Module::APP_ENV == 'production' ? '' : '.' + Module::APP_ENV)
       path("config#{env}/#{name}.yml")
     end
     
@@ -244,7 +259,7 @@ class AppConfig
 			puts msg unless AppConfig.options.quiet
 			msg
 		end
-
+
     def method_missing(name, *args)
       load
       if (args.size > 0)
@@ -260,35 +275,4 @@ class AppConfig
       end
     end
   end
-end
-
-
-__END__
-
-AppConfig.parse_options
-
-APP_ENV = AppConfig.options.environment unless defined?(APP_ENV)
-
-
-['actionmailer','actionpack', 'activerecord', 'activeresource', 'activesupport'].each {|gem|
-  $:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'rails',gem, 'lib')
-}
-
-
-#gem 'activerecord', '<2.2.2'
-
-require 'active_record'
-
-ActiveRecord::Base.logger = AppConfig.logger
-ActiveRecord::Base.colorize_logging = false
-
-DataGateway.logger = AppConfig.logger
-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.resource_path(AppConfig.path(AppConfig.data['resource_path']))
-
-AppConfig.jobs ||= []
-
-
+end

data/lib/version.rb

@@ -1,16 +1,12 @@
-require 'time'
+require 'time'
 
 module Application
-  module VERSION #:nodoc:
+  module VERSION #:nodoc:
 		@res = File.join(File.dirname(__FILE__), '..', 'VERSION.yml')
     PRODUCT     = 'DataGateway'
     COMPANY     = 'Memory Comm S. L.'
     AUTHOR      = 'jorge.cangas@gmail.com'
     NUMBER      = YAML::load(ERB.new(IO.read(@res)).result)
-    #MAJOR       = 1
-    #MINOR       = 1
-    #TINY        = 0
     STRING      = [NUMBER[:major], NUMBER[:minor], NUMBER[:patch]].join('.')
-    RELEASED_AT = Time.parse('2008/03/22 03:04:54')
   end
-end
+end

data/template-prj/README

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

data/template-prj/config/settings.yml

@@ -17,9 +17,4 @@ data:
   use_resources: false
   resource_path: C:/Archivos de programa/SIE/NEXUS/shopin/img/
 
-jobs:
-  #- nexus_export 
-  #- nexus_import 
-  #- shopin_export
-  - shopin_import
   

data/template-prj/dgw-job.rb

@@ -0,0 +1,25 @@
+
+## 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

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

data/template-prj/sistema.ini

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jcangas-datagateway
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors: 
 - Jorge L. Cangas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-28 00:00:00 -08:00
+date: 2009-02-02 00:00:00 -08:00
 default_executable: datagw
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -17,9 +17,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.2.2
     version: 
 description: TODO
 email: jorge.cangas@gmail.com
@@ -34,7 +34,6 @@ files:
 - bin/datagw
 - lib/version.rb
 - lib/datagateway
-- lib/datagateway/version.rb
 - lib/datagateway/dbchange_point.rb
 - lib/datagateway/ssh_transfer.rb
 - lib/datagateway/jobs
@@ -56,6 +55,7 @@ files:
 - 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
@@ -67,8 +67,10 @@ files:
 - template-prj/config/settings.yml
 - template-prj/config/README
 - template-prj/config/database.yml
+- template-prj/ruby.exe
 - template-prj/README
-- template-prj/datagateway.rb
+- template-prj/sistema.ini
+- template-prj/run.bat
 has_rdoc: true
 homepage: http://github.com/jcangas/datagateway
 post_install_message: 

data/lib/datagateway/version.rb

@@ -1,13 +0,0 @@
-require 'time'
-module Application
-  module VERSION #:nodoc:
-    PRODUCT     = 'DataGateway'
-    COMPANY     = 'Memory Comm S. L.'
-    AUTHOR      = 'jorge.cangas@gmail.com'
-    MAJOR       = 1
-    MINOR       = 1
-    TINY        = 0
-    STRING      = [MAJOR, MINOR, TINY].join('.')
-    RELEASED_AT = Time.parse('2008/03/22 03:04:54')
-  end
-end

data/template-prj/datagateway.rb

@@ -1,18 +0,0 @@
-require 'datagateway'
-
-begin
-	AppConfig.logger.info echo("Data Gateway started")
-	AppConfig.logger.debug echo("Entorno: #{APP_ENV} \n Opciones: #{AppConfig.config.inspect}")
-	AppConfig.logger.info echo("job list: #{AppConfig.jobs.join(',')}")
-
-	include DataGateway
-	AppConfig.jobs.each do |job|
-		#require File.join('jobs', job)
-	end
-	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")	
-end
-