cloudstrap 0.48.15.pre → 0.49.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 067523f95e2a069de84b9c7f864fcde63d0f12eb
-  data.tar.gz: f39b3e3ba879cb0d39a1af94c49ff436d934333e
+  metadata.gz: 3a40c0dbcbcd4d1c36beac0f3dbc65c0215a0712
+  data.tar.gz: f18335993d1119cc36388d23d8bf5729a24080e7
 SHA512:
-  metadata.gz: a4252ecca251956433abe053dd5c485b95400b618c72741bdf4076d21676db3844a0dcb3d7918909686d23e10408c10cc7d222e8c7dfa2dc937fad8eb3991c75
-  data.tar.gz: 4914b122f9022978e2852a6eb1a52e1a13ba55c58380a5fb6e52ebe28fda6aa703137f4497a48f9bebb73db4bfadf5256204317edf4ea7be1877924958f09eb2
+  metadata.gz: 49b8c4a1ff684337421602893fce727ee6b7f60c77e6468a6624ba324a8d94329046fad93ed92deda1acfdcdbadf8043496785bcb84a8bafd18f17bbc56b63d5
+  data.tar.gz: 2d2a652d1eed6f569317be9fdd93b74b6fa38de637fa0cbaed034e28c239c803281fb9c7eaa4901be6f637e2857a9416a472bf474a76fbb00daa841466b68447

data/lib/cloudstrap/config.rb

@@ -21,22 +21,32 @@ module Cloudstrap
       lookup(:cache_path) { [workdir, '.cache'].join('/') }
     end
 
+    Contract None => String
+    def network_bits
+      lookup(:network_bits) { '16' }
+    end
+
+    Contract None => String
+    def subnet_bits
+      lookup(:subnet_bits) { '24' }
+    end
+
     Contract None => String
     def vpc_cidr_block
-      lookup(:vpc_cidr_block) { '10.0.0.0/16' }
+      lookup(:vpc_cidr_block) { "10.0.0.0/#{network_bits}" }
     end
 
     Contract None => String
     def public_cidr_block
       lookup(:public_cidr_block) do
-        vpc_cidr_block.gsub(/([[:digit:]]{1,3}\.?){2,2}\/[[:digit:]]{1,2}$/, '0.0/24')
+        vpc_cidr_block.gsub(/([[:digit:]]{1,3}\.?){2,2}\/[[:digit:]]{1,2}$/, "0.0/#{subnet_bits}")
       end
     end
 
     Contract None => String
     def private_cidr_block
       lookup(:private_cidr_block) do
-        vpc_cidr_block.gsub(/([[:digit:]]{1,3}\.?){2,2}\/[[:digit:]]{1,2}$/, '1.0/24')
+        vpc_cidr_block.gsub(/([[:digit:]]{1,3}\.?){2,2}\/[[:digit:]]{1,2}$/, "1.0/#{subnet_bits}")
       end
     end
 

data/lib/cloudstrap/network.rb

@@ -1,16 +1,17 @@
 require 'ipaddress'
+require_relative 'config'
 
 module Cloudstrap
   class Network
     def initialize(network = '10.0.0.0')
-      @network = IPAddress(network).tap { |n| n.prefix = 16 }
+      @network = IPAddress(network).tap { |n| n.prefix = config.network_bits.to_i }
       self
     end
 
     attr_reader :network
 
     def subnets
-      @subnets ||= network.subnet 24
+      @subnets ||= network.subnet config.subnet_bits.to_i
     end
 
     def public
@@ -41,5 +42,11 @@ module Cloudstrap
         private: private_layout(*zones)
       }
     end
+
+    private
+
+    def config
+      @config ||= Config.new
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstrap
 version: !ruby/object:Gem::Version
-  version: 0.48.15.pre
+  version: 0.49.0.pre
 platform: ruby
 authors:
 - Chris Olstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk