cowtech-rails 2.3.0.3 → 2.3.0.4

data/lib/cowtech/tasks/log.rake

@@ -10,7 +10,9 @@ module Cowtech
       @@log_compressor_command = "bzip2"
       @@log_compressed_extension = "bz2"
 
-      def self.generate_new_name(base, i = 0); "#{base}#{if i > 0 then "-#{i}" else "" end}"  end
+      def self.generate_new_name(base, i = 0)
+        (Rails.root + "backups/logs/#{base}#{if i > 0 then "-#{i}" else "" end}").to_s  
+      end
 
       def self.run_command(cmd)
         IO.popen(cmd) do |f| print f.gets end
@@ -25,12 +27,19 @@ module Cowtech
         # For each log file
         Dir.glob(Rails.root + "log/*.log") do |log_file|
           puts "\tRotating #{log_file} ..."
-          new_name = "#{log_file}-#{tstamp}" # CREIAMO IL NOME
+          new_name = "#{File.basename(log_file)}-#{tstamp}" # CREIAMO IL NOME
       
           # Resolv duplicates
           i = 0
-          i += 1 while File.exists?("#{generate_new_name(new_name, i)}.#{@@log_compressed_extension}")
-          new_file = generate_new_name(new_name, i)
+          new_file = catch(:name) do
+            i += 1
+            name = generate_new_name(new_name, i)
+            redo if File.exists?(name . + "." + @@log_compressed_extension)
+            throw :name, name
+          end
+
+          dir = File.dirname(new_file)
+          FileUtils.mkdir_p(dir) if !File.directory?(dir)
       
           # Send file via mail
           email_class.constantize.log_report(log_file).deliver if Rails.env == "production" && email_class.present?

data/lib/cowtech/tasks/sql.rake

@@ -13,7 +13,7 @@ module Cowtech
       def self.run_command(cmd); system(cmd) end
 
       def self.mysql_execute(config)
-        dest_file = Rails.root + "db/backup/db-#{Time.now.strftime("%Y%m%d-%H%M%S")}.sql"
+        dest_file = Rails.root + "backups/mysql/db-#{Time.now.strftime("%Y%m%d-%H%M%S")}.sql"
     
         dump_cmd = "mysqldump"
         dump_args = {"" => "-R -r \"#{dest_file}\"", "host" => "-h @@ARG@@", "username" => "-u @@ARG@@", "password" => "--password=\"@@ARG@@\"", "database" => "@@ARG@@"}
@@ -30,7 +30,7 @@ module Cowtech
     
         # Create directory
         dir = File.dirname(dest_file)
-        FileUtils.mkdir(dir) if !File.directory?(dir)
+        FileUtils.mkdir_p(dir) if !File.directory?(dir)
     
         # Execute command
         puts "\tDumping data ..."

data/lib/cowtech/version.rb

@@ -10,7 +10,7 @@ module Cowtech
       MAJOR = 2
       MINOR = 3
       PATCH = 0
-      BUILD = 3
+      BUILD = 4
 
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cowtech-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0.3
+  version: 2.3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cowtech-extensions
-  requirement: &70162545789420 !ruby/object:Gem::Requirement
+  requirement: &70325422750360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70162545789420
+  version_requirements: *70325422750360
 description: A general purpose Rails utility plugin.
 email: shogun_panda@me.com
 executables: []