rosie 0.0.3 → 0.0.5

data/README.md

@@ -8,7 +8,7 @@ The gem provides two rake tasks which will backup or restore a MySQL database al
 
 ## Requirements
 
-* Rails3
+* Rails (2.3.x or 3.x)
 * MySQL > 5 with commandline tools (mysql, mysqladmin, mysqldump)
 * Unix(ish) system shell with tar
 
@@ -26,6 +26,18 @@ Use bundler to install it:
 bundle install
 </pre>
 
+### Rails 2.3.x
+If you're using Rails 2, you'll need to add a couple lines to your `Rakefile`.  
+After all the requires, add the following:
+
+<code><pre>
+
+require 'rosie'
+
+Dir["#{Gem.searcher.find('rosie').full_gem_path}/lib/tasks/**/*.rake"].each { |ext| load ext }
+
+</pre></code>
+
 ## Configuration
 
 Configuration values can be set by placing a rosie.yml file in your config directory.  Default keys and values are as follows:
@@ -34,13 +46,14 @@ Configuration values can be set by placing a rosie.yml file in your config direc
 # sample rosie.yml
 #
 backup_dir:backups    
-assets_dir:public/system
+assets_dirs:
+  - public/system
 mysql_bin_dir: 
 
 </pre>
 
 * `backup_dir`: This specifies the directory where the backup files will be stored.  It should be specified relative to your Rails root.  This setting would give you `#{Rails.root}/backups`.  
-* `assets_dir`: This specifies the directory which hold system assets you want to be added to the backup file.  This should be specified relative to your Rails root.
+* `assets_dirs`: This specifies the directorys which hold system assets you want to be added to the backup file.  All entries should be specified relative to your Rails root.
 * `mysql_bin_dir`: If mysql and mysqldump are not on the path of the user running this rake task, you may need to specify the directory where those commandline applications live.  This should be an absolute path.   By default, Rosie will try to find these in the user's PATH.
 
 The generated backup files (zipped tarballs) will be named by timestamp and placed in `backup_dir`.
@@ -63,7 +76,9 @@ Rosie Config: read from /projects/boilerplate/config/rosie.yml
 mysql: mysql
 mysqldump: mysqldump
 backup dir: /projects/boilerplate/my_backups
-assets dir: /projects/boilerplate/public/my_assets
+assets dirs: 
+  - public/my_assets
+  - public/my_other_assets
 </pre></code>
 
 
@@ -92,7 +107,6 @@ Tested with Ruby 1.9.2-p180 on OSX 10.6/Ubuntu 10.10/11
 
 ## TODO
 * add ability to backup remote databases (not on localhost)
-* make Rails2.3.x compatible
 * add alternate database support
 
 ## Credits

data/lib/rosie.rb

@@ -1,16 +1,18 @@
 rootpath = File.join(File.dirname(__FILE__),'..')
 require File.join(rootpath, 'lib/rosie/version')
 
-Dir[File.join(rootpath, "lib/tasks/**/*.rake")].each { |ext| load ext } if defined?(Rake)
+if /^3\./.match Rails.version
+  Dir[File.join(rootpath, "lib/tasks/**/*.rake")].each { |ext| load ext } if defined?(Rake)
+end
 
 module Rosie
   class Config
-    @@allowed_attributes = [:backup_dir, :assets_dir, :mysql_bin_dir, :config_file]
+    @@allowed_attributes = [:backup_dir, :assets_dirs, :mysql_bin_dir, :config_file]
     
     attr_accessor *@@allowed_attributes
 
     def initialize
-      _config = {"backup_dir"=>"backups", "assets_dir"=>"public/system", "mysql_bin_dir"=>nil} 
+      _config = {"backup_dir"=>"backups", "assets_dirs"=> ["public/system"], "mysql_bin_dir"=>nil} 
       self.config_file = File.join(Rails.root, 'config/rosie.yml')
       if File.exists? self.config_file
         _config.merge!(YAML.load(File.open(self.config_file)))
@@ -24,10 +26,6 @@ module Rosie
       File.join(Rails.root, @backup_dir)
     end
     
-    def assets_dir
-      File.join(Rails.root, @assets_dir)
-    end
-
     def mysql_cmd
       mysql_bin_dir.present? ? File.join(mysql_bin_dir, 'mysql') : 'mysql'
     end

data/lib/rosie/version.rb

@@ -1,3 +1,3 @@
 module Rosie
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 end

data/lib/tasks/rosie.rake

@@ -32,29 +32,30 @@ namespace :rosie do
   end
 
   desc "show config"
-  task :config => :init do
+  task :config => 'rosie:init' do
     puts "Rosie Config: read from #{rosie.config_file}"
     puts "mysql: #{rosie.mysql_cmd}"
     puts "mysqldump: #{rosie.mysqldump_cmd}"
     puts "backup dir: #{rosie.backup_dir}"
-    puts "assets dir: #{rosie.assets_dir}"
+    puts "assets dirs: #{rosie.assets_dirs.join(', ')}"
   end
 
   desc "restore data from backup tarball"
-  task :restore => :init do
+  task :restore => 'rosie:init' do
     puts "Restoring data..."    
     tarball = ENV["datafile"]
     if tarball.present? 
-      tarball = File.absolute_path(tarball)
+      tarball = File.expand_path(tarball)
       tmp = File.join(Dir.tmpdir, "rosie-restore")
       FileUtils.remove_dir(tmp, true)
       FileUtils.mkdir_p(tmp)
-      if !Dir.exists?(tmp) 
+      if !File.exists?(tmp) 
         msg = "Unable to create a temporary directory.  Please check your file permissions.\nAttempted to create #{tmp}"
         raise msg
       end
       files_before = Dir.entries(tmp)
-      sh "cd #{tmp} && tar -xzf #{tarball}"
+      puts "Unpacking backup bundle"
+      `cd #{tmp} && tar -xzf #{tarball}`
       ts = Dir.entries(tmp).reject{ |f| files_before.include? f }.first
       unless ts.present?
         puts "*** Something went wrong while trying to unpack the datafile."
@@ -65,7 +66,8 @@ namespace :rosie do
       image_tarball = File.join(data_dir, Dir.entries(data_dir).select{|f| f =~ /#{ts}.*\.tar/}.first)
       sql_dump = File.join(data_dir, Dir.entries(data_dir).select{|f| f =~ /#{ts}.*\.sql/}.first)
       args = get_db_cmdline_args
-      sh "tar -C #{rosie.assets_dir} -xf #{image_tarball} && #{rosie.mysql_cmd} #{args.join(' ')} #{dbcnf['database']} < #{sql_dump}"
+      puts "Restoring assets and database"
+      `tar -C #{Rails.root} -xf #{image_tarball} && #{rosie.mysql_cmd} #{args.join(' ')} #{dbcnf['database']} < #{sql_dump}`
       
     else
       puts "*** You must specify the datafile from which to restore"
@@ -76,24 +78,35 @@ namespace :rosie do
 
   desc "backup all data"
   task :backup => ["rosie:backups:db", "rosie:backups:assets"] do
-    sh "cd #{rosie.backup_dir}/#{ts}/../ && tar -czvf #{ts}.tgz ./#{ts} && rm -rf #{ts}"
+    puts "Bundling backup files into #{ts}.tgz"
+    `cd #{rosie.backup_dir}/#{ts}/../ && tar -czf #{ts}.tgz ./#{ts} && rm -rf #{ts}`
   end
 
   namespace :backups do
     task :init => 'rosie:init' do
-      ts = Time.now.strftime('%Y%m%d%H%m%S')
+      ts = Time.now.strftime('%Y%m%d%H%M%S')
     end
 
-    task :db => :init do
+    task :db => 'rosie:backups:init' do
       dbcnf = get_db_config
       db_file = "#{dbcnf['database']}-#{ts}.backup.sql"
       path = File.join(rosie.backup_dir, ts, db_file)
       args = get_db_cmdline_args
-      sh "mkdir -p #{rosie.backup_dir}/#{ts} && #{rosie.mysqldump_cmd} #{args.join(' ')} --single-transaction #{dbcnf['database']} > #{path}"
+      puts "Dumping database #{dbcnf['database']}"
+      `mkdir -p #{rosie.backup_dir}/#{ts} && #{rosie.mysqldump_cmd} #{args.join(' ')} --single-transaction #{dbcnf['database']} > #{path}`
     end
 
-    task :assets => :init do
-      sh "tar -C #{rosie.assets_dir} -cvf #{rosie.backup_dir}/#{ts}/rosie_backup_#{Rails.env}_#{ts}.tar ."
+    task :assets => 'rosie:backups:init' do
+      tarball = "#{rosie.backup_dir}/#{ts}/rosie_backup_#{Rails.env}_#{ts}.tar"
+      rosie.assets_dirs.each_with_index do |dr, idx|
+        if File.exists?(dr)
+          puts "Backing up #{dr}"
+          tarargs = (idx==0) ? 'chf' : 'uhf'
+          sh "tar -C #{Rails.root} -#{tarargs} #{tarball} #{dr}"
+        else
+          puts "No directory #{dr} to backup"
+        end
+      end
     end
 
   end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rosie
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.3
+  hash: 21
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jon Rogers
@@ -11,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-20 00:00:00 Z
+date: 2011-08-21 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -21,6 +27,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -32,6 +41,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id002
@@ -55,6 +68,7 @@ files:
 - lib/rosie/version.rb
 - lib/tasks/rosie.rake
 - rosie.gemspec
+has_rdoc: true
 homepage: http://github.com/2rye/rosie
 licenses: []
 
@@ -68,19 +82,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rosie
-rubygems_version: 1.8.8
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rosie-0.0.3
+summary: rosie-0.0.5
 test_files: []