jenkins-plugin-runtime 0.1.23 → 0.1.24

data/lib/jenkins/model/describable.rb

@@ -41,8 +41,8 @@ module Jenkins
         # Java class that represents the extension point, which gets eventually set to Descriptor.clazz
         # :with will use this java class as the type of descriptor.
         def describe_as cls, options = {}
-          @describe_as_type = verify_java_class(cls).java_class
-          @descriptor_is = verify_java_class(options[:with]).java_class if options[:with]
+          @describe_as_type = verify_java_class(cls)
+          @descriptor_is = verify_java_class(options[:with]) if options[:with]
         end
 
         def describe_as_type

data/lib/jenkins/model/environment.rb

@@ -0,0 +1,24 @@
+module Jenkins::Model
+  module Environment
+    # Perform setup for a build
+    #
+    # invoked after checkout, but before any `Builder`s have been run
+    # @param [Jenkins::Model::Build] build the build about to run
+    # @param [Jenkins::Launcher] launcher a launcher for the orderly starting/stopping of processes.
+    # @param [Jenkins::Model::Listener] listener channel for interacting with build output console
+    def setup(build, launcher, listener)
+
+    end
+
+    # Optionally perform optional teardown for a build
+    #
+    # invoked after a build has run for better or for worse. It's ok if subclasses
+    # don't override this.
+    #
+    # @param [Jenkins::Model::Build] the build which has completed
+    # @param [Jenkins::Model::Listener] listener channel for interacting with build output console
+    def teardown(build, listener)
+
+    end
+  end
+end

data/lib/jenkins/model/environment_proxy.rb

@@ -0,0 +1,52 @@
+module Jenkins::Model
+  module EnvironmentProxy
+    extend Jenkins::Plugin::Behavior
+
+    module InstanceMethods
+      def setUp(build, launcher, listener)
+        @object.setup(import(build), import(launcher), import(listener))
+        environment_class = self.class.environment_class || DefaultEnvironment
+        environment_class.new(self, @plugin, @object).tap do |env|
+          env.plugin = @plugin
+          env.impl = @object
+        end
+      rescue Jenkins::Model::Build::Halt
+        nil
+      end
+    end
+
+    module ClassMethods
+      attr_reader :environment_class
+
+      def environment_is(java_class, &block)
+        @environment_class = Class.new(java_class)
+        if block_given?
+          @environment_class.class_eval(&block)
+        end
+        @environment_class.class_eval do
+          include EnvironmentWrapper
+        end
+      end
+    end
+
+    module EnvironmentWrapper
+      attr_accessor :plugin, :impl
+
+      def tearDown(build, listener)
+        @impl.teardown(@plugin.import(build), @plugin.import(listener))
+        true
+      rescue Jenkins::Model::Build::Halt
+        false
+      end
+    end
+
+    class DefaultEnvironment < Java.hudson.model.Environment
+      include EnvironmentWrapper
+      def initialize(proxy, plugin, object)
+        @plugin = plugin
+        @object = object
+      end
+    end
+
+  end
+end

data/lib/jenkins/plugin.rb

@@ -116,10 +116,10 @@ module Jenkins
     # @see [Model::Describable]
     def register_describable(describable_class)
       on.start do
-        fail "#{describable_class} is not an instance of Describable" unless describable_class.is_a? Model::Describable
-        descriptor_class = descriptor_class.descriptor_is || Jenkins::Model::Descriptor
-        descriptor = descriptor_class.new(ruby_class, self, describable_class.describe_as_type)
-        @descriptors[ruby_class] = descriptor
+        fail "#{describable_class} is not an instance of Describable" unless describable_class < Model::Describable
+        descriptor_class = describable_class.descriptor_is || Jenkins::Model::Descriptor
+        descriptor = descriptor_class.new(describable_class, self, describable_class.describe_as_type.java_class)
+        @descriptors[describable_class] = descriptor
         register_extension(descriptor)
       end
     end
@@ -237,7 +237,7 @@ module Jenkins
       def callback(listener, *args)
         listener.call(*args)
       rescue Exception => e
-        $stderr.warn "#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
+        warn "#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
       end
     end
   end

data/lib/jenkins/plugin/proxies.rb

@@ -172,7 +172,7 @@ module Jenkins
 end
 
 require 'jenkins/model/describable'
-["action", "build_wrapper", "builder", "publisher", "root_action"].each do |proxy|
+["action", "builder", "publisher", "root_action"].each do |proxy|
   require "jenkins/plugin/proxies/#{proxy}"
 end
 

data/lib/jenkins/plugin/runtime.rb

@@ -8,6 +8,8 @@ require 'jenkins/plugin/proxies/describable'
 require 'jenkins/plugin/proxies'
 require 'jenkins/cli/command'
 require 'jenkins/model'
+require 'jenkins/model/environment'
+require 'jenkins/model/environment_proxy'
 require 'jenkins/model/action'
 require 'jenkins/model/root_action'
 require 'jenkins/model/build'
@@ -16,6 +18,9 @@ require 'jenkins/model/listener'
 require 'jenkins/slaves/cloud'
 require 'jenkins/tasks/builder'
 require 'jenkins/tasks/build_wrapper'
+require 'jenkins/tasks/build_wrapper_proxy'
 require 'jenkins/launcher'
 require 'jenkins/listeners/run_listener'
 require 'jenkins/listeners/run_listener_proxy'
+require 'jenkins/slaves/node_property'
+require 'jenkins/slaves/node_property_proxy'

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

@@ -1,7 +1,7 @@
 module Jenkins
   class Plugin
     module Runtime
-      VERSION = "0.1.23"
+      VERSION = "0.1.24"
     end
   end
 end

data/lib/jenkins/slaves/node_property.rb

@@ -0,0 +1,16 @@
+module Jenkins::Slaves
+  class NodeProperty
+    include Jenkins::Model
+    include Jenkins::Model::Environment
+    include Jenkins::Model::Describable
+
+    class NodePropertyDescriptor < Java.hudson.slaves.NodePropertyDescriptor
+      include Jenkins::Model::RubyDescriptor
+
+      def isApplicable(targetType)
+        true
+      end
+    end
+    describe_as Java.hudson.slaves.NodeProperty, :with => NodePropertyDescriptor
+  end
+end

data/lib/jenkins/slaves/node_property_proxy.rb

@@ -0,0 +1,7 @@
+module Jenkins::Slaves
+  class NodePropertyProxy < Java.hudson.slaves.NodeProperty
+    include Jenkins::Model::EnvironmentProxy
+    include Jenkins::Plugin::Proxies::Describable
+    proxy_for NodeProperty
+  end
+end

data/lib/jenkins/tasks/build_wrapper.rb

@@ -7,30 +7,9 @@ module Jenkins
     # {http://javadoc.jenkins-ci.org/hudson/tasks/BuildWrapper.html}
     class BuildWrapper
       include Jenkins::Model
+      include Jenkins::Model::Environment
       include Jenkins::Model::Describable
-
       describe_as Java.hudson.tasks.BuildWrapper
-
-      # Perform setup for a build
-      #
-      # invoked after checkout, but before any `Builder`s have been run
-      # @param [Jenkins::Model::Build] build the build about to run
-      # @param [Jenkins::Launcher] launcher a launcher for the orderly starting/stopping of processes.
-      # @param [Jenkins::Model::Listener] listener channel for interacting with build output console
-      def setup(build, launcher, listener)
-
-      end
-
-      # Optionally perform optional teardown for a build
-      #
-      # invoked after a build has run for better or for worse. It's ok if subclasses
-      # don't override this.
-      #
-      # @param [Jenkins::Model::Build] the build which has completed
-      # @param [Jenkins::Model::Listener] listener channel for interacting with build output console
-      def teardown(build, listener)
-
-      end
     end
   end
 end

data/lib/jenkins/tasks/build_wrapper_proxy.rb

@@ -0,0 +1,15 @@
+module Jenkins::Tasks
+  class BuildWrapperProxy < Java.hudson.tasks.BuildWrapper
+    include Jenkins::Plugin::Proxies::Describable
+    proxy_for Jenkins::Tasks::BuildWrapper
+
+    include Jenkins::Model::EnvironmentProxy
+
+    # BuildWrapper needs a custom Environment class, not sure why
+    environment_is Java.hudson.tasks.BuildWrapper::Environment do
+      def initialize(proxy, plugin, object)
+        super(proxy)
+      end
+    end
+  end
+end

data/spec/jenkins/model/describable_spec.rb

@@ -40,7 +40,7 @@ describe Jenkins::Model::Describable do
       end
 
       it "has the same java type as its superclass" do
-        @subclass.describe_as_type.should eql java.lang.Object.java_class
+        @subclass.describe_as_type.should eql java.lang.Object
       end
 
       describe ". a sub-subclass" do
@@ -51,9 +51,9 @@ describe Jenkins::Model::Describable do
         it "is also registered as an extension of the original java type" do
           @plugin.should have_received(:register_describable).with(@subsubclass)
         end
-        
+
         it 'inherits its describe_as_type' do
-          @subsubclass.describe_as_type.should eql java.lang.Object.java_class
+          @subsubclass.describe_as_type.should eql java.lang.Object
         end
       end
     end
@@ -70,7 +70,7 @@ describe Jenkins::Model::Describable do
         lambda {@class.describe_as java.lang.Object, :with => Object}.should raise_error(Jenkins::Model::Describable::DescribableError)
       end
       it "inherits the descriptor type" do
-        @subclass.descriptor_is.should eql java.lang.String.java_class
+        @subclass.descriptor_is.should eql java.lang.String
       end
     end
   end

data/spec/jenkins/{plugin/proxies/build_wrapper_spec.rb → tasks/build_wrapper_proxy_spec.rb}

@@ -1,15 +1,15 @@
 
 require 'spec_helper'
 
-describe Jenkins::Plugin::Proxies::BuildWrapper do
+describe Jenkins::Tasks::BuildWrapperProxy do
   include ProxyHelper
 
-  subject {Jenkins::Plugin::Proxies::BuildWrapper}
+  subject {Jenkins::Tasks::BuildWrapperProxy}
   it {should be_transient(:plugin)}
 
   before do
     @object = mock(Jenkins::Tasks::BuildWrapper)
-    @wrapper = Jenkins::Plugin::Proxies::BuildWrapper.new(@plugin, @object)
+    @wrapper = Jenkins::Tasks::BuildWrapperProxy.new(@plugin, @object)
   end
 
   it "passes in an env file which will be called to " do

metadata

@@ -2,7 +2,7 @@
 name: jenkins-plugin-runtime
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors: 
   - Charles Lowell
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-02 00:00:00 Z
+date: 2012-02-03 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: json
@@ -106,6 +106,8 @@ files:
   - lib/jenkins/model/build.rb
   - lib/jenkins/model/describable.rb
   - lib/jenkins/model/descriptor.rb
+  - lib/jenkins/model/environment.rb
+  - lib/jenkins/model/environment_proxy.rb
   - lib/jenkins/model/listener.rb
   - lib/jenkins/model/root_action.rb
   - lib/jenkins/plugin.rb
@@ -113,7 +115,6 @@ files:
   - lib/jenkins/plugin/proxies.rb
   - lib/jenkins/plugin/proxies/action.rb
   - lib/jenkins/plugin/proxies/build_step.rb
-  - lib/jenkins/plugin/proxies/build_wrapper.rb
   - lib/jenkins/plugin/proxies/builder.rb
   - lib/jenkins/plugin/proxies/describable.rb
   - lib/jenkins/plugin/proxies/publisher.rb
@@ -125,8 +126,11 @@ files:
   - lib/jenkins/plugin/wrapper.rb
   - lib/jenkins/rack.rb
   - lib/jenkins/slaves/cloud.rb
+  - lib/jenkins/slaves/node_property.rb
+  - lib/jenkins/slaves/node_property_proxy.rb
   - lib/jenkins/tasks/build_step.rb
   - lib/jenkins/tasks/build_wrapper.rb
+  - lib/jenkins/tasks/build_wrapper_proxy.rb
   - lib/jenkins/tasks/builder.rb
   - lib/jenkins/tasks/publisher.rb
   - spec/jenkins/cli/command_proxy_spec.rb
@@ -141,7 +145,6 @@ files:
   - spec/jenkins/model_spec.rb
   - spec/jenkins/plugin/behavior_spec.rb
   - spec/jenkins/plugin/example.pluginspec
-  - spec/jenkins/plugin/proxies/build_wrapper_spec.rb
   - spec/jenkins/plugin/proxies/builder_spec.rb
   - spec/jenkins/plugin/proxies/proxy_helper.rb
   - spec/jenkins/plugin/proxies/publisher_spec.rb
@@ -150,6 +153,7 @@ files:
   - spec/jenkins/plugin/proxy_spec.rb
   - spec/jenkins/plugin/specification_spec.rb
   - spec/jenkins/plugin_spec.rb
+  - spec/jenkins/tasks/build_wrapper_proxy_spec.rb
   - spec/jenkins/tasks/build_wrapper_spec.rb
   - spec/jenkins/tasks/builder_spec.rb
   - spec/spec_helper.rb
@@ -195,7 +199,6 @@ test_files:
   - spec/jenkins/model_spec.rb
   - spec/jenkins/plugin/behavior_spec.rb
   - spec/jenkins/plugin/example.pluginspec
-  - spec/jenkins/plugin/proxies/build_wrapper_spec.rb
   - spec/jenkins/plugin/proxies/builder_spec.rb
   - spec/jenkins/plugin/proxies/proxy_helper.rb
   - spec/jenkins/plugin/proxies/publisher_spec.rb
@@ -204,6 +207,7 @@ test_files:
   - spec/jenkins/plugin/proxy_spec.rb
   - spec/jenkins/plugin/specification_spec.rb
   - spec/jenkins/plugin_spec.rb
+  - spec/jenkins/tasks/build_wrapper_proxy_spec.rb
   - spec/jenkins/tasks/build_wrapper_spec.rb
   - spec/jenkins/tasks/builder_spec.rb
   - spec/spec_helper.rb

data/lib/jenkins/plugin/proxies/build_wrapper.rb

@@ -1,49 +0,0 @@
-
-require 'jenkins/tasks/build_wrapper'
-require 'jenkins/model/build'
-
-module Jenkins
-  class Plugin
-    class Proxies
-
-      ##
-      # Binds the Java hudson.tasks.BuildWrapper API to the idomatic
-      # Ruby API Jenkins::Tasks::BuildWrapper
-
-      class BuildWrapper < Java.hudson.tasks.BuildWrapper
-        include Describable
-        proxy_for Jenkins::Tasks::BuildWrapper
-
-        def setUp(build, launcher, listener)
-          @object.setup(import(build), import(launcher), import(listener))
-          EnvironmentWrapper.new(self, @plugin, @object)
-        rescue Jenkins::Model::Build::Halt
-          nil
-        end
-      end
-
-
-      class EnvironmentWrapper < Java.hudson.tasks.BuildWrapper::Environment
-        attr_accessor :env
-
-        def initialize(build_wrapper, plugin, impl)
-          super(build_wrapper)
-          @plugin = plugin
-          @impl = impl
-        end
-
-        # build wrapper that created this environment
-        def build_wrapper
-          @impl
-        end
-
-        def tearDown(build, listener)
-          @impl.teardown(@plugin.import(build), @plugin.import(listener))
-          true
-        rescue Jenkins::Model::Build::Halt
-          false
-        end
-      end
-    end
-  end
-end