jenkins_pipeline_builder 0.15.0 → 0.15.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjAwOGQ5NDM1MmMyYTkzNjExNzViMWYyMzRlMzFiYTYwMTc0ZTU3MA==
+    MjE1OTAzNTU1MTFkMDYwZjJiZjVlZWM3ZTY0NWJlNjZlMzBkNDU1Nw==
   data.tar.gz: !binary |-
-    MzlmOGIxNmRhYWFiYjYyMDUxNmIzNzZjOGFhZTIxNmUxNmE2NjhmMA==
+    YjVkZjVkZjA4ZWI3ODdhNzliNTU3YmE0NTM4YjVkODI4NjlkZTUxNQ==
 SHA512:
   metadata.gz: !binary |-
-    YzMwNWQzZjliNGFkZTY5ZjY5NzgzMzY1MTdmZThjZjI5MjhkNDAwNzVhNzE3
-    YTI2ZGY5ZWVhNWRhMDliOWVmNGE1NGIwNDdhYjEwNTdiNjM5MGVmYzExOTY5
-    YmU1NmJmZGYxZjlhMTJmZWRlNTU2OWY0ZGQ1MWVjOWY5YjI1OTE=
+    MWJhN2EyZDg3OTNiNTBhZWJlMDY4OTljYzM3MjBjMjQ5M2UwMDNkNDQ0YzI3
+    YWRhZWI0M2M1YjkyN2JkODE1NGVjYTdkZDdjNDNhM2JjMTQxYmNiZDc1NmE5
+    MjQ2ZDNjOGRlNDdkNzkzZjcyNTYxYmU0NWVjMmE3NmMyMTJkMTk=
   data.tar.gz: !binary |-
-    ZGMwNjliZDJiNWQ4YWJlZTlmOWQxZjVlMTQxNjQwOTgwYjc5YTUyMDA2NWU1
-    NDdlZDgzMjg5YmJhY2U1NTY2NWM3YWI1NzhhZmU5OGQ1Y2M3ZTBjOTQ1NjU0
-    MmY5N2E5Zjc5NzNjMTExYmIwYjNkOWM4NDcwZGIzOTU2NGFlNjE=
+    YjFlYTQ5OTVkY2ViMTY0MmI1NDk1Mzc1OWRiMTIyZTJlZTc2YTRkYmYyZThi
+    MWNjODlmMzM4YTFiNGZmMWFjNWE5YWI3YzMxNGY5Zjg3MmFiMWIxMmM4YmQ0
+    NDZiMTY5NGI3YmRmMzAxMWVkYmE3YWUxYzliNGI1ZTYyY2Y4NTM=

data/lib/jenkins_pipeline_builder/cli/helper.rb

@@ -38,7 +38,7 @@ module JenkinsPipelineBuilder
         attr_accessor :jenkins_api_creds
       end
 
-      DEFAULT_FILE_FORMATS = %w(rb json yaml).freeze
+      DEFAULT_FILE_FORMATS = %w(rb json yml yaml).freeze
 
       # Sets up the credentials and initializes the Jenkins Pipeline Builder
       #

data/lib/jenkins_pipeline_builder/version.rb

@@ -21,5 +21,5 @@
 #
 
 module JenkinsPipelineBuilder
-  VERSION = '0.15.0'.freeze
+  VERSION = '0.15.1'.freeze
 end

data/spec/lib/jenkins_pipeline_builder/cli/helper_spec.rb

@@ -1,9 +1,10 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe JenkinsPipelineBuilder::CLI::Helper do
+  file_suffixes = JenkinsPipelineBuilder::CLI::Helper::DEFAULT_FILE_FORMATS
+
   context '#setup' do
     let(:creds_file_base) { 'spec/lib/jenkins_pipeline_builder/fixtures/sample_creds' }
