@@ -10,6 +10,5 @@ Echoe.new 'clientperf' do |p| p.project = 'clientperf' p.summary = "Instrumentation for the FiveRuns TuneUp product." p.url = "http://github.com/efalcao/clientperf" - p.dependencies = %w(activesupport) p.include_rakefile = true end \ No newline at end of file Rakefile @@ -1,12 +1,20 @@ #!/usr/bin/env ruby + +# USAGE: clientperf [RAILS_ROOT] +rails_dir = ARGV[0] || Dir.pwd + require 'fileutils' + +require rails_dir + '/config/boot' +require "#{RAILS_ROOT}/config/environment" +require 'rails_generator' +require 'rails_generator/scripts/generate' + require File.dirname(__FILE__) << "/../lib/clientperf" require File.dirname(__FILE__) << "/../lib/clientperf_config" require File.dirname(__FILE__) << "/../lib/clientperf_migrations" -# For older Rails versions -# USAGE: clientperf [RAILS_ROOT] -rails_dir = ARGV[0] || Dir.pwd + plugin_dir = File.join(rails_dir, 'vendor/plugins') unless File.directory?(plugin_dir) abort "clientperf: #{plugin_dir} does not exist; cannot install plugin" @@ -25,7 +33,7 @@ File.readlines(File.dirname(__FILE__) << "/../Manifest").each do |line| end end -ClientperfMigrations.new(rails_dir).install_new +ClientperfMigrations.install_new ClientperfConfig.create_unless_exists(rails_dir) STDERR.puts "Installed clientperf (v#{Clientperf.version}) in vendor/plugins/clientperf" \ No newline at end of file bin/clientperf @@ -27,7 +27,7 @@ module Clientperf end def version - "0.0.2" + "0.0.3" end private lib/clientperf.rb @@ -1,7 +1,3 @@ -require 'yaml' -require 'rubygems' -require 'active_support' - class ClientperfConfig delegate :[], :[]=, :each, :update, :to => :data lib/clientperf_config.rb @@ -23,33 +23,28 @@ class AddClientperfTables < ActiveRecord::Migration end) } - attr_accessor :rails_dir - - def initialize(rails_dir) - @rails_dir = rails_dir - end - - def install_new - MIGRATION_NAMES.reject {|name| exists?(name) }.each do |migration| - generate(migration) - install(migration) + class << self + def install_new + to_migrate = MIGRATION_NAMES.reject {|name| exists?(name) } + to_migrate.each do |migration| + generate(migration) + install(migration) + end end - end - - private - - def generate(migration_name) - `#{File.join(rails_dir, 'script', 'generate')} migration #{migration_name}` - end - - def migration_path(migration_name) - Dir[File.join(rails_dir, 'db', 'migrate', "*_#{migration_name}.rb")].first - end - alias_method :exists?, :migration_path - - def install(migration) - File.open(migration_path(migration), 'w') do |file| - file << MIGRATION_CONTENTS[migration.to_sym] + + def generate(migration_name) + Rails::Generator::Scripts::Generate.new.run(['migration', migration_name]) + end + + def migration_path(migration_name) + Dir[File.join(RAILS_ROOT, 'db', 'migrate', "*_#{migration_name}.rb")].first + end + alias_method :exists?, :migration_path + + def install(migration) + File.open(migration_path(migration), 'w') do |file| + file << MIGRATION_CONTENTS[migration.to_sym] + end end end end \ No newline at end of file lib/clientperf_migrations.rb 3e3b3d24466ec6fd541b8afd547780e8eb754b7e Eric Falcao efalcao@gmail.com http://github.com/efalcao/clientperf/commit/7b4dc84ea9d9ac3202ece74b883acff54d3fd87a 7b4dc84ea9d9ac3202ece74b883acff54d3fd87a 2008-06-20T13:16:20-07:00 2008-06-20T13:16:20-07:00 using script/generate programmatically rather than shelling out 90beeec52794d773caed1700f7190c4cf64d70ef Eric Falcao efalcao@gmail.com