rubyjobbuilderdsl 0.0.4 → 0.0.5

data/lib/rubyjobbuilderdsl/postbuild.rb

@@ -1,160 +1,160 @@
-require_relative 'postbuild/archive'
-require_relative 'postbuild/logparser'
-require_relative 'postbuild/html_publisher'
-require_relative 'postbuild/email_publisher'
-require_relative 'postbuild/nunit_publisher'
-require_relative 'postbuild/xunit_publisher'
-require_relative 'postbuild/cloverphp_publisher'
-require_relative 'postbuild/javadoc_publisher'
-require_relative 'postbuild/pmd_publisher'
-require_relative 'postbuild/claim_publisher'
-require_relative 'postbuild/tap_publisher'
-require_relative 'postbuild/chucknorris_publisher'
-require_relative 'postbuild/game_publisher'
-require_relative 'postbuild/script'
-require_relative 'postbuild/trigger'
-require_relative 'postbuild/groovy'
-require_relative 'postbuild/cucumber_json_publisher'
-require_relative 'postbuild/slack'
-require_relative 'buildstep/shell'
-
-# dsl methods for job builder
-module JenkinsJob
-  module Postbuild
-    class Postbuild < BasicObject
-      attr_reader :job, :publishers_
-
-      def initialize(job)
-        @job = job
-        @publishers_ = {}
-      end
-
-      def archive(&block)
-        # sandbox for archive dsl
-        archive = Archive.new
-        archive.instance_eval(&block)
-
-        @publishers_['archive'] = archive
-      end
-
-      def publish_html(name, &block)
-        # sandbox for html publisher dsl
-        publisher = HtmlPublisher.new(name)
-        publisher.instance_eval(&block)
-
-        @publishers_['publish_html'] ||= []
-        @publishers_['publish_html'] << publisher
-      end
-
-      def send_email(recipients, &block)
-        publisher = EmailPublisher.new(recipients)
-        publisher.instance_eval(&block) if block
-
-        @publishers_['send_email'] = publisher
-      end
-
-      def publish_nunit_report(test_results_pattern, &block)
-        publisher = NUnitPublisher.new(test_results_pattern)
-        publisher.instance_eval(&block) if block
-
-        @publishers_['publish_nunit_report'] = publisher
-      end
-
-      def publish_xunit_report(test_results_pattern, &block)
-        publisher = XUnitPublisher.new(test_results_pattern)
-        publisher.instance_eval(&block) if block
-
-        @publishers_['publish_xunit_report'] = publisher
-      end
-
-      def publish_tap(test_results, &block)
-        publisher = TapPublisher.new(test_results)
-        publisher.instance_eval(&block) if block
-
-        @publishers_['publish_tap'] = publisher
-      end
-
-      def logparser(rule_file, &block)
-        # sandbox for html publisher dsl
-        logparser = LogParser.new(rule_file)
-        logparser.instance_eval(&block) if block
-
-        @publishers_['logparser'] = logparser
-      end
-
-      def shell(value)
-        @publishers_['postbuildscript'] ||= PostbuildScript.new
-        @publishers_['postbuildscript'].add(::JenkinsJob::BuildStep::Shell.new(value))
-      end
-
-      def batch(value)
-        @publishers_['postbuildscript'] ||= PostbuildScript.new
-        @publishers_['postbuildscript'].add(::JenkinsJob::BuildStep::Batch.new(value))
-      end
-
-      def powershell(value)
-        @publishers_['postbuildscript'] ||= PostbuildScript.new
-        @publishers_['postbuildscript'].add(::JenkinsJob::BuildStep::Powershell.new(value))
-      end
-
-      def trigger(*project, &block)
-        trigger = PostbuildTrigger.new(project)
-        trigger.instance_eval(&block) if block
-        @publishers_['trigger-parameterized-builds'] = trigger
-      end
-
-      def groovy(value)
-        @publishers_['groovy'] = PostbuildGroovy.new(value)
-      end
-
-      def publish_cloverphp(&block)
-        clover = CloverPhpPublisher.new
-        clover.instance_eval(&block) if block
-        @publishers_['clover-php'] = clover
-      end
-
-      def publish_slack(&block)
-        slack = PostbuildSlack.new
-        slack.instance_eval(&block) if block
-        @publishers_['slack'] = slack
-      end      
-
-      def cucumber_json_publisher(&block)
-        cucumber = CucumberJsonPublisher.new
-        cucumber.instance_eval(&block) if block
-        @publishers_['cucumber'] = cucumber
-      end
-
-      def publish_javadoc(&block)
-        doc = JavaDocPublisher.new
-        doc.instance_eval(&block) if block
-        @publishers_['java-doc'] = doc
-      end
-
-      def publish_pmd(&block)
-        pmd = PMDPublisher.new
-        pmd.instance_eval(&block) if block
-        @publishers_['pmd'] = pmd
-      end
-
-      def publish_chucknorris(&block)
-        chucknorris = ChuckNorrisPublisher.new
-        chucknorris.instance_eval(&block) if block
-        @publishers_['chucknorris'] = chucknorris
-      end
-      alias_method :chucknorris, :publish_chucknorris
-
-      def publish_game(&block)
-        game = GamePublisher.new
-        game.instance_eval(&block) if block
-        @publishers_['game'] = game
-      end
-      alias_method :game, :publish_game
-
-      def allow_broken_build_claiming
-        publisher = ClaimPublisher.new
-        @publishers_['claim-publisher'] = publisher
-      end
-    end
-  end
-end
+require_relative 'postbuild/archive'
+require_relative 'postbuild/logparser'
+require_relative 'postbuild/html_publisher'
+require_relative 'postbuild/email_publisher'
+require_relative 'postbuild/nunit_publisher'
+require_relative 'postbuild/xunit_publisher'
+require_relative 'postbuild/cloverphp_publisher'
+require_relative 'postbuild/javadoc_publisher'
+require_relative 'postbuild/pmd_publisher'
+require_relative 'postbuild/claim_publisher'
+require_relative 'postbuild/tap_publisher'
+require_relative 'postbuild/chucknorris_publisher'
+require_relative 'postbuild/game_publisher'
+require_relative 'postbuild/script'
+require_relative 'postbuild/trigger'
+require_relative 'postbuild/groovy'
+require_relative 'postbuild/cucumber_json_publisher'
+require_relative 'postbuild/slack'
+require_relative 'buildstep/shell'
+
+# dsl methods for job builder
+module JenkinsJob
+  module Postbuild
+    class Postbuild < BasicObject
+      attr_reader :job, :publishers_
+
+      def initialize(job)
+        @job = job
+        @publishers_ = {}
+      end
+
+      def archive(&block)
+        # sandbox for archive dsl
+        archive = Archive.new
+        archive.instance_eval(&block)
+
+        @publishers_['archive'] = archive
+      end
+
+      def publish_html(name, &block)
+        # sandbox for html publisher dsl
+        publisher = HtmlPublisher.new(name)
+        publisher.instance_eval(&block)
+
+        @publishers_['publish_html'] ||= []
+        @publishers_['publish_html'] << publisher
+      end
+
+      def send_email(recipients, &block)
+        publisher = EmailPublisher.new(recipients)
+        publisher.instance_eval(&block) if block
+
+        @publishers_['send_email'] = publisher
+      end
+
+      def publish_nunit_report(test_results_pattern, &block)
+        publisher = NUnitPublisher.new(test_results_pattern)
+        publisher.instance_eval(&block) if block
+
+        @publishers_['publish_nunit_report'] = publisher
+      end
+
+      def publish_xunit_report(test_results_pattern, &block)
+        publisher = XUnitPublisher.new(test_results_pattern)
+        publisher.instance_eval(&block) if block
+
+        @publishers_['publish_xunit_report'] = publisher
+      end
+
+      def publish_tap(test_results, &block)
+        publisher = TapPublisher.new(test_results)
+        publisher.instance_eval(&block) if block
+
+        @publishers_['publish_tap'] = publisher
+      end
+
+      def logparser(rule_file, &block)
+        # sandbox for html publisher dsl
+        logparser = LogParser.new(rule_file)
+        logparser.instance_eval(&block) if block
+
+        @publishers_['logparser'] = logparser
+      end
+
+      def shell(value)
+        @publishers_['postbuildscript'] ||= PostbuildScript.new
+        @publishers_['postbuildscript'].add(::JenkinsJob::BuildStep::Shell.new(value))
+      end
+
+      def batch(value)
+        @publishers_['postbuildscript'] ||= PostbuildScript.new
+        @publishers_['postbuildscript'].add(::JenkinsJob::BuildStep::Batch.new(value))
+      end
+
+      def powershell(value)
+        @publishers_['postbuildscript'] ||= PostbuildScript.new
+        @publishers_['postbuildscript'].add(::JenkinsJob::BuildStep::Powershell.new(value))
+      end
+
+      def trigger(*project, &block)
+        trigger = PostbuildTrigger.new(project)
+        trigger.instance_eval(&block) if block
+        @publishers_['trigger-parameterized-builds'] = trigger
+      end
+
+      def groovy(value)
+        @publishers_['groovy'] = PostbuildGroovy.new(value)
+      end
+
+      def publish_cloverphp(&block)
+        clover = CloverPhpPublisher.new
+        clover.instance_eval(&block) if block
+        @publishers_['clover-php'] = clover
+      end
+
+      def publish_slack(&block)
+        slack = PostbuildSlack.new
+        slack.instance_eval(&block) if block
+        @publishers_['slack'] = slack
+      end      
+
+      def cucumber_json_publisher(&block)
+        cucumber = CucumberJsonPublisher.new
+        cucumber.instance_eval(&block) if block
+        @publishers_['cucumber'] = cucumber
+      end
+
+      def publish_javadoc(&block)
+        doc = JavaDocPublisher.new
+        doc.instance_eval(&block) if block
+        @publishers_['java-doc'] = doc
+      end
+
+      def publish_pmd(&block)
+        pmd = PMDPublisher.new
+        pmd.instance_eval(&block) if block
+        @publishers_['pmd'] = pmd
+      end
+
+      def publish_chucknorris(&block)
+        chucknorris = ChuckNorrisPublisher.new
+        chucknorris.instance_eval(&block) if block
+        @publishers_['chucknorris'] = chucknorris
+      end
+      alias_method :chucknorris, :publish_chucknorris
+
+      def publish_game(&block)
+        game = GamePublisher.new
+        game.instance_eval(&block) if block
+        @publishers_['game'] = game
+      end
+      alias_method :game, :publish_game
+
+      def allow_broken_build_claiming
+        publisher = ClaimPublisher.new
+        @publishers_['claim-publisher'] = publisher
+      end
+    end
+  end
+end

