hoptoad_notifier 2.2.6 → 2.3.0

data/CHANGELOG

@@ -1,3 +1,14 @@
+Version 2.3.0 - 2010-06-24
+===============================================================================
+
+Jason Morrison (5):
+      Add integration test for rails 3.0.0.beta4
+      Added feature: Support the Heroku addon in the generator
+      Add --heroku flag to generator to support ENV['HOPTOAD_API_KEY']
+      Reflect a copy change in rails.feature for --heroku generator flag
+      Support the proxy configuration options when notifying Hoptoad of a deploy (hat tip @gudleik)
+
+
 Version 2.2.6 - 2010-06-02
 ===============================================================================
 
@@ -147,3 +158,4 @@ Nick Quaranto (3):
 
 
 
+

data/SUPPORTED_RAILS_VERSIONS

@@ -6,4 +6,4 @@
 2.3.2
 2.3.4
 2.3.5
-3.0.0.beta3
+3.0.0.beta4

data/generators/hoptoad/hoptoad_generator.rb

@@ -3,12 +3,13 @@ require File.expand_path(File.dirname(__FILE__) + "/lib/rake_commands.rb")
 
 class HoptoadGenerator < Rails::Generator::Base
   def add_options!(opt)
-    opt.on('-k', '--api-key=key', String, "Your Hoptoad API key") {|v| options[:api_key] = v}
+    opt.on('-k', '--api-key=key', String, "Your Hoptoad API key")                                 {|v| options[:api_key] = v}
+    opt.on('-h', '--heroku',              "Use the Heroku addon to provide your Hoptoad API key") {|v| options[:heroku]  = v}
   end
 
   def manifest
-    if !api_key_configured? && !options[:api_key]
-      puts "Must pass --api-key or create config/initializers/hoptoad.rb"
+    if !api_key_configured? && !options[:api_key] && !options[:heroku]
+      puts "Must pass --api-key or --heroku or create config/initializers/hoptoad.rb"
       exit
     end
     if plugin_is_present?
@@ -21,13 +22,13 @@ class HoptoadGenerator < Rails::Generator::Base
       if ['config/deploy.rb', 'Capfile'].all? { |file| File.exists?(file) }
         m.append_to 'config/deploy.rb', capistrano_hook
       end
-      if options[:api_key]
+      if api_key_expression
         if use_initializer?
           m.template 'initializer.rb', 'config/initializers/hoptoad.rb',
-            :assigns => {:api_key => options[:api_key]}
+            :assigns => {:api_key => api_key_expression}
         else
           m.template 'initializer.rb', 'config/hoptoad.rb',
-            :assigns => {:api_key => options[:api_key]}
+            :assigns => {:api_key => api_key_expression}
           m.append_to 'config/environment.rb', "require 'config/hoptoad'"
         end
       end
@@ -35,6 +36,14 @@ class HoptoadGenerator < Rails::Generator::Base
     end
   end
 
+  def api_key_expression
+    s = if options[:api_key]
+      "'#{options[:api_key]}'"
+    elsif options[:heroku]
+      "ENV['HOPTOAD_API_KEY']"
+    end
+  end
+
   def use_initializer?
     Rails::VERSION::MAJOR > 1
   end

data/generators/hoptoad/templates/initializer.rb

@@ -2,5 +2,5 @@
 require 'hoptoad_notifier/rails'
 <% end -%>
 HoptoadNotifier.configure do |config|
-  config.api_key = '<%= api_key %>'
+  config.api_key = <%= api_key_expression %>
 end

data/lib/hoptoad_notifier/version.rb

@@ -1,3 +1,3 @@
 module HoptoadNotifier
-  VERSION = "2.2.6".freeze
+  VERSION = "2.3.0".freeze
 end

data/lib/hoptoad_tasks.rb

@@ -29,7 +29,14 @@ module HoptoadTasks
     opts.each {|k,v| params["deploy[#{k}]"] = v }
 
     url = URI.parse("http://#{HoptoadNotifier.configuration.host || 'hoptoadapp.com'}/deploys.txt")
-    response = Net::HTTP.post_form(url, params)
+
+    proxy = Net::HTTP.Proxy(HoptoadNotifier.configuration.proxy_host,
+                            HoptoadNotifier.configuration.proxy_port,
+                            HoptoadNotifier.configuration.proxy_user,
+                            HoptoadNotifier.configuration.proxy_pass)
+
+    response = proxy.post_form(url, params)
+
     puts response.body
     return Net::HTTPSuccess === response
   end

data/lib/rails/generators/hoptoad/hoptoad_generator.rb

@@ -3,6 +3,7 @@ require 'rails/generators'
 class HoptoadGenerator < Rails::Generators::Base
 
   class_option :api_key, :aliases => "-k", :type => :string, :desc => "Your Hoptoad API key"
+  class_option :heroku, :type => :boolean, :desc => "Use the Heroku addon to provide your Hoptoad API key"
 
   def self.source_root
     @_hoptoad_source_root ||= File.expand_path("../../../../../generators/hoptoad/templates", __FILE__)
