jenkins_pipeline_builder 0.8.5 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4768b1a1bf8d52cb1bd5724b5a9a23b5fd34ea57
-  data.tar.gz: f0d5e26d5672d1073a50b7a36094ee4968d50ffe
+  metadata.gz: d7769c803148949697affa29d205e1a2a38fe192
+  data.tar.gz: 1588845d28a5bf12aff8c8bd32ab4b712e8f89e1
 SHA512:
-  metadata.gz: 7e325592c56f9de7c2182c0d1c8836e752fb7e88049e8c1c233bd37659990b8a0c33911ed32148fb73ed208f14e98a2f3809404d124062c9b43180c6d3db0543
-  data.tar.gz: 14c2863da61416b1072378e13228362e3f858f7b2adb72e1ca8380c9d3fb853c0b7059a132228dd7b547f4d6c69924694ca0962e068fdcfb80e04c64bb0f4a6e
+  metadata.gz: 65281a731a94d19df901e28759725cffa2b98e7ac4119e174b663e0c30f828043ba04e30d5efe34433e3051c368d5ef9ac197db9afad73ca638e14c6692dfd5c
+  data.tar.gz: 7629dbc4eddf4d1e58e63eeb879dc6c7d6c4b37b63968f6c440fc600ba6eac6627d6e2bc5f27fe365577239a1d52597af53a9a50f6f4a2fa0e7fa6194de1746b

data/README.md

@@ -77,6 +77,9 @@ NOTE: you can run the pipeline in NOOP (debug-only) mode by addind -d parameter,
 
 The command comes with fairly extensive help. For example you can list all of the registered extension types with `generate list` and a list of all extensions of a type with `generate list type`
 
+#### JSON now supported
+The pipeline builder now suppots json for config and pipeline files instead of or in addition to yaml files
+
 DSL:
 ----
 

data/lib/jenkins_pipeline_builder/cli/helper.rb

@@ -44,7 +44,11 @@ module JenkinsPipelineBuilder
           (options[:password] || options[:password_base64])
           creds = options
         elsif options[:creds_file]
-          creds = YAML.load_file(File.expand_path(options[:creds_file]))
+          if creds_file.end_with? "json"
+            creds = JSON.parse(IO.read(File.expand_path(options[:creds_file])))
+          else
+            creds = YAML.load_file(File.expand_path(options[:creds_file]))
+          end
         elsif File.exist?("#{ENV['HOME']}/.jenkins_api_client/login.yml")
           creds = YAML.load_file(
             File.expand_path("#{ENV['HOME']}/.jenkins_api_client/login.yml", __FILE__)

data/lib/jenkins_pipeline_builder/generator.rb

@@ -21,6 +21,7 @@
 #
 
 require 'yaml'
+require 'json'
 
 module JenkinsPipelineBuilder
   class Generator
@@ -180,15 +181,24 @@ module JenkinsPipelineBuilder
       path = File.expand_path(path, Dir.getwd)
       if File.directory?(path)
         logger.info "Generating from folder #{path}"
-        Dir[File.join(path, '/*.yaml'), File.join(path, '/*.yml')].each do |file|
+        Dir[File.join(path, '/*.{yaml,yml}')].each do |file|
           logger.info "Loading file #{file}"
           yaml = YAML.load_file(file)
           load_job_collection(yaml, remote)
         end
+        Dir[File.join(path, '/*.json')].each do |file|
+          logger.info "Loading file #{file}"
+          json = JSON.parse(IO.read(file))
+          load_job_collection(json, remote)
+        end
       else
         logger.info "Loading file #{path}"
-        yaml = YAML.load_file(path)
-        load_job_collection(yaml, remote)
+        if path.end_with? "json"
+          hash = JSON.parse(IO.read(path))
+        else  # elsif path.end_with?("yml") || path.end_with?("yaml")
+          hash = YAML.load_file(path)
+        end
+        load_job_collection(hash, remote)
       end
     end
 

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.8.5'
+  VERSION = '0.9.0'
 end

data/lib/jenkins_pipeline_builder/view.rb

@@ -35,9 +35,13 @@ module JenkinsPipelineBuilder
     end
 
     def generate(path)
-      yaml = YAML.load_file(path)
+      if path.end_with? "json"
+        hash = JSON.parse(IO.read(path))
+      else
+        hash = YAML.load_file(path)
+      end
 
-      yaml.each do |item|
+      hash.each do |item|
         Utils.symbolize_keys_deep!(item)
         create(item[:view]) if item[:view]
       end

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/project.json

@@ -0,0 +1,16 @@
+[
+  {
+    "defaults": {
+      "name": "global",
+      "description": "Tests, all the tests"
+    }
+  },
+  {
+    "project": {
+      "name": "TestProject",
+      "jobs": [
+        "{{name}}-part1"
+      ]
+    }
+  }
+]

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/view.yaml

@@ -0,0 +1,5 @@
+- view:
+    name: '{{name}} View'
+    type: 'listview'
+    description: '{{description}}'
+    regex: '{{name}}.*'

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_json_files/project.json

@@ -0,0 +1,16 @@
+[
+  {
+    "defaults": {
+      "name": "global",
+      "description": "Tests, all the tests"
+    }
+  },
+  {
+    "project": {
+      "name": "TestProject",
+      "jobs": [
+        "{{name}}-part1"
+      ]
+    }
+  }
+]

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_json_files/view.json

@@ -0,0 +1,10 @@
+[
+  {
+    "view": {
+      "name": "{{name}} View",
+      "type": "listview",
+      "description": "{{description}}",
+      "regex": "{{name}}.*"
+    }
+  }
+]

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_yaml_files/project.yaml

@@ -0,0 +1,8 @@
+- defaults:
+    name: global
+    description: 'Tests, all the tests'
+
+- project:
+    name: TestProject
+    jobs:
+      - '{{name}}-part1'

data/spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_yaml_files/view.yaml

@@ -0,0 +1,5 @@
+- view:
+    name: '{{name}} View'
+    type: 'listview'
+    description: '{{description}}'
+    regex: '{{name}}.*'

data/spec/lib/jenkins_pipeline_builder/generator_spec.rb

@@ -152,6 +152,29 @@ describe JenkinsPipelineBuilder::Generator do
     # Fails to purge old PR jobs from Jenkins
   end
 
+  describe '#load_collection_from_path' do
+    let(:project_hash) { [{"defaults"=>{"name"=>"global", "description"=>"Tests, all the tests"}}, {"project"=>{"name"=>"TestProject", "jobs"=>["{{name}}-part1"]}}] }
+    let(:view_hash) { [{"view"=>{"name"=>"{{name}} View", "type"=>"listview", "description"=>"{{description}}", "regex"=>"{{name}}.*"}}] }
+    it 'loads a yaml collection from a path' do
+      path = File.expand_path('../fixtures/generator_tests/test_yaml_files', __FILE__)
+      expect(@generator).to receive(:load_job_collection).once.with(view_hash, false).and_return(true)
+      expect(@generator).to receive(:load_job_collection).once.with(project_hash, false).and_return(true)
+      @generator.send(:load_collection_from_path, path)
+    end
+    it 'loads a json collection from a path' do
+      path = File.expand_path('../fixtures/generator_tests/test_json_files', __FILE__)
+      expect(@generator).to receive(:load_job_collection).once.with(view_hash, false).and_return(true)
+      expect(@generator).to receive(:load_job_collection).once.with(project_hash, false).and_return(true)
+      @generator.send(:load_collection_from_path, path)
+    end
+    it 'loads both yaml and json files from a path' do
+      path = File.expand_path('../fixtures/generator_tests/test_combo_files', __FILE__)
+      expect(@generator).to receive(:load_job_collection).once.with(view_hash, false).and_return(true)
+      expect(@generator).to receive(:load_job_collection).once.with(project_hash, false).and_return(true)
+      @generator.send(:load_collection_from_path, path)
+    end
+  end
+
   describe '#dump' do
     it "writes a job's config XML to a file" do
       @generator.debug = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
 platform: ruby
 authors:
 - Igor Moochnick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -371,7 +371,13 @@ files:
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/sample_pipeline/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline/jobs.tar.gz
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/project.json
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_job.xml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_json_files/project.json
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_json_files/view.json
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_yaml_files/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_yaml_files/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/duplicate_view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/parent_view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/regular_view.yaml
@@ -423,7 +429,13 @@ test_files:
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/sample_pipeline/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline/jobs.tar.gz
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/template_pipeline/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/project.json
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_combo_files/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_job.xml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_json_files/project.json
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_json_files/view.json
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_yaml_files/project.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/generator_tests/test_yaml_files/view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/duplicate_view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/parent_view.yaml
 - spec/lib/jenkins_pipeline_builder/fixtures/view_test/regular_view.yaml