stemcell 0.11.8 → 0.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac5c43057f6dedabdbae868bc6d2ba532a024f2
-  data.tar.gz: c0dfd5f07899e1b6ead8c9ba6c201aebee2177dc
+  metadata.gz: 4d3d71d194f64fa371f8052946dd96ce7d014434
+  data.tar.gz: e25f56378baeeaee5e5750fb74fc938db759c2d4
 SHA512:
-  metadata.gz: 33f543e985945155f3f08618b8d3922827c0351bbf1733e76a6384086bae081539d73eb36e5fc8c73febc47f5d6a2bd8397f288edcfe248f7366e9d36d428e91
-  data.tar.gz: b15dc55412394a25fbb989fb12c7a3f8f2da632891755e312825e58a37ac889f1d0896a39f4fff747c92f7a90f9e34c1db43757ef2591a226ffd7de8e926b12f
+  metadata.gz: ad7f8d3f4343e2c98591339cda7f6351d25aac7648e54c7a4f6d46e23264fefeb704e74a4d69bbdb7cc67f12f0fcefdf44d69c43db1728a35f3850592a4408b8
+  data.tar.gz: 253d9789fe346065cb9a4911e6806a0a60a3a2ccd3161fd9452b307ff57f1c54d3a9daa5bb97e54c1ceb8bc4c5c7eefc6b5e12e208e42e56a4518fe2c05241c5

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# 0.11.7
+# 0.11.9
+- Transform chef_cookbook_attributes option for command-line parser
+- Set vpc_id when creating Launcher object
+
+# 0.11.8
 - Configure AWS earlier to work around aws-sdk-v1 vpc bug
 
 # 0.11.7

data/lib/stemcell/command_line.rb

@@ -125,13 +125,14 @@ module Stemcell
     end
 
     def transform_parser_defaults(pd)
-      # There are two special cases: security groups and tags. Security groups
+      # There are some special cases, eg security groups and tags. Security groups
       # are an array in the template, but trollop expects a string. Likewise,
       # in the case of tags, they are represented as a hash, but trollop wants
       # a string once again. In both cases, the data types are encoded as a
       # comma-separated list when presented as defaults.
       pd['security_groups'] &&= pd['security_groups'].join(',')
       pd['tags'] &&= pd['tags'].to_a.map { |p| p.join('=') }.join(',')
+      pd['chef_cookbook_attributes'] &&= pd['chef_cookbook_attributes'].join(',')
     end
 
     def parse_options_or_print_help

data/lib/stemcell/metadata_launcher.rb

@@ -99,6 +99,7 @@ module Stemcell
         'aws_secret_key'    => options['aws_secret_key'],
         'aws_session_token' => options['aws_session_token'],
         'region'            => options['region'],
+        'vpc_id'            => options['vpc_id'],
       })
       # Slice off just the options used for launching.
       launch_options = {}

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.11.8"
+  VERSION = "0.11.9"
 end

data/spec/fixtures/chef_repo/stemcell-options-parser.json

@@ -0,0 +1,29 @@
+{
+  "defaults": {
+    "region": "us-east-1",
+    "security_groups": ["sg1", "sg2"],
+    "instance_type": "m1.small",
+    "backing_store": "hvm1",
+    "git_origin": "git1",
+    "instance_domain_name": "example.com",
+    "chef_package_source": "https://example.com/chef.deb",
+    "chef_version": "12.12.15-1",
+    "chef_cookbook_attributes": ["name::attribute"],
+    "tags": {
+      "tag1": "value"
+    }
+  },
+
+  "backing_store": {
+    "hvm1": {
+      "image_id": "ami-1"
+    },
+    "pv1": {
+      "image_id": "ami-2"
+    }
+  },
+
+  "availability_zones": {
+    "us-east-1": ["us-east-1a", "us-east-1b", "us-east-1c", "us-east-1e"]
+  }
+}

data/spec/lib/stemcell/command_line_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Stemcell::CommandLine do
+  describe '#run!' do
+    let(:chef_root) { FixtureHelper.chef_repo_fixture_path }
+    let(:config_fn) { 'Stemcell::MetadataSource::DEFAULT_CONFIG_FILENAME' }
+    it 'outputs a help message' do
+      stub_const 'ARGV', ["--local-chef-root=#{chef_root}", "--help"]
+      stub_const config_fn, 'stemcell-options-parser.json'
+      expect do
+        subject.run!
+      end.to output(/Show this message/).to_stdout.and raise_error(SystemExit)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.11.9
 platform: ruby
 authors:
 - Martin Rhoads
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -210,7 +210,9 @@ files:
 - spec/fixtures/chef_repo/stemcell-backing-store-missing.json
 - spec/fixtures/chef_repo/stemcell-cookbook-attribute.json
 - spec/fixtures/chef_repo/stemcell-defaults-missing.json
+- spec/fixtures/chef_repo/stemcell-options-parser.json
 - spec/fixtures/chef_repo/stemcell.json
+- spec/lib/stemcell/command_line_spec.rb
 - spec/lib/stemcell/launcher_spec.rb
 - spec/lib/stemcell/metadata_source/chef_repository_spec.rb
 - spec/lib/stemcell/metadata_source/configuration_spec.rb
@@ -239,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: no summary
@@ -269,7 +271,9 @@ test_files:
 - spec/fixtures/chef_repo/stemcell-backing-store-missing.json
 - spec/fixtures/chef_repo/stemcell-cookbook-attribute.json
 - spec/fixtures/chef_repo/stemcell-defaults-missing.json
+- spec/fixtures/chef_repo/stemcell-options-parser.json
 - spec/fixtures/chef_repo/stemcell.json
+- spec/lib/stemcell/command_line_spec.rb
 - spec/lib/stemcell/launcher_spec.rb
 - spec/lib/stemcell/metadata_source/chef_repository_spec.rb
 - spec/lib/stemcell/metadata_source/configuration_spec.rb