data/lib/rubyjobbuilderdsl/view.rb

@@ -1,14 +1,14 @@
-module JenkinsJob
-  class View
-    attr_reader :name, :jobname_
-
-    def initialize(name, builder)
-      @builder = builder
-      @name = name
-    end
-
-    def job(regex)
-      @jobname_ = regex
-    end
-  end
-end
+module JenkinsJob
+  class View
+    attr_reader :name, :jobname_
+
+    def initialize(name, builder)
+      @builder = builder
+      @name = name
+    end
+
+    def job(regex)
+      @jobname_ = regex
+    end
+  end
+end

data/lib/rubyjobbuilderdsl/xml_generator.rb

@@ -438,7 +438,7 @@ module JenkinsJob
 
     def generate_build_timeout(model, wrappers)
       wrappers.tag!('hudson.plugins.build__timeout.BuildTimeoutWrapper') do |timeout|
-        timeout.timeoutMinutes(3)
+        timeout.timeoutMinutes(10)
         timeout.failBuild(false)
         timeout.writingDescription(false)
         timeout.timeoutType(model.type_)

data/lib/rubyjobbuilderdsl.rb

@@ -1,2 +1,2 @@
-require_relative './rubyjobbuilderdsl/builder'
-require_relative './rubyjobbuilderdsl/deployer'
+require_relative './rubyjobbuilderdsl/builder'
+require_relative './rubyjobbuilderdsl/deployer'

data/rubyjobbuilderdsl.gemspec

@@ -1,13 +1,13 @@
-Gem::Specification.new do |s|
-  s.name        = 'rubyjobbuilderdsl'
-  s.version     = '0.0.4'
-  s.date        = '2017-10-16'
-  s.summary     = 'Ruby Internal DSL for creating Jenkins jobs'
-  s.description = 'Ruby Internal DSL for creating Jenkins jobs'
-  s.authors     = ['Huy Le']
-  s.email       = 'lehuy20@gmail.com'
-  s.files       = Dir['**/*']
-  s.license     = 'MIT'
-  s.add_runtime_dependency 'nokogiri'
-  s.add_runtime_dependency 'builder'
-end
+Gem::Specification.new do |s|
+  s.name        = 'rubyjobbuilderdsl'
+  s.version     = '0.0.5'
+  s.date        = '2017-10-16'
+  s.summary     = 'Ruby Internal DSL for creating Jenkins jobs'
+  s.description = 'Ruby Internal DSL for creating Jenkins jobs'
+  s.authors     = ['Huy Le']
+  s.email       = 'lehuy20@gmail.com'
+  s.files       = Dir['**/*']
+  s.license     = 'MIT'
+  s.add_runtime_dependency 'nokogiri'
+  s.add_runtime_dependency 'builder'
+end

data/rubyjobbuilderdsl.sublime-project

@@ -1,14 +1,14 @@
-{
-    "folders":
-    [
-        {
-            "path": ".",
-            "folder_exclude_patterns": [".bundle", "vendor"]
-        }
-    ],
-    "settings":
-    {
-        "tab_size": 2,
-        "translate_tabs_to_spaces": true
-    }
-}
+{
+    "folders":
+    [
+        {
+            "path": ".",
+            "folder_exclude_patterns": [".bundle", "vendor"]
+        }
+    ],
+    "settings":
+    {
+        "tab_size": 2,
+        "translate_tabs_to_spaces": true
+    }
+}

data/run_tests.sh

@@ -1,7 +1,7 @@
-#!/bin/sh
-
-set -ex
-
-bundle install --deployment
-
-bundle exec rake
+#!/bin/sh
+
+set -ex
+
+bundle install --deployment
+
+bundle exec rake

data/sample/Schedule-sample-pipeline.xml

@@ -0,0 +1,32 @@
+<flow-definition plugin="workflow-job@2.11">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers>
+        <hudson.triggers.TimerTrigger>
+          <spec>0 15 * * *</spec>
+        </hudson.triggers.TimerTrigger>
+      </triggers>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.32">
+    <script>
+def date = new Date()
+def release = date.format('yyyy.MM.dd')
+def releaseManifest = release + ".0400"
+println releaseManifest
+
+build job: 'CreateRelease-gen3', 
+    parameters: [
+            string(name: 'OctopusServer', value: 'https://OctopusServerSomewhere.com'), 
+            string(name: 'OctopusKey', value: 'An API Key'), 
+            string(name: 'DeploySpecificPackages', value: 'false'), 
+            string(name: 'ReleaseNumber', value: '63'), 
+            string(name: 'ReleaseManifest', value: releaseManifest), 
+            string(name: 'Channel', value: 'Release Channel')]
+</script>
+  </definition>
+  <disabled>false</disabled>
+</flow-definition>

data/sample/hello_mars.rb

@@ -1,27 +1,27 @@
-require_relative '../lib/rubyjobbuilderdsl'
-
-builder = JenkinsJob::Builder.new
-
-builder.freestyle 'hello_mars' do
-  shell 'echo hello mars > hello_mars-1.0.$BUILD_NUMBER.txt && gzip hello_mars-1.0.$BUILD_NUMBER.txt'
-end
-
-builder.view 'test' do
-  job 'test-.*'
-end
-
-JenkinsJob::Deployer.new(builder).run do
-  disable_job 'hello_mars'
-  wipeout_workspace 'hello_mars'
-  delete_job 'hello_mars'
-  delete_view 'test'
-
-  each do |name, xml, type|
-    upload_view(name, xml) if type == :view
-    upload_job(name, xml) if type == :job
-  end
-
-  groovysh 'println "hello world"'
-  enable_job 'hello_mars'
-  trigger_job 'hello_mars'
-end
+require_relative '../lib/rubyjobbuilderdsl'
+
+builder = JenkinsJob::Builder.new
+
+builder.freestyle 'hello_mars' do
+  shell 'echo hello mars > hello_mars-1.0.$BUILD_NUMBER.txt && gzip hello_mars-1.0.$BUILD_NUMBER.txt'
+end
+
+builder.view 'test' do
+  job 'test-.*'
+end
+
+JenkinsJob::Deployer.new(builder).run do
+  disable_job 'hello_mars'
+  wipeout_workspace 'hello_mars'
+  delete_job 'hello_mars'
+  delete_view 'test'
+
+  each do |name, xml, type|
+    upload_view(name, xml) if type == :view
+    upload_job(name, xml) if type == :job
+  end
+
+  groovysh 'println "hello world"'
+  enable_job 'hello_mars'
+  trigger_job 'hello_mars'
+end

data/sample/local.ini

@@ -1,4 +1,4 @@
-[jenkins]
-url=http://localhost:8080/
-user=jenkins-jobs
-password=7bb352e4f3da683c17247f3abf88f47c
+[jenkins]
+url=http://localhost:8080/
+user=jenkins-jobs
+password=7bb352e4f3da683c17247f3abf88f47c

data/test/test_ant.rb

@@ -1,38 +1,38 @@
-require_relative './test_xml_generator'
-
-class TestXmlAnt < Test::Unit::TestCase
-  def test_ant
-    builder = JenkinsJob::Builder.new
-
-    builder.freestyle 'foo' do
-      ant do
-        target 'clean', 'lint'
-        buildfile 'foo.xml'
-        java_opts '-Xmx512m', '-Xms512m'
-        property 'skipTest' => 'false'
-      end
-    end
-
-    actual = builder.config_as_xml_node('foo')
-    { 'hudson.tasks.Ant/targets' => 'clean lint',
-      'hudson.tasks.Ant/buildFile' => 'foo.xml',
-      'hudson.tasks.Ant/properties' => '-DskipTest=false',
-      'hudson.tasks.Ant/antOpts' => '-Xmx512m -Xms512m',
-    }.each do |k, v|
-      assert_equal v, actual.xpath('./project/builders/' \
-          "#{k}").text, k
-    end
-  end
-
-  def test_ant_defalt_target
-    builder = JenkinsJob::Builder.new
-
-    builder.freestyle 'foo' do
-      ant do
-      end
-    end
-
-    actual = builder.config_as_xml_node('foo')
-    assert actual.at('./project/builders/hudson.tasks.Ant/targets')
-  end
-end
+require_relative './test_xml_generator'
+
+class TestXmlAnt < Test::Unit::TestCase
+  def test_ant
+    builder = JenkinsJob::Builder.new
+
+    builder.freestyle 'foo' do
+      ant do
+        target 'clean', 'lint'
+        buildfile 'foo.xml'
+        java_opts '-Xmx512m', '-Xms512m'
+        property 'skipTest' => 'false'
+      end
+    end
+
+    actual = builder.config_as_xml_node('foo')
+    { 'hudson.tasks.Ant/targets' => 'clean lint',
+      'hudson.tasks.Ant/buildFile' => 'foo.xml',
+      'hudson.tasks.Ant/properties' => '-DskipTest=false',
+      'hudson.tasks.Ant/antOpts' => '-Xmx512m -Xms512m',
+    }.each do |k, v|
+      assert_equal v, actual.xpath('./project/builders/' \
+          "#{k}").text, k
+    end
+  end
+
+  def test_ant_defalt_target
+    builder = JenkinsJob::Builder.new
+
+    builder.freestyle 'foo' do
+      ant do
+      end
+    end
+
+    actual = builder.config_as_xml_node('foo')
+    assert actual.at('./project/builders/hudson.tasks.Ant/targets')
+  end
+end

data/test/test_archive.rb

@@ -1,24 +1,24 @@
-require_relative './test_xml_generator'
-
-class TestXmlArchive < Test::Unit::TestCase
-  def test_postbuild_archive
-    builder = JenkinsJob::Builder.new
-
-    builder.freestyle 'foo' do
-      postbuild do
-        archive do
-          file 'a/**',
-               'b/**',
-               'c/lib/**'
-          latest_only true
-        end
-      end
-    end
-
-    actual = builder.config_as_xml_node('foo')
-    { 'artifacts' => 'a/**,b/**,c/lib/**',
-      'latestOnly' => 'true' }.each do |k, v|
-      assert_equal v, actual.xpath("./project/publishers/hudson.tasks.ArtifactArchiver/#{k}").text, k
-    end
-  end
-end
+require_relative './test_xml_generator'
+
+class TestXmlArchive < Test::Unit::TestCase
+  def test_postbuild_archive
+    builder = JenkinsJob::Builder.new
+
+    builder.freestyle 'foo' do
+      postbuild do
+        archive do
+          file 'a/**',
+               'b/**',
+               'c/lib/**'
+          latest_only true
+        end
+      end
+    end
+
+    actual = builder.config_as_xml_node('foo')
+    { 'artifacts' => 'a/**,b/**,c/lib/**',
+      'latestOnly' => 'true' }.each do |k, v|
+      assert_equal v, actual.xpath("./project/publishers/hudson.tasks.ArtifactArchiver/#{k}").text, k
+    end
+  end
+end