formatron 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa838c27b599f963e068ce0237499ac84df6fa86
-  data.tar.gz: 103620771c737d722c3d80e00ac8be9f2edcbf9b
+  metadata.gz: f65ce71a403a7fb9643dc55ded5f5db6e29ed56a
+  data.tar.gz: 017ba0b1ecf0fb92becc855038b3bc1023bba5cc
 SHA512:
-  metadata.gz: 00c35229a64d78d4102cdd0822787710f793d88e16a92545d247a80b92094450015710d1db5c31def0baa8684fa2f76d354f503557c909485adb8c98279218d0
-  data.tar.gz: a78ce02b19afc19339f8923b5df1a04f01e48a2abd0994ec15d315bc2badbb5adce3377fafe1d48e779fc60dac7996cef5d48dfb7e17effc6ea3d9f9bdcec876
+  metadata.gz: 719acdc0c0e57bb503253f1a37c4b9543701a2112d9a069a4488ad50fc7b2a524d84d83b96771a3a683183652bfcb6d3c880f13385c0b0ea57616ef89b0de8d2
+  data.tar.gz: e429955eade1cd8f89039e43991583f02b47d00152a7389e120f133aa360ab072d6ec9bc7eb7b57a1c9993af12be21b5466864c533747adf49e4b2f8fe2c7dfe

data/lib/formatron.rb

@@ -147,26 +147,26 @@ class Formatron
     end
   end
 
-  def provision
+  def provision(guid: nil)
     @all_instances.each do |key, instances|
-      _provision_vpc key, instances
+      _provision_vpc key, instances, guid
     end
   end
 
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
-  def _provision_vpc(key, instances)
+  def _provision_vpc(key, instances, guid_filter)
     chef_clients = @chef_clients[key]
     chef_clients.init
-    chef_clients.deploy_databags
     instances.values.each do |instance|
+      guid = instance.guid
+      next unless guid_filter.nil? || guid_filter.eql?(guid)
       dsl_chef = instance.chef
       next if dsl_chef.nil?
       chef = chef_clients.get dsl_chef.server
       cookbook = dsl_chef.cookbook
       bastion = dsl_chef.bastion
       sub_domain = instance.sub_domain
-      guid = instance.guid
       _provision_instance chef, cookbook, sub_domain, guid, bastion
     end
   ensure
@@ -323,7 +323,6 @@ class Formatron
   def _destroy_chef_vpc_instances(key, instances)
     chef_clients = @chef_clients[key]
     chef_clients.init
-    chef_clients.delete_databags
     instances.values.each do |instance|
       dsl_chef = instance.chef
       next if dsl_chef.nil?
@@ -331,8 +330,6 @@ class Formatron
       guid = instance.guid
       _destroy_chef_instance chef, guid
     end
-  rescue => error
-    LOG.warn error
   ensure
     chef_clients.unlink
   end

data/lib/formatron/chef.rb

@@ -50,7 +50,6 @@ class Formatron
         username: username,
         organization: organization,
         ssl_verify: ssl_verify,
-        name: @name,
         databag_secret: databag_secret,
         configuration: configuration
       )
@@ -75,21 +74,8 @@ class Formatron
       @berkshelf.init
     end
 
-    def deploy_databag
-      Formatron::LOG.info do
-        "Deploying data bag to chef server: #{@chef_sub_domain}"
-      end
-      @knife.deploy_databag
-    end
-
-    def delete_databag
-      Formatron::LOG.info do
-        "Deleting data bag from chef server: #{@chef_sub_domain}"
-      end
-      @knife.delete_databag
-    end
-
     # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def provision(
       sub_domain:,
       guid:,
@@ -112,8 +98,18 @@ class Formatron
       hostname = _hostname(
         sub_domain: sub_domain
       )
+      Formatron::LOG.info do
+        "Deploying data bag item '#{guid}' to chef server: #{@chef_sub_domain}"
+      end
+      @knife.deploy_databag name: guid
+      Formatron::LOG.info do
+        "Lock cookbook versions for environment #{guid}"
+      end
       @knife.create_environment environment: guid
       @berkshelf.upload environment: guid, cookbook: cookbook
+      Formatron::LOG.info do
+        "Bootstrap node #{guid}"
+      end
       @knife.bootstrap(
         bastion_hostname: bastion_hostname,
         guid: guid,
@@ -121,17 +117,32 @@ class Formatron
         hostname: hostname
       )
     end
-    # rubocop:enable Metrics/ParameterLists
+    # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
 
+    # rubocop:disable Metrics/MethodLength
     def destroy(guid:)
       Formatron::LOG.info do
         "Delete Chef configuration for node: #{guid}"
       end
+      Formatron::LOG.info do
+        "Deleting data bag item '#{guid}' from chef server: #{@chef_sub_domain}"
+      end
+      @knife.delete_databag name: guid
+      Formatron::LOG.info do
+        "Deleting node '#{guid}' from chef server: #{@chef_sub_domain}"
+      end
       @knife.delete_node node: guid
+      Formatron::LOG.info do
+        "Deleting client '#{guid}' from chef server: #{@chef_sub_domain}"
+      end
       @knife.delete_client client: guid
+      Formatron::LOG.info do
+        "Deleting environment '#{guid}' from chef server: #{@chef_sub_domain}"
+      end
       @knife.delete_environment environment: guid
     end
+    # rubocop:enable Metrics/MethodLength
 
     def unlink
       @keys.unlink

data/lib/formatron/chef/knife.rb

@@ -15,7 +15,6 @@ class Formatron
         username:,
         organization:,
         ssl_verify:,
-        name:,
         databag_secret:,
         configuration:
       )
@@ -24,7 +23,6 @@ class Formatron
         @username = username
         @organization = organization
         @ssl_verify = ssl_verify
-        @name = name
         @databag_secret = databag_secret
         @configuration = configuration
       end
@@ -47,15 +45,20 @@ class Formatron
         @databag_secret_file = Tempfile.new 'formatron-databag-secret-'
         @databag_secret_file.write @databag_secret
         @databag_secret_file.close
-        @databag_file = Tempfile.new ['formatron-databag-', '.json']
-        @databag_file.write @configuration.merge(id: @name).to_json
-        @databag_file.close
       end
       # rubocop:enable Metrics/MethodLength
 
-      def deploy_databag
+      def deploy_databag(name:)
+        databag_file = Tempfile.new ['formatron-databag-', '.json']
+        databag_file.write @configuration.merge(id: name).to_json
+        databag_file.close
         _attempt_to_create_databag unless _databag_exists
-        _attempt_to_create_databag_item
+        _attempt_to_create_databag_item(
+          name: name,
+          databag_file: databag_file
+        )
+      ensure
+        databag_file.unlink unless databag_file.nil?
       end
 
       def _databag_exists
@@ -72,15 +75,15 @@ class Formatron
         # rubocop:enable Metrics/LineLength
       end
 
-      def _attempt_to_create_databag_item
+      def _attempt_to_create_databag_item(name:, databag_file:)
         # rubocop:disable Metrics/LineLength
-        fail "failed to create data bag item: #{@name}" unless _create_databag_item
+        fail "failed to create data bag item: #{name}" unless _create_databag_item databag_file: databag_file
         # rubocop:enable Metrics/LineLength
       end
 
-      def _create_databag_item
+      def _create_databag_item(databag_file:)
         # rubocop:disable Metrics/LineLength
-        Util::Shell.exec "knife data bag from file formatron #{@databag_file.path} --secret-file #{@databag_secret_file.path} -c #{@knife_file.path}"
+        Util::Shell.exec "knife data bag from file formatron #{databag_file.path} --secret-file #{@databag_secret_file.path} -c #{@knife_file.path}"
         # rubocop:enable Metrics/LineLength
       end
 
@@ -121,10 +124,10 @@ class Formatron
         # rubocop:enable Metrics/LineLength
       end
 
-      def delete_databag
+      def delete_databag(name:)
         # rubocop:disable Metrics/LineLength
-        command = "knife data bag delete formatron #{@name} -y -c #{@knife_file.path}"
-        fail "failed to delete data bag item: #{@name}" unless Util::Shell.exec command
+        command = "knife data bag delete formatron #{name} -y -c #{@knife_file.path}"
+        fail "failed to delete data bag item: #{name}" unless Util::Shell.exec command
         # rubocop:enable Metrics/LineLength
       end
 
@@ -150,7 +153,6 @@ class Formatron
       def unlink
         @knife_file.unlink unless @knife_file.nil?
         @databag_secret_file.unlink unless @databag_secret_file.nil?
-        @databag_file.unlink unless @databag_file.nil?
       end
 
       private(

data/lib/formatron/chef_clients.rb

@@ -61,13 +61,5 @@ class Formatron
     def unlink
       @chef_clients.values.each(&:unlink)
     end
-
-    def deploy_databags
-      @chef_clients.values.each(&:deploy_databag)
-    end
-
-    def delete_databags
-      @chef_clients.values.each(&:delete_databag)
-    end
   end
 end

data/lib/formatron/cli.rb

@@ -7,6 +7,7 @@ class Formatron
     include Commander::Methods
 
     def global_options
+      global_option '-y', '--yes', 'Automatic yes to prompts'
       global_option '-c', '--credentials FILE', 'The credentials file'
       global_option(
         '-d',

data/lib/formatron/cli/deploy.rb

@@ -23,8 +23,8 @@ class Formatron
         )
       end
 
-      def deploy_ok(formatron, target)
-        !formatron.protected? || agree(
+      def deploy_ok(options, formatron, target)
+        options.yes || !formatron.protected? || agree(
           "Are you sure you wish to deploy protected target: #{target}?"
         ) do |q|
           q.default = 'no'
@@ -40,7 +40,7 @@ class Formatron
             directory: directory,
             target: target
           )
-          formatron.deploy if deploy_ok(formatron, target)
+          formatron.deploy if deploy_ok options, formatron, target
         end
       end
 

data/lib/formatron/cli/destroy.rb

@@ -23,8 +23,8 @@ class Formatron
         )
       end
 
-      def destroy_ok(formatron, target)
-        !formatron.protected? || agree(
+      def destroy_ok(options, formatron, target)
+        options.yes || !formatron.protected? || agree(
           "Are you sure you wish to destroy protected target: #{target}?"
         ) do |q|
           q.default = 'no'
@@ -40,7 +40,7 @@ class Formatron
             directory: directory,
             target: target
           )
-          formatron.destroy if destroy_ok formatron, target
+          formatron.destroy if destroy_ok options, formatron, target
         end
       end
 

data/lib/formatron/cli/generators/bootstrap.rb

@@ -92,7 +92,7 @@ class Formatron
             'The protected targets (eg. production)'
           )
           c.option(
-            '-y',
+            '-q',
             '--unprotected-targets LIST',
             Array,
             'The unprotected targets (eg. test)'

data/lib/formatron/cli/provision.rb

@@ -5,6 +5,15 @@ class Formatron
   class CLI
     # CLI command for provision
     module Provision
+      def provision_options(c)
+        c.option(
+          '-g',
+          '--guid STRING',
+          'The guid of an instance to provision ' \
+          '(will provision all instances if not specified)'
+        )
+      end
+
       def provision_directory(options)
         options.directory || Dir.pwd
       end
@@ -23,14 +32,15 @@ class Formatron
         )
       end
 
-      def provision_ok(formatron, target)
-        !formatron.protected? || agree(
+      def provision_ok(options, formatron, target)
+        options.yes || !formatron.protected? || agree(
           "Are you sure you wish to provision protected target: #{target}?"
         ) do |q|
           q.default = 'no'
         end
       end
 
+      # rubocop:disable Metrics/MethodLength
       def provision_action(c)
         c.action do |args, options|
           directory = provision_directory options
@@ -40,9 +50,12 @@ class Formatron
             directory: directory,
             target: target
           )
-          formatron.provision if provision_ok formatron, target
+          formatron.provision(
+            guid: options.guid
+          ) if provision_ok options, formatron, target
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def provision_formatron_command
         command :provision do |c|
@@ -51,6 +64,7 @@ class Formatron
                       'stack using Opscode Chef'
           c.description = 'Provision the instances in a Formatron ' \
                           'stack using Opscode Chef'
+          provision_options c
           provision_action c
         end
       end

data/lib/formatron/version.rb

@@ -1,4 +1,4 @@
 # add version to class
 class Formatron
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formatron
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Peter Halliday
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -413,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: AWS/Chef Deployment Tool