Changed rake tasks to be included instead of copied

.gitignore

@@ -1,5 +1,5 @@
 log/*
-tmp/**/*
+tmp
 db/schema.rb
 db/*.sqlite3
 public/system

features/rails.feature

@@ -10,6 +10,15 @@ Feature: Install the Gem in a Rails application
     And I run "script/generate hoptoad -k myapikey"
     Then I should receive a Hoptoad notification
 
+  Scenario: vendor the gem and uninstall
+    When I generate a new Rails application
+    And I configure the Hoptoad shim
+    And I configure my application to require the "hoptoad_notifier" gem
+    And I run "rake gems:unpack"
+    And I uninstall the "hoptoad_notifier" gem
+    And I run "script/generate hoptoad -k myapikey"
+    Then I should receive a Hoptoad notification
+
   Scenario: Configure the notifier by hand
     When I generate a new Rails application
     And I configure the Hoptoad shim

features/step_definitions/rails_application_steps.rb

@@ -52,3 +52,7 @@
 Then /^I should see "([^\"]*)"$/ do |expected_text|
   @terminal.output.should include(expected_text)
 end
+
+When /^I uninstall the "([^\"]*)" gem$/ do |gem_name|
+  @terminal.uninstall_gem(gem_name)
+end

features/support/terminal.rb

@@ -3,13 +3,13 @@
 end
 
 class Terminal
-
   attr_reader :output, :status
 
   def initialize
     @cwd = FileUtils.pwd
     @output = ""
     @status = 0
+    @logger = Logger.new(File.join(TEMP_DIR, 'terminal.log'))
   end
 
   def cd(directory)
@@ -19,7 +19,9 @@ def cd(directory)
   def run(command)
     output << "#{command}\n"
     FileUtils.cd(@cwd) do
+      logger.debug(command)
       result = `#{environment_settings} #{command} 2>&1`
+      logger.debug(result)
       output << result
     end
     @status = $?
@@ -39,6 +41,10 @@ def install_gem(gem)
     install_gem_to(LOCAL_GEM_ROOT, gem)
   end
 
+  def uninstall_gem(gem)
+    `gem uninstall -i #{BUILT_GEM_ROOT} #{gem}`
+  end
+
   private
 
   def install_gem_to(root, gem)
@@ -48,4 +54,6 @@ def install_gem_to(root, gem)
   def environment_settings
     "GEM_HOME=#{LOCAL_GEM_ROOT} GEM_PATH=#{LOCAL_GEM_ROOT}:#{BUILT_GEM_ROOT}"
   end
+
+  attr_reader :logger
 end

generators/hoptoad/templates/hoptoad_notifier_tasks.rake

@@ -1,89 +1,5 @@
-namespace :hoptoad do
-  desc "Notify Hoptoad of a new deploy."
-  task :deploy => :environment do
-    require 'hoptoad_tasks'
-    HoptoadTasks.deploy(:rails_env      => ENV['TO'], 
-                        :scm_revision   => ENV['REVISION'],
-                        :scm_repository => ENV['REPO'],
-                        :local_username => ENV['USER'],
-                        :api_key        => ENV['API_KEY'])
-  end
-
-  task :log_stdout do
-    require 'logger'
-    RAILS_DEFAULT_LOGGER = Logger.new(STDOUT)
-  end
-
-  desc "Verify your gem installation by sending a test exception to the hoptoad service"
-  task :test => ['hoptoad:log_stdout', :environment] do
-    RAILS_DEFAULT_LOGGER.level = Logger::DEBUG
-
-    require 'action_controller/test_process'
-    require 'app/controllers/application' if File.exists?('app/controllers/application.rb')
-
-    request = ActionController::TestRequest.new
-    response = ActionController::TestResponse.new
-
-    class HoptoadTestingException < RuntimeError; end
-
-    unless HoptoadNotifier.configuration.api_key
-      puts "Hoptoad needs an API key configured! Check the README to see how to add it."
-      exit
-    end
-
-    HoptoadNotifier.configuration.development_environments = []
-
-    in_controller = ApplicationController.included_modules.include? HoptoadNotifier::Catcher
-    in_base = ActionController::Base.included_modules.include? HoptoadNotifier::Catcher
-    if !in_controller || !in_base
-      puts "HoptoadNotifier::Catcher must be included inside your ApplicationController class."
-      exit
-    end
-
-    puts "Configuration:"
-    HoptoadNotifier.configuration.to_hash.each do |key, value|
-      puts sprintf("%25s: %s", key.to_s, value.inspect.slice(0, 55))
-    end
-
-    puts 'Setting up the Controller.'
-    class ApplicationController
-      # This is to bypass any filters that may prevent access to the action.
-      prepend_before_filter :test_hoptoad
-      def test_hoptoad
-        puts "Raising '#{exception_class.name}' to simulate application failure."
-        raise exception_class.new, 'Testing hoptoad via "rake hoptoad:test". If you can see this, it works.'
-      end
-
-      def rescue_action exception
-        rescue_action_in_public exception
-      end
-
-      # Ensure we actually have an action to go to.
-      def verify; end
-
-      def consider_all_requests_local
-        false
-      end
-
-      def local_request?
-        false
-      end
-
-      def exception_class
-        exception_name = ENV['EXCEPTION'] || "HoptoadTestingException"
-        Object.const_get(exception_name)
-      rescue
-        Object.const_set(exception_name, Class.new(Exception))
-      end
-
-      def logger
-        nil
-      end
-    end
-
-    puts 'Processing request.'
-    class HoptoadVerificationController < ApplicationController; end
-    HoptoadVerificationController.new.process(request, response)
-  end
+Dir[File.join(RAILS_ROOT, 'vendor', 'gems', 'hoptoad_notifier-*')].each do |vendored_notifier|
+  $: << File.join(vendored_notifier, 'lib')
 end
 
+require 'hoptoad_notifier/tasks'

lib/hoptoad_notifier/tasks.rb

@@ -0,0 +1,91 @@
+require 'hoptoad_notifier'
+
+namespace :hoptoad do
+  desc "Notify Hoptoad of a new deploy."
+  task :deploy => :environment do
+    require 'hoptoad_tasks'
+    HoptoadTasks.deploy(:rails_env      => ENV['TO'], 
+                        :scm_revision   => ENV['REVISION'],
+                        :scm_repository => ENV['REPO'],
+                        :local_username => ENV['USER'],
+                        :api_key        => ENV['API_KEY'])
+  end
+
+  task :log_stdout do
+    require 'logger'
+    RAILS_DEFAULT_LOGGER = Logger.new(STDOUT)
+  end
+
+  desc "Verify your gem installation by sending a test exception to the hoptoad service"
+  task :test => ['hoptoad:log_stdout', :environment] do
+    RAILS_DEFAULT_LOGGER.level = Logger::DEBUG
+
+    require 'action_controller/test_process'
+    require 'app/controllers/application' if File.exists?('app/controllers/application.rb')
+
+    request = ActionController::TestRequest.new
+    response = ActionController::TestResponse.new
+
+    class HoptoadTestingException < RuntimeError; end
+
+    unless HoptoadNotifier.configuration.api_key
+      puts "Hoptoad needs an API key configured! Check the README to see how to add it."
+      exit
+    end
+
+    HoptoadNotifier.configuration.development_environments = []
+
+    in_controller = ApplicationController.included_modules.include? HoptoadNotifier::Catcher
+    in_base = ActionController::Base.included_modules.include? HoptoadNotifier::Catcher
+    if !in_controller || !in_base
+      puts "HoptoadNotifier::Catcher must be included inside your ApplicationController class."
+      exit
+    end
+
+    puts "Configuration:"
+    HoptoadNotifier.configuration.to_hash.each do |key, value|
+      puts sprintf("%25s: %s", key.to_s, value.inspect.slice(0, 55))
+    end
+
+    puts 'Setting up the Controller.'
+    class ApplicationController
+      # This is to bypass any filters that may prevent access to the action.
+      prepend_before_filter :test_hoptoad
+      def test_hoptoad
+        puts "Raising '#{exception_class.name}' to simulate application failure."
+        raise exception_class.new, 'Testing hoptoad via "rake hoptoad:test". If you can see this, it works.'
+      end
+
+      def rescue_action exception
+        rescue_action_in_public exception
+      end
+
+      # Ensure we actually have an action to go to.
+      def verify; end
+
+      def consider_all_requests_local
+        false
+      end
+
+      def local_request?
+        false
+      end
+
+      def exception_class
+        exception_name = ENV['EXCEPTION'] || "HoptoadTestingException"
+        Object.const_get(exception_name)
+      rescue
+        Object.const_set(exception_name, Class.new(Exception))
+      end
+
+      def logger
+        nil
+      end
+    end
+
+    puts 'Processing request.'
+    class HoptoadVerificationController < ApplicationController; end
+    HoptoadVerificationController.new.process(request, response)
+  end
+end
+