jenkins-plugin-runtime 0.1.16 → 0.1.17

data/jenkins-plugin-runtime.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Charles Lowell"]
   s.email       = ["cowboyd@thefrontside.net"]
-  s.homepage    = "http://github.com/cowboyd/jenkins-plugins.rb"
+  s.homepage    = "http://github.com/cowboyd/jenkins-plugin-runtime"
   s.summary     = %q{Runtime support libraries for Jenkins Ruby plugins}
   s.description = %q{I'll think of a better description later, but if you're reading this, then I haven't}
 
@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
   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 "jenkins-war"
+  s.add_development_dependency "jenkins-war", "~> 1.445"
 
 end

data/lib/jenkins/filepath.rb

@@ -4,7 +4,7 @@ module Jenkins
   class FilePath
     Stat = Struct.new(:size, :mode, :mtime)
 
-    attr_reader :natvie
+    attr_reader :native
 
     def initialize(native)
       @native = native

data/lib/jenkins/model/build.rb

@@ -3,9 +3,9 @@ require 'jenkins/filepath'
 module Jenkins
   module Model
 
-    ##
-    # Represents a single build. In general, you won't need this
-    #
+    # Represents a single build. This object is passed in to
+    # all build steps, and can be used to configure, halt, message
+    # the current running build.
     class Build
 
       # Raised to indicate that a build wrapper halted a build.
@@ -16,9 +16,24 @@ module Jenkins
       # the Hudson::Model::AbstractBuild represented by this build
       attr_reader :native
 
-      def initialize(native = nil)
+      # Hash of environment variables that will be added to each process
+      # started as part of this build. E.g.
+      #
+      # build.env['GEM_HOME'] = '/path/to/my/gem/home'
+      #
+      # Note that this is not an exhaustive list of all environement variables,
+      # only those which have been explicitly set by code inside this Ruby
+      # plugin.
+      #
+      # Also, this list does not contain variables that might get set by things
+      # like .profile and .rc files.
+      attr_reader :env
+
+      def initialize(native)
         @native = native
         @variables = {}
+        @env = {}
+        @native.buildEnvironments.add(EnvironmentVariables.new(@env))
       end
 
       # Gets a build value. Each build stores a map of key,value
@@ -40,6 +55,8 @@ module Jenkins
         @variables[key.to_s] = value
       end
 
+      # The workspace associated with this build
+      # @return [Jenkins::FilePath] workspace
       def workspace
         FilePath.new(@native.getWorkspace())
       end
@@ -58,18 +75,24 @@ module Jenkins
         raise Java.hudson.AbortException.new(reason)
       end
 
-      def build_var
-        @native.getBuildVariables()
-      end
+      class EnvironmentVariables < Java.hudson.model.Environment
+        def initialize(variables)
+          super()
+          @variables = variables
+        end
 
-      def env
-        @native.getEnvironment(nil)
+        def buildEnvVars(map)
+          @variables.each do |key,value|
+            map.put(key.to_s.upcase, value.to_s)
+          end
+        end
       end
 
-      def build_wrapper_environment(cls)
-        @native.getEnvironmentList().find do |e|
-          e.instance_of?(Jenkins::Plugin::Proxies::EnvironmentWrapper) && e.build_wrapper.instance_of?(cls)
-        end
+      # Until the accessor gets into mainline, we
+      # add directly to the protected field
+      # @see https://github.com/jenkinsci/jenkins/commit/8cd23888b4f07efaa5bb499ad599375ca67b9146
+      Java.hudson.model.AbstractBuild.class_eval do
+        field_accessor :buildEnvironments
       end
 
       Jenkins::Plugin::Proxies.register self, Java.hudson.model.AbstractBuild

data/lib/jenkins/plugin.rb

@@ -179,7 +179,7 @@ module Jenkins
           begin
             load path
           rescue Exception => e
-            puts "#{e.message} (#{e.class})\n" << (e.backtrace || []).join("\n")
+            puts "#{e.message} (#{e.class})\n  " << (e.backtrace || ["(not available)"]).join("\n  ")
           end
           nil
         end

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

@@ -1,7 +1,7 @@
 module Jenkins
   class Plugin
     module Runtime
-      VERSION = "0.1.16"
+      VERSION = "0.1.17"
     end
   end
 end

data/spec/jenkins/model/build_spec.rb

@@ -2,16 +2,14 @@ require 'spec_helper'
 
 describe Jenkins::Model::Build do
   include Jenkins::Model
+  include SpecHelper
 
   before :each do
-    @native = mock("AbstractBuild")
+    @native = mockito(Java.hudson.model.AbstractBuild)
+    @native.buildEnvironments = java.util.ArrayList.new
     @build = Jenkins::Model::Build.new(@native)
   end
 
-  it "can be instantiated" do
-    Jenkins::Model::Build.new
-  end
-
   it "returns workspace path" do
     fs = Jenkins::FilePath.new(nil)
     fs.should_receive(:getRemote).and_return(".")
@@ -19,16 +17,6 @@ describe Jenkins::Model::Build do
     @build.workspace.to_s.should == "."
   end
 
-  it "returns build variables as Hash-like" do
-    @native.should_receive(:getBuildVariables).and_return("FOO" => "BAR")
-    @build.build_var.should == {"FOO" => "BAR"}
-  end
-
-  it "returns environment variables as Hash-like" do
-    @native.should_receive(:getEnvironment).with(nil).and_return("FOO" => "BAR")
-    @build.env.should == {"FOO" => "BAR"}
-  end
-
   it "can halt" do
     expect {@build.halt "stopping"}.should raise_error(Jenkins::Model::Build::Halt, "stopping")
   end
@@ -57,4 +45,21 @@ describe Jenkins::Model::Build do
     end
   end
 
+  describe "environment variables" do
+    before do
+      @build.env['FOO'] = 'bar'
+      @build.env[:bar] = :baz
+      Java.org.mockito.Mockito.when(@native.getEvironment(nil)).thenCallRealMethod()
+      @vars = @native.getEnvironment(nil)
+    end
+
+    it "sets environment variables into the native build environment" do
+      @vars.get('FOO').should eql 'bar'
+    end
+
+    it "capitalizes and stringifies keys and stringifies values" do
+      @vars.get('BAR').should eql 'baz'
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ $:.unshift Pathname(__FILE__).dirname.join('../lib')
 
 require 'jenkins/plugin/runtime'
 require 'jenkins/plugin/proxies/proxy_helper'
+require File.expand_path '../mockito-all-1.8.5.jar', __FILE__
 
 module SpecHelper
   # Java does not support opening directory as a File: File.open(".")
@@ -42,4 +43,8 @@ module SpecHelper
       f << content
     end
   end
+
+  def mockito(cls)
+    Java.org.mockito.Mockito.mock(cls.java_class)
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: jenkins-plugin-runtime
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors: 
   - Charles Lowell
@@ -10,63 +10,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 Z
+date: 2011-12-27 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: json
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    requirement: *id001
-    prerelease: false
     type: :runtime
+    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: rake
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 0.8.7
-    requirement: *id002
-    prerelease: false
     type: :development
+    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: rspec
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.0"
-    requirement: *id003
-    prerelease: false
     type: :development
+    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: rspec-spies
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    requirement: *id004
-    prerelease: false
     type: :development
+    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: jenkins-war
-    version_requirements: &id005 !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id005
-    prerelease: false
+            version: "1.445"
     type: :development
+    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
@@ -128,10 +128,11 @@ files:
   - spec/jenkins/plugin_spec.rb
   - spec/jenkins/tasks/build_wrapper_spec.rb
   - spec/jenkins/tasks/builder_spec.rb
+  - spec/mockito-all-1.8.5.jar
   - spec/spec_helper.rb
   - src/jenkins/ruby/DoDynamic.java
   - src/jenkins/ruby/Get.java
-homepage: http://github.com/cowboyd/jenkins-plugins.rb
+homepage: http://github.com/cowboyd/jenkins-plugin-runtime
 licenses: []
 
 post_install_message: 
@@ -144,18 +145,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
@@ -164,24 +159,5 @@ rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Runtime support libraries for Jenkins Ruby plugins
-test_files: 
-  - spec/jenkins/filepath_spec.rb
-  - spec/jenkins/launcher_spec.rb
-  - spec/jenkins/model/action_spec.rb
-  - spec/jenkins/model/build_spec.rb
-  - 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/publisher_spec.rb
-  - spec/jenkins/plugin/proxies/root_action_spec.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
-  - spec/spec_helper.rb
+test_files: []
+