zfben_rails_rake 0.0.18 → 0.0.19

data/lib/zfben_rails_rake.rb

@@ -1,19 +1,10 @@
-ZfbenRailsRakePath = File.join File.dirname(__FILE__), 'zfben_rails_rake'
-
-if defined? Rails
-  module ZfbenRailsRake
-    class Railtie < Rails::Railtie
-      railtie_name :zfben_rails_rake  
-      rake_tasks do
-        require ZfbenRailsRakePath + '/helper.rb'
-        Dir[File.join(ZfbenRailsRakePath, 'tasks', '*')].each{ |f| require f }
-      end
+module ZfbenRailsRake
+  class Railtie < Rails::Railtie
+    railtie_name :zfben_rails_rake  
+    rake_tasks do
+      path = File.dirname(__FILE__) << '/zfben_rails_rake'
+      require path + '/helper.rb'
+      Dir[path + '/tasks/*.rb'].each{ |f| require f }
     end
   end
-else
-  require ZfbenRailsRakePath + '/helper.rb'
-  Dir[File.join(ZfbenRailsRakePath, 'tasks', '*')].each{ |f| require f }
-  task :default do
-    p 'ok'
-  end
 end

data/lib/zfben_rails_rake/helper.rb

@@ -2,18 +2,13 @@ require 'rainbow'
 require 'fileutils'
 require 'yaml'
 
-def sys cmd
+def zfben_rails_rake_system cmd
+  cmd = cmd
   STDOUT.print (cmd + "\n").color(:green)
-  err '' unless system cmd
+  zfben_rails_rake_err unless system cmd
 end
 
-def err msg
-  STDOUT.print (msg + "\n").color(:red)
+def zfben_rails_rake_err msg = 'Failed!'
+  STDERR.print (msg + "\n").color(:red)
   exit!
 end
-
-if defined?(Rails) && !Rails.root.nil?
-  ROOT = File.realpath(Rails.root).to_s
-else
-  ROOT = File.realpath('.').to_s
-end

data/lib/zfben_rails_rake/tasks/git.rb

@@ -1,29 +1,29 @@
-if File.exists?(ROOT + '/.git')
-  namespace :git do  
+if File.exists? Rails.root.join('.git')
+  namespace :git do
     desc 'Git pull'
     task :pull do
-      sys 'git pull'
+      zfben_rails_rake_system 'git pull'
     end
 
     desc 'Git commit with your comment'
     task :commit, [:comment] do |task, args|
       args = args.to_hash
-      sys "git add ."
+      zfben_rails_rake_system "git add ."
       comment = args.has_key?(:comment) ? args[:comment] : `git status`
-      sys "git commit -m '#{comment}' -a"
+      zfben_rails_rake_system "git commit -m '#{comment}' -a"
     end
 
     desc 'Git push with your comment'
     task :push, [:comment] => [:commit] do |task, comment|
-      sys 'git push'
+      zfben_rails_rake_system 'git push'
     end
 
     desc 'Clear files in .gitignore'
     task :clear do
-      unless File.exists? ROOT + '/.gitignore'
-        err '.gitignore is not exists!'
+      unless File.exists? Rails.root.join('.gitignore')
+        zfben_rails_rake_err '.gitignore is not exists!'
       else
-        sys 'git clean -dfX'
+        zfben_rails_rake_system 'git clean -dfX'
       end
     end
   end

data/lib/zfben_rails_rake/tasks/mongodb.rb

@@ -1,36 +1,36 @@
-if File.exist?(ROOT + '/config/mongoid.yml')
-  config = YAML.load(File.read(ROOT + '/config/mongoid.yml'))
+if File.exist? Rails.root.join('config/mongoid.yml')
   namespace :mongodb do
+    config = YAML.load(File.read(Rails.root.join('config/mongoid.yml')))
     backup = "mongodump --host #{config['production']['host']} --port #{config['production']['port']}"
     desc backup
     task :dump do
-      sys backup
+      zfben_rails_rake_system backup
     end
 
     restore = "mongorestore --host #{config['production']['host']} --port #{config['production']['port']}"
     desc restore
     task :restore do
-      sys restore
+      zfben_rails_rake_system restore
     end
 
     desc 'Start Mongodb'
     task :start do
-      sys "mkdir #{ROOT}/mongo" unless File.exists?(ROOT + '/mongo')
-      sys "mongod --nohttpinterface --nojournal --port #{config['production']['port']} --bind_ip #{config['production']['host']} --dbpath #{ROOT}/mongo --fork --logpath #{ROOT}/log/mongodb.log"
+      zfben_rails_rake_system "mkdir #{Rails.root}/mongo" unless File.exists?(Rails.root.join('mongo'))
+      zfben_rails_rake_system "mongod --nohttpinterface --nojournal --port #{config['production']['port']} --bind_ip #{config['production']['host']} --dbpath #{Rails.root}/mongo --fork --logpath #{Rails.root}/log/mongodb.log"
     end
 
     desc 'Stop Mongodb'
     task :stop do
-      path = ROOT + '/mongo/mongod.lock'
+      path = Rails.root.join('mongo/mongod.lock').to_s
       if File.exists?(path)
-        sys "kill `cat #{path}`"
-        sys 'rm ' + path
+        zfben_rails_rake_system "kill `cat #{path}`"
+        zfben_rails_rake_system 'rm ' + path
       end
     end
 
     desc 'Clear mongo folder'
     task :clear do
-      sys 'rm -r mongo/*'
+      zfben_rails_rake_system 'rm -r mongo/*'
     end
   end
 end

data/lib/zfben_rails_rake/tasks/resque.rb

@@ -1,41 +1,42 @@
-if File.exists?(ROOT + '/config/initializers/resque.rb')
-  require ROOT + '/config/initializers/resque.rb'
-  require 'resque/tasks'
-  if defined?(Resque::Scheduler)
-    require 'resque_scheduler/tasks'
-  end
+if File.exists? Rails.root.join('config/initializers/resque.rb')
   namespace :resque do
+    require Rails.root.join('config/initializers/resque.rb')
+    require 'resque/tasks'
+    if defined?(Resque::Scheduler)
+      require 'resque_scheduler/tasks'
+    end
+    
     task :setup => :environment
 
     task :_work => ['resque:preload', 'resque:setup'] do
       work = Resque::Worker.new('*')
       Process.daemon(true)
-      File.open(ROOT + '/tmp/resque.pid', 'w') { |f| f << work.pid }
+      File.open(Rails.root.join('tmp/resque.pid'), 'w') { |f| f << work.pid }
       work.work(5)
     end
 
     if defined?(Resque::Scheduler)
       task :_scheduler => 'resque:setup' do
         Process.daemon(true)
-        File.open(ROOT + '/tmp/scheduler.pid', 'w') { |f| f << Process.pid.to_s }
+        File.open(Rails.root.join('tmp/scheduler.pid'), 'w') { |f| f << Process.pid.to_s }
         Resque::Scheduler.run
       end
     end
 
     desc 'Start Resque daemon worker'
     task :start => 'resque:stop' do
-      sys "bash -c 'RAILS_ENV=production rake resque:_work'"
+      zfben_rails_rake_system "bash -c 'RAILS_ENV=production rake resque:_work'"
       if defined?(Resque::Scheduler)
-        sys "bash -c 'RAILS_ENV=production rake resque:_scheduler'"
+        zfben_rails_rake_system "bash -c 'RAILS_ENV=production rake resque:_scheduler'"
       end
     end
 
     desc 'Stop Resque worker'
     task :stop do
       ['resque', 'scheduler'].each do |name|
-        path = ROOT + '/tmp/' + name + '.pid'
+        path = Rails.root.join('tmp/' + name + '.pid')
         if File.exists?(path)
-          sys "kill `cat #{path}`;rm #{path}"
+          zfben_rails_rake_system "kill `cat #{path}`;rm #{path}"
         end
       end
     end

data/lib/zfben_rails_rake/tasks/unicorn.rb

@@ -1,27 +1,25 @@
-if File.exists? ROOT + '/unicorn.rb'
+if File.exists? Rails.root.join('unicorn.rb')
   namespace :unicorn do
     desc 'Start unicorn server'
     task :start do
-      if File.exists? ROOT + '/config.ru'
+      if File.exists? Rails.root.join('config.ru')
         cmd = 'unicorn'
       else
         cmd = 'unicorn_rails'
       end
-      sys cmd << ' -c unicorn.rb -E production -D'
+      zfben_rails_rake_system cmd << ' -c unicorn.rb -E production -D'
     end
 
     desc 'Stop unicorn server'
     task :stop do
-      if File.exists? ROOT + '/tmp/unicorn.pid'
-        sys 'kill -QUIT `cat tmp/unicorn.pid`'
+      if File.exists? Rails.root.join('tmp/unicorn.pid')
+        zfben_rails_rake_system 'kill -QUIT `cat tmp/unicorn.pid`'
         sleep 1
       end
-      sys 'rm -r tmp/*'
+      zfben_rails_rake_system 'rm -r tmp/*'
     end
 
-    desc 'Hot restart unicorn server'
-    task :restart do
-      sys 'kill -HUP `cat tmp/unicorn.pid`'
-    end
+    desc 'Restart unicorn server'
+    task :restart => [:stop, :start]
   end
 end

data/zfben_rails_rake.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'zfben_rails_rake'
-  s.version     = '0.0.18'
+  s.version     = '0.0.19'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Ben']
   s.email       = ['ben@zfben.com']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfben_rails_rake
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000 Z
+date: 2011-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &9640120 !ruby/object:Gem::Requirement
+  requirement: &11135260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,12 +21,11 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9640120
+  version_requirements: *11135260
 description: ''
 email:
 - ben@zfben.com
-executables:
-- zfben
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -34,7 +33,6 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
-- bin/zfben
 - lib/zfben_rails_rake.rb
 - lib/zfben_rails_rake/helper.rb
 - lib/zfben_rails_rake/tasks/git.rb

data/bin/zfben

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-if File.exists?('Rakefile')
-  system "rake #{ARGV.join(' ')} -E \"require 'zfben_rails_rake'\""
-else
-  print "Sorry, Not found Rakefile.\n"
-end