jcangas-datagateway 1.4.4 → 1.5.0

data/VERSION.yml

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

data/lib/datagateway/job.rb

@@ -54,11 +54,12 @@ module DataGateway
 				import_file(filename)
 				FileUtils.mv(filename, DataGateway::donebox)
 				DataGateway.logger.info "Import done for #{filename}"
-			end
+			end
 			DataGateway.last_time['import'] = new_last_time
+			clean_donebox
 		end
 		
-		def donebox
+		def clean_donebox
 			Dir.glob(File.join(DataGateway::donebox, '*.zip')).each do |filename|
 				FileUtils.rm(filename) if File.mtime(filename) < 7.days.ago
 			end		
@@ -220,4 +221,4 @@ module DataGateway
 			end
 		end
 	end
-end
+end

data/lib/datagateway/jobs/shopin_export.rb

@@ -3,8 +3,8 @@ db_connection AppConfig.connections[:shopindb]
 
 export 'shopin_export' do
 	exporting :user,
-		:select => "login as userid, email, ' 1' as codcli",
-		:conditions => 'activated_at is not null'
+		:select => "login as userid, email, '9999' as codcli",
+		:conditions => "(activated_at is not null) and (updated_at > '#{last_time(:export)}')"
 
 	exporting :order,
 		:select => 'number, reference, special_instructions, login as userid',

data/lib/datagateway/jobs/shopin_import.rb

@@ -26,6 +26,7 @@ import 'shopin_import' do
 	end
 
 	importing :User do
+		force_downcase
 		identity_by :login
 	end
 

data/lib/datagateway.rb

@@ -157,13 +157,13 @@ class AppConfig
 		def command_generate
 				target = File.expand_path(@options.project)
 				FileUtils.mkdir target
-				puts "generating #{target}"
+				echo "generating #{target}"
 				FileUtils.cp_r(File.join(AppConfig::GEMROOT, '..', 'template-prj', "#{@options.template}/."), target, :verbose => !@options.quiet)
 		end
 
 		def command_job
 			echo version_msg
-			AppConfig.logger.info echo("Data Gateway started")
+			AppConfig.logger.info echo("#{Application::VERSION::PRODUCT} started")
 			#AppConfig.logger.debug echo("configuración: #{AppConfig.config.inspect}")
 
 			require 'activerecord'
@@ -176,19 +176,20 @@ class AppConfig
 			DataGateway.outbox = AppConfig.path(AppConfig.data['outbox'])
 			DataGateway.donebox = AppConfig.path(AppConfig.data['donebox'])
 			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:?
+			## Porque no va?:
 			##eval(File.read(File.expand_path(file)))
 
 			AppConfig.last_time = DataGateway.last_time
-			save
-			AppConfig.logger.info echo("Data Gateway finished ok")
+			save
+			clean_log
+			AppConfig.logger.info echo("#{Application::VERSION::PRODUCT} finished ok")
 
 		rescue Exception => e
 			puts "Error:\n#{e}\n."
@@ -215,7 +216,13 @@ class AppConfig
 
     def log_path
       path('log/application.log')
-    end
+    end
+
+		def clean_log
+			Dir.glob(File.join(path('log'), '*.*')).each do |filename|
+				FileUtils.rm(filename) if File.mtime(filename) < 7.days.ago
+			end
+		end
 
     def settings(name)
       path("config/#{name}.yml")
@@ -309,4 +316,3 @@ class AppConfig
     end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jcangas-datagateway
 version: !ruby/object:Gem::Version 
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors: 
 - Jorge L. Cangas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-12 00:00:00 -08:00
+date: 2009-02-13 00:00:00 -08:00
 default_executable: datagw
 dependencies: 
 - !ruby/object:Gem::Dependency