@@ -19,8 +20,8 @@ class HoptoadGenerator < Rails::Generators::Base
   private
 
   def ensure_api_key_was_configured
-    if !options[:api_key] && !api_key_configured?
-      puts "Must pass --api-key or create config/initializers/hoptoad.rb"
+    if !options[:api_key] && !options[:heroku] && !api_key_configured?
+      puts "Must pass --api-key or --heroku or create config/initializers/hoptoad.rb"
       exit
     end
   end
@@ -42,8 +43,12 @@ class HoptoadGenerator < Rails::Generators::Base
     end
   end
 
-  def api_key
-    options[:api_key]
+  def api_key_expression
+    s = if options[:api_key]
+      "'#{options[:api_key]}'"
+    elsif options[:heroku]
+      "ENV['HOPTOAD_API_KEY']"
+    end
   end
 
   def generate_initializer

data/test/hoptoad_tasks_test.rb

@@ -37,25 +37,39 @@ class HoptoadTasksTest < Test::Unit::TestCase
         end
       end
 
-      context "given valid options" do
-        setup { @options = {:rails_env => "staging"} }
+      context "given an optional HTTP proxy and valid options" do
+        setup do
+          @response   = stub("response", :body => "stub body")
+          @http_proxy = stub("proxy", :post_form => @response)
+
+          Net::HTTP.expects(:Proxy).
+            with(HoptoadNotifier.configuration.proxy_host,
+                 HoptoadNotifier.configuration.proxy_port,
+                 HoptoadNotifier.configuration.proxy_user,
+                 HoptoadNotifier.configuration.proxy_pass).
+            returns(@http_proxy)
+
+          @options    = { :rails_env => "staging" }
+        end
 
         context "on deploy(options)" do
-          setup { @output = HoptoadTasks.deploy(@options) }
+          setup do
+            @output = HoptoadTasks.deploy(@options)
+          end
 
           before_should "post to http://hoptoadapp.com/deploys.txt" do
             URI.stubs(:parse).with('http://hoptoadapp.com/deploys.txt').returns(:uri)
-            Net::HTTP.expects(:post_form).with(:uri, kind_of(Hash)).returns(successful_response)
+            @http_proxy.expects(:post_form).with(:uri, kind_of(Hash)).returns(successful_response)
           end
 
           before_should "use the project api key" do
-            Net::HTTP.expects(:post_form).
+            @http_proxy.expects(:post_form).
               with(kind_of(URI), has_entries('api_key' => "1234123412341234")).
               returns(successful_response)
           end
 
           before_should "use send the rails_env param" do
-            Net::HTTP.expects(:post_form).
+            @http_proxy.expects(:post_form).
               with(kind_of(URI), has_entries("deploy[rails_env]" => "staging")).
               returns(successful_response)
           end
@@ -63,7 +77,7 @@ class HoptoadTasksTest < Test::Unit::TestCase
           [:local_username, :scm_repository, :scm_revision].each do |key|
             before_should "use send the #{key} param if it's passed in." do
               @options[key] = "value"
-              Net::HTTP.expects(:post_form).
+              @http_proxy.expects(:post_form).
                 with(kind_of(URI), has_entries("deploy[#{key}]" => "value")).
                 returns(successful_response)
             end
@@ -71,29 +85,29 @@ class HoptoadTasksTest < Test::Unit::TestCase
 
           before_should "use the :api_key param if it's passed in." do
             @options[:api_key] = "value"
-            Net::HTTP.expects(:post_form).
+            @http_proxy.expects(:post_form).
               with(kind_of(URI), has_entries("api_key" => "value")).
               returns(successful_response)
           end
 
           before_should "puts the response body on success" do
             HoptoadTasks.expects(:puts).with("body")
-            Net::HTTP.expects(:post_form).with(any_parameters).returns(successful_response('body'))
+            @http_proxy.expects(:post_form).with(any_parameters).returns(successful_response('body'))
           end
 
           before_should "puts the response body on failure" do
             HoptoadTasks.expects(:puts).with("body")
-            Net::HTTP.expects(:post_form).with(any_parameters).returns(unsuccessful_response('body'))
+            @http_proxy.expects(:post_form).with(any_parameters).returns(unsuccessful_response('body'))
           end
 
           should "return false on failure", :before => lambda {
-            Net::HTTP.expects(:post_form).with(any_parameters).returns(unsuccessful_response('body'))
+            @http_proxy.expects(:post_form).with(any_parameters).returns(unsuccessful_response('body'))
           } do
             assert !@output
           end
 
           should "return true on success", :before => lambda {
-            Net::HTTP.expects(:post_form).with(any_parameters).returns(successful_response('body'))
+            @http_proxy.expects(:post_form).with(any_parameters).returns(successful_response('body'))
           } do
             assert @output
           end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 2
-  - 6
-  version: 2.2.6
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - thoughtbot, inc
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -04:00
+date: 2010-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency