cloudstrap 0.29.1.pre → 0.29.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79075784a2e532fa8f708f83ab14d4d2d4f7f262
-  data.tar.gz: a36f02ccc53bbba3cd7c6985c9dc778a016ebcbf
+  metadata.gz: 95dbc2808072ab2167cdc2fa12946a9a84ff7b0d
+  data.tar.gz: a83c858dd8c01ca32bd243f5b8cd20c6bece025e
 SHA512:
-  metadata.gz: db973e404ee5707cbcb8b5af935815b8aca99df65a77b9f908f362c39cd2a4aa7e389e82227f62321305df04dcdb1f56d93fa2bdcd4be83c7921e3be7fbf925e
-  data.tar.gz: 68112e361736d5a9912f3638a4706547a1d23c4eb9108a96b7bd8ace7b438a699741ea8f8b04f0edfdd92c3083f4a1108870f711ccaa06f442e6b265bdc05bc3
+  metadata.gz: 21b5492b2bf0f2aba315acc8417f5d7cdfc8ed7efcb6ab2528a2e5ad236bd7240b29d13b637820e01b8ad7b056c02fe5727b270e3dcc4bc79b07e1474cfb761b
+  data.tar.gz: a8dd214c05c6ab929f97a99cb00eaaaece286b795a2f444afe7e3463563b891a2784f2bb33d909117254a6afc875eb5e6c4bdaa76b04ce26702253078a7bb0f1

data/README.org

@@ -61,7 +61,7 @@ The output describes the results, and all settings used in the process.
   BOOTSTRAP_ROUTE_TABLE_ID=rtb-9d28dcfa
   BOOTSTRAP_AVAILABILITY_ZONE=us-west-2b
   BOOTSTRAP_JUMPBOX_ID=i-051c248563a2c3f54
-  BOOTSTRAP.JUMPBOX_IP=52.89.237.123
+  BOOTSTRAP_JUMPBOX_IP=52.89.237.123
   BOOTSTRAP_WITHOUT_HUMAN_OVERSIGHT=true
 
   # Additional Information

data/lib/cloudstrap/config.rb

@@ -9,86 +9,56 @@ module StackatoLKG
 
     Contract None => String
     def region
-      @region ||= ENV.fetch('BOOTSTRAP_REGION') do
-        config.fetch('region') do
-          'us-west-2'
-        end
-      end
+      lookup(:region) { 'us-west-2' }
     end
 
     Contract None => String
     def cache_path
-      @cache_path ||= ENV.fetch('BOOTSTRAP_CACHE_PATH') do
-        config.fetch('cache_path') { [workdir, '.cache'].join('/') }
-      end
+      lookup(:cache_path) { [workdir, '.cache'].join('/') }
     end
 
     Contract None => String
     def vpc_cidr_block
-      @vpc_cidr_block ||= ENV.fetch('BOOTSTRAP_VPC_CIDR_BLOCK') do
-        config.fetch('vpc_cidr_block') { '10.0.0.0/16' }
-      end
+      lookup(:vpc_cidr_block) { '10.0.0.0/16' }
     end
 
     Contract None => String
     def public_cidr_block
-      @public_cidr_block ||= ENV.fetch('BOOTSTRAP_PUBLIC_CIDR_BLOCK') do
-        config.fetch('public_cidr_block') do
-          vpc_cidr_block.gsub(/([[:digit:]]{1,3}\.?){2,2}\/[[:digit:]]{1,2}$/, '0.0/24')
-        end
+      lookup(:public_cidr_block) do
+        vpc_cidr_block.gsub(/([[:digit:]]{1,3}\.?){2,2}\/[[:digit:]]{1,2}$/, '0.0/24')
       end
     end
 
     Contract None => String
     def private_cidr_block
-      @private_cidr_block ||= ENV.fetch('BOOTSTRAP_PRIVATE_CIDR_BLOCK') do
-        config.fetch('private_cidr_block') do
-          vpc_cidr_block.gsub(/([[:digit:]]{1,3}\.?){2,2}\/[[:digit:]]{1,2}$/, '1.0/24')
-        end
+      lookup(:private_cidr_block) do
+        vpc_cidr_block.gsub(/([[:digit:]]{1,3}\.?){2,2}\/[[:digit:]]{1,2}$/, '1.0/24')
       end
     end
 
     Contract None => String
     def ami_owner
-      @ami_owner ||= ENV.fetch('BOOTSTRAP_AMI_OWNER') do
-        config.fetch('ami_owner') do
-          '099720109477'
-        end
-      end
+      lookup(:ami_owner) { '099720109477' }
     end
 
     Contract None => String
     def ubuntu_release
-      @distribution ||= ENV.fetch('BOOTSTRAP_UBUNTU_RELEASE') do
-        config.fetch('ubuntu_release') do
-          '14.04'
-        end
-      end
+      lookup(:ubuntu_release) { '14.04' }
     end
 
     Contract None => String
     def instance_type
-      @instance_type ||= ENV.fetch('BOOTSTRAP_INSTANCE_TYPE') do
-        config.fetch('instance_type') do
-          't2.micro'
-        end
-      end
+      lookup(:instance_type) { 't2.micro' }
     end
 
     Contract None => String
     def ssh_dir
-      @ssh_dir ||= File.expand_path(ENV.fetch('BOOTSTRAP_SSH_DIR') do
-        [workdir, '.ssh'].join('/')
-      end)
+      lookup(:ssh_dir) { [workdir, '.ssh'].join('/') }
     end
 
     Contract None => String
     def ssh_username
-      @ssh_username ||= ENV.fetch('BOOTSTRAP_SSH_USERNAME') do
-        config.fetch('ssh_username') do
-          'ubuntu'
-        end
-      end
+      lookup(:ssh_username) { 'ubuntu' }
     end
 
     Contract None => String
@@ -98,36 +68,49 @@ module StackatoLKG
 
     Contract None => String
     def hdp_origin
-      @hdp_origin ||= ENV.fetch('BOOTSTRAP_HDP_BOOTSTRAP_ORIGIN') do
-        config.fetch('hdp_bootstrap_origin')
-      end
+      lookup :hdp_bootstrap_origin
     end
 
     Contract None => String
     def hdp_version
-      @hdp_archive ||= ENV.fetch('BOOTSTRAP_HDP_BOOTSTRAP_VERSION') do
-        config.fetch('hdp_bootstrap_version')
-      end
+      lookup :hdp_bootstrap_version
     end
 
     Contract None => String
     def hdp_package_url
-      @hdp_package_url ||= ENV.fetch('BOOTSTRAP_HDP_BOOTSTRAP_PACKAGE_URL') do
-        config.fetch('hdp_bootstrap_package_url') do
-          "#{hdp_origin}/hcp-bootstrap_#{hdp_version.gsub('+', '%2B')}_amd64.deb"
-        end
+      lookup(:hdp_bootstrap_package_url) do
+        "#{hdp_origin}/hcp-bootstrap_#{hdp_version.gsub('+', '%2B')}_amd64.deb"
       end
     end
 
     Contract None => String
     def bootstrap_properties_seed_url
-      ENV.fetch('BOOTSTRAP_PROPERTIES_SEED_URL') do
-        config.fetch('bootstrap_properties_seed_url')
-      end
+      lookup :bootstrap_properties_seed_url
     end
 
     private
 
+    StringToString = Func[Maybe[String] => Maybe[String]]
+
+    Contract RespondTo[:to_s], Maybe[Or[String, StringToString]] => Maybe[String]
+    def memoize(key, value = nil)
+      key = key.to_s.tap { |k| k.prepend('@') unless k.start_with?('@') }
+      return instance_variable_get(key) if instance_variable_defined?(key)
+
+      instance_variable_set(key, block_given? ? yield(key) : value)
+    end
+
+    Contract RespondTo[:to_s], Maybe[Or[String, StringToString]] => String
+    def lookup(key = __callee__, default = nil)
+      memoize(key) do
+        ENV.fetch("BOOTSTRAP_#{key.to_s.upcase}") do
+          config.fetch(key.to_s) do
+            block_given? ? yield(key) : default
+          end
+        end
+      end
+    end
+
     Contract None => String
     def workdir
       @workdir ||= ENV.fetch('BOOTSTRAP_WORKDIR') { Dir.pwd }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstrap
 version: !ruby/object:Gem::Version
-  version: 0.29.1.pre
+  version: 0.29.5.pre
 platform: ruby
 authors:
 - Chris Olstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk