chef 10.12.0 → 10.14.0.beta.1

data/spec/unit/knife/cookbook_bulk_delete_spec.rb

@@ -0,0 +1,87 @@
+#
+# Author:: Stephen Delano (<stephen@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+require 'spec_helper'
+
+describe Chef::Knife::CookbookBulkDelete do
+  before(:each) do
+    Chef::Log.logger = Logger.new(StringIO.new)
+
+    Chef::Config[:node_name]  = "webmonkey.example.com"
+    @knife = Chef::Knife::CookbookBulkDelete.new
+    @knife.config = {:print_after => nil}
+    @knife.name_args = ["."]
+    @stdout = StringIO.new
+    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @knife.ui.stub!(:confirm).and_return(true)
+    @cookbooks = Hash.new
+    %w{cheezburger pizza lasagna}.each do |cookbook_name|
+      cookbook = Chef::CookbookVersion.new(cookbook_name)
+      @cookbooks[cookbook_name] = cookbook
+    end
+    @rest = mock("Chef::REST")
+    @rest.stub!(:get_rest).and_return(@cookbooks)
+    @rest.stub!(:delete_rest).and_return(true)
+    @knife.stub!(:rest).and_return(@rest)
+    Chef::CookbookVersion.stub!(:list).and_return(@cookbooks)
+
+  end
+
+
+
+  describe "when there are several cookbooks on the server" do
+    before do
+      @cheezburger = {'cheezburger' => {"url" => "file:///dev/null", "versions" => [{"url" => "file:///dev/null-cheez", "version" => "1.0.0"}]}}
+      @rest.stub!(:get_rest).with('cookbooks/cheezburger').and_return(@cheezburger)
+      @pizza = {'pizza' => {"url" => "file:///dev/null", "versions" => [{"url" => "file:///dev/null-pizza", "version" => "2.0.0"}]}}
+      @rest.stub!(:get_rest).with('cookbooks/pizza').and_return(@pizza)
+      @lasagna = {'lasagna' => {"url" => "file:///dev/null", "versions" => [{"url" => "file:///dev/null-lasagna", "version" => "3.0.0"}]}}
+      @rest.stub!(:get_rest).with('cookbooks/lasagna').and_return(@lasagna)
+    end
+
+    it "should print the cookbooks you are about to delete" do
+      expected = @knife.ui.list(@cookbooks.keys.sort, :columns_down)
+      @knife.run
+      @stdout.string.should match(/#{expected}/)
+    end
+
+    it "should confirm you really want to delete them" do
+      @knife.ui.should_receive(:confirm)
+      @knife.run
+    end
+
+    it "should delete each cookbook" do
+      {"cheezburger" => "1.0.0", "pizza" => "2.0.0", "lasagna" => '3.0.0'}.each do |cookbook_name, version|
+        @rest.should_receive(:delete_rest).with("cookbooks/#{cookbook_name}/#{version}")
+      end
+      @knife.run
+    end
+
+    it "should only delete cookbooks that match the regex" do
+      @knife.name_args = ["cheezburger"]
+      @rest.should_receive(:delete_rest).with('cookbooks/cheezburger/1.0.0')
+      @knife.run
+    end
+  end
+
+  it "should exit if the regex is not provided" do
+    @knife.name_args = []
+    lambda { @knife.run }.should raise_error(SystemExit)
+  end
+
+end

data/spec/unit/knife/cookbook_create_spec.rb

@@ -0,0 +1,251 @@
+#
+# Author:: Nuo Yan (<nuo@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+require 'spec_helper'
+require 'tmpdir'
+
+describe Chef::Knife::CookbookCreate do
+  before(:each) do
+    Chef::Config[:node_name]  = "webmonkey.example.com"
+    @knife = Chef::Knife::CookbookCreate.new
+    @knife.config = {}
+    @knife.name_args = ["foobar"]
+    @stdout = StringIO.new
+    @knife.stub!(:stdout).and_return(@stdout)
+  end
+
+  describe "run" do
+
+    # Fixes CHEF-2579
+    it "should expand the path of the cookbook directory" do
+      File.should_receive(:expand_path).with("~/tmp/monkeypants")
+      @knife.config = {:cookbook_path => "~/tmp/monkeypants"}
+      @knife.stub!(:create_cookbook)
+      @knife.stub!(:create_readme)
+      @knife.stub!(:create_metadata)
+      @knife.run
+    end
+
+    it "should create a new cookbook with default values to copyright name, email, readme format and license if those are not supplied" do
+      @dir = Dir.tmpdir
+      @knife.config = {:cookbook_path => @dir}
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "YOUR_COMPANY_NAME", "none")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "YOUR_COMPANY_NAME", "YOUR_EMAIL", "none", "md")
+      @knife.run
+    end
+
+    it "should create a new cookbook with specified company name in the copyright section if one is specified" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc"
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "YOUR_EMAIL", "none", "md")
+      @knife.run
+    end
+
+    it "should create a new cookbook with specified copyright name and email if they are specified" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc",
+        :cookbook_email => "nuo@opscode.com"
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
+      @knife.run
+    end
+
+    it "should create a new cookbook with specified copyright name and email and license information (true) if they are specified" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc",
+        :cookbook_email => "nuo@opscode.com",
+        :cookbook_license => "apachev2"
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "apachev2")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "apachev2", "md")
+      @knife.run
+    end
+
+    it "should create a new cookbook with specified copyright name and email and license information (false) if they are specified" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc",
+        :cookbook_email => "nuo@opscode.com",
+        :cookbook_license => false
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
+      @knife.run
+    end
+
+    it "should create a new cookbook with specified copyright name and email and license information ('false' as string) if they are specified" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc",
+        :cookbook_email => "nuo@opscode.com",
+        :cookbook_license => "false"
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "none")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "none", "md")
+      @knife.run
+    end
+
+    it "should allow specifying a gpl2 license" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc",
+        :cookbook_email => "nuo@opscode.com",
+        :cookbook_license => "gplv2"
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "gplv2")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "gplv2", "md")
+      @knife.run
+    end
+
+    it "should allow specifying a gplv3 license" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc",
+        :cookbook_email => "nuo@opscode.com",
+        :cookbook_license => "gplv3"
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "gplv3")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "gplv3", "md")
+      @knife.run
+    end
+
+    it "should allow specifying the mit license" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc",
+        :cookbook_email => "nuo@opscode.com",
+        :cookbook_license => "mit"
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "md")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "md")
+      @knife.run
+    end
+
+    it "should allow specifying the rdoc readme format" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc",
+        :cookbook_email => "nuo@opscode.com",
+        :cookbook_license => "mit",
+        :readme_format => "rdoc"
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "rdoc")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "rdoc")
+      @knife.run
+    end
+
+    it "should allow specifying the mkd readme format" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc",
+        :cookbook_email => "nuo@opscode.com",
+        :cookbook_license => "mit",
+        :readme_format => "mkd"
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "mkd")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "mkd")
+      @knife.run
+    end
+
+    it "should allow specifying the txt readme format" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc",
+        :cookbook_email => "nuo@opscode.com",
+        :cookbook_license => "mit",
+        :readme_format => "txt"
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "txt")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "txt")
+      @knife.run
+    end
+
+    it "should allow specifying an arbitrary readme format" do
+      @dir = Dir.tmpdir
+      @knife.config = {
+        :cookbook_path => @dir,
+        :cookbook_copyright => "Opscode, Inc",
+        :cookbook_email => "nuo@opscode.com",
+        :cookbook_license => "mit",
+        :readme_format => "foo"
+      }
+      @knife.name_args=["foobar"]
+      @knife.should_receive(:create_cookbook).with(@dir, @knife.name_args.first, "Opscode, Inc", "mit")
+      @knife.should_receive(:create_readme).with(@dir, @knife.name_args.first, "foo")
+      @knife.should_receive(:create_metadata).with(@dir, @knife.name_args.first, "Opscode, Inc", "nuo@opscode.com", "mit", "foo")
+      @knife.run
+    end
+
+    context "when the cookbooks path is not specified in the config file nor supplied via parameter" do
+      before do
+        @old_cookbook_path = Chef::Config[:cookbook_path]
+        Chef::Config[:cookbook_path] = nil
+      end
+
+      it "should throw an argument error" do
+        @dir = Dir.tmpdir
+        lambda{@knife.run}.should raise_error(ArgumentError)
+      end
+
+      after do
+        Chef::Config[:cookbook_path] = @old_cookbook_path
+      end
+    end
+
+  end
+end

data/spec/unit/knife/cookbook_delete_spec.rb

@@ -0,0 +1,239 @@
+#
+# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
+# Copyright:: Copyright (c) 2011 Thomas Bishop
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+require 'spec_helper'
+
+describe Chef::Knife::CookbookDelete do
+  before(:each) do
+    @knife = Chef::Knife::CookbookDelete.new
+    @knife.name_args = ['foobar']
+    @knife.cookbook_name = 'foobar'
+    @stdout = StringIO.new
+    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @stderr = StringIO.new
+    @knife.ui.stub!(:stderr).and_return(@stderr)
+  end
+
+  describe 'run' do
+    it 'should print usage and exit when a cookbook name is not provided' do
+      @knife.name_args = []
+      @knife.should_receive(:show_usage)
+      @knife.ui.should_receive(:fatal)
+      lambda { @knife.run }.should raise_error(SystemExit)
+    end
+
+    describe 'when specifying a cookbook name' do
+      it 'should delete the cookbook without a specific version' do
+        @knife.should_receive(:delete_without_explicit_version)
+        @knife.run
+      end
+
+      describe 'and a version' do
+        it 'should delete the specific version of the cookbook' do
+          @knife.name_args << '1.0.0'
+          @knife.should_receive(:delete_explicit_version)
+          @knife.run
+        end
+      end
+
+      describe 'with -a or --all' do
+        it 'should delete all versions of the cookbook' do
+          @knife.config[:all] = true
+          @knife.should_receive(:delete_all_versions)
+          @knife.run
+        end
+      end
+
+      describe 'with -p or --purge' do
+        it 'should prompt to purge the files' do
+          @knife.config[:purge] = true
+          @knife.should_receive(:confirm).
+                 with(/.+Are you sure you want to purge files.+/)
+          @knife.should_receive(:delete_without_explicit_version)
+          @knife.run
+        end
+      end
+    end
+  end
+
+  describe 'delete_explicit_version' do
+    it 'should delete the specific cookbook version' do
+      @knife.cookbook_name = 'foobar'
+      @knife.version = '1.0.0'
+      @knife.should_receive(:delete_object).with(Chef::CookbookVersion,
+                                                 'foobar version 1.0.0',
+                                                 'cookbook').and_yield()
+      @knife.should_receive(:delete_request).with('cookbooks/foobar/1.0.0')
+      @knife.delete_explicit_version
+    end
+  end
+
+  describe 'delete_all_versions' do
+    it 'should prompt to delete all versions of the cookbook' do
+      @knife.cookbook_name = 'foobar'
+      @knife.should_receive(:confirm).with('Do you really want to delete all versions of foobar')
+      @knife.should_receive(:delete_all_without_confirmation)
+      @knife.delete_all_versions
+    end
+  end
+
+  describe 'delete_all_without_confirmation' do
+    it 'should delete all versions without confirmation' do
+      versions = ['1.0.0', '1.1.0']
+      @knife.should_receive(:available_versions).and_return(versions)
+      versions.each do |v|
+        @knife.should_receive(:delete_version_without_confirmation).with(v)
+      end
+      @knife.delete_all_without_confirmation
+    end
+  end
+
+  describe 'delete_without_explicit_version' do
+    it 'should exit if there are no available versions' do
+      @knife.should_receive(:available_versions).and_return(nil)
+      lambda { @knife.delete_without_explicit_version }.should raise_error(SystemExit)
+    end
+
+    it 'should delete the version if only one is found' do
+      @knife.should_receive(:available_versions).at_least(:once).and_return(['1.0.0'])
+      @knife.should_receive(:delete_explicit_version)
+      @knife.delete_without_explicit_version
+    end
+
+    it 'should ask which version(s) to delete if multiple are found' do
+      @knife.should_receive(:available_versions).at_least(:once).and_return(['1.0.0', '1.1.0'])
+      @knife.should_receive(:ask_which_versions_to_delete).and_return(['1.0.0', '1.1.0'])
+      @knife.should_receive(:delete_versions_without_confirmation).with(['1.0.0', '1.1.0'])
+      @knife.delete_without_explicit_version
+    end
+  end
+
+  describe 'available_versions' do
+    before(:each) do
+      @rest_mock = mock('rest')
+      @knife.should_receive(:rest).and_return(@rest_mock)
+      @cookbook_data = { 'foobar' => { 'versions' => [{'version' => '1.0.0'},
+                                                      {'version' => '1.1.0'},
+                                                      {'version' => '2.0.0'} ]}
+      }
+    end
+
+    it 'should return the list of versions of the cookbook' do
+      @rest_mock.should_receive(:get_rest).with('cookbooks/foobar').and_return(@cookbook_data)
+      @knife.available_versions.should == ['1.0.0', '1.1.0', '2.0.0']
+    end
+
+    it 'should raise if an error other than HTTP 404 is returned' do
+      exception = Net::HTTPServerException.new('500 Internal Server Error', '500')
+      @rest_mock.should_receive(:get_rest).and_raise(exception)
+      lambda { @knife.available_versions }.should raise_error Net::HTTPServerException
+    end
+
+    describe "if the cookbook can't be found" do
+      before(:each) do
+        @rest_mock.should_receive(:get_rest).
+          and_raise(Net::HTTPServerException.new('404 Not Found', '404'))
+      end
+
+      it 'should print an error' do
+        @knife.available_versions
+        @stderr.string.should match /error.+cannot find a cookbook named foobar/i
+      end
+
+      it 'should return nil' do
+        @knife.available_versions.should == nil
+      end
+    end
+  end
+
+  describe 'ask_which_version_to_delete' do
+    before(:each) do
+      @knife.stub!(:available_versions).and_return(['1.0.0', '1.1.0', '2.0.0'])
+    end
+
+    it 'should prompt the user to select a version' do
+      prompt = /Which version\(s\) do you want to delete\?.+1\. foobar 1\.0\.0.+2\. foobar 1\.1\.0.+3\. foobar 2\.0\.0.+4\. All versions.+/m
+      @knife.should_receive(:ask_question).with(prompt).and_return('1')
+      @knife.ask_which_versions_to_delete
+    end
+
+    it "should print an error and exit if a version wasn't specified" do
+      @knife.should_receive(:ask_question).and_return('')
+      @knife.ui.should_receive(:error).with(/no versions specified/i)
+      lambda { @knife.ask_which_versions_to_delete }.should raise_error(SystemExit)
+    end
+
+    it 'should print an error if an invalid choice was selected' do
+      @knife.should_receive(:ask_question).and_return('100')
+      @knife.ui.should_receive(:error).with(/100 is not a valid choice/i)
+      @knife.ask_which_versions_to_delete
+    end
+
+    it 'should return the selected versions' do
+      @knife.should_receive(:ask_question).and_return('1, 3')
+      @knife.ask_which_versions_to_delete.should == ['1.0.0', '2.0.0']
+    end
+
+    it "should return all of the versions if 'all' was selected" do
+      @knife.should_receive(:ask_question).and_return('4')
+      @knife.ask_which_versions_to_delete.should == [:all]
+    end
+  end
+
+  describe 'delete_version_without_confirmation' do
+    it 'should delete the cookbook version' do
+      @knife.should_receive(:delete_request).with('cookbooks/foobar/1.0.0')
+      @knife.delete_version_without_confirmation('1.0.0')
+    end
+
+    it 'should output that the cookbook was deleted' do
+      @knife.stub!(:delete_request)
+      @knife.delete_version_without_confirmation('1.0.0')
+      @stdout.string.should match /deleted cookbook\[foobar\]\[1.0.0\]/im
+    end
+
+    describe 'with --print-after' do
+      it 'should display the cookbook data' do
+        object = ''
+        @knife.config[:print_after] = true
+        @knife.stub!(:delete_request).and_return(object)
+        @knife.should_receive(:format_for_display).with(object)
+        @knife.delete_version_without_confirmation('1.0.0')
+      end
+    end
+  end
+
+  describe 'delete_versions_without_confirmation' do
+    it 'should delete each version without confirmation' do
+      versions = ['1.0.0', '1.1.0']
+      versions.each do |v|
+        @knife.should_receive(:delete_version_without_confirmation).with(v)
+      end
+      @knife.delete_versions_without_confirmation(versions)
+    end
+
+    describe 'with -a or --all' do
+      it 'should delete all versions without confirmation' do
+        versions = [:all]
+        @knife.should_receive(:delete_all_without_confirmation)
+        @knife.delete_versions_without_confirmation(versions)
+      end
+    end
+  end
+
+end