flak 0.0.1 → 0.0.2

data/lib/flak/thor/templates/env.tt

@@ -1,15 +1,43 @@
+
+
+# You can have any number of configurations with names you choose. 
+# Set the name here and then set up configuration specific blocks in  
+# any yaml config files.
 configuration:              "debug"
 
+# The name of your product of course.
 product_name:               "<%= name %>"
 
+# The revision number for your product. You can set it to any string
+# but it is recommended to include the name of the product so it can 
+# be recognized when it is deployed.
 product_revision:           "<%= name %>-0.0.1"
 
-target_release_prefix:      "bin"
+# set to true if you dont want the os name appended to the release directory.
+# For example, if the module contains only cross platform scripts, there is
+# no need to build for every platform. In that case, set agnostic to true.
+agnostic:                	false
 
+# Your full name is used for documentation and also to set plugin vendor 
+# information. This is done by adding these fields as compiler options
+# which are then picked up in the plugin code. In the case of a maya plugin
+# this happens in the initialize_plugin function.
 author_name:                "<%= ENV['USER'] %>"
 
+# Your email address is used for documentation.
 author_email:               "<%= ENV['USER'] %>@example.com"
 
+# Set the root of the release location here. Notice how specific locations 
+# are set for different platforms and named configurations.
+# This mechanism can be used to give os-specific and/or 
+# configuration-specific values to nearly any setting key. See the compiler
+# options in the cpp.yml file for example.
+# The exceptions are of course those keys themselves - i.e.
+# :configuration and :os, which means you can't set the configuration based 
+# on the OS. For a full list of keys, 
+# type in a shell at the project root: 
+# rake -T | grep inspect 
+# and run one of the rake commands for a tool
 os_darwin:   
     target_release_path:    "/Users/<%= ENV['USER'] %>/tools"
 os_linux_64:   

data/lib/flak/thor/templates/gitignore.tt

@@ -0,0 +1,3 @@
+build
+.DS_Store
+tmp

data/lib/flak/thor/templates/init.mel.tt

@@ -0,0 +1,22 @@
+global proc <%= name %>.init(string $moduleName) {
+	
+	string $moduleMenu = module.menuName( $moduleName );
+
+	setParent -m $moduleMenu;
+
+	// make some menu items under the <%= name %> menu
+	menuItem -l "Create a menu item" -c "command" ;
+	menuItem -l "Create another menu item" -c "command" ;
+
+	// make some menu items under the menu: <%= name %>->Foo->Bar
+	module.subMenu($moduleMenu, "Foo|Bar");
+	
+	menuItem -l "Create a deep menu item" -c "command" ;
+	menuItem -l "Create another deep menu item" -c "command" ;
+
+
+	setParent -m $moduleMenu;
+
+
+}
+

data/lib/flak/thor/templates/product.mel.tt

@@ -1,13 +1,21 @@
-global proc <%= @settings[:product_name] %>() {
+global proc <%= name %>(string $parentUI) {
 
 
-	// To build the <%= @settings[:product_name] %> menu automatically when Maya starts, add the line
-	// <%= @settings[:product_name] %>; 
-	// to your userSetup.mel (without the // of course)
+	// To build the <%= name %> menu automatically 
+	// when Maya starts, you will need to add the following line to userSetup.mel
+	// <%= name %>(<parent>); 
+	// where <parent> is the name of the UI under which to parent the <%= name %> menu.
+	// valid options for <parent> are:
+	//       The global variable $gMainWindow to place the <%= name %> menu in the main menubar	
+	//       A string such as "RmwTools" to place the <%= name %> menu in a menu called "RmwTools"
+	//       An empty string "" to ignore menu creation altogether
  
-	// This script relies on the jlib mel library for the module creation functions
+	// This script relies on the jlib module to initialize <%= name %> as a module
 	source "jlib_module";
 	
+	
+	
+	
 	// global proc module.initialize(
 	// 	string $initializer, 
 	// 	string $parentUI, 
@@ -19,16 +27,13 @@ global proc <%= @settings[:product_name] %>() {
 
 	// initializer:string The name of the tool/. e.g. solar
 	// parentUI:string The name of the parent menu.
-	//       Use a string such as "RmwTools" to place it in a menu called "RmwTools"
-	//       Use an empty string "" to ignore menu creation
-	//       Use the global variable $gMainWindow to place the menu in the main menubar 
 	// firstPlugins:string[] If any plugins should be loaded before others, put them in this array
 	// melSourceExcludes:string[] If any mel scripts should not be sourced, put them in this array
 	// docLocation:string Documentation index URL, can be a relative or absolute path, or a web URL
-	//       If a relative path is used, it will be relative to 
+	//       If a relative path is used, it will be relative to the <%= name %> directory
 	// devMode:int Adds a menu that allows you to reload plugins
 
 	// 	global string $gMainWindow;
 
-	module.initialize("<%= @settings[:product_name] %>", "<%=  File.basename(File.dirname(@settings[:root])).camelize %>",{},{},"<%= self.settings[:product_revision] %>-doc/index.html", 0);
+	module.initialize("<%= name %>", $parentUI ,{},{},"<%%= self.settings[:product_revision] %>-doc/index.html", 0);
 }

data/lib/flak/thor/wizard.rb

@@ -0,0 +1,47 @@
+module Flak
+  module Wizard
+
+
+    # include Thor::Shell::Basic
+
+    def self.project_options
+      asker = Thor::Shell::Basic.new
+      opts = Hash.new
+      asker.say("In order to set up paths, I need to know what will be included in this project")
+      opts[:maya_module] = asker.yes?("Will this project contain a Maya module? (y/n)")
+      opts[:delight] = asker.yes?("Will this project contain 3delight tools? (y/n)")
+      opts[:nuke] = asker.yes?("Will this project contain nuke tools? (y/n)")
+      opts
+    end
+
+
+
+    def self.tool_options
+      asker = Thor::Shell::Basic.new
+      opts = Hash.new
+
+      # just determine what the compiled target is, if any:
+
+      opts[:maya_plugin_target] = false
+      opts[:maya_app_target] = false
+      opts[:delight_target] = false
+      opts[:nuke_target] = false
+      opts[:standalone_target] = false
+
+      finished = false
+
+      finished = opts[:maya_plugin_target] = asker.yes?("Is this tool a Maya plugin? (y/n)") unless finished
+
+      finished = opts[:maya_app_target] = asker.yes?("Is this tool a Maya standalone application? (y/n)") unless finished
+
+      finished = opts[:delight_target] = asker.yes?("Will this tool contain 3delight shaders filters or DSOs? (y/n)")  unless finished
+
+      finished = opts[:nuke_target] = asker.yes?("Will this tool contain Nuke plugins? (y/n)")  unless finished
+
+      finished = opts[:standalone_target] = asker.yes?("Will this tool contain a standalone application? (y/n)") unless finished
+
+      opts
+    end
+
+  end
+end

data/lib/flak/version.rb

@@ -1,3 +1,3 @@
 module Flak
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,87 +1,147 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flak
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Julian Mann
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70319437889160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: awesome_print
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70319437889160
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: &70319437886500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70319437886500
+- !ruby/object:Gem::Dependency
   name: nanoc
+  requirement: &70319437886080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70319437886080
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: &70319437885660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70319437885660
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &70319444337200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70319444337200
 description: VFX tool build and documentation framework based on rake with thor generators
-email: 
+email:
 - julian.mann@gmail.com
-executables: 
+executables:
 - flak
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
+- README.textile
 - Rakefile
 - bin/flak
 - flak.gemspec
 - lib/core_ext/string.rb
 - lib/flak.rb
-- lib/flak/cpp.rb
-- lib/flak/delight.rb
-- lib/flak/doc.rb
-- lib/flak/gl.rb
-- lib/flak/mac.rb
-- lib/flak/max.rb
-- lib/flak/maya.rb
-- lib/flak/maya_app.rb
-- lib/flak/maya_plugin.rb
-- lib/flak/nuke.rb
-- lib/flak/target.rb
+- lib/flak/rake/base.rb
+- lib/flak/rake/cpp.rb
+- lib/flak/rake/delight.rb
+- lib/flak/rake/doc.rb
+- lib/flak/rake/gl.rb
+- lib/flak/rake/mac.rb
+- lib/flak/rake/max.rb
+- lib/flak/rake/maya.rb
+- lib/flak/rake/maya_app.rb
+- lib/flak/rake/maya_plugin.rb
+- lib/flak/rake/nuke.rb
+- lib/flak/rake/target.rb
 - lib/flak/thor/cli.rb
 - lib/flak/thor/generate.rb
 - lib/flak/thor/junk/junk.rb
+- lib/flak/thor/target_file.rb
 - lib/flak/thor/templates/INSTALL.tt
 - lib/flak/thor/templates/Rakefile.tt
 - lib/flak/thor/templates/cpp.tt
 - lib/flak/thor/templates/delight.tt
+- lib/flak/thor/templates/doc.tt
+- lib/flak/thor/templates/doc/Rules
+- lib/flak/thor/templates/doc/config.yaml
+- lib/flak/thor/templates/doc/content/assets/css/include.scss
+- lib/flak/thor/templates/doc/content/assets/css/page.scss
+- lib/flak/thor/templates/doc/content/assets/images/.empty_directory
+- lib/flak/thor/templates/doc/content/assets/images/screenshot.jpg
+- lib/flak/thor/templates/doc/content/assets/movies/.empty_directory
+- lib/flak/thor/templates/doc/content/assets/movies/sampleMovie.webm
+- lib/flak/thor/templates/doc/content/assets/site_images/array.gif
+- lib/flak/thor/templates/doc/content/assets/site_images/connectable.gif
+- lib/flak/thor/templates/doc/content/assets/site_images/create.gif
+- lib/flak/thor/templates/doc/content/assets/site_images/edit.gif
+- lib/flak/thor/templates/doc/content/assets/site_images/hidden.gif
+- lib/flak/thor/templates/doc/content/assets/site_images/input.gif
+- lib/flak/thor/templates/doc/content/assets/site_images/keyable.gif
+- lib/flak/thor/templates/doc/content/assets/site_images/logo.jpg
+- lib/flak/thor/templates/doc/content/assets/site_images/maya.png
+- lib/flak/thor/templates/doc/content/assets/site_images/miro_logo_bw.png
+- lib/flak/thor/templates/doc/content/assets/site_images/multiuse.gif
+- lib/flak/thor/templates/doc/content/assets/site_images/nanoc.png
+- lib/flak/thor/templates/doc/content/assets/site_images/nuke.png
+- lib/flak/thor/templates/doc/content/assets/site_images/output.gif
+- lib/flak/thor/templates/doc/content/assets/site_images/prman.png
+- lib/flak/thor/templates/doc/content/assets/site_images/python.png
+- lib/flak/thor/templates/doc/content/assets/site_images/query.gif
+- lib/flak/thor/templates/doc/content/assets/site_images/storable.gif
+- lib/flak/thor/templates/doc/content/assets/site_images/vfxoverflow_ribbon.png
+- lib/flak/thor/templates/doc/content/assets/site_images/vray.png
+- lib/flak/thor/templates/doc/content/index.txt.tt
+- lib/flak/thor/templates/doc/content/install_guide.txt.tt
+- lib/flak/thor/templates/doc/content/release_notes.txt.tt
+- lib/flak/thor/templates/doc/content/scenes/.empty_directory
+- lib/flak/thor/templates/doc/content/tutorial.txt.tt
+- lib/flak/thor/templates/doc/layouts/default.html
+- lib/flak/thor/templates/doc/lib/helpers.rb
 - lib/flak/thor/templates/env.tt
+- lib/flak/thor/templates/gitignore.tt
 - lib/flak/thor/templates/gl.tt
+- lib/flak/thor/templates/init.mel.tt
 - lib/flak/thor/templates/mac.tt
 - lib/flak/thor/templates/max.tt
 - lib/flak/thor/templates/maya.tt
@@ -90,33 +150,30 @@ files:
 - lib/flak/thor/templates/nuke.tt
 - lib/flak/thor/templates/product.mel.tt
 - lib/flak/thor/templates/product.sh.tt
+- lib/flak/thor/wizard.rb
 - lib/flak/version.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: flak
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: build system for VFX tools
 test_files: []
-

data/lib/flak/doc.rb

@@ -1,259 +0,0 @@
-
-
-module Flak
-
-  module Doc
-
-    def self.resolve_settings( existing_settings )
-      f = existing_settings[:root] + '/config/doc.yml' 
-      h =Flak.flatten_settings(f,existing_settings[:configuration], existing_settings[:os] )
-
-      h[:full_site_index_file] = File.join(existing_settings[:root],h[:site_index_file])
-     # puts "doc_release_root = #{existing_settings[:doc_release_root]}"
-     # puts "name = #{@settings[:name]}"
-     #  h[:doc_release_path]  = File.join( existing_settings[:doc_release_root] , existing_settings[:name])
-      h
-    end
-
-    def doc_dir
-      File.join( @settings[:target_root],"doc")
-    end
-    def output_dir()     
-      File.join(doc_dir ,"output")  
-    end
-
-    def content_dir()     
-      File.join(doc_dir ,"content")  
-    end
-
-    #h[:versioned_doc_release_path] =  File.join( h[:release_root] , "#{h[:product_revision]}-#{h[:os]}" )
-
-   #def doc_release_path
-   #  File.join( @settings[:doc_release_root] , @settings[:name])
-   ##   File.join(@settings[:release_root],  "#{@settings[:product_revision]}-doc")
-   #end
-    
-   def release_dir
-     File.join( @settings[:doc_release_root] , @settings[:name])
-   end
-
-    def copy_to_release_dir
-      r = release_dir
-      rm_rf r if File.exists? r
-      Flak.make_dir_for(r)
-      FileUtils.cp_r output_dir, r if File.exists? output_dir
-    end
-
-
-    # get the header information out of the index file so we can 
-    # build its site index entry
-    #def index_hash
-    #  h={}     
-    #  Dir.chdir(@root) do
-    #    h = YAML::load_file( File.join(self.content_dir,'index.txt') )
-    #  end
-    #  h    
-    #end
-
-
-    ######################################################
-    def site_index_hash
-      h = {
-        'title' => "#{@settings[:product_revision]}",
-        'author' => @settings[:author],
-        'email' => @settings[:email],
-        'created_at' => "#{Date.today.day} #{Date::MONTHNAMES[Date.today.month]} #{Date.today.year}",
-        'description' =>  "#{@settings[:product_revision]} documentation",
-        'doc_type'  => "Site Index",
-        'layout' =>  "tools_doc",
-        'filter' => ['erb', 'textile']
-      }
-    end
-
-
-
-    def write_site_index_header(f)
-      YAML.dump(site_index_hash, f)
-      f.puts '---'
-      f.puts "h3. Projects\n\n"
-      f.puts "table(d1)."
-      f.puts "|_(projname). Project Name |_(projauth). Author|_(projdate). Created|\n\n"
-    end
-
-
-
-    def write_header_to_site_index(f,hash)
-      unless hash.nil?
-        if hash.has_key?('description') && (!hash['description'].nil?)
-
-          doc_link = File.join(hash['title'],'index.html')
-          f.puts 'table(d1).'
-          f.puts "|(projname). \"#{hash['title']}\":#{doc_link} |(projauth). \"#{hash['author']}\":mailto:#{hash['email']} |(projdate). #{hash['created_at']}|"
-          f.puts '|\3(projdesc). '+ hash['description'] +'|'
-          f.puts "\n\n"
-        else
-          "WARNING: Problem with description for #{hash['title']}. Please check header in #{f}"
-        end
-      end
-    end
-
-
-    # List of documentation objects
-    ##############################################
-    def doc_objects
-      arr = Array.new
-      FileList.new('**/target.yml').each do |path|
-        path = File.join(@settings[:root],path)
-        h = YAML::load_file(path)
-        if h.has_key?('templates')
-          if (h['templates']).kind_of?(Array) 
-            if h['templates'].include?('doc')   
-              index_file = File.join(File.dirname(path) , 'doc/content/index.txt')
-              if File.exists?(index_file)
-                arr << YAML::load_file(index_file )
-              end
-            end
-          end
-        end
-      end
-      arr.sort! {|x,y| x['title'] <=> y['title'] }
-    end
-    ##############################################
-
-    def write_site_index
-      File.open(@settings[:full_site_index_file] , 'w') do |f|
-        self.write_site_index_header(f)
-        doc_objects.each do |hash| 
-          write_header_to_site_index(f,hash)
-        end
-      end
-    end
-
-    # if a command exists to do the conversion - make a file task for each of icon and out_icon 
-    # that is - one for the hypershade and one for the outliner
-    def doc_instance_tasks
-
-      namespace @settings[:name].to_sym do 
-        namespace :doc do
-
-          desc "build documentation for #{@settings[:name]}"
-          task :rebuild  do
-
-            write_site_index if @settings[:name] == 'jRelease'
-            puts "doc_dir #{doc_dir}"
-            Dir.chdir(doc_dir) do |d|
-              sh "webby rebuild"
-            end
-          end
-
-
-          desc "release documentation for #{@settings[:name]}"
-          task :release  => "#{@settings[:name].to_sym}:doc:rebuild"  do
-            # release_doc
-            Dir.chdir(@settings[:target_dir]) do |d|
-              self.copy_to_release_dir
-            end
-
-            if (@settings[:name] == "jRelease" )
-              index = File.join( self.release_dir, 'site_index.html' )
-             # rel_notes = File.join(@settings[:versioned_os_release_path], 'doc',@settings[:name],'release_notes.html' )
-              css = File.join(self.release_dir,'css' )
-              images = File.join(self.release_dir,'images' )
-              dest = File.join(@settings[:doc_release_root],'' )
-              mv index , dest 
-             # mv rel_notes , dest 
-             cp_r css , dest 
-             cp_r images , dest
-            end
-
-          end
-
-          desc "clobber documentation for #{@settings[:name]}"      
-          task :clobber do
-            Dir.chdir(doc_dir) do |d|
-              sh "webby clobber"
-            end
-            # d = self.release_dir
-            rm_rf self.release_dir if File.exists? self.release_dir
-          end
-
-
-
-
-
-
-          desc "initialize a project for documenation"    
-          task :init do
-            doc_dir = File.join(@settings[:target_dir],"doc")
-            flak_doc_dir = File.join(@settings[:root],"flak","doc")
-            index_erb_file = File.join(flak_doc_dir,"erb","index.txt.erb")
-            index_destination_file = File.join(content_dir,"index.txt")
-            
-            
-            FileUtils.mkdir_p doc_dir
-
-            Dir.chdir(doc_dir) do
-              Flak.copy_over File.join(flak_doc_dir,"Sitefile"), File.join(Dir.pwd, "Sitefile")
-              Flak.copy_over File.join(flak_doc_dir,"lib"), File.join(Dir.pwd, "lib")
-              Flak.copy_over File.join(flak_doc_dir,"tasks"), File.join(Dir.pwd, "tasks")
-              FileUtils.mkdir_p ["content","layouts","output","scenes"]
-              Dir.chdir("content") do
-                FileUtils.mkdir_p ["css","images","media"]
-                Dir.chdir("css") do
-                  Flak.copy_over File.join(flak_doc_dir,"content/css/page.css"), File.join(Dir.pwd, "page.css")
-                end
-                Dir.chdir("images") do
-                  [ "array.gif" , "connectable.gif" , "create.gif","edit.gif","forkme_right_red_aa0000.png","hidden.gif","input.gif","jToolsSnapon.jpg" ,"keyable.gif","logo.jpg","multiuse.gif","output.gif","query.gif","storable.gif","vfxoverflow_ribbon.png" ].each do |img|
-  #puts "******************"
-                    #puts File.exists?  File.join(flak_doc_dir,"content/images/",img)
-                   # puts Dir.pwd
-                  #  puts File.exists? img
-                    
-                    Flak.copy_over File.join(flak_doc_dir,"content/images/",img)  , File.join(Dir.pwd, img)
-                  end      
-                end
-              end
-              Dir.chdir("layouts") do
-                Flak.copy_over File.join(flak_doc_dir,"layouts/tools_doc.html"),  File.join(Dir.pwd, "tools_doc.html")
-              end
-
-              # make the index
-
-              write_erb_template(index_erb_file,index_destination_file, {:no_force => true}) 
-
-            end
-          end   
-
-        # desc "create index.txt with common textile markup examples"    
-        # task :create_skeleton_index =>  "#{@settings[:name].to_sym}:doc:create_doc_links" do
-        #     write_erb_template(index_erb_file,index_destination_file) 
-        # end
-        # 
-        # desc "initialize a project for documenation"    
-        # task :init =>  "#{@settings[:name].to_sym}:doc:create_skeleton_index" 
-
-
-        end
-      end
-
-
-      task :doc => "#{@settings[:name].to_sym}:doc:release"    
-
-      namespace :doc do
-        task :clobber => "#{@settings[:name].to_sym}:doc:clobber" 
-      end
-
-    end
-    ################################################################################
-
-
-    desc "release all documentation"
-    task :doc   
-
-    desc "clobber all documentation"   
-    namespace :doc do
-      task :clobber 
-    end
-  end
-end
-