sfn 3.0.18 → 3.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e0e8bc2bc5c05f56fe561d245c6e713462ea8ce
-  data.tar.gz: b1e750978c0762edf2f7c1f4abfb2d4195afb551
+  metadata.gz: fb7f6574c00a8cf09a14557610e3a00ea89e22d0
+  data.tar.gz: e606f5fd3a2b9a9ba7b6ddad048a138d52259ea3
 SHA512:
-  metadata.gz: cafe68c3e0a8e504ff5944a1f3ba3de88746cfeed2aad1cdc2bcd2074cd3af9464ff56432f3f847ba63c20366cc225ebfcc7430b6c8c8ad9691448ddc2e62a74
-  data.tar.gz: 9d8e08912ff14edc21f19f231e87a3b6f948991948d4c27300ad83942a000a3a607701f28939ec6e2a7a1fdce2c130351671f746c49300385181a64388cd24b4
+  metadata.gz: 29704f3a0467a4e32a597b3565598852f5f38e15e6964d5f869930d46db46fbf0a9affea9605cbc8dac0f61267f1b63d2cb3c307b81e77d132d90f27932eda69
+  data.tar.gz: 8985b3018da481d53f3214aa9302b58d5800730c94e16d42baa9b94ba9976b214ec7f759b80d4337ac9d51f19d45672e52acfdbe1ced3abefaa7ea3c48dffe1f

data/CHANGELOG.md

@@ -1,8 +1,12 @@
+# v3.0.20
+* [fix] Only dump templates when dumpable (#220, #223)
+* [enhancement] Support NoEcho template parameters (#226)
+
 # v3.0.18
 * [enhancement] Add `colors` flag to CLI commands
 
 # v3.0.16
-* [enhancement] Update output format of lint command(#212)
+* [enhancement] Update output format of lint command (#212)
 * [fix] Fix parameter scrub to use instance method
 
 # v3.0.14

data/LICENSE

@@ -1,13 +1,201 @@
-   Copyright 2014 Heavy Water Operations LLC.
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-     http://www.apache.org/licenses/LICENSE-2.0
+1. Definitions.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright 2016 Chris Roberts
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/lib/sfn/command/conf.rb

@@ -5,6 +5,8 @@ module Sfn
     # Config command
     class Conf < Command
 
+      include Sfn::CommandModule::Base
+
       # Run the list command
       def execute!
         ui.info ui.color("Current configuration state:")

data/lib/sfn/command/update.rb

@@ -90,7 +90,10 @@ module Sfn
               stack.parameters = original_parameters
               plan = build_planner(stack)
               if(plan)
-                result = plan.generate_plan(file.dump, config_root_parameters)
+                result = plan.generate_plan(
+                  file.respond_to?(:dump) ? file.dump : file,
+                  config_root_parameters
+                )
                 display_plan_information(result)
               end
             rescue => e

data/lib/sfn/command/validate.rb

@@ -22,7 +22,10 @@ module Sfn
         if(config[:print_only])
           ui.puts raw_template
         else
-          validate_stack(file.dump, sparkle_collection.get(:template, config[:file])[:name])
+          validate_stack(
+            file.respond_to?(:dump) ? file.dump : file,
+            sparkle_collection.get(:template, config[:file])[:name]
+          )
         end
       end
 

data/lib/sfn/command_module/callbacks.rb

@@ -54,7 +54,8 @@ module Sfn
             begin
               klass = Sfn::Callback.const_get(Bogo::Utility.camel(c_name.to_s))
               klass.new(ui, config, arguments, provider)
-            rescue NameError
+            rescue NameError => e
+              ui.debug "Callback type lookup error: #{e.class} - #{e}"
               raise "Unknown #{type} callback requested: #{c_name} (not found)"
             end
           end

data/lib/sfn/command_module/stack.rb

@@ -14,6 +14,8 @@ module Sfn
         TEMPLATE_PARAMETER_LOCATIONS = ['Parameters', 'parameters']
         # Template parameter default value locations
         TEMPLATE_PARAMETER_DEFAULTS = ['Default', 'defaultValue', 'default']
+        # Template parameter no echo locations
+        TEMPLATE_PARAMETER_NOECHO = ['NoEcho']
 
         # Apply any defined remote stacks
         #
@@ -184,7 +186,13 @@ module Sfn
               )
             )
             if(config[:interactive_parameters])
-              answer = ui.ask_question("#{param_name.split(/([A-Z]+[^A-Z]*)/).find_all{|s|!s.empty?}.join(' ')}", :default => default)
+              answer = ui.ask_question(
+                "#{param_name.split(/([A-Z]+[^A-Z]*)/).find_all{|s|!s.empty?}.join(' ')}",
+                :default => default,
+                :no_echo => !!TEMPLATE_PARAMETER_NOECHO.detect{|loc_key|
+                  param_value[loc_key].to_s.downcase == 'true'
+                }
+              )
             else
               answer = default
             end

data/lib/sfn/version.rb

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

data/sfn.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.license = 'Apache-2.0'
   s.require_path = 'lib'
   s.add_runtime_dependency 'bogo-cli', '>= 0.2.5', '< 0.4'
-  s.add_runtime_dependency 'bogo-ui', '>= 0.1.13', '< 0.4'
+  s.add_runtime_dependency 'bogo-ui', '>= 0.1.20', '< 0.4'
   s.add_runtime_dependency 'miasma', '>= 0.3.0', '< 0.4'
-  s.add_runtime_dependency 'miasma-aws', '>= 0.3.3', '< 0.4'
+  s.add_runtime_dependency 'miasma-aws', '>= 0.3.6', '< 0.4'
   s.add_runtime_dependency 'miasma-azure', '>= 0.1.0', '< 0.3'
   s.add_runtime_dependency 'miasma-open-stack', '>= 0.1.0', '< 0.3'
   s.add_runtime_dependency 'miasma-rackspace', '>= 0.1.0', '< 0.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 3.0.18
+  version: 3.0.20
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.1.20
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.1.20
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -435,9 +435,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SparkleFormation CLI
 test_files: []
-has_rdoc: