sfn 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 932b1dd44a660a08997530244880226b82ccce30
-  data.tar.gz: 3d6b9402858c40a92627c1b8b2b60062fc363a99
+  metadata.gz: 4dc5791789b8e7f511712d9d81e8352f8e4780db
+  data.tar.gz: e98faf54dde7e50b2677e6cd8eb11cb5f07c55b1
 SHA512:
-  metadata.gz: afe324f57a37e74133a776a33ee1bd1fcf068085dc13737627c24b2f284c9920923ee87f0838d3396143d4e6b017410c39b38f25cf612946ba1d1d7d70cf01ba
-  data.tar.gz: 9e81542e7eaeb6ea50ba7cf4459f7e055897be01bffb28e43f889b6cd9d0149f027ae0c759fada3e241b32e9138b4d24352587687b63980cdc7404ade050c4d8
+  metadata.gz: e6d304c36c90b3776397d17a940a3e3a8eab174c9492f84151f6f96f2a78b8d176b3db05a204bf08c447603ed39ea5af65a7d4f1ef54ac6230e6c69312967ff7
+  data.tar.gz: 1d25448614c1252fd5d66644e33d028c9b4eef596347ea7c373758ca0bfebf68dcec906424d83b06083c7253abd8efda1b280e37716531e234065679f80a15af

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v2.1.0
+* [fix] Use SparkleFormation::Collection helper to ensure proper pack ordering (#115)
+* [fix] Set minimum constraint on sparkle_formation library to 2.1.2
+
 # v2.0.6
 * [fix] Remove bundler assumption within `init` command (#114)
 

data/README.md

@@ -5,312 +5,16 @@
 SparkleFormation command line interface for interacting
 with orchestration APIs.
 
-## Extra Documentation
-
-* [User Documentation](http://www.sparkleformation.io/docs/sfn/)
-
 ## API Compatibility
 
 * AWS
 * Rackspace
 * OpenStack
+* Azure
 
-## Configuration
-
-Configuration is defined within a `.sfn` file. The
-`sfn` command will start from the current working
-directory and work up to the root of the file system
-to discover this file.
-
-### Configuration formats
-
-The configuration file can be provided in a variety of
-formats:
-
-#### JSON
-
-```json
-{
-  "credentials": {
-    MIASMA_CREDENTIALS
-  },
-  "options": {
-    "disable_rollback": true
-  }
-}
-```
-
-#### YAML
-
-```yaml
----
-:credentials:
-  :fubar: true
-:options:
-  :disable_rollback: true
-```
-
-#### XML
-
-```xml
-<configuration>
-  <credentials>
-    MIASMA_CREDENTIALS
-  </credentials>
-  <options>
-    <disable_rollback>
-      true
-    </disable_rollback>
-  </options>
-</configuration>
-```
-
-#### Ruby
-
-```ruby
-Configuration.new do
-  credentials do
-    MIASMA_CREDENTIALS
-  end
-  options.on_failure 'nothing'
-end
-```
-
-
-## Commands
-
-* `sfn list`
-* `sfn create`
-* `sfn update`
-* `sfn destroy`
-* `sfn events`
-* `sfn describe`
-* `sfn inspect`
-* `sfn validate`
-* `sfn diff`
-
-_NOTE: All commands respond to `--help` and will provide a full list of valid options._
-
-### `sfn list`
-
-Provides listing of current stacks and state of each stack.
-
-### `sfn validate`
-
-Validates template with API
-
-### `sfn create NAME`
-
-Creates a new stack with the provided name (`NAME`).
-
-
-#### Processing
-
-The default behavior of this plugin assumes templates will be
-in JSON format. The `--processing` flag will allow providing Ruby
-files to dynamically generate templates using the SparkleFormation
-library.
-
-_NOTE: [SparkleFormation Usage Documentation](http://www.sparkleformation.io/docs/sparkle_formation/)._
-
-This plugin supports the advanced stack nesting feature provided by
-the SparkleFormation library.
-
-#### Translations
-
-Translations are currently an `alpha` feature and only a subset of
-resources are supported.
-
-### `sfn update STACK`
-
-Update an existing stack.
-
-### `sfn diff STACK`
-
-View resources differences that would be applied to a running stack
-on update.
-
-### `sfn destroy STACK`
-
-Destroy an existing stack.
-
-#### Name globs
-
-The destroy command supports globbing for performing multiple
-destructions based on glob match. For example, given existing
-stacks:
-
-* TestStack1
-* TestStack2
-* Production
-
-running the following command:
-
-```
-$ sfn destroy Test*
-```
-
-will destroy the `TestStack1` and `TestStack2`
+## Documentation
 
-### `sfn events STACK`
-
-Display the event listing of given stack. If the state of the
-stack is "in progress", the polling option will result in
-polling and displaying new events until the stack reaches a
-completed state.
-
-### `sfn describe STACK`
-
-Display resources and outputs of give stack.
-
-
-### `sfn inspect STACK`
-
-The stack inspection command simply provides a proxy to the
-underlying resource modeling objects provided via the
-[miasma][miasma] library. It also provides extra helpers for
-running common inspection commands.
-
-### Interesting `inspect` options
-
-* `--nodes` list node addresses within stack
-* `--instance-failure [LOG_FILE]` print log file from failed instance
-* `--attribute ATTR` print stack attribute
-
-#### `--nodes`
-
-This option will return a list of compute instance IDs and
-their addresses. The result will be a complete list including
-direct compute resources within the stack as well as compute
-resources that are part of auto scaling group resouces.
-
-#### `--instance-failure [LOG_FILE]`
-
-If the stack create or update failed due to a compute instance,
-this option will attempt to locate the instance, connect to
-it and download the defined log file. The default log file
-is set to: `/var/log/chef/client.log`
-
-#### `--attribute ATTR`
-
-The attribute option is what provides the proxy to the underlying
-[miasma][miasma] resource modeling. The value of `ATTR` is what should be
-called on the `Miasma::Models::Orchestration::Stack` instance.
-For example, to display the JSON template of a stack:
-
-```
-$ sfn inspect STACK -a template
-```
-
-To display the resource collection of the stack:
-
-```
-$ sfn inspect STACK -a resources
-```
-
-This will provide a list of resources. Now, to make this more
-useful, we can start inspect specific resources. Lets assume
-that the 3rd resource in the collection is an auto scaling
-group resource. We can isolate that resource for display:
-
-```
-$ sfn inspect STACK -a "resources.all.at(2)"
-```
-
-Note that the resources are an array, and we are using a zero
-based index. Now, this simply provides us with the information
-we already have seen. One of the handy features within the
-[miasma][miasma] library is the ability to expand supported resources.
-So, we can expand this resource:
-
-```
-$ sfn inspect STACK -a "resources.all.at(2).expand"
-```
-
-This will expand the resource instance and return the actual
-auto scaling group resource. The result will provide more detailed
-information about the scaling group. But, perhaps we are looking
-for the instances in this scaling group. The model instance we
-now have (`Miasma::Orchestration::Models::AutoScale::Group`)
-contains a `servers` attribute. The output lists the IDs of the
-instances, but we can expand those as well:
-
-```
-$ sfn inspect STACK -a "resources.all.at(2).expand.servers.map(&:expand)"
-```
-
-The attribute string will be minimally processed when proxying calls
-to the underlying models, which is why we are able to do ruby-ish
-style things.
-
-## Chef Knife Integration
-
-This library will also provide `cloudformation` subcommands
-to knife.
-
-### Configuration
-
-The easiest way to configure the plugin is via the
-`knife.rb` file. Credentials are the only configuration
-requirement, and the `Hash` provided is proxied to
-[Miasma][miasma]. All configuration options provided
-via the `sfn` command are allowed within the
-`knife[:cloudformation]` namespace:
-
-#### AWS
-
-```ruby
-# .chef/knife.rb
-
-knife[:cloudformation][:credentials] = {
-  :provider => :aws,
-  :aws_access_key_id => ENV['AWS_ACCESS_KEY_ID'],
-  :aws_secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'],
-  :aws_region => ENV['AWS_REGION']
-}
-```
-
-#### Rackspace
-
-```ruby
-# .chef/knife.rb
-
-knife[:cloudformation][:credentials] = {
-  :provider => :rackspace,
-  :rackspace_username => ENV['RACKSPACE_USERNAME'],
-  :rackspace_api_key => ENV['RACKSPACE_API_KEY'],
-  :rackspace_region => ENV['RACKSPACE_REGION']
-}
-```
-
-#### OpenStack
-
-```ruby
-# .chef/knife.rb
-
-knife[:cloudformation][:credentials] = {
-  :provider => :open_stack,
-  :open_stack_username => ENV['OPENSTACK_USERNAME'],
-  :open_stack_password => ENV['OPENSTACK_PASSWORD'],
-  :open_stack_identity_url => ENV['OPENSTACK_IDENTITY_URL'],
-  :open_stack_tenant_name => ENV['OPENSTACK_TENANT']
-}
-```
-
-### Usage
-
-All commands available via the `sfn` command are available as
-knife subcommands under `cloudformation` and `sparkleformation`
-
-```
-$ knife cloudformation --help
-```
-
-or
-
-```
-$ knife sparkleformation --help
-```
+* [User Documentation](http://www.sparkleformation.io/docs/sfn/)
 
 # Info
 

data/lib/sfn/command_module/template.rb

@@ -158,9 +158,7 @@ module Sfn
                   formation.compile_state = current_state
                 end
               end
-              sparkle_packs.each do |pack|
-                sf.sparkle.add_sparkle(pack)
-              end
+              sf.sparkle.apply sparkle_collection
               custom_stack_types.each do |s_type|
                 unless(sf.stack_resource_types.include?(s_type))
                   sf.stack_resource_types.push(s_type)

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new('2.0.6')
+  VERSION = Gem::Version.new('2.1.0')
 end

data/sfn.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'miasma-aws', '>= 0.2.0', '< 0.4'
   s.add_runtime_dependency 'miasma-azure', '>= 0.1.0', '< 0.3'
   s.add_runtime_dependency 'net-ssh'
-  s.add_runtime_dependency 'sparkle_formation', '~> 2.0'
+  s.add_runtime_dependency 'sparkle_formation', '>= 2.1.2', '< 3'
   s.add_runtime_dependency 'hashdiff', '~> 0.2.2'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Roberts
@@ -108,16 +108,22 @@ dependencies:
   name: sparkle_formation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement