commands 0.0.4 → 0.1.0

data/README.md

@@ -1,7 +1,7 @@
 Commands
 ========
 
-Let you run Rake and Rails commands during a console session. This side-steps the need to load the entire environment over and over again when you run these commands from the shell. This constant reloading of the environment is what causes slow boot time on big applications. Think of this like a baby Zeus or the Turbolinks of commands.
+Run Rake and Rails commands during a console session. This side-steps the need to load the entire environment over and over again when you run these commands from the shell. This constant reloading of the environment is what causes slow boot time on big applications. Think of this like a baby Zeus or the Turbolinks of commands.
 
 
 Installation
@@ -18,15 +18,8 @@ And then execute:
 Usage
 -----
 
-When your console boots, it'll automatically have a `commands` object instantiated (aliased to `c`). The following methods are delegated to this object: rake, test, generate, destroy, update. It's used like this:
+When your console boots, it'll automatically have a `commander` object instantiated. The following methods are delegated to this object: rake, test, generate, destroy, update. It's used like this:
 
     > generate "scaffold post title:string"
     > rake "db:migrate"
     > test "models/person"
-
-
-Work needed
------------
-
-1. The test runner needs to run in the same process, not use Rake (as it shells out). So the test class needs to be instantiated directly and run under the test environment.
-1. Generating models seem to be bust for some reason.

data/commands.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'commands'
-  s.version = '0.0.4'
+  s.version = '0.1.0'
   s.author  = 'David Heinemeier Hansson'
   s.email   = 'david@37signals.com'
   s.summary = 'Run Rake/Rails commands through the console'

data/lib/commands.rb

@@ -1,133 +1,4 @@
-require 'rake'
-require 'rails/generators'
-
-class Commands
-  module ConsoleMethods
-    def commands
-      @commands ||= Commands.new
-    end
-    
-    delegate :rake, :test, :generate, :destroy, :update, to: :commands
-  end
-
-  include Rake::DSL
-  
-  def initialize
-    load_rake_tasks
-    load_rails_generators
-  end
-  
-  def rake(task = nil, *args)
-    task.nil? ? print_rake_tasks : invoke_rake_task(task, *args)
-    "Completed"
-  rescue SystemExit, RuntimeError
-    "Failed"
-  end
-
-  # FIXME: Turn this into calls directly to the test classes, so we don't have to load environment again.
-  # Also need to toggle the environment to test and back to dev after running.
-  def test(what = nil)
-    forking do
-      case what
-      when NilClass
-        print_test_usage
-      when "all"
-        rake "test"
-      when /^[^\/]+$/ # models
-        rake "test:#{what}"
-      when /[\/]+/ # models/person
-        ENV['TEST'] = "test/#{what}_test.rb"
-        rake "test:single"
-        ENV['TEST'] = nil
-      end
-    end
-
-    "Completed"
-  end
-
-  def generate(argv = nil)
-    generator :generate, argv
-  end
-  
-  def update(argv = nil)
-    generator :update, argv
-  end
-  
-  def destroy(argv = nil)
-    generator :destroy, argv
-  end
-  
-  
-  private
-    def load_rake_tasks
-      Rake::TaskManager.record_task_metadata = true # needed to capture comments from define_task
-      load Rails.root.join('Rakefile')
-    end
-    
-    def load_rails_generators
-      Rails.application.load_generators
-    end
-
-
-    def print_rake_tasks
-      Rake.application.options.show_tasks = :tasks
-      Rake.application.options.show_task_pattern = Regexp.new('')
-      Rake.application.display_tasks_and_comments
-    end
-
-    def invoke_rake_task(task, *args)
-      silence_active_record_logger { Rake::Task[task].invoke(*args) }
-      Rake.application.tasks.each(&:reenable) # Rake by default only allows tasks to be run once per session
-    end
-
-
-    def print_test_usage
-      puts <<-EOT
-Usage:
-  test "WHAT"
-
-Description:
-    Runs either a full set of test suites or single suite.
-    
-    If you supply WHAT with either models, controllers, helpers, integration, or performance,
-    those whole sets will be run.
-    
-    If you supply WHAT with models/person, just test/models/person_test.rb will be run.
-EOT
-    end
-
-    def forking
-      pid = Kernel.fork do
-        yield
-        Kernel.exit
-      end
-      Process.wait pid
-    end
-
-
-    def generator(name, argv = nil)
-      if argv.nil?
-        # FIXME: I don't know why we can't just catch SystemExit here, then we wouldn't need this if block
-        Rails::Generators.help name
-      else
-        ARGV.replace argv.nil? ? [nil] : argv.split(" ")
-        load "rails/commands/#{name}.rb"
-        ARGV.replace [nil]
-      end
-
-      "Completed"
-    end
-    
-    # Only just ensured that this method is available in rails/master, so need a guard for a bit.
-    def silence_active_record_logger
-      begin
-        old_logger_level, ActiveRecord::Base.logger.level = ActiveRecord::Base.logger.level, Logger::ERROR
-        yield
-      ensure
-        ActiveRecord::Base.logger.level = old_logger_level
-      end
-    end
-end
-
 require 'rails/console/app'
-Rails::ConsoleMethods.send :include, Commands::ConsoleMethods
+require 'commands/console_delegation'
+
+Rails::ConsoleMethods.send :include, Commands::ConsoleDelegation

data/lib/commands/commander.rb

@@ -0,0 +1,32 @@
+require 'commands/raker'
+require 'commands/tester'
+require 'commands/generator'
+
+module Commands
+  class Commander
+    delegate :rake, to: :raker
+    delegate :test, to: :tester
+    delegate :generate, :destroy, :update, to: :generator
+
+    # Only just ensured that this method is available in rails/master, so need a guard for a bit.
+    def self.silence_active_record_logger
+      return yield unless defined? ActiveRecord::Base.logger
+
+      begin
+        old_logger_level, ActiveRecord::Base.logger.level = ActiveRecord::Base.logger.level, Logger::ERROR
+        yield
+      ensure
+        ActiveRecord::Base.logger.level = old_logger_level
+      end
+    end
+
+    attr_reader :raker, :tester, :generator
+
+    def initialize
+      @raker     = Raker.new
+      @tester    = Tester.new
+      @generator = Generator.new
+    end
+  end
+end
+

data/lib/commands/console_delegation.rb

@@ -0,0 +1,11 @@
+require 'commands/commander'
+
+module Commands
+  module ConsoleDelegation
+    def commander
+      @commander ||= Commander.new
+    end
+
+    delegate :rake, :test, :generate, :destroy, :update, to: :commander
+  end
+end

data/lib/commands/generator.rb

@@ -0,0 +1,40 @@
+require 'rails/generators'
+
+module Commands
+  class Generator
+    def initialize
+      load_rails_generators
+    end
+
+    def generate(argv = nil)
+      generator :generate, argv
+    end
+
+    def update(argv = nil)
+      generator :update, argv
+    end
+
+    def destroy(argv = nil)
+      generator :destroy, argv
+    end
+
+
+    private
+      def load_rails_generators
+        Rails.application.load_generators
+      end
+
+      def generator(name, argv = nil)
+        if argv.nil?
+          # FIXME: I don't know why we can't just catch SystemExit here, then we wouldn't need this if block
+          Rails::Generators.help name
+        else
+          ARGV.replace argv.nil? ? [nil] : argv.split(" ")
+          load "rails/commands/#{name}.rb"
+          ARGV.replace [nil]
+        end
+
+        "Completed"
+      end
+  end
+end

data/lib/commands/raker.rb

@@ -0,0 +1,36 @@
+require 'rake'
+
+module Commands
+  class Raker
+    include Rake::DSL
+
+    def initialize
+      load_rake_tasks
+    end
+
+    def rake(task = nil, *args)
+      task.nil? ? print_rake_tasks : invoke_rake_task(task, *args)
+      "Completed"
+    rescue SystemExit, RuntimeError
+      "Failed"
+    end
+    
+    
+    private
+      def load_rake_tasks
+        Rake::TaskManager.record_task_metadata = true # needed to capture comments from define_task
+        load Rails.root.join('Rakefile')
+      end
+      
+      def print_rake_tasks
+        Rake.application.options.show_tasks = :tasks
+        Rake.application.options.show_task_pattern = Regexp.new('')
+        Rake.application.display_tasks_and_comments
+      end
+
+      def invoke_rake_task(task, *args)
+        Commander.silence_active_record_logger { Rake::Task[task].invoke(*args) }
+        Rake.application.tasks.each(&:reenable) # Rake by default only allows tasks to be run once per session
+      end
+  end
+end

data/lib/commands/tester.rb

@@ -0,0 +1,81 @@
+module Commands
+  class Tester
+    # FIXME: Turn this into calls directly to the test classes, so we don't have to load environment again.
+    # Also need to toggle the environment to test and back to dev after running.
+    def test(what = nil)
+      case what
+      when NilClass
+        print_test_usage
+      when "all"
+        # test/**/*_test.rb doesn't work because of performance tests
+        run "test/models/**/*_test.rb", "test/controllers/**/*_test.rb", "test/integration/**/*_test.rb"
+      when /^[^\/]+$/ # models
+        run "test/#{what}/**/*_test.rb"
+      when /[\/]+/ # models/person
+        run "test/#{what}_test.rb"
+      end
+
+      "Completed"
+    end
+
+
+    private
+      # Executes the tests matching the passed filename globs
+      def run(*test_patterns)
+        forking do
+          switch_env_to :test
+          redirect_active_record_logger
+          require_test_files(test_patterns)
+        end
+      end
+
+      def switch_env_to(new_env)
+        Rails.env = new_env.to_s
+        Rails.application
+
+        $:.unshift("./#{new_env}")
+        
+        reset_active_record
+      end
+
+      def reset_active_record
+        if defined? ::ActiveRecord
+          ::ActiveRecord::Base.clear_active_connections!
+          ::ActiveRecord::Base.establish_connection
+        end
+      end
+
+      def require_test_files(test_patterns)
+        # load the test files
+        test_patterns.each do |test_pattern|
+          Dir[test_pattern].each do |path|
+            require File.expand_path(path)
+          end
+        end        
+      end
+
+      def forking
+        Kernel.fork do
+          yield
+          Kernel.exit
+        end
+
+        Process.waitall
+      end
+
+      def print_test_usage
+        puts <<-EOT
+  Usage:
+    test "WHAT"
+
+  Description:
+      Runs either a full set of test suites or single suite.
+
+      If you supply WHAT with either models, controllers, helpers, integration, or performance,
+      those whole sets will be run.
+
+      If you supply WHAT with models/person, just test/models/person_test.rb will be run.
+  EOT
+      end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commands
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,11 +33,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ./commands-0.0.2.gem
-- ./commands-0.0.3.gem
+- ./commands-0.0.1.gem
 - ./commands.gemspec
 - ./Gemfile
 - ./Gemfile.lock
+- ./lib/commands/commander.rb
+- ./lib/commands/console_delegation.rb
+- ./lib/commands/generator.rb
+- ./lib/commands/raker.rb
+- ./lib/commands/tester.rb
 - ./lib/commands.rb
 - ./MIT-LICENSE
 - ./Rakefile