commands 0.0.1 → 0.0.2

data/README.md

@@ -20,9 +20,9 @@ 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:
 
-   > generate "scaffold post title:string"
-   > rake "db:migrate"
-   > test "models/person"
+    > generate "scaffold post title:string"
+    > rake "db:migrate"
+    > test "models/person"
 
 
 Work needed

data/commands.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'commands'
-  s.version = '0.0.1'
+  s.version = '0.0.2'
   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,5 @@
 require 'rake'
+require 'rails/generators'
 
 class Commands
   module ConsoleMethods
@@ -6,8 +7,6 @@ class Commands
       @commands ||= Commands.new
     end
     
-    alias_method :c, :commands
-    
     delegate :rake, :test, :generate, :destroy, :update, to: :commands
   end
 
@@ -15,34 +14,32 @@ class Commands
   
   def initialize
     load Rails.root.join('Rakefile')
+    Rails.application.load_generators
   end
   
   def rake(task, *args)
-    ActiveRecord::Base.logger.silence do
-      Rake::Task[task].invoke(*args)
+    silence_logger { Rake::Task[task].invoke(*args) }
       
-      # Rake by default only allows tasks to be run once per session
-      Rake.application.tasks.each(&:reenable)
-    end
+    # Rake by default only allows tasks to be run once per session
+    Rake.application.tasks.each(&:reenable)
+
+    nil
+  rescue SystemExit
+    # Swallow exit/abort calls as we'll never want to exit the IRB session
     nil
   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)
-    ActiveRecord::Base.logger.silence do
-      case what
-      when NilClass, :all
-        rake "test:units"
-      when String
-        ENV['TEST'] = "test/#{what}_test.rb"
-        rake "test:single"
-        ENV['TEST'] = nil
-      end
+    case what
+    when NilClass, :all
+      rake "test:units"
+    when String
+      ENV['TEST'] = "test/#{what}_test.rb"
+      rake "test:single"
+      ENV['TEST'] = nil
     end
-    nil
-  rescue SystemExit
-    nil
   end
 
   def generate(argv = nil)
@@ -62,7 +59,6 @@ class Commands
     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
-        require 'rails/generators'
         Rails::Generators.help name
       else
         ARGV.replace argv.nil? ? [nil] : argv.split(" ")
@@ -72,6 +68,15 @@ class Commands
 
       nil
     end
+    
+    # Only just ensured that this method is available in rails/master, so need a guard for a bit.
+    def silence_logger
+      if ActiveRecord::Base.logger.respond_to? :silence
+        ActiveRecord::Base.logger.silence { yield }
+      else
+        yield
+      end
+    end
 end
 
 require 'rails/console/app'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commands
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails