jenkins-plugin-runtime 0.1.4 → 0.1.5

data/.travis.yml

@@ -4,3 +4,4 @@ notifications:
   recipients:
     - cowboyd@thefrontside.net
     - kk@kohsuke.org
+    - nakahiro@gmail.com

data/jenkins-plugin-runtime.gemspec

@@ -21,10 +21,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json"
 
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", "0.8.7"
   s.add_development_dependency "rspec", "~> 2.0"
   s.add_development_dependency "rspec-spies"
-  s.add_development_dependency "cucumber", "~> 1.0"
   s.add_development_dependency "jenkins-war"
 
 end

data/lib/jenkins/launcher.rb

@@ -3,13 +3,20 @@ module Jenkins
 
   # Launch processes on build slaves. No functionality is currently exposed
   class Launcher
-    # the nantive hudson.Launcher object
+    # the native hudson.Launcher object
     attr_reader :native
 
     def initialize(native = nil)
       @native = native
     end
 
+    # TODO: wrap needed.
+    # Do we really wrap whole Launcher.ProcStarter things?
+    # Or create our own Launcher (must support remote, local, etc)
+    def launch
+      @native.launch()
+    end
+
     Plugin::Proxies.register self, Java.hudson.Launcher
   end
-end
+end

data/lib/jenkins/model/build.rb

@@ -13,6 +13,18 @@ module Jenkins
         @native = native
       end
 
+      def build_var
+        @native.getBuildVariables()
+      end
+
+      def env(listener = nil)
+        if listener
+          # TODO: not tested. dump to listener?
+          listener = Plugin.instance.export(listener)
+        end
+        @native.getEnvironment(listener)
+      end
+
       Jenkins::Plugin::Proxies.register self, Java.hudson.model.AbstractBuild
     end
 

data/lib/jenkins/model/descriptor.rb

@@ -22,9 +22,9 @@ module Jenkins
         properties = JSON.parse(form.toString(2))
         properties.delete("kind")
         properties.delete("stapler-class")
-        instance = @plugin.export(construct(properties))
-        puts "instance created: #{instance}"
-        return instance
+        instance = construct(properties)
+        puts "instance created: #{instance} (#{@java_type})"
+        return @plugin.export(instance)
       end
 
       private

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

@@ -8,14 +8,18 @@ module Jenkins
         include Java.jenkins.ruby.Get
         include Jenkins::Plugin::Proxy
 
-        def prebuild(build, launcher, listener)
-          @object.prebuild(import(build), import(launcher), import(listener)) ? true : false
+        def prebuild(build, listener)
+          @object.prebuild(import(build), import(listener)) ? true : false
         end
 
         def perform(build, launcher, listener)
           @object.perform(import(build), import(launcher), import(listener)) ? true : false
         end
 
+        def getDescriptor
+          @plugin.descriptors[@object.class]
+        end
+
         def get(name)
           @object.respond_to?(name) ? @object.send(name) : nil
         end

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

@@ -1,7 +1,7 @@
 module Jenkins
   class Plugin
     module Runtime
-      VERSION = "0.1.4"
+      VERSION = "0.1.5"
     end
   end
 end

data/lib/jenkins/plugin/runtime.rb

@@ -1,4 +1,5 @@
 require 'jenkins/plugin'
+require 'jenkins/plugin/specification'
 require 'jenkins/plugin/runtime/version'
 require 'jenkins/plugin/proxy'
 require 'jenkins/plugin/proxies'

data/lib/jenkins/plugin/specification.rb

@@ -0,0 +1,49 @@
+
+require 'pathname'
+
+module Jenkins
+  class Plugin
+    class Specification
+
+      # The name of this plugin. Will be used as a globally
+      # unique identifier inside the Jenkins server
+      attr_accessor :name
+
+      # Plugin version. This is used during dependency resolution
+      attr_accessor :version
+
+      # Free form text description of the plugin. No character limit, but please, keep it civil.
+      attr_accessor :description
+
+      # A hash of dependencies, like 'foo' => '1.2.3', 'bar' => '0.0.1'
+      # Our dependency handling is not smart (yet).
+      attr_accessor :dependencies
+
+      def initialize
+        @dependencies = {}
+        yield(self) if block_given?
+      end
+
+      # Adds `plugin_name` as a pre-requisite of
+      # this plugin. This can be the name of any Jenkins plugin
+      # written in Ruby, Java, or any other language. Version right
+      # now must be an *exact* version number.
+      def depends_on(plugin_name, version)
+        dependencies[plugin_name] = version
+      end
+
+      # Make sure that your specification is not corrupt.
+      def validate!
+        [:name, :version, :description].each do |field|
+          fail SpecificationError, "field may not be nil" unless send(field)
+        end
+      end
+
+      def self.load(path)
+        eval(File.read(path), binding, path, 1)
+      end
+    end
+
+    SpecificationError = Class.new(StandardError)
+  end
+end

data/spec/jenkins/model/build_spec.rb

@@ -5,4 +5,7 @@ describe Jenkins::Model::Build do
   it "can be instantiated" do
     Jenkins::Model::Build.new(mock(Java.hudson.model.AbstractBuild))
   end
+
+  # TODO: spec for build_var and env
+  # Just a mocking and method invocation checks are enough?
 end

data/spec/jenkins/plugin/example.pluginspec

@@ -0,0 +1,6 @@
+
+Jenkins::Plugin::Specification.new do |plugin|
+  plugin.name = 'the-name'
+  plugin.version = '1.0.0'
+  plugin.description = 'one great plugin'
+end

data/spec/jenkins/plugin/proxies/builder_spec.rb

@@ -10,8 +10,8 @@ describe Jenkins::Plugin::Proxies::Builder do
 
   describe "prebuild" do
     it "calls through to its implementation" do
-      @object.should_receive(:prebuild).with(@build, @launcher, @listener)
-      @builder.prebuild(@jBuild, @jLauncher, @jListener)
+      @object.should_receive(:prebuild).with(@build, @listener)
+      @builder.prebuild(@jBuild, @jListener)
     end
   end
 

data/spec/jenkins/plugin/specification_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Jenkins::Plugin::Specification do
+  it "is invalid by default" do
+    expect {subject.validate!}.should raise_error Jenkins::Plugin::SpecificationError
+  end
+
+  describe "when name, version and desc are set" do
+    before do
+      subject.tap do |spec|
+        spec.name = 'my-plugin'
+        spec.version = "0.0.1"
+        spec.description = "test plugin"
+      end
+    end
+    it "is valid" do
+      subject.validate!.should be_true
+    end
+  end
+
+  describe "a spec loaded from a file" do
+    subject {Jenkins::Plugin::Specification.load(Pathname(__FILE__).dirname.join('example.pluginspec'))}
+    its(:name) {should eql "the-name"}
+    its(:version) {should eql "1.0.0"}
+    its(:description) {should eql "one great plugin"}
+    its(:dependencies) {should be_empty}
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: jenkins-plugin-runtime
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
   - Charles Lowell
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 -05:00
+date: 2011-09-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -30,9 +30,9 @@ dependencies:
     requirement: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - "="
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: 0.8.7
     type: :development
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -57,28 +57,17 @@ dependencies:
             version: "0"
     type: :development
     version_requirements: *id004
-  - !ruby/object:Gem::Dependency 
-    name: cucumber
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "1.0"
-    type: :development
-    version_requirements: *id005
   - !ruby/object:Gem::Dependency 
     name: jenkins-war
     prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
+    requirement: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
     type: :development
-    version_requirements: *id006
+    version_requirements: *id005
 description: I'll think of a better description later, but if you're reading this, then I haven't
 email: 
   - cowboyd@thefrontside.net
@@ -103,13 +92,13 @@ files:
   - lib/jenkins/model/listener.rb
   - lib/jenkins/model/root_action.rb
   - lib/jenkins/plugin.rb
-  - lib/jenkins/plugin/cli.rb
   - lib/jenkins/plugin/proxies.rb
   - lib/jenkins/plugin/proxies/build_wrapper.rb
   - lib/jenkins/plugin/proxies/builder.rb
   - lib/jenkins/plugin/proxy.rb
   - lib/jenkins/plugin/runtime.rb
   - lib/jenkins/plugin/runtime/version.rb
+  - lib/jenkins/plugin/specification.rb
   - lib/jenkins/rack.rb
   - lib/jenkins/slaves/cloud.rb
   - lib/jenkins/tasks/build_wrapper.rb
@@ -120,11 +109,13 @@ files:
   - spec/jenkins/model/describable_spec.rb
   - spec/jenkins/model/listener_spec.rb
   - spec/jenkins/model_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_spec.rb
   - spec/jenkins/plugin/proxy_spec.rb
+  - spec/jenkins/plugin/specification_spec.rb
   - spec/jenkins/plugin_spec.rb
   - spec/jenkins/tasks/build_wrapper_spec.rb
   - spec/jenkins/tasks/builder_spec.rb
@@ -166,11 +157,13 @@ test_files:
   - spec/jenkins/model/describable_spec.rb
   - spec/jenkins/model/listener_spec.rb
   - spec/jenkins/model_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_spec.rb
   - spec/jenkins/plugin/proxy_spec.rb
+  - spec/jenkins/plugin/specification_spec.rb
   - spec/jenkins/plugin_spec.rb
   - spec/jenkins/tasks/build_wrapper_spec.rb
   - spec/jenkins/tasks/builder_spec.rb

data/lib/jenkins/plugin/cli.rb

@@ -1,20 +0,0 @@
-
-require 'thor'
-
-module Jenkins
-  module Plugins
-    class CLI < Thor
-
-
-      desc "init", "Create a new Jenkins plugin"
-      def init
-
-      end
-
-      desc "gen", "generate extension boilerplate"
-      def gen
-
-      end
-    end
-  end
-end