capones_recipes 1.1.0 → 1.1.1

data/lib/capones_recipes/tasks/airbrake.rb

@@ -1 +1 @@
-Dir.glob(File.join(File.dirname(__FILE__), '/airbrake/*.rb')).sort.each { |f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), '/airbrake/*.rb')).sort.each { |f| load f }

data/lib/capones_recipes/tasks/airbrake/setup.rb

@@ -6,10 +6,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :airbrake do
     desc "Creates the air brake initializer with the custom API key."
     task :setup do
-      api_key = utilities.ask('Please insert the API key.', '')
+      api_key = Utilities.ask('Please insert the API key.', '')
       run "mkdir -p #{shared_path}/config/initializers"
       initializer_template = File.expand_path(File.dirname(__FILE__) + '/templates/airbrake.rb')
-      utilities.init_file(initializer_template, "<%%>", api_key, "#{shared_path}/config/initializers/airbrake.rb")
-    end
+      put Utilities.init_file(initializer_template, "<%%>", api_key), "#{shared_path}/config/initializers/airbrake.rb"    end
   end
 end

data/lib/capones_recipes/tasks/bookyt/setup.rb

@@ -16,7 +16,7 @@ Capistrano::Configuration.instance(true).load do
       end
       modules = modules.map {|item| "'#{item}'" }.join(', ')
       initializer_template = File.expand_path(File.dirname(__FILE__) + '/templates/bookyt.rb')
-      utilities.init_file(initializer_template, "<%%>", modules, "#{shared_path}/initializer/bookyt.rb")
+      puts Utilities.init_file(initializer_template, "<%%>", modules), "#{shared_path}/initializer/bookyt.rb"
     end
     
     desc "Make symlink for shared bookyt initializer"

data/lib/capones_recipes/tasks/database/sync.rb

@@ -64,12 +64,13 @@ Capistrano::Configuration.instance.load do
 
         # Local DB import
         username, password, database, host = database_config('development')
-        system "bzip2 -d -c #{filename} | mysql -u #{username} --password='#{password}' #{database}; rm -f #{filename}"
+        run "bzip2 -d -c #{filename} | mysql -u #{username} --password='#{password}' #{database}"
+        run "rm -f #{filename}"
 
         logger.important "sync database from the stage '#{stage}' to local finished"
         
         # Start db:migrate
-        system "rake db:migrate"
+        run "rake db:migrate"
       end
 
       desc <<-DESC
@@ -90,7 +91,7 @@ Capistrano::Configuration.instance.load do
           end
           logger.info "sync #{syncdir} from #{server}:#{port} to local"
           destination, base = Pathname.new(syncdir).split
-          system "rsync --verbose --archive --compress --copy-links --delete --stats --rsh='ssh -p #{port}' #{user}@#{server}:#{current_path}/#{syncdir} #{destination.to_s}"
+          run "rsync --verbose --archive --compress --copy-links --delete --stats --rsh='ssh -p #{port}' #{user}@#{server}:#{current_path}/#{syncdir} #{destination.to_s}"
         end
 
         logger.important "sync filesystem from the stage '#{stage}' to local finished"
@@ -133,7 +134,8 @@ Capistrano::Configuration.instance.load do
 
           # Local DB import
           username, password, database, host = database_config('development')
-          system "bzip2 -d -c #{filename} | mysql -u #{username} --password='#{password}' #{database}; rm -f #{filename}"
+          run "bzip2 -d -c #{filename} | mysql -u #{username} --password='#{password}' #{database}"
+          run "rm -f #{filename}"
 
           logger.important "sync database from the stage '#{stage}' to local finished"
         end
@@ -179,14 +181,15 @@ Capistrano::Configuration.instance.load do
         filename = "dump.local.#{Time.now.strftime '%Y-%m-%d_%H:%M:%S'}.sql.bz2"
         username, password, database, host = database_config('development')
         host_option = host ? "--host='#{host}'" : ""
-        system "mysqldump -u #{username} --password='#{password}' #{host_option} #{database} | bzip2 -9 > #{filename}"
+        run "mysqldump -u #{username} --password='#{password}' #{host_option} #{database} | bzip2 -9 > #{filename}"
         upload filename, "#{shared_path}/sync/#{filename}"
         system "rm -f #{filename}"
 
         # Remote DB import
         username, password, database, host = remote_database_config(stage)
         host_option = host ? "--host='#{host}'" : ""
-        run "bzip2 -d -c #{shared_path}/sync/#{filename} | mysql -u #{username} --password='#{password}' #{host_option} #{database}; rm -f #{shared_path}/sync/#{filename}"
+        run "bzip2 -d -c #{shared_path}/sync/#{filename} | mysql -u #{username} --password='#{password}' #{host_option} #{database}"
+        run "rm -f #{shared_path}/sync/#{filename}"
         purge_old_backups "database.all"
 
         logger.important "sync database from local to the stage '#{stage}' finished"
@@ -216,7 +219,7 @@ Capistrano::Configuration.instance.load do
 
           # Sync directory up
           logger.info "sync #{syncdir} to #{server}:#{port} from local"
-          system "rsync --verbose --archive --compress --keep-dirlinks --delete --stats --rsh='ssh -p #{port}' #{syncdir} #{user}@#{server}:#{current_path}/#{destination.to_s}"
+          run "rsync --verbose --archive --compress --keep-dirlinks --delete --stats --rsh='ssh -p #{port}' #{syncdir} #{user}@#{server}:#{current_path}/#{destination.to_s}"
         end
         logger.important "sync filesystem from local to the stage '#{stage}' finished"
       end
@@ -259,14 +262,15 @@ Capistrano::Configuration.instance.load do
           filename = "dump.local.#{Time.now.strftime '%Y-%m-%d_%H:%M:%S'}.sql.bz2"
           username, password, database, host = database_config('development')
           host_option = host ? "--host='#{host}'" : ""
-          system "mysqldump -u #{username} --password='#{password}' #{host_option} #{database} | bzip2 -9 > #{filename}"
+          run "mysqldump -u #{username} --password='#{password}' #{host_option} #{database} | bzip2 -9 > #{filename}"
           upload filename, "#{shared_path}/sync/#{filename}"
           system "rm -f #{filename}"
 
           # Remote DB import
           username, password, database, host = remote_database_config(stage)
           host_option = host ? "--host='#{host}'" : ""
-          run "bzip2 -d -c #{shared_path}/sync/#{filename} | mysql -u #{username} --password='#{password}' #{host_option} #{database}; rm -f #{shared_path}/sync/#{filename}"
+          run "bzip2 -d -c #{shared_path}/sync/#{filename} | mysql -u #{username} --password='#{password}' #{host_option} #{database}"
+          run "rm -f #{shared_path}/sync/#{filename}"
           purge_old_backups "database.kuhsaft"
 
           logger.important "sync database from local to the stage '#{stage}' finished"

data/lib/capones_recipes/tasks/utilities.rb

@@ -1,23 +1,26 @@
 require 'fileutils'
 
 module Utilities
-  # utilities.ask('What is your name?', 'John')
-  def ask(question, default='')
-    question = "\n" + question.join("\n") if question.respond_to?(:uniq)
-    answer = Capistrano::CLI.ui.ask(space(question)).strip
-    answer.empty? ? default : answer
-  end
+  class << self
+    # Utilities.ask('What is your name?', 'John')
+    def ask(question, default='')
+      question = "\n" + question.join("\n") if question.respond_to?(:uniq)
+      answer = Capistrano::CLI.ui.ask(question).strip
+      answer.empty? ? default : answer
+    end
 
-  # utilities.yes?('Proceed with install?')
-  def yes?(question)
-    question = "\n" + question.join("\n") if question.respond_to?(:uniq)
-    question += ' (y/n)'
-    ask(question).downcase.include? 'y'
-  end
+    # Utilities.yes?('Proceed with install?')
+    def yes?(question)
+      question = "\n" + question.join("\n") if question.respond_to?(:uniq)
+      question += ' (y/n)'
+      ask(question).downcase.include? 'y'
+    end
   
-  def init_file(file, find, replace, target)
-    content = File.open(file).read
-    content.gsub!(find,replace)
-    put content, target
+    def init_file(file, find, replace)
+      content = File.open(file).read
+      content.gsub!(find,replace)
+      
+      content
+    end
   end
 end

data/lib/capones_recipes/version.rb

@@ -1,3 +1,3 @@
 module CaponesRecipes
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: capones_recipes
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-22 00:00:00 +02:00
-default_executable: 
+date: 2011-10-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -27,9 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -41,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -55,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -69,9 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -83,9 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -97,9 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -163,7 +139,6 @@ files:
 - lib/capones_recipes/tasks/thinking_sphinx/thinking_sphinx.rb
 - lib/capones_recipes/tasks/utilities.rb
 - lib/capones_recipes/version.rb
-has_rdoc: true
 homepage: http://github.com/raskhadafi/capones-recipes
 licenses: 
 - MIT
@@ -177,23 +152,17 @@ 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: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Some capistrano recipes for use.