omeka-recipes 0.5.1 → 0.5.2

data/README.md

@@ -133,7 +133,7 @@ set :themes, {
 after "deploy:restart", "deploy:cleanup"
 ```
 In each of the stages of your deployment (e.g.
-`deploy/deploy/production.rb`), you will need to add a definition to
+`config/deploy/production.rb`), you will need to add a definition to
 tell capistrano where to go.
 
 ```ruby

data/lib/omeka-recipes/application.rb

@@ -32,7 +32,7 @@ Capistrano::Configuration.instance.load do
     set :rvm_ruby_string, '1.9.3' unless exists?(:rvm_ruby_string)
   end
 
-  set :shared_dirs, %w(archive system) unless exists?(:shared_dirs)
+  set :shared_dirs, %w(archive system backup) unless exists?(:shared_dirs)
 
   namespace :app do
     task :setup, :roles => :app do

data/lib/omeka-recipes/db.rb

@@ -1,14 +1,16 @@
 require 'erb'
+require 'fileutils'
 
 Capistrano::Configuration.instance.load do
   namespace :db do
     namespace :mysql do
 
       desc "|OmekaRecipes| Performs a compressed database dump. \n
-      WARNING: This locks your database tables for the duraction of the mysqldump."
+      WARNING: This locks your database tables for the duration of the mysqldump."
       task :dump, :roles => :db, :only => { :primary => true } do
+        FileUtils.mkdir_p "#{shared_path}/backup"
         prepare_from_ini
-        run "mysqldump --user=#{username} --host=#{host} -p #{name} | bzip2 -z9 > #{db_remote_file}" do |channel, stream, out|
+        run "mysqldump --user=#{username} --host=#{host} -p #{db_name} | bzip2 -z9 > #{db_remote_file}" do |channel, stream, out|
           channel.send_data "#{password}\n" if out =~ /^Enter password:/
           puts out
         end
@@ -17,7 +19,7 @@ Capistrano::Configuration.instance.load do
       desc "|OmekaRecipes| Restores the database from the latest compressed dump"
       task :restore, :roles => :db, :only => { :primary => true } do
         prepare_from_ini
-        run "bzcat #{db_remote_file} | mysql --user=#{username} -p --host=#{host} #{name}" do |channel, stream, out|
+        run "bzcat #{db_remote_file} | mysql --user=#{username} -p --host=#{host} #{db_name}" do |channel, stream, out|
           channel.send_data "#{password}" if out =~ /^Enter password:/
           puts out
         end
@@ -75,10 +77,10 @@ EOF
     set(:db_remote_file) { "#{shared_path}/backup/#{db_file}" }
     set(:db_local_file) { "/tmp/#{db_file}" }
     set(:username) { db_config['database']['username'] }
-    set(:password) { db_config['database']["password"] }
-    set(:host) { db_config['database']["host"] }
-    set(:database) { db_config['database']["name"] }
-    set(:prefix) { db_config['database']["prefix"] }
+    set(:password) { db_config['database']['password'] }
+    set(:host) { db_config['database']['host'] }
+    set(:db_name) { db_config['database']['name'] }
+    set(:prefix) { db_config['database']['prefix'] }
   end
 
   def db_config
@@ -86,11 +88,11 @@ EOF
   end
 
   def fetch_db_ini
-    require 'IniFile'
+    require 'inifile'
 
-    file = capture "cat #{shared_path}/db.ini"
+    file = capture "cat #{current_path}/db.ini"
 
-    db_config = IniFile.new(file).to_h
+    @db_config = IniFile.new(file).to_h
 
   end
 

data/lib/omeka-recipes/version.rb

@@ -1,5 +1,5 @@
 module Omeka
   module Recipes
-    RECIPES_VERSION = "0.5.1"
+    RECIPES_VERSION = "0.5.2"
   end
 end

data/tests/fixtures/test.rb

@@ -2,7 +2,7 @@
 
 def fetch_db_ini
   require 'fileutils'
-  require 'IniFile'
+  require 'inifile'
   
   file_path = "./db.ini"
   @db_config = IniFile.new(:filename => file_path).to_h

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omeka-recipes
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3398635288902731352
+      hash: 415402469583493969
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3398635288902731352
+      hash: 415402469583493969
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24