omg_pull_request 0.4.0 → 0.5.0

data/lib/omg_pull_request/configuration.rb

@@ -37,15 +37,6 @@ module OmgPullRequest
       file
     end
 
-    def plugins
-      return @plugins if @plugins
-      p = self.config['plugins'] || ''
-
-      @plugins = p.split(',').map(&:constantize).collect do |klass|
-        klass.new({ :options => config }.with_indifferent_access)
-      end
-    end
-
     def omg_dir
       File.join(local_repo, '.omgprrc')
     end

data/lib/omg_pull_request/context.rb

@@ -24,7 +24,6 @@ module OmgPullRequest
       closed
     end
 
-
     private
 
     def ran_hash

data/lib/omg_pull_request/plugin.rb

@@ -0,0 +1,37 @@
+require 'singleton'
+
+module OmgPullRequest
+  class Plugin
+    def self.initialize(&block)
+      ActiveSupport::Notifications.subscribe("omgpr:initialize") do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+        block.call(event.payload)
+      end
+    end
+
+    def self.subscribe(method, &block)
+      ActiveSupport::Notifications.subscribe("omgpr:#{method}") do |*args|
+        event = ActiveSupport::Notifications::Event.new(*args)
+        block.call(event.payload)
+      end
+    end
+
+    def self.instrument(event, args)
+      Plugin::Instrumenter.instance.instrument(event, args)
+    end
+
+    class Instrumenter
+      include Singleton
+
+      def initialize
+        Plugin.initialize do |attributes|
+          @attributes = attributes
+        end
+      end
+
+      def instrument(event, args)
+        ActiveSupport::Notifications.instrument("omgpr:#{event}", (@attributes || {}).merge(args))
+      end
+    end
+  end
+end

data/lib/omg_pull_request/test_runner.rb

@@ -1,4 +1,5 @@
 module OmgPullRequest
+
   module TestRunner
 
     def self.start_daemon(configuration=Configuration.new, daemonize=true)
@@ -11,23 +12,19 @@ module OmgPullRequest
         :github_wrapper => github_wrapper
       )
 
-      plugins = configuration.plugins
+      Plugin.instrument("initialize", 
+        :configuration  => configuration,
+        :github_wrapper => github_wrapper
+      )
 
       while(true)
         begin
-          pull_requests   = github_wrapper.pull_requests
-          closed_requests = CONTEXT.get_recently_closed(pull_requests)
-          closed_requests.each do |closed|
+          pull_requests = github_wrapper.pull_requests
+
+          CONTEXT.get_recently_closed(pull_requests).each do |closed|
             pr = github_wrapper.find_pull_request(closed)
-            merged = pr.merged 
-
-            plugins.each do |plugin|
-              if merged && plugin.respond_to?(:pull_request_merged)
-                plugin.pull_request_merged(pr)
-              elsif !merged && plugin.respond_to?(:pull_request_closed)
-                plugin.pull_request_closed(pr)
-              end
-            end
+            event = pr.merged ? 'merged' : 'closed'
+            Plugin.instrument(event, :pull_request => pr)
           end
 
           pull_requests.each do |pr|
@@ -39,13 +36,8 @@ module OmgPullRequest
             )
             next if CONTEXT.ran?(runner.request_sha)
             CONTEXT.ran(runner.request_sha)
-
-            plugins.each do |plugin|
-              if plugin.respond_to?(:test_run)
-                plugin.test_run(pr)
-              end
-            end
-
+            
+            Plugin.instrument("run", :pull_request => pr)
             runner.run
           end
 

data/lib/omg_pull_request/version.rb

@@ -1,3 +1,3 @@
 module OmgPullRequest
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/omg_pull_request.rb

@@ -23,6 +23,7 @@ require 'omg_pull_request/git_client'
 require 'omg_pull_request/prowl'
 require 'omg_pull_request/lolcommits'
 require 'omg_pull_request/version'
+require 'omg_pull_request/plugin'
 
 module OmgPullRequest
   CONTEXT = Context.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omg_pull_request
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &70291716629820 !ruby/object:Gem::Requirement
+  requirement: &70129346855720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70291716629820
+  version_requirements: *70129346855720
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70291716643700 !ruby/object:Gem::Requirement
+  requirement: &70129346854780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70291716643700
+  version_requirements: *70129346854780
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &70291716662620 !ruby/object:Gem::Requirement
+  requirement: &70129346874260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70291716662620
+  version_requirements: *70129346874260
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70291716658640 !ruby/object:Gem::Requirement
+  requirement: &70129346873600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70291716658640
+  version_requirements: *70129346873600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70291716657800 !ruby/object:Gem::Requirement
+  requirement: &70129346872860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70291716657800
+  version_requirements: *70129346872860
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70291716656240 !ruby/object:Gem::Requirement
+  requirement: &70129346872360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70291716656240
+  version_requirements: *70129346872360
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70291716669020 !ruby/object:Gem::Requirement
+  requirement: &70129346871800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,7 +90,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70291716669020
+  version_requirements: *70129346871800
 description: Have tests run automatically for your Github Pull Request
 email:
 - kenmazaika@gmail.com
@@ -112,6 +112,7 @@ files:
 - lib/omg_pull_request/github_wrapper.rb
 - lib/omg_pull_request/lolcommits.rb
 - lib/omg_pull_request/notifications.rb
+- lib/omg_pull_request/plugin.rb
 - lib/omg_pull_request/prowl.rb
 - lib/omg_pull_request/storage/aws.rb
 - lib/omg_pull_request/storage/gist.rb
@@ -140,7 +141,6 @@ files:
 - test/mocks/pull_request.rb
 - test/omg_pull_request/.gitkeep
 - test/test_helper.rb
-- test/units/omg_pull_request/configuration_test.rb
 - test/units/omg_pull_request/context_test.rb
 - test/units/omg_pull_request/git_client_test.rb
 - test/units/omg_pull_request/github_wrapper_test.rb
@@ -190,7 +190,6 @@ test_files:
 - test/mocks/pull_request.rb
 - test/omg_pull_request/.gitkeep
 - test/test_helper.rb
-- test/units/omg_pull_request/configuration_test.rb
 - test/units/omg_pull_request/context_test.rb
 - test/units/omg_pull_request/git_client_test.rb
 - test/units/omg_pull_request/github_wrapper_test.rb

data/test/units/omg_pull_request/configuration_test.rb

@@ -1,39 +0,0 @@
-require './test/test_helper.rb'
-
-module OmgPullRequest
-  class ConfigurationTest < MiniTest::Unit::TestCase
-    def test_plugins
-      conf = { 'plugins' => 'OmgPullRequest::ConfigurationTest::MockPlugin1,OmgPullRequest::ConfigurationTest::MockPlugin2' }
-
-      configuration = OmgPullRequest::Configuration.new('config' => conf)
-      plugins = configuration.plugins
-
-      plugins.each do |plugin|
-        assert_equal({:options => conf }.with_indifferent_access, plugin.attributes)
-        assert_equal('mock_plugin_yeah', plugin.to_s)
-      end
-    end
-
-    class MockPlugin1
-      attr_accessor :attributes
-      def initialize(attributes=Hash.new)
-        self.attributes = attributes
-      end
-
-      def to_s
-        "mock_plugin_yeah"
-      end
-    end
-
-    class MockPlugin2
-      attr_accessor :attributes
-      def initialize(attributes=Hash.new)
-        self.attributes = attributes
-      end
-
-      def to_s
-        "mock_plugin_yeah"
-      end
-    end
-  end
-end