build-cloud 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ce7d885b72b7593b17233987dc7c3324654df41
-  data.tar.gz: 7efd51bc6a75e8a0f3261ea841a4a5137f9acdbd
+  metadata.gz: 72245a7b0957d72c26f62ede91be794720d3ba03
+  data.tar.gz: 71459cd2a0588ef2bea38220abbef0fa972b9f9f
 SHA512:
-  metadata.gz: 35cb9ddcce62def01bf5d1f1dbd4f1c34a07f1135e78aaa334449471e96ebc2f754465f385725716cb10b421feb2205a39e9b6c316dbcff1b1f100c06c89f7ac
-  data.tar.gz: ecedfa232cedb594acd795d2f0ed12a45159743689cdeea9c7ec8620e78254131a3fd8a3c89e1a4cd21f0d6ec1cd8062a89ff93fa43da0e4f603891b3071a93c
+  metadata.gz: 9143dd5d438d7a701d78916678bde29efcc604e244d946df970085289c0c4600a66674de73179c1d8694ba93e08b7550bdb830f50079cdd4b5aa2155655f4056
+  data.tar.gz: 3f253ebf2b891078e41250cd4d2b02f6faf77474404ecb3cfa14602c55b032fc85a58cab91c9f09e6fd6516b2a64377743c951e4c462df86a2e5e08b662d50f5

data/README.md

@@ -22,6 +22,10 @@ See the command line help for `build-cloud`.
 
 ## Changelog
 
+2015-08-24 - version 0.0.12 - adds support for tagging network interfaces, permits multiple config files to be passed on the commandline, fixes a bug with S3 buckets named to contain dots.
+
+2015-05-18 - version 0.0.11 - fixed problems with IAM roles
+
 2015-04-14 - version 0.0.10 - adds "lifecycle" functionality for security groups. Existing security groups will now have rules removed from them or added to them to make AWS reflect the YAML passed to build-cloud. Previously, once a security group had been created by build-cloud, it was never subsequently updated.
 
 2014-12-12 - version 0.0.9 - bugfixes to file path resolution. It is worth noting that when multiple files are passed to `--config` they're treated as relative to the CWD - this is what you'd expect from referencing a file in a command line option. When file(s) are specified in an `:include` key in the given YAML file, relative paths given there are considered to be relative to the location of the YAML file given to `--config` - this is to ensure consistent behaviour regardless of what $CWD is when calling build-cloud.

data/bin/build-cloud

@@ -34,9 +34,10 @@ require 'build-cloud/dhcpoptionsset'
 options = {}
 optparse = OptionParser.new do |opts|
 
-    options[:config] = nil
+    options[:config] = []
     opts.on('-c', '--config file1,file2', Array, 'Config files - second and subsequent files merged into first.') do |c|
-        options[:config] = c
+        options[:config] << c
+        options[:config].flatten!
     end
 
     options[:debug] = false
@@ -92,7 +93,7 @@ begin
 
     optparse.parse!
 
-    if options[:config].nil?
+    if options[:config].empty?
         raise OptionParser::MissingArgument, "--config"
     end
 

data/build-cloud.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "build-cloud"
-  spec.version       = "0.0.11"
+  spec.version       = "0.0.12"
   spec.authors       = ["The Scale Factory"]
   spec.email         = ["info@scalefactory.com"]
   spec.summary       = %q{Tools for building resources in AWS}

data/lib/build-cloud.rb

@@ -255,7 +255,7 @@ class BuildCloud
         @fog_interfaces = {
 
             :compute     => Fog::Compute::AWS.new( fog_options ),
-            :s3          => Fog::Storage::AWS.new( fog_options ),
+            :s3          => Fog::Storage::AWS.new( fog_options.merge(:path_style => true)),
             :as          => Fog::AWS::AutoScaling.new( fog_options ),
             :elb         => Fog::AWS::ELB.new( fog_options ),
             :iam         => Fog::AWS::IAM.new( fog_options_regionless ),

data/lib/build-cloud/networkinterface.rb

@@ -66,16 +66,22 @@ class BuildCloud::NetworkInterface
         options[:description] = options[:name]
         options.delete(:name)
 
+        tags = options[:tags]
+        options.delete(:tags)
+
         interface = @compute.network_interfaces.new(options)
         interface.save
         wait_until_ready
 
-        attributes = {}
-        attributes[:resource_id] = interface.network_interface_id
-        attributes[:key] = 'Name'
-        attributes[:value] = options[:description]
-        interface_tag = @compute.tags.new( attributes )
-        interface_tag.save
+        tags.merge!({'Name' => options[:description]})
+        tags.each do |k,v|
+            attributes = {}
+            attributes[:resource_id] = interface.network_interface_id
+            attributes[:key] = k
+            attributes[:value] = v
+            interface_tag = @compute.tags.new(attributes)
+            interface_tag.save
+        end
 
         if options[:assign_new_public_ip] and ! options[:existing_public_ip].nil?
             raise "Cannot specifiy both new and existing IP addresses"
@@ -105,7 +111,6 @@ class BuildCloud::NetworkInterface
         end
 
         @log.debug( interface.inspect )
-        @log.debug( interface_tag.inspect )
         @log.debug( ip.inspect ) unless ! options[:assign_new_public_ip]
         @log.debug( ip.inspect ) unless options[:existing_public_ip].nil?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - The Scale Factory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler