itamae 1.4.5 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1702b011e6985d136ff6cd8d86d962a0ecb4c0a
-  data.tar.gz: a6e3caf02febbc6229fc4762abe498626c734b6f
+  metadata.gz: 5824e615aa71ac1b33b444d24ef09a784ce481fe
+  data.tar.gz: 18ded54560fa8f2c95d94bdee351d33edfc53b06
 SHA512:
-  metadata.gz: dfda34ba80a5c2f0bc1eaa7a8070c07387b44e9cfcea7d86ab5edc5dff9a06772a82f6f290d17191b3c35f6d42f179185a95183d1c31962034c2a69ec504ea28
-  data.tar.gz: c558ee700af41b9fec212cffc761bc90859f4236e57583363fbd7ea8a4adb4e54884c467919a8896c515f34dcc64d53d987d9941e8e65617a74eff2d6972fc2e
+  metadata.gz: f04064f58c4b1ed7130dee98dd8d640562140e49b49de8f4cf098181fe628fd1eafa9ff6350ed3e3213d52f9b1a160133e6169c973a34a556b095bd3a29a540a
+  data.tar.gz: 7180ffdc7d22da2ba174d6c9985e8bf596ba458943e3483a4391af88a84da75ff6535e2627aebdcce58fb60b4b72305b8ff7f4fb8ff389f94400fa5e31b07697

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.5.0
+
+Improvements
+
+- [Make a logger injectable from outside of Itamae.](https://github.com/itamae-kitchen/itamae/pull/160)
+
 ## v1.4.5
 
 Improvements
@@ -417,4 +423,3 @@ Features
 Incompatible changes
 
 - `uid` and `gid` attributes of `user` resource accept only Integer. (https://github.com/ryotarai/itamae/pull/65)
-

data/README.md

@@ -1,4 +1,4 @@
-# Itamae [![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![Code Climate](https://codeclimate.com/github/ryotarai/itamae/badges/gpa.svg)](https://codeclimate.com/github/ryotarai/itamae) [![wercker status](https://app.wercker.com/status/3e7be3b982d3671940a07e3ef45d9f5f/s/master "wercker status")](https://app.wercker.com/project/bykey/3e7be3b982d3671940a07e3ef45d9f5f) [![Slack](https://itamae-slackin.herokuapp.com/badge.svg)](https://itamae-slackin.herokuapp.com/)
+# Itamae [![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![Code Climate](https://codeclimate.com/github/ryotarai/itamae/badges/gpa.svg)](https://codeclimate.com/github/ryotarai/itamae) [![wercker status](https://app.wercker.com/status/3e7be3b982d3671940a07e3ef45d9f5f/s/master "wercker status")](https://app.wercker.com/project/bykey/3e7be3b982d3671940a07e3ef45d9f5f) [![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://itamae-slackin.herokuapp.com/)
 
 Simple and lightweight configuration management tool inspired by Chef.
 
@@ -6,9 +6,9 @@ Simple and lightweight configuration management tool inspired by Chef.
 
 ## Concept
 
-- Chef-like DSL
+- Chef-like DSL (but not compatible with Chef)
 - Simpler and lighter weight than Chef
-- Not compatible with Chef
+- Only recipes
 - Idempotent
 
 ## Installation
@@ -19,9 +19,49 @@ $ gem install itamae
 
 ## Getting Started
 
-https://github.com/itamae-kitchen/itamae/wiki/Getting-Started
+Create a recipe file as `recipe.rb`:
 
-## Documentations
+```ruby
+package 'nginx' do
+  action :install
+end
+
+service 'nginx' do
+  action [:enable, :start]
+end
+```
+
+And then excute `itamae` command to apply a recipe to a local machine.
+
+```
+$ itamae local recipe.rb
+ INFO : Starting Itamae...
+ INFO : Recipe: /home/user/recipe.rb
+ INFO :    package[nginx]
+ INFO :       action: install
+ INFO :          installed will change from 'false' to 'true'
+ INFO :    service[nginx]
+ INFO :       action: enable
+ INFO :       action: start
+```
+
+Or you can apply a recipe to a remote machine by `itamae ssh`.
+
+```
+$ itamae ssh --host host001.example.jp recipe.rb
+```
+
+You can also apply a recipe to Vagrant VM by `itamae ssh --vagrant`.
+
+```
+$ itamae ssh --vagrant --host vm_name recipe.rb
+```
+
+You can find further information to use Itamae on [Itamae Wiki](https://github.com/itamae-kitchen/itamae/wiki).
+
+Enjoy!
+
+## Documentation
 
 https://github.com/itamae-kitchen/itamae/wiki
 

data/lib/itamae/backend.rb

@@ -44,11 +44,11 @@ module Itamae
         options = {error: true}.merge(options)
 
         command = build_command(commands, options)
-        Logger.debug "Executing `#{command}`..."
+        Itamae.logger.debug "Executing `#{command}`..."
 
         result = nil
 
-        Logger.formatter.with_indent do
+        Itamae.logger.with_indent do
           reset_output_handler
           result = @backend.run_command(command)
           flush_output_handler_buffer
@@ -60,7 +60,7 @@ module Itamae
             method = :error
             message = "Command `#{command}` failed. (exit status: #{result.exit_status})"
 
-            unless Logger.logger.level == ::Logger::DEBUG
+            unless Itamae.logger.level == ::Logger::DEBUG
               result.stdout.each_line do |l|
                 log_output_line("stdout", l, :error)
               end
@@ -70,7 +70,7 @@ module Itamae
             end
           end
 
-          Logger.public_send(method, message)
+          Itamae.logger.public_send(method, message)
         end
 
         if options[:error] && result.exit_status != 0
@@ -86,15 +86,15 @@ module Itamae
 
       def receive_file(src, dst = nil)
         if dst
-          Logger.debug "Receiving a file from '#{src}' to '#{dst}'..."
+          Itamae.logger.debug "Receiving a file from '#{src}' to '#{dst}'..."
         else
-          Logger.debug "Receiving a file from '#{src}'..."
+          Itamae.logger.debug "Receiving a file from '#{src}'..."
         end
         @backend.receive_file(src, dst)
       end
 
       def send_file(src, dst)
-        Logger.debug "Sending a file from '#{src}' to '#{dst}'..."
+        Itamae.logger.debug "Sending a file from '#{src}' to '#{dst}'..."
         unless ::File.exist?(src)
           raise SourceNotExistError, "The file '#{src}' doesn't exist."
         end
@@ -105,7 +105,7 @@ module Itamae
       end
 
       def send_directory(src, dst)
-        Logger.debug "Sending a directory from '#{src}' to '#{dst}'..."
+        Itamae.logger.debug "Sending a directory from '#{src}' to '#{dst}'..."
         unless ::File.exist?(src)
           raise SourceNotExistError, "The directory '#{src}' doesn't exist."
         end
@@ -157,7 +157,7 @@ module Itamae
 
       def log_output_line(output_name, line, severity = :debug)
         line = line.gsub(/[[:cntrl:]]/, '')
-        Logger.public_send(severity, "#{output_name} | #{line}")
+        Itamae.logger.public_send(severity, "#{output_name} | #{line}")
       end
 
       def build_command(commands, options)
@@ -245,7 +245,7 @@ module Itamae
     class Docker < Base
       def finalize
         image = @backend.commit_container
-        Logger.info "Image created: #{image.id}"
+        Itamae.logger.info "Image created: #{image.id}"
       end
 
       private
@@ -253,12 +253,12 @@ module Itamae
         begin
           require 'docker'
         rescue LoadError
-          Logger.fatal "To use docker backend, please install 'docker-api' gem"
+          Itamae.logger.fatal "To use docker backend, please install 'docker-api' gem"
         end
 
         # TODO: Move to Specinfra?
         Excon.defaults[:ssl_verify_peer] = @options[:tls_verify_peer]
-        ::Docker.logger = Logger
+        ::Docker.logger = Itamae.logger
 
         Specinfra::Backend::Docker.new(
           docker_image: @options[:image],

data/lib/itamae/cli.rb

@@ -10,8 +10,8 @@ module Itamae
       opts = Config.new(opts).load
       super(args, opts, config)
 
-      Itamae::Logger.level = ::Logger.const_get(options[:log_level].upcase)
-      Itamae::Logger.formatter.colored = options[:color]
+      Itamae.logger.level = ::Logger.const_get(options[:log_level].upcase)
+      Itamae.logger.formatter.colored = options[:color]
     end
 
     def self.define_exec_options

data/lib/itamae/logger.rb

@@ -4,28 +4,7 @@ require 'ansi/code'
 
 module Itamae
   module Logger
-    class Formatter
-      attr_accessor :colored
-      attr_accessor :depth
-      attr_accessor :color
-
-      INDENT_LENGTH = 2
-
-      def initialize(*args)
-        super
-
-        @depth = 0
-      end
-
-      def call(severity, datetime, progname, msg)
-        log = "%s : %s%s\n" % ["%5s" % severity, ' ' * INDENT_LENGTH * depth , msg2str(msg)]
-        if colored
-          colorize(log, severity)
-        else
-          log
-        end
-      end
-
+    module IndentHelper
       def with_indent
         indent
         yield
@@ -42,12 +21,42 @@ module Itamae
       end
 
       def indent
-        @depth += 1
+        self.indent_depth += 1
       end
 
       def outdent
-        @depth -= 1
-        @depth = 0 if @depth < 0
+        self.indent_depth -= 1
+        self.indent_depth = 0 if self.indent_depth < 0
+      end
+
+      def indent_depth
+        @indent_depth ||= 0
+      end
+
+      def indent_depth=(val)
+        @indent_depth = val
+      end
+
+      %w!debug info warn error fatal unknown!.each do |level|
+        module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+          def #{level}(msg)
+            super("  " * indent_depth + msg)
+          end
+        EOC
+      end
+    end
+
+    class Formatter
+      attr_accessor :colored
+      attr_accessor :color
+
+      def call(severity, datetime, progname, msg)
+        log = "%s : %s\n" % ["%5s" % severity, msg2str(msg)]
+        if colored
+          colorize(log, severity)
+        else
+          log
+        end
       end
 
       def color(code)
@@ -89,37 +98,19 @@ module Itamae
         ANSI.public_send(color_code) { str }
       end
     end
+  end
 
-    class << self
-      def logger
-        @logger ||= create_logger
-      end
-
-      def log_device
-        @log_device || $stdout
-      end
-
-      def log_device=(value)
-        @log_device = value
-        @logger = create_logger
-      end
-
-      private
-
-      def create_logger
-        ::Logger.new(log_device).tap do |logger|
-          logger.formatter = Formatter.new
-        end
-      end
+  @logger = ::Logger.new($stdout).tap do |l|
+    l.formatter = Itamae::Logger::Formatter.new
+  end.extend(Itamae::Logger::IndentHelper)
 
-      def respond_to_missing?(method, include_private = false)
-        logger.respond_to?(method)
-      end
+  class << self
+    def logger
+      @logger
+    end
 
-      def method_missing(method, *args, &block)
-        logger.public_send(method, *args, &block)
-      end
+    def logger=(l)
+      @logger = l.extend(Itamae::Logger::IndentHelper)
     end
   end
 end
-

data/lib/itamae/node.rb

@@ -34,7 +34,7 @@ module Itamae
       errors = Schash::Validator.new(&block).validate(@mash)
       unless errors.empty?
         errors.each do |error|
-          Logger.error "'#{error.position.join('->')}' #{error.message}"
+          Itamae.logger.error "'#{error.position.join('->')}' #{error.message}"
         end
         raise ValidationError
       end

data/lib/itamae/notification.rb

@@ -32,7 +32,7 @@ module Itamae
 
     def validate!
       unless [:delay, :delayed, :immediately].include?(timing)
-        Logger.error "'#{timing}' is not valid notification timing. (Valid option is delayed or immediately)"
+        Itamae.logger.error "'#{timing}' is not valid notification timing. (Valid option is delayed or immediately)"
         abort
       end
     end

data/lib/itamae/recipe.rb

@@ -49,7 +49,7 @@ module Itamae
     def run(options = {})
       show_banner
 
-      Logger.formatter.with_indent do
+      Itamae.logger.with_indent do
         @children.run(options)
         run_delayed_notifications(options)
       end
@@ -68,7 +68,7 @@ module Itamae
     end
 
     def show_banner
-      Logger.info "Recipe: #{@path}"
+      Itamae.logger.info "Recipe: #{@path}"
     end
 
     class EvalContext
@@ -118,7 +118,7 @@ module Itamae
         end
 
         if runner.children.find_recipe_by_path(path)
-          Logger.debug "Recipe, #{path}, is skipped because it is already included"
+          Itamae.logger.debug "Recipe, #{path}, is skipped because it is already included"
           return
         end
 
@@ -151,7 +151,7 @@ module Itamae
       private
 
       def show_banner
-        Logger.debug "#{@definition.resource_type}[#{@definition.resource_name}]"
+        Itamae.logger.debug "#{@definition.resource_type}[#{@definition.resource_name}]"
       end
     end
   end

data/lib/itamae/resource.rb

@@ -42,7 +42,7 @@ module Itamae
       def define_resource(name, klass)
         class_name = to_camel_case(name.to_s)
         if Resource.const_defined?(class_name)
-          Logger.warn "Redefine class. (#{class_name})"
+          Itamae.logger.warn "Redefine class. (#{class_name})"
           return
         end
 

data/lib/itamae/resource/base.rb

@@ -121,14 +121,14 @@ module Itamae
       end
 
       def run(specific_action = nil, options = {})
-        Logger.debug "#{resource_type}[#{resource_name}]"
+        Itamae.logger.debug "#{resource_type}[#{resource_name}]"
 
-        Logger.formatter.with_indent_if(Logger.debug?) do
+        Itamae.logger.with_indent_if(Itamae.logger.debug?) do
           if do_not_run_because_of_only_if?
-            Logger.debug "#{resource_type}[#{resource_name}] Execution skipped because of only_if attribute"
+            Itamae.logger.debug "#{resource_type}[#{resource_name}] Execution skipped because of only_if attribute"
             return
           elsif do_not_run_because_of_not_if?
-            Logger.debug "#{resource_type}[#{resource_name}] Execution skipped because of not_if attribute"
+            Itamae.logger.debug "#{resource_type}[#{resource_name}] Execution skipped because of not_if attribute"
             return
           end
 
@@ -142,7 +142,7 @@ module Itamae
 
         @updated = false
       rescue Backend::CommandExecutionError
-        Logger.error "#{resource_type}[#{resource_name}] Failed."
+        Itamae.logger.error "#{resource_type}[#{resource_name}] Failed."
         exit 2
       end
 
@@ -172,24 +172,24 @@ module Itamae
 
         clear_current_attributes
 
-        Logger.debug "#{resource_type}[#{resource_name}] action: #{action}"
+        Itamae.logger.debug "#{resource_type}[#{resource_name}] action: #{action}"
 
         return if action == :nothing
 
-        Logger.formatter.with_indent_if(Logger.debug?) do
-          Logger.debug "(in pre_action)"
+        Itamae.logger.with_indent_if(Itamae.logger.debug?) do
+          Itamae.logger.debug "(in pre_action)"
           pre_action
 
-          Logger.debug "(in set_current_attributes)"
+          Itamae.logger.debug "(in set_current_attributes)"
           set_current_attributes
 
-          Logger.debug "(in show_differences)"
+          Itamae.logger.debug "(in show_differences)"
           show_differences
 
           method_name = "action_#{action}"
           if options[:dry_run]
             unless respond_to?(method_name)
-              Logger.error "action #{action.inspect} is unavailable"
+              Itamae.logger.error "action #{action.inspect} is unavailable"
             end
           else
             public_send(method_name, options)
@@ -228,14 +228,14 @@ module Itamae
           if current_value.nil? && value.nil?
             # ignore
           elsif current_value.nil? && !value.nil?
-            Logger.formatter.color :green do
-              Logger.info "#{resource_type}[#{resource_name}] #{key} will be '#{value}'"
+            Itamae.logger.formatter.color :green do
+              Itamae.logger.info "#{resource_type}[#{resource_name}] #{key} will be '#{value}'"
             end
           elsif current_value == value || value.nil?
-            Logger.debug "#{resource_type}[#{resource_name}] #{key} will not change (current value is '#{current_value}')"
+            Itamae.logger.debug "#{resource_type}[#{resource_name}] #{key} will not change (current value is '#{current_value}')"
           else
-            Logger.formatter.color :green do
-              Logger.info "#{resource_type}[#{resource_name}] #{key} will change from '#{current_value}' to '#{value}'"
+            Itamae.logger.formatter.color :green do
+              Itamae.logger.info "#{resource_type}[#{resource_name}] #{key} will change from '#{current_value}' to '#{value}'"
             end
           end
         end
@@ -319,7 +319,7 @@ module Itamae
       end
 
       def updated!
-        Logger.debug "This resource is updated."
+        Itamae.logger.debug "This resource is updated."
         @updated = true
       end
 
@@ -337,10 +337,10 @@ module Itamae
             message << " (immediately)"
           end
 
-          Logger.info message
+          Itamae.logger.info message
 
           if notification.instance_of?(Subscription)
-            Logger.info "(because it subscribes this resource)"
+            Itamae.logger.info "(because it subscribes this resource)"
           end
 
           if notification.delayed?
@@ -354,8 +354,8 @@ module Itamae
       def verify
         return if @verify_commands.empty?
 
-        Logger.info "Verifying..."
-        Logger.formatter.with_indent do
+        Itamae.logger.info "Verifying..."
+        Itamae.logger.with_indent do
           @verify_commands.each do |command|
             run_command(command)
           end
@@ -364,4 +364,3 @@ module Itamae
     end
   end
 end
-

data/lib/itamae/resource/file.rb

@@ -110,9 +110,9 @@ module Itamae
         diff = run_command(["diff", "-u", attributes.path, @temppath], error: false)
         if diff.exit_status == 0
           # no change
-          Logger.debug "file content will not change"
+          Itamae.logger.debug "file content will not change"
         else
-          Logger.info "diff:"
+          Itamae.logger.info "diff:"
           diff.stdout.each_line do |line|
             color = if line.start_with?('+')
                       :green
@@ -121,8 +121,8 @@ module Itamae
                     else
                       :clear
                     end
-            Logger.formatter.color(color) do
-              Logger.info line.chomp
+            Itamae.logger.formatter.color(color) do
+              Itamae.logger.info line.chomp
             end
           end
         end

data/lib/itamae/resource/remote_directory.rb

@@ -44,11 +44,11 @@ module Itamae
           diff = run_command(["diff", "-u", attributes.path, @temppath], error: false)
           if diff.exit_status == 0
             # no change
-            Logger.debug "directory content will not change"
+            Itamae.logger.debug "directory content will not change"
           else
-            Logger.info "diff:"
+            Itamae.logger.info "diff:"
             diff.stdout.each_line do |line|
-              Logger.info "#{line.strip}"
+              Itamae.logger.info "#{line.strip}"
             end
           end
         end

data/lib/itamae/resource/remote_file.rb

@@ -27,7 +27,7 @@ module Itamae
             source_file_exts.each do |ext|
               path = ::File.join(@recipe.dir, source_file_dir, "#{dirs[i..-1].join("/")}#{ext}")
               if ::File.exist?(path)
-                Logger.debug "#{path} is used as a source file."
+                Itamae.logger.debug "#{path} is used as a source file."
                 return path
               else
                 searched_paths << path

data/lib/itamae/runner.rb

@@ -6,14 +6,14 @@ module Itamae
   class Runner
     class << self
       def run(recipe_files, backend_type, options)
-        Logger.info "Starting Itamae..."
+        Itamae.logger.info "Starting Itamae..."
 
         backend = Backend.create(backend_type, options)
         runner = self.new(backend, options)
         runner.load_recipes(recipe_files)
 
         if dot_file = options[:dot]
-          Logger.info "Writing dependency graph in DOT to #{dot_file}..."
+          Itamae.logger.info "Writing dependency graph in DOT to #{dot_file}..."
           open(dot_file, 'w') do |f|
             f.write(runner.children.deps_in_dot)
           end
@@ -61,23 +61,23 @@ module Itamae
       if @options[:ohai]
         unless @backend.run_command("which ohai", error: false).exit_status == 0
           # install Ohai
-          Logger.info "Installing Chef package... (to use Ohai)"
+          Itamae.logger.info "Installing Chef package... (to use Ohai)"
           @backend.run_command("curl -L https://www.opscode.com/chef/install.sh | bash")
         end
 
-        Logger.info "Loading node data via ohai..."
+        Itamae.logger.info "Loading node data via ohai..."
         hash.merge!(JSON.parse(@backend.run_command("ohai").stdout))
       end
 
       if @options[:node_json]
         path = File.expand_path(@options[:node_json])
-        Logger.info "Loading node data from #{path}..."
+        Itamae.logger.info "Loading node data from #{path}..."
         hash.merge!(JSON.load(open(path)))
       end
 
       if @options[:node_yaml]
         path = File.expand_path(@options[:node_yaml])
-        Logger.info "Loading node data from #{path}..."
+        Itamae.logger.info "Loading node data from #{path}..."
         hash.merge!(YAML.load(open(path)))
       end
 

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.4.5
+1.5.0

data/spec/integration/recipes/default.rb

@@ -204,7 +204,7 @@ end
 
 local_ruby_block "greeting" do
   block do
-    Itamae::Logger.info "板前"
+    Itamae.logger.info "板前"
   end
 end
 

data/spec/unit/lib/itamae/resource/base_spec.rb

@@ -124,7 +124,7 @@ describe TestResource do
     context 'with dry_run' do
       context 'when specified action is unavailable' do
         it 'logs error' do
-          expect(Itamae::Logger).to receive(:error).with(/action :name is unavailable/)
+          expect(Itamae.logger).to receive(:error).with(/action :name is unavailable/)
           subject.run(nil, dry_run: true)
         end
       end

data/spec/unit/spec_helper.rb

@@ -19,6 +19,5 @@ RSpec.configure do |config|
   config.raise_errors_for_deprecations!
 end
 
-Itamae::Logger.log_device = StringIO.new
+Itamae.logger = ::Logger.new(StringIO.new)
 Specinfra.configuration.error_on_missing_backend_type = false
-

data/wercker.yml

@@ -7,7 +7,7 @@ build:
   steps:
     # Uncomment this to force RVM to use a specific Ruby version
     - rvm-use:
-        version: 2.1.4
+        version: 2.2.3
 
     - script:
         name: update bundler

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.5.0
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -249,7 +249,6 @@ files:
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/backend_spec.rb
 - spec/unit/lib/itamae/config_spec.rb
-- spec/unit/lib/itamae/logger_spec.rb
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb
 - spec/unit/lib/itamae/resource/base_spec.rb
@@ -298,7 +297,6 @@ test_files:
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/backend_spec.rb
 - spec/unit/lib/itamae/config_spec.rb
-- spec/unit/lib/itamae/logger_spec.rb
 - spec/unit/lib/itamae/node_spec.rb
 - spec/unit/lib/itamae/recipe_spec.rb
 - spec/unit/lib/itamae/resource/base_spec.rb

data/spec/unit/lib/itamae/logger_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-module Itamae
-  describe Logger do
-    let(:io) { StringIO.new }
-
-    before do
-      Logger.log_device = io
-    end
-
-    [:fatal, :error, :warn, :info, :debug].each do |level|
-      describe "##{level}" do
-        it "puts #{level} log" do
-          Logger.public_send(level, "CONTENT")
-          expect(io.string).to include('CONTENT')
-        end
-      end
-    end
-  end
-end