jenkins-factory 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60aaf76876752d63addddac33250f51bf111b9a5
-  data.tar.gz: 74680ab235cec211d7f6f36ac2a2e83222e48d7a
+  metadata.gz: 2e7df192bece4ec52515c421905cbdc95b328bc5
+  data.tar.gz: e72ee9c369efaef5909f971b74975ab62d6930a1
 SHA512:
-  metadata.gz: 912768ca97933987e8e5778199dca65b46e503438e6d65ee991aad2f00a2a7d6fd2196298bf99aa5b6042cb97bf66f68d352c96acb0a569cc9ab4e3b1ff54bd7
-  data.tar.gz: 41500759ede7d4c6df788102a6bceb6e82607ee654d7d8806eaeecd10e07159c2c0e9eb0e17136040200752f03425544162f03d18113819c2fe5b172143cf8e7
+  metadata.gz: fac86c78d7b73361c9065f8234ea2bac59e25367569b364c9a269e8f3a19bd480d817bb85bfd008ee0a1caa02c48b0b9b87a793839e4b340c22ecbf60f3318d2
+  data.tar.gz: 2042f1693adede5158a5fd2f4a4d42e65e11703ace8311f4af611fffa9ccbadf963cd070dc97228ad3238fb5e60e0930285be0dbf309eb6fce844dbcb436bab9

data/bin/jenkins_factory

@@ -2,22 +2,19 @@
 require 'trollop'
 require 'jenkins_factory'
 require 'yaml'
+require 'util'
 
 opts = Trollop::options do
-  opt :jenkins_settings_yml_path, 'Show the YAML here', type: :string, required: true
+  opt :jenkins_settings_yml_path, 'YAML path', type: :string, required: true
 end
 
-jenkins_settings = YAML.load_file(opts[:jenkins_settings_yml_path])
-secret_properties = YAML.load_file("secret_#{opts[:jenkins_settings_yml_path]}")
-jenkins_settings.merge! secret_properties
+Trollop::die :jenkins_settings_yml_path, 'Must end in .yml' unless opts[:jenkins_settings_yml_path].end_with?('.yml')
 
-jenkins_settings.keys.each do |k|
-  jenkins_settings[k.to_sym] = jenkins_settings[k]
-  jenkins_settings.delete k
-end
+jenkins_settings = merge_secrets(opts[:jenkins_settings_yml_path])
+
+Util.transform_keys_to_symbols(jenkins_settings)
 
-my_ip = `dig @resolver1.opendns.com myip.opendns.com +short`
-jenkins_settings[:controller_ip] = "#{my_ip.chomp}/32"
+jenkins_settings[:controller_ip] = Util.discover_my_public_ip_cidr
 
 jenkins_url = JenkinsFactory.new.create(jenkins_settings)
 

data/lib/util.rb

@@ -0,0 +1,26 @@
+module Util
+  def self.secrets_file_path(yml_path)
+    yml_split_path = File.split(yml_path)
+    secret_name_base = File.basename yml_split_path[1], '.yml'
+    File.join yml_split_path[0], "#{secret_name_base}_secret.yml"
+  end
+
+  def self.merge_secrets(yml_path)
+    jenkins_settings = YAML.load_file(yml_path)
+    secret_properties = secrets_file_path(yml_path)
+    jenkins_settings.merge! secret_properties
+    jenkins_settings
+  end
+
+  def self.transform_keys_to_symbols(hash)
+    hash.keys.each do |k|
+      hash[k.to_sym] = hash[k]
+      hash.delete k
+    end
+  end
+
+  def self.discover_my_public_ip_cidr
+    my_ip = `dig @resolver1.opendns.com myip.opendns.com +short`
+    "#{my_ip.chomp}/32"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkins-factory
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - someguy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -65,6 +65,7 @@ files:
 - lib/cfndsl/jenkins_cfndsl.rb
 - lib/jenkins_factory.rb
 - lib/job_seeder.rb
+- lib/util.rb
 homepage: https://github.com/stelligent/jenkins-factory
 licenses:
 - MIT