jenkins-plugin-runtime 0.1.26 → 0.1.27

data/lib/jenkins/cli/command.rb

@@ -44,6 +44,7 @@ module Jenkins::CLI
   # @see {https://wiki.jenkins-ci.org/display/JENKINS/Jenkins+CLI Running Jenkins CLI}
   module Command
     extend Jenkins::Plugin::Behavior
+    include Jenkins::Extension
 
     implemented do |cls|
       cls.instance_eval do

data/lib/jenkins/extension.rb

@@ -0,0 +1,29 @@
+module Jenkins
+  #
+  # Defines the equivalent of `hudson.Extension`
+  #
+  module Extension
+    extend Plugin::Behavior
+
+    module ClassMethods
+      #
+      # Set the relative order of your extension among others.
+      # Ordinals are in the descending order, so the bigger the value, the closer you get to the head of the list.
+      #
+      # class MyRootAction extends RootAction
+      #   ordinal 3
+
+      #   ...
+      # end
+      def order(n=nil)
+        if n.nil?
+          @order || 0
+        else
+          @order = n
+        end
+      end
+    end
+  end
+
+
+end

data/lib/jenkins/listeners/run_listener.rb

@@ -17,6 +17,7 @@ module Jenkins::Listeners
   #
   module RunListener
     extend Jenkins::Plugin::Behavior
+    include Jenkins::Extension
 
     implemented do |cls|
       Jenkins.plugin.register_extension RunListenerProxy.new(Jenkins.plugin, cls.new)

data/lib/jenkins/model.rb

@@ -2,6 +2,7 @@
 module Jenkins
   module Model
     extend Plugin::Behavior
+    include Jenkins::Extension
 
     module InstanceDisplayName
       # Get the display name of this Model. This value will be used as a default

data/lib/jenkins/model/describable.rb

@@ -30,6 +30,7 @@ module Jenkins
     # glue layer and not the public runtime API.
     module Describable
       extend Plugin::Behavior
+      include Jenkins::Extension
       DescribableError = Class.new(StandardError)
 
       implemented do |cls|

data/lib/jenkins/model/environment_proxy.rb

@@ -1,6 +1,7 @@
 module Jenkins::Model
   module EnvironmentProxy
     extend Jenkins::Plugin::Behavior
+    include Jenkins::Extension
 
     module InstanceMethods
       def setUp(build, launcher, listener)

data/lib/jenkins/plugin.rb

@@ -101,7 +101,19 @@ module Jenkins
 
     def register_extension(class_or_instance, *args)
       extension = class_or_instance.is_a?(Class) ? class_or_instance.new(*args) : class_or_instance
-      @peer.addExtension(export(extension))
+
+      # look everywhere for possible ordinal value.
+      # extension can be a Java object, or a Proxy to a Ruby object
+      ordinal = 0
+      if extension.class.respond_to? :order
+        ordinal = extension.class.order
+      else
+        t = import(extension)
+        if t.class.respond_to? :order
+          ordinal = t.class.order
+        end
+      end
+      @peer.addExtension(export(extension), ordinal)
     end
 
     # Register a ruby class as a Jenkins extension point of

data/lib/jenkins/plugin/behavior.rb

@@ -36,9 +36,28 @@ module Jenkins
     #     end
     #   end
     # end
+    #
     # And of course, there is the case of proxies where we need to make sure that
     # certain behaviors are always included into the proxy, and that if java classes
     # need to be implemented, they are.
+    #
+    # If the module (=X) that extend Behavior defines a module named ClassMethods in it,
+    # then every subtype of X automatically extends this ClassMethods.n
+    #
+    # module Foo
+    #  extend Behavior
+    #  module ClassMethod
+    #    def look_ma
+    #      puts "I'm here'"
+    #    end
+    #  end
+    # end
+    # class Bar
+    #   include Foo
+    # end
+    #
+    # Bar.look_ma
+    #
     module Behavior
       def included(mod)
         if mod.is_a? Class

data/lib/jenkins/plugin/proxy.rb

@@ -28,6 +28,7 @@ module Jenkins
         super(*super_args) if defined? super
         @plugin, @object = plugin, object
         @pluginid = @plugin.name
+        @plugin.linkout object, self
       end
 
       # tell Stapler to go look for views from the wrapped object

data/lib/jenkins/plugin/runtime.rb

@@ -1,5 +1,6 @@
 require 'jenkins/plugin'
 require 'jenkins/plugin/behavior'
+require 'jenkins/extension'
 require 'jenkins/plugin/wrapper'
 require 'jenkins/plugin/specification'
 require 'jenkins/plugin/runtime/version'

data/lib/jenkins/plugin/runtime/version.rb

@@ -1,7 +1,7 @@
 module Jenkins
   class Plugin
     module Runtime
-      VERSION = "0.1.26"
+      VERSION = "0.1.27"
     end
   end
 end

data/lib/jenkins/slaves/computer_listener.rb

@@ -17,6 +17,7 @@ module Jenkins::Slaves
   #
   module ComputerListener
     extend Jenkins::Plugin::Behavior
+    include Jenkins::Extension
 
     implemented do |cls|
       Jenkins.plugin.register_extension ComputerListenerProxy.new(Jenkins.plugin, cls.new)

data/spec/jenkins/extension_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Jenkins::Extension do
+  include SpecHelper
+
+  it "adds the ordinal method to class" do
+    class Foo
+      class Foo
+        include Jenkins::Extension
+        order 3
+      end
+
+      class Bar < Foo
+        order 5
+      end
+
+      Foo.order.should == 3
+      Bar.order.should == 5
+    end
+  end
+end

data/spec/jenkins/plugin/proxies_spec.rb

@@ -4,8 +4,10 @@ describe Jenkins::Plugin::Proxies do
   Proxies = Jenkins::Plugin::Proxies
   before  do
     Proxies.clear
-    @plugin = mock(Jenkins::Plugin)
+    @plugin = mock(Jenkins::Plugin, :name => 'mock-plugin')
+    @plugin.stub(:linkout) {|*args| @proxies.linkout(*args)}
     @proxies = Jenkins::Plugin::Proxies.new(@plugin)
+    Jenkins.stub(:plugin) {@plugin}
   end
 
   describe "exporting a native ruby object" do
@@ -163,15 +165,33 @@ describe Jenkins::Plugin::Proxies do
     end
   end
 
+  describe 'importing a java proxy object which was manually created' do
+    before do
+      @impl = Object.new
+      @proxy = proxy_class.new(@plugin, @impl)
+    end
+
+    it 'returns the proxied ruby object' do
+      @proxies.import(@proxy).should be @impl
+    end
+
+    it 'exports the proxy in lieu of the ruby implementation' do
+      @proxies.export(@impl).should be @proxy
+    end
+  end
+
   private
 
   def proxy_class
-    cls = Class.new
+    cls = Class.new(java.lang.Object)
     cls.class_eval do
+      include Jenkins::Plugin::Proxy
       attr_reader :plugin, :object
+
       def initialize(plugin = nil, object = nil)
-        @plugin, @object = plugin, object
+        super(plugin || Jenkins.plugin, object)
       end
+
     end
     return cls
   end

data/spec/jenkins/plugin_spec.rb

@@ -1,8 +1,52 @@
 require 'spec_helper'
+require 'rspec-spies'
 require 'tmpdir'
 
 describe Jenkins::Plugin do
 
+  describe 'registering an extension.' do
+    before do
+      @peer = mock(:name => 'org.jenkinsci.ruby.RubyPlugin')
+      @peer.stub(:addExtension)
+      @plugin = Jenkins::Plugin.new @peer
+      @plugin.stub(:export) {|obj| obj}
+    end
+    describe 'When the extension class defines its order' do
+      before do
+        ext_class = Class.new
+        def ext_class.order; 10;end
+        @ext = ext_class.new
+        @plugin.register_extension @ext
+      end
+      it 'uses it' do
+        @peer.should have_received(:addExtension).with(@ext,10)
+      end
+    end
+    describe 'When the extension is a proxy' do
+      before do
+        impl_class = Class.new
+        def impl_class.order; 5; end
+        @impl = impl_class.new
+        @ext = Object.new
+        @plugin.stub(:import) {@impl}
+        @plugin.register_extension @ext
+      end
+      it 'uses the proxied objects class order' do
+        @peer.should have_received(:addExtension).with(@ext, 5)
+      end
+    end
+
+    describe 'when no order is defined' do
+      before do
+        @ext = Object.new
+        @plugin.register_extension @ext
+      end
+      it 'uses 0' do
+        @peer.should have_received(:addExtension).with(@ext, 0)
+      end
+    end
+  end
+
   describe Jenkins::Plugin::Lifecycle do
     before do |variable|
       @plugin = Jenkins::Plugin.new mock(:name => 'org.jenkinsci.ruby.RubyPlugin')

metadata

@@ -2,7 +2,7 @@
 name: jenkins-plugin-runtime
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors: 
   - Charles Lowell
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-03 00:00:00 Z
+date: 2012-03-22 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: json
@@ -88,8 +88,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - .gitignore
-  - .travis.yml
   - Gemfile
   - README.md
   - Rakefile
@@ -97,6 +95,7 @@ files:
   - lib/core_ext/exception.rb
   - lib/jenkins/cli/command.rb
   - lib/jenkins/cli/command_proxy.rb
+  - lib/jenkins/extension.rb
   - lib/jenkins/filepath.rb
   - lib/jenkins/launcher.rb
   - lib/jenkins/listeners/run_listener.rb
@@ -137,6 +136,7 @@ files:
   - lib/jenkins/tasks/publisher.rb
   - spec/jenkins/cli/command_proxy_spec.rb
   - spec/jenkins/cli/command_spec.rb
+  - spec/jenkins/extension_spec.rb
   - spec/jenkins/filepath_spec.rb
   - spec/jenkins/launcher_spec.rb
   - spec/jenkins/listeners/run_listener_proxy_spec.rb
@@ -184,13 +184,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jenkins-plugin-runtime
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Runtime support libraries for Jenkins Ruby plugins
 test_files: 
   - spec/jenkins/cli/command_proxy_spec.rb
   - spec/jenkins/cli/command_spec.rb
+  - spec/jenkins/extension_spec.rb
   - spec/jenkins/filepath_spec.rb
   - spec/jenkins/launcher_spec.rb
   - spec/jenkins/listeners/run_listener_proxy_spec.rb

data/.gitignore

@@ -1,7 +0,0 @@
-.rvmrc
-*.gem
-.bundle
-.idea
-Gemfile.lock
-pkg/*
-target/

data/.travis.yml

@@ -1,7 +0,0 @@
-rvm:
-  - jruby
-notifications:
-  recipients:
-    - cowboyd@thefrontside.net
-    - kk@kohsuke.org
-    - nakahiro@gmail.com