-
     context 'username and password given' do
       let(:options) do
         {
@@ -110,65 +111,44 @@ describe JenkinsPipelineBuilder::CLI::Helper do
         allow(ENV).to receive(:[]).with('HOME').and_return '/foo'
       end
 
-      it 'checks for all 3 supported formats in order' do
+      it 'checks for all 4 supported formats in order' do
         expect(File).to receive(:exist?).with("#{default_creds_base}.rb")
         expect(File).to receive(:exist?).with("#{default_creds_base}.json")
         expect(File).to receive(:exist?).with("#{default_creds_base}.yaml")
+        expect(File).to receive(:exist?).with("#{default_creds_base}.yml")
         expect { described_class.setup({}) }.to raise_error(SystemExit, 'exit')
       end
 
-      it 'loads the default ruby file' do
-        expect(File).to receive(:exist?).with("#{default_creds_base}.rb").and_return true
-        expect(File).to receive(:exist?).with("#{default_creds_base}.json").and_return false
-        expect(File).to receive(:exist?).with("#{default_creds_base}.yaml").and_return false
-        expect(File).to receive(:expand_path).with("#{default_creds_base}.rb").and_return "#{creds_file_base}.rb"
-        described_class.setup({})
-      end
-
-      it 'loads the default json file' do
-        expect(File).to receive(:exist?).with("#{default_creds_base}.rb").and_return false
-        expect(File).to receive(:exist?).with("#{default_creds_base}.json").and_return true
-        expect(File).to receive(:exist?).with("#{default_creds_base}.yaml").and_return false
-        expect(File).to receive(:expand_path).with("#{default_creds_base}.json").and_return "#{creds_file_base}.json"
-        expect(JSON).to receive(:parse).and_call_original
-        described_class.setup({})
-      end
-
-      it 'loads the default yaml file' do
-        expect(File).to receive(:exist?).with("#{default_creds_base}.rb").and_return false
-        expect(File).to receive(:exist?).with("#{default_creds_base}.json").and_return false
-        expect(File).to receive(:exist?).with("#{default_creds_base}.yaml").and_return true
-        expect(File).to receive(:expand_path).with("#{default_creds_base}.yaml").and_return "#{creds_file_base}.yaml"
-        expect(YAML).to receive(:load_file).and_call_original
-        described_class.setup({})
-      end
-
-      it 'warns if both ruby and yaml' do
-        used_suffix = 'rb'
-        found_suffix = 'yaml'
-        expect(File).to receive(:exist?).with("#{default_creds_base}.rb").and_return true
-        expect(File).to receive(:exist?).with("#{default_creds_base}.json").and_return false
-        expect(File).to receive(:exist?).with("#{default_creds_base}.yaml").and_return true
-        expect(JenkinsPipelineBuilder.logger).to receive(:warn)
-          .with(/'#{default_creds_base}\.#{used_suffix}' but '#{default_creds_base}\.#{found_suffix}' found\./)
-          .and_return true
-        expect(File).to receive(:expand_path)
-          .with("#{default_creds_base}.#{used_suffix}").and_return "#{creds_file_base}.#{used_suffix}"
-        described_class.setup({})
-      end
-
-      it 'warns if both ruby and json' do
-        used_suffix = 'rb'
-        found_suffix = 'json'
-        expect(File).to receive(:exist?).with("#{default_creds_base}.rb").and_return true
-        expect(File).to receive(:exist?).with("#{default_creds_base}.json").and_return true
-        expect(File).to receive(:exist?).with("#{default_creds_base}.yaml").and_return false
-        expect(JenkinsPipelineBuilder.logger).to receive(:warn)
-          .with(/'#{default_creds_base}\.#{used_suffix}' but '#{default_creds_base}\.#{found_suffix}' found\./)
-          .and_return true
-        expect(File).to receive(:expand_path)
-          .with("#{default_creds_base}.#{used_suffix}").and_return "#{creds_file_base}.#{used_suffix}"
-        described_class.setup({})
+      file_suffixes.each do |suffix|
+        it "loads a default file ending in .#{suffix}" do
+          file_suffixes.each do |ending|
+            expect(File).to receive(:exist?).with("#{default_creds_base}.#{ending}")
+              .and_return ending == suffix
+          end
+          expect(File).to receive(:expand_path).with("#{default_creds_base}.#{suffix}")
+            .and_return "#{creds_file_base}.#{suffix}"
+
+          described_class.setup({})
+        end
+      end
+
+      # file_suffixes.combination(2).to_a
+      # returns something like:
+      #   [["rb", "json"], ["rb", "yml"], ["rb", "yaml"], ["json", "yml"], ["json", "yaml"], ["yml", "yaml"]]
+      file_suffixes.combination(2).each do |used_suffix, found_suffix|
+        it "warns if both #{used_suffix} and #{found_suffix} exists" do
+          # Stub the existence of the used and extraneous 'found' files
+          file_suffixes.each do |suffix|
+            expect(File).to receive(:exist?).with("#{default_creds_base}.#{suffix}")
+              .and_return suffix == used_suffix || suffix == found_suffix
+          end
+          expect(JenkinsPipelineBuilder.logger).to receive(:warn)
+            .with(/'#{default_creds_base}\.#{used_suffix}' but '#{default_creds_base}\.#{found_suffix}' found\./)
+            .and_return true
+          expect(File).to receive(:expand_path)
+            .with("#{default_creds_base}.#{used_suffix}").and_return "#{creds_file_base}.#{used_suffix}"
+          described_class.setup({})
+        end
       end
     end
   end

data/spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.yml

@@ -0,0 +1,4 @@
+server_url: https://localhost.localdomain
+server_port: 8080
+username: username
+password: password

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_pipeline_builder
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Igor Moochnick
@@ -429,6 +429,7 @@ files:
 - spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.json
 - spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.rb
 - spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.yml
 - 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
@@ -516,6 +517,7 @@ test_files:
 - spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.json
 - spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.rb
 - spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.yaml
+- spec/lib/jenkins_pipeline_builder/fixtures/sample_creds.yml
 - 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