rubyjobbuilderdsl 0.0.5 → 0.0.6

data/lib/rubyjobbuilderdsl/postbuild/trigger.rb

@@ -1,38 +1,38 @@
-module JenkinsJob
-  module Postbuild
-    class PostbuildTrigger < BasicObject
-      attr_reader :project_, :fail_on_missing_, :file_,
-                  :predefined_parameters_, :current_parameters_, :trigger_with_no_parameters_,
-                  :pass_through_git_commit_
-
-      def initialize(*project)
-        @project_ = project
-        @trigger_with_no_parameters_ = false
-      end
-
-      def fail_on_missing(value = false)
-        @fail_on_missing_ = value
-      end
-
-      def file(value)
-        @file_ = value
-      end
-
-      def predefined_parameters(value)
-        @predefined_parameters_ = value.map { |key, val| "#{key}=#{val}" }.join("\n")
-      end
-
-      def current_parameters(value)
-        @current_parameters_ = value
-      end
-
-      def trigger_with_no_parameters(value)
-        @trigger_with_no_parameters_ = value
-      end
-
-      def pass_through_git_commit(value = true)
-        @pass_through_git_commit_ = value
-      end
-    end
-  end
-end
+module JenkinsJob
+  module Postbuild
+    class PostbuildTrigger < BasicObject
+      attr_reader :project_, :fail_on_missing_, :file_,
+                  :predefined_parameters_, :current_parameters_, :trigger_with_no_parameters_,
+                  :pass_through_git_commit_
+
+      def initialize(*project)
+        @project_ = project
+        @trigger_with_no_parameters_ = false
+      end
+
+      def fail_on_missing(value = false)
+        @fail_on_missing_ = value
+      end
+
+      def file(value)
+        @file_ = value
+      end
+
+      def predefined_parameters(value)
+        @predefined_parameters_ = value.map { |key, val| "#{key}=#{val}" }.join("\n")
+      end
+
+      def current_parameters(value)
+        @current_parameters_ = value
+      end
+
+      def trigger_with_no_parameters(value)
+        @trigger_with_no_parameters_ = value
+      end
+
+      def pass_through_git_commit(value = true)
+        @pass_through_git_commit_ = value
+      end
+    end
+  end
+end

data/lib/rubyjobbuilderdsl/postbuild/xunit_publisher.rb

@@ -1,35 +1,35 @@
-# dsl methods for job builder
-module JenkinsJob
-  module Postbuild
-    class XUnitPublisher < BasicObject
-      attr_reader :test_results_pattern_,
-                  :failed_threshold_, :unstable_threshold_
-
-      THRESH_HOLDS = [:total_failed_tests, :new_failed_tests,
-                      :total_skipped_tests, :new_skipped_tests]
-
-      def initialize(test_results_pattern)
-        @test_results_pattern_ = test_results_pattern
-
-        @debug_ = false
-        @keep_junit_reports_ = false
-        @skip_junit_archiver_ = false
-
-        @failed_threshold_ =  {}
-        @unstable_threshold_ =  {}
-      end
-
-      def test_results_pattern(value)
-        @test_results_pattern_ = value
-      end
-
-      def failed_threshold(params = {})
-        @failed_threshold_ =  params
-      end
-
-      def unstable_threshold(params = {})
-        @unstable_threshold_ = params
-      end
-    end
-  end
-end
+# dsl methods for job builder
+module JenkinsJob
+  module Postbuild
+    class XUnitPublisher < BasicObject
+      attr_reader :test_results_pattern_,
+                  :failed_threshold_, :unstable_threshold_
+
+      THRESH_HOLDS = [:total_failed_tests, :new_failed_tests,
+                      :total_skipped_tests, :new_skipped_tests]
+
+      def initialize(test_results_pattern)
+        @test_results_pattern_ = test_results_pattern
+
+        @debug_ = false
+        @keep_junit_reports_ = false
+        @skip_junit_archiver_ = false
+
+        @failed_threshold_ =  {}
+        @unstable_threshold_ =  {}
+      end
+
+      def test_results_pattern(value)
+        @test_results_pattern_ = value
+      end
+
+      def failed_threshold(params = {})
+        @failed_threshold_ =  params
+      end
+
+      def unstable_threshold(params = {})
+        @unstable_threshold_ = params
+      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(10)
+        timeout.timeoutMinutes(15)
         timeout.failBuild(false)
         timeout.writingDescription(false)
         timeout.timeoutType(model.type_)

