commands 0.1.0 → 0.2.0

data/README.md

@@ -23,3 +23,5 @@ When your console boots, it'll automatically have a `commander` object instantia
     > generate "scaffold post title:string"
     > rake "db:migrate"
     > test "models/person"
+
+You can see the options available for all the commands by running them with no parameters.

data/commands.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'commands'
-  s.version = '0.1.0'
+  s.version = '0.2.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,4 +1,4 @@
 require 'rails/console/app'
-require 'commands/console_delegation'
+require 'rails/commands/console_delegation'
 
-Rails::ConsoleMethods.send :include, Commands::ConsoleDelegation
+Rails::ConsoleMethods.send :include, Rails::Commands::ConsoleDelegation

data/lib/rails/commands/commander.rb

@@ -0,0 +1,21 @@
+require 'rails/commands/raker'
+require 'rails/commands/tester'
+require 'rails/commands/generator'
+
+module Rails
+  module Commands
+    class Commander
+      delegate :rake, to: :raker
+      delegate :test, to: :tester
+      delegate :generate, :destroy, :update, to: :generator
+
+      attr_reader :raker, :tester, :generator
+
+      def initialize
+        @raker     = Raker.new
+        @tester    = Tester.new
+        @generator = Generator.new
+      end
+    end
+  end
+end

data/lib/rails/commands/console_delegation.rb

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

data/lib/rails/commands/environment.rb

@@ -0,0 +1,16 @@
+module Rails
+  module Commands
+    module Environment
+      extend self
+    
+      def fork
+        Kernel.fork do
+          yield
+          Kernel.exit
+        end
+
+        Process.waitall
+      end
+    end
+  end
+end

data/lib/rails/commands/generator.rb

@@ -0,0 +1,42 @@
+require 'rails/generators'
+
+module Rails
+  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
+end

data/lib/rails/commands/raker.rb

@@ -0,0 +1,62 @@
+require 'rake'
+
+module Rails
+  module Commands
+    class Raker
+      include Rake::DSL
+
+      def initialize
+        load_rake_tasks
+      end
+
+      def rake(task = nil)
+        task.nil? ? print_rake_tasks : invoke_rake_task(task)
+        "Completed"
+      rescue SystemExit, RuntimeError => e
+        "Failed: #{e.message}"
+      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)
+          task, *options = task.split(" ")
+
+          ARGV.replace options
+
+          # FIXME: Before we can use this, we need a way to reset the options again
+          # Rake.application.handle_options
+
+          expose_argv_arguments_via_env { Rake::Task[task].invoke }
+          Rake.application.tasks.each(&:reenable) # Rake by default only allows tasks to be run once per session
+        ensure
+          ARGV.replace([])
+        end
+      
+        def expose_argv_arguments_via_env
+          argv_arguments.each { |key, value| ENV[key] = value }
+          yield
+        ensure
+          argv_arguments.keys.each { |key| ENV.delete(key) }
+        end
+      
+        def argv_arguments
+          ARGV.each_with_object({}) do |arg, arguments|
+            if arg =~ /^(\w+)=(.*)$/
+              arguments[$1] = $2
+            end
+          end
+        end
+    end
+  end
+end

data/lib/rails/commands/test_environment.rb

@@ -0,0 +1,59 @@
+require 'rails/commands/environment'
+
+module Rails
+  module Commands
+    module TestEnvironment
+      extend self
+    
+      def fork
+        Environment.fork do
+          switch_to_test
+          yield
+        end
+      end
+
+
+      private
+        def switch_to_test
+          switch_rails
+          switch_bundler
+
+          reset_active_record
+          reload_classes
+        
+          add_test_dir_to_load_path
+        end
+
+        def switch_rails
+          ENV['RAILS_ENV'] = Rails.env = "test"
+
+          Kernel.silence_warnings do
+            Dir[Rails.root.join('config', 'initializers', '*.rb')].map { |file| load file }
+            load Rails.root.join('config', 'environments', "test.rb")
+          end
+        end
+    
+        def switch_bundler
+          Bundler.require "test"
+        end
+
+    
+        def reload_classes
+          ActionDispatch::Reloader.cleanup!
+          ActionDispatch::Reloader.prepare!
+        end
+    
+        def reset_active_record
+          if defined? ActiveRecord
+            ActiveRecord::Base.clear_active_connections!
+            ActiveRecord::Base.establish_connection
+          end
+        end
+
+      
+        def add_test_dir_to_load_path
+          $:.unshift("./test")
+        end
+    end
+  end
+end

data/lib/rails/commands/tester.rb

@@ -0,0 +1,49 @@
+require 'rails/commands/test_environment'
+
+module Rails
+  module Commands
+    class Tester
+      def test(what = nil)
+        case what
+        when NilClass
+          print_test_usage
+        when "all"
+          run "test/**/**/*_test.rb"
+        when /^[^\/]+$/ # models
+          run "test/#{what}/**/*_test.rb"
+        when /[\/]+/ # models/person
+          run "test/#{what}_test.rb"
+        end
+
+        "Completed"
+      end
+
+
+      private
+        def run(*test_patterns)
+          TestEnvironment.fork do
+            test_patterns.each do |test_pattern|
+              Dir[test_pattern].each do |path|
+                require File.expand_path(path)
+              end
+            end        
+          end
+        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
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commands
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -34,15 +34,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ./commands-0.0.1.gem
+- ./commands-0.1.0.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
+- ./lib/rails/commands/commander.rb
+- ./lib/rails/commands/console_delegation.rb
+- ./lib/rails/commands/environment.rb
+- ./lib/rails/commands/generator.rb
+- ./lib/rails/commands/raker.rb
+- ./lib/rails/commands/test_environment.rb
+- ./lib/rails/commands/tester.rb
 - ./MIT-LICENSE
 - ./Rakefile
 - ./README.md

data/lib/commands/commander.rb

@@ -1,32 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,40 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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

@@ -1,81 +0,0 @@
-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