data/rubyjobbuilderdsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'rubyjobbuilderdsl'
-  s.version     = '0.0.5'
-  s.date        = '2017-10-16'
+  s.version     = '0.0.6'
+  s.date        = '2017-10-19'
   s.summary     = 'Ruby Internal DSL for creating Jenkins jobs'
   s.description = 'Ruby Internal DSL for creating Jenkins jobs'
   s.authors     = ['Huy Le']

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/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/hello_mars.xml

@@ -0,0 +1,18 @@
+<project>
+  <actions/>
+  <description>&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <publishers/>
+  <buildWrappers/>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>echo hello mars &gt; hello_mars-1.0.$BUILD_NUMBER.txt &amp;&amp; gzip hello_mars-1.0.$BUILD_NUMBER.txt</command>
+    </hudson.tasks.Shell>
+  </builders>
+</project>

data/sample/hello_world-post.xml

@@ -0,0 +1,40 @@
+<flow-definition plugin="workflow-job@2.11">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+      <triggers/>
+    </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@2.32">
+    <script>build("hello_world",
+    SOME_PARAM: "A_param_value")
+</script>
+  </definition>
+  <disabled>false</disabled>
+  <publishers>
+    <jenkins.plugins.slack.SlackNotifier plugin="slack@2.3">
+      <baseUrl>This is base url</baseUrl>
+      <teamDomain/>
+      <authToken>This is an auth_token</authToken>
+      <authTokenCredentialId/>
+      <botUser>false</botUser>
+      <room/>
+      <startNotification>true</startNotification>
+      <notifySuccess>true</notifySuccess>
+      <notifyAborted>true</notifyAborted>
+      <notifyNotBuilt>false</notifyNotBuilt>
+      <notifyUnstable>false</notifyUnstable>
+      <notifyRegression>false</notifyRegression>
+      <notifyFailure>true</notifyFailure>
+      <notifyBackToNormal>false</notifyBackToNormal>
+      <notifyRepeatedFailure>false</notifyRepeatedFailure>
+      <includeTestSummary>false</includeTestSummary>
+      <includeFailedTests>false</includeFailedTests>
+      <commitInfoChoice>NONE</commitInfoChoice>
+      <includeCustomMessage>false</includeCustomMessage>
+      <CustomMessage/>
+    </jenkins.plugins.slack.SlackNotifier>
+  </publishers>
+</flow-definition>

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/sample/test.xml

@@ -0,0 +1,21 @@
+<hudson.model.ListView>
+  <name>test</name>
+  <filterExecutors>false</filterExecutors>
+  <filterQueue>false</filterQueue>
+  <properties class="hudson.model.View$PropertyList"/>
+  <jobNames>
+    <comparator class="hudson.util.CaseInsensitiveComparator"/>
+  </jobNames>
+  <jobFilters/>
+  <columns>
+    <hudson.views.StatusColumn/>
+    <hudson.views.WeatherColumn/>
+    <hudson.views.JobColumn/>
+    <hudson.views.LastSuccessColumn/>
+    <hudson.views.LastFailureColumn/>
+    <hudson.views.LastDurationColumn/>
+    <hudson.views.BuildButtonColumn/>
+  </columns>
+  <includeRegex>test-.*</includeRegex>
+  <recurse>false</recurse>
+</hudson.model.ListView>

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