amp 0.5.0

data/test/store_tests/test_fncache_store.rb

@@ -0,0 +1,122 @@
+require "test/unit"
+require File.expand_path(File.join(File.dirname(__FILE__), "../../lib/amp"))
+
+class TestFilenameCacheStore < Test::Unit::TestCase
+  STORE_PATH = File.expand_path(File.join(File.dirname(__FILE__)))
+  def setup
+    @store = Amp::Repositories::Stores.pick(['store','fncache'], STORE_PATH, Amp::Opener)
+  end
+  
+  def test_load_manifest
+    assert_not_nil @store
+    assert_instance_of Amp::Repositories::Stores::FilenameCacheStore, @store
+  end
+  
+  def test_hybrid_encode
+    result = Amp::Repositories::Stores.hybrid_encode("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
+                                       "A????WHHHHHHHHHHHAAAAAAAAATTTTTTTTTT/"+
+                                       "lolzorZ?.rb")
+    expected = "dh/abcdefgh/hahaha~3/lolzorz~3f.rb0d132fe8aa79af42d3d3c11038"+
+               "3007e9f5bd43d4.rb"
+    assert_equal expected, result
+    
+    result = Amp::Repositories::Stores.hybrid_encode("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
+                                       "A????WHHHHTT/lolzorZ?.rb")
+    expected = "data/_a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z/_h"+
+               "_a_h_a_h_a~3f~3f~3f~3f_w_h_h_h_h_t_t/lolzor_z~3f.rb"
+    assert_equal expected, result
+    
+    result = Amp::Repositories::Stores.hybrid_encode("data///../.././//lolzorZ?.rb")
+    expected = "data///.~2e/.~2e/~2e///lolzor_z~3f.rb"
+    assert_equal expected, result
+  end
+  
+  def test_normal_encode
+    result = Amp::Repositories::Stores.encode_filename("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
+                                       "A????WHHHHHHHHHHHAAAAAAAAATTTTTTTTTT/"+
+                                       "lolzorZ?.rb")
+    expected = "data/_a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z/_h_"+
+               "a_h_a_h_a~3f~3f~3f~3f_w_h_h_h_h_h_h_h_h_h_h_h_a_a_a_a_a_a_a_a"+
+               "_a_t_t_t_t_t_t_t_t_t_t/lolzor_z~3f.rb"
+    assert_equal expected, result
+    
+    result = Amp::Repositories::Stores.encode_filename("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
+                                       "A????WHHHHTT/lolzorZ?.rb")
+    expected = "data/_a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z/_h_"+
+               "a_h_a_h_a~3f~3f~3f~3f_w_h_h_h_h_t_t/lolzor_z~3f.rb"
+    assert_equal expected, result
+    
+    result = Amp::Repositories::Stores.encode_filename("data///../.././//lolzorZ?.rb")
+    expected = "data///../.././//lolzor_z~3f.rb"
+    assert_equal expected, result
+  end
+  
+  def test_normal_decode
+    result = Amp::Repositories::Stores.decode_filename(
+               "data/_a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z/_h_"+
+               "a_h_a_h_a~3f~3f~3f~3f_w_h_h_h_h_h_h_h_h_h_h_h_a_a_a_a_a_a_a_a"+
+               "_a_t_t_t_t_t_t_t_t_t_t/lolzor_z~3f.rb")
+               
+    expected =  "data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
+                "A????WHHHHHHHHHHHAAAAAAAAATTTTTTTTTT/"+
+                "lolzorZ?.rb"
+    assert_equal expected, result
+    
+    result = Amp::Repositories::Stores.decode_filename(
+                "data/_a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z/_h_"+
+                           "a_h_a_h_a~3f~3f~3f~3f_w_h_h_h_h_t_t/lolzor_z~3f.rb")
+    expected = "data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAHA????WHHHHTT/lolzorZ?.rb"
+    assert_equal expected, result
+    
+    result = Amp::Repositories::Stores.decode_filename("data///../.././//lolzor_z~3f.rb")
+    expected = "data///../.././//lolzorZ?.rb"
+    assert_equal expected, result
+  end
+  
+  def test_custom_pathjoiner
+    tempstore = @store.path_joiner
+    @store.path_joiner = proc {|*args| args.join "LOLCATS"}
+    result = @store.join "teh_file_namez"
+    expected = TestFilenameCacheStore::STORE_PATH + "/store" + "LOLCATS" + "teh_file_namez"
+    assert_equal expected, result
+  end
+  
+  def test_walk
+    # alright.... the list is just too fucking huge to have it compare
+    # against the whole thing. So we're going to pick 10 and make sure
+    # that they're in there. These are some pretty good edge cases, too.
+    expected = [['data/lib/commands/dispatch.rb.i', 'data/lib/commands/dispatch.rb.i', 1500],
+                ['data/test/test_support.rb.i', 'data/test/test__support.rb.i', 640],
+                ['data/AUTHORS.i', 'data/_a_u_t_h_o_r_s.i', 64],
+                ['data/test/manifest_tests/test_manifest.rb.i', 'data/test/manifest__tests/test__manifest.rb.i', 1865],
+                ['data/lib/revlogs/changelog.rb.i', 'data/lib/revlogs/changelog.rb.i', 5386],
+                ['data/test/revlog_tests/00changelog.i.i', 'data/test/revlog__tests/00changelog.i.i', 10285],
+                ['00manifest.i', '00manifest.i', 43979],
+                ['00changelog.i', '00changelog.i', 28785]
+               ]
+    result = []
+    @store.walk do |arr|
+      result << arr
+    end
+    
+    expected.each do |exp|
+      flunk "Couldn't find #{exp.inspect} in walked list." unless result.include? exp
+    end
+    assert true
+  end
+  
+  def test_picker_works
+    requirements = []
+    store = Amp::Repositories::Stores.pick(requirements, STORE_PATH, Amp::Opener)
+    assert_instance_of Amp::Repositories::Stores::BasicStore, store
+    
+    requirements = ['store']
+    store = Amp::Repositories::Stores.pick(requirements, STORE_PATH, Amp::Opener)
+    assert_instance_of Amp::Repositories::Stores::EncodedStore, store
+    
+    requirements = ['store', 'fncache']
+    store = Amp::Repositories::Stores.pick(requirements, STORE_PATH, Amp::Opener)
+    assert_instance_of Amp::Repositories::Stores::FilenameCacheStore, store
+    
+  end
+end

data/test/test_amp.rb

@@ -0,0 +1,9 @@
+require "test/unit"
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
+
+class TestAmp < Test::Unit::TestCase
+  
+  def test_truth
+    assert true
+  end
+end

data/test/test_base85.rb

@@ -0,0 +1,14 @@
+require "test/unit"
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
+
+class TestBase85 < Test::Unit::TestCase
+  def test_encode
+    assert_equal("Xk~0{Zy<DNWpZUKAZ>XdZeeX@AZc?TZE0g@VP$L~AZTxQAYpQ4AbD?fAarkJVR=6",
+               Amp::Encoding::Base85.encode("hello there, my name is michael! how are you today?"))
+  end
+  
+  def test_decode
+    assert_equal("hello there, my name is michael! how are you today?",
+               Amp::Encoding::Base85.decode("Xk~0{Zy<DNWpZUKAZ>XdZeeX@AZc?TZE0g@VP$L~AZTxQAYpQ4AbD?fAarkJVR=6"))
+  end
+end

data/test/test_bdiff.rb

@@ -0,0 +1,42 @@
+require "test/unit"
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
+
+class TestBdiff < Test::Unit::TestCase
+  include Amp::Diffs
+
+  def test_create_bdiff
+    input = "hi there\ni'm cool"
+    output = "hi there\ni'm stupid"
+    expected_output = "\000\000\000\t\000\000\000\021\000\000\000\ni'm stupid"
+    assert_equal(expected_output, BinaryDiff.bdiff(input, output))
+  end
+  
+  def test_another_bdiff
+    input = "c913df15006c6e06504414acf8acfedd32e5875d\nmichaeledgar@michael-edgars-macbook-pro.local"+
+            "\n1248396415 14400\nSTYLE.txt\n\nFirst commit."
+    output = "b2a7f7ab636d1dbd06afd90f1bf287dfb92762fb\nmichaeledgar@michael-edgars-macbook-pro.local"+
+             "\n1248396417 14400\ncommand.rb\ncommands/annotate.rb\ncommands/heads.rb"+
+             "\ncommands/manifest.rb\ncommands/status.rb\n\nSecond commit, added commands"
+    expected_output = "\x00\x00\x00\x00\x00\x00\x00)\x00\x00\x00)b2a7f7ab636d1dbd06afd90f1bf287dfb92762fb"+
+                      "\n\x00\x00\x00W\x00\x00\x00r\x00\x00\x00k1248396417 14400\ncommand.rb"+
+                      "\ncommands/annotate.rb\ncommands/heads.rb\ncommands/manifest.rb"+
+                      "\ncommands/status.rb\n\x00\x00\x00s\x00\x00\x00\x80\x00\x00\x00\x1d"+
+                      "Second commit, added commands"
+    assert_equal(expected_output, BinaryDiff.bdiff(input, output))
+  end
+  
+  def test_yet_another_bdiff
+    input = "The Amp Commandments Redux:\n\t1. This is intended to genreate a conflict. "+
+            "I'm out of witty stuff to put here."
+    output = "\t1. This is intended to genreate a conflict. I'm out of witty stuff to put here."
+    expected_output = "\x00\x00\x00\x00\x00\x00\x00\x1c\x00\x00\x00\x00"
+    assert_equal(expected_output, BinaryDiff.bdiff(input, output))
+  end
+  
+  def test_create_simple_bdiff
+    input = ""
+    output = "hi there\ni'm stupid"
+    expected_output = "\000\000\000\000\000\000\000\000\000\000\000\x13"+output
+    assert_equal expected_output, BinaryDiff.bdiff(input, output)
+  end
+end

data/test/test_commands.rb

@@ -0,0 +1,122 @@
+require "test/unit"
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp/commands/command.rb"))
+
+class TestCommmands < Test::Unit::TestCase
+  include Amp
+  include Amp::KernelMethods
+  extend  Amp::KernelMethods
+  @@command = Amp::Command.new :testingzorz do |c|
+    c.opt :silly, "Silliness"
+    c.opt :shorted, "Shorted", :short => "-s"
+    c.opt :stringy, "Stringed", :type => :string
+    c.opt :"stop-at-filter", "Testing before filters"
+    c.before do |opts, args|
+      $_test_before_ran = true
+      $_test_ran_on_run = false # reset this one
+      if opts[:"stop-at-filter"]
+        cut!
+      end
+      true
+    end
+    
+    c.on_run do |opts, args|
+      $_test_silly = opts[:silly]
+      $_test_silly_given = opts[:silly_given]
+      $_test_shorted = opts[:shorted]
+      $_test_shorted_given = opts[:shorted_given]
+      $_test_stringy = opts[:stringy]
+      $_test_stringy_given = opts[:stringy_given]
+      $_test_args = args
+      $_test_ran_on_run = true
+    end
+  end
+  
+  def set_argv(new_argv)
+    argv = Object.send(:remove_const, :ARGV)
+    Object.send(:const_set, :ARGV, new_argv)
+    return argv
+  end
+
+  def cloak_argv(temp_argv)
+    $break = false
+    argv = set_argv(temp_argv)
+    yield
+    set_argv(argv)
+  end
+  
+  def test_anything_runs
+    cloak_argv([]) do
+      opts = @@command.collect_options
+      @@command.run(opts, Object::ARGV)
+    end
+    
+    assert $_test_ran_on_run
+    assert $_test_before_ran
+  end
+  
+  def test_long_option
+    cloak_argv(["--silly"]) do
+      opts = @@command.collect_options
+      @@command.run(opts, Object::ARGV)
+    end
+    
+    assert $_test_silly_given
+    assert $_test_silly
+  end
+  
+  def test_short_option
+    cloak_argv(["-s"]) do
+      opts = @@command.collect_options
+      @@command.run(opts, Object::ARGV)
+    end
+    
+    assert $_test_shorted
+    assert $_test_shorted_given
+  end
+  
+  def test_string_option
+    cloak_argv(["--stringy", "thestring"]) do
+      opts = @@command.collect_options
+      @@command.run(opts, Object::ARGV)
+    end
+    
+    assert_equal "thestring", $_test_stringy
+    assert $_test_stringy_given
+  end
+  
+  def test_extra_args
+    cloak_argv(["--stringy", "thestring", "arg1", "arg2"]) do
+      opts = @@command.collect_options
+      @@command.run(opts, Object::ARGV)
+    end
+    
+    assert_equal ["arg1","arg2"], $_test_args
+  end
+  
+  def test_break
+    cloak_argv(["--stop-at-filter"]) do
+      opts = @@command.collect_options
+      @@command.run(opts, Object::ARGV)
+    end
+    
+    assert $_test_before_ran
+    assert_false $_test_ran_on_run
+  end
+  
+  def test_maybe_repo
+    assert_false Amp::Command::MAYBE_REPO_ALLOWED[:testingzorz]
+    @@command.maybe_repo
+    assert Amp::Command::MAYBE_REPO_ALLOWED[:testingzorz]
+    @@command.maybe_repo = false
+    assert_false Amp::Command::MAYBE_REPO_ALLOWED[:testingzorz]
+  end
+  
+  def test_no_repo
+    assert_false Amp::Command::NO_REPO_ALLOWED[:testingzorz]
+    @@command.no_repo
+    assert Amp::Command::NO_REPO_ALLOWED[:testingzorz]
+    @@command.no_repo = false
+    assert_false Amp::Command::NO_REPO_ALLOWED[:testingzorz]
+  end
+end

data/test/test_difflib.rb

@@ -0,0 +1,50 @@
+require "test/unit"
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
+
+
+class TestDifflib < Test::Unit::TestCase
+  include Amp::Diffs
+  def test_one_match
+    matcher = SequenceMatcher.new("hi there my name is mike i hope you like me", 
+                                  "hi there my name is joe i hate you like i hate me")
+    assert_equal([0,0,20], matcher.find_longest_match(0,43,0,49))
+  end
+  
+  def test_full_matching
+    matcher = SequenceMatcher.new("hi there my name is mike i hope you like me", 
+                                  "hi there my name is joe i hate you like i hate me")
+    assert_equal([{:start_a => 0, :start_b => 0, :length => 20}, #match for "hi there my name is "
+                  {:start_a => 23, :start_b => 22, :length => 5}, #match for "e i ha"
+                  {:start_a => 30, :start_b => 29, :length => 11}, #match for "e you like "
+                  {:start_a => 41, :start_b => 47, :length => 2}, #match for "me"
+                  {:start_a => 43, :start_b => 49, :length => 0}], 
+                  matcher.get_matching_blocks.sort {|a1,a2| a1[:start_a] <=> a2[:start_a]}) #last match is terminator
+                  
+  end
+  
+  def test_full_example
+    matcher = SequenceMatcher.new(
+    ['c913df15006c6e06504414acf8acfedd32e5875d\n', 'michaeledgar@michael-edgars-macbook-pro.local\n', 
+      '1248396415 14400\n', 'STYLE.txt\n', '\n', 'First commit.'], 
+    ['b2a7f7ab636d1dbd06afd90f1bf287dfb92762fb\n', 'michaeledgar@michael-edgars-macbook-pro.local\n', 
+      '1248396417 14400\n', 'command.rb\n', 'commands/annotate.rb\n', 'commands/heads.rb\n', 
+      'commands/manifest.rb\n', 'commands/status.rb\n', '\n', 'Second commit, added commands'])
+    assert_equal([{:start_a => 1, :start_b => 1, :length => 1}, #match for "michaeledgar@..."
+                  {:start_a => 4, :start_b => 8, :length => 1}, #match for "\n"
+                  {:start_a => 6, :start_b => 10, :length => 0}], 
+                  matcher.get_matching_blocks.sort {|a1,a2| a1[:start_a] <=> a2[:start_a]}) #last match is terminator
+                  
+  end
+  
+  def test_another_full_example
+    matcher = SequenceMatcher.new(
+    ['The Amp Commandments Redux:\n', 
+      "\t1. This is intended to genreate a conflict. I'm out of witty stuff to put here."], 
+    ["\t1. This is intended to genreate a conflict. I'm out of witty stuff to put here."])
+    assert_equal([{:start_a => 1, :start_b => 0, :length => 1}, #match for "michaeledgar@..."
+                  {:start_a => 2, :start_b => 1, :length => 0}], 
+                  matcher.get_matching_blocks.sort {|a1,a2| a1[:start_a] <=> a2[:start_a]}) #last match is terminator
+                  
+  end
+  
+end

data/test/test_helper.rb

@@ -0,0 +1,15 @@
+require 'test/unit'
+
+def assert_false(val)
+  assert_equal(false, !!val)
+end
+
+def assert_not_nil(val)
+  assert_not_equal(nil, val)
+end
+
+def assert_file_contents(file, contents)
+  File.open(file,"r") do |f|
+    assert_equal f.read, contents
+  end
+end

data/test/test_journal.rb

@@ -0,0 +1,29 @@
+require "test/unit"
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
+
+class TestJournal < Test::Unit::TestCase
+  def test_journal
+    tfile = "tempjournal"
+    j = Amp::Journal.new(Amp::StandardErrorReporter, tfile, nil)
+    j << ["file",12345]
+    
+    
+    test_open = open(tfile)
+    assert_equal("file\0#{12345}\n", test_open.read)
+    test_open.close
+    j.close
+    
+    assert !File.exists?(tfile)
+  end
+  
+  def test_journal_start_mode
+    tfile = "tempjournal"
+    Amp::Journal.start tfile do |j|
+      j << ["file",12345]
+      test_open = open(tfile)
+      assert_equal("file\0#{12345}\n", test_open.read)
+      test_open.close
+    end
+    assert !File.exists?(tfile)
+  end
+end

data/test/test_match.rb

@@ -0,0 +1,134 @@
+require "test/unit"
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
+
+class TestMatch < Test::Unit::TestCase
+
+  def setup
+    @all_files = ["silly.rb", "code/lib.rb", "code/support.yml", "bin/amp.rb", "test/test_bdiff.rb"]
+    @match_files = ["code/support.yml", "bin/amp.rb"]
+    @files = ['lib/amp.rb', 'lib/monkey', 'poop']
+    @matcher1 = Amp::Match.create :files => @files,
+                                  :includer => "regexp:\\.rbc$\n", # it will come in as such from the command line
+                                  :excluder => /^(.+\/)?\.[^.].*/
+    @block = proc {|f| f =~ /\.rbc$/ }
+    @matcher2 = Amp::Match.new :files => @files, &@block
+    
+    @matcher3 = Amp::Match.create :includer => "glob: code/ext/*.o"
+    
+    @matcher4 = Amp::Match.create :includer => "glob: code/ext/**/*.o"
+  end
+  def test_files_match
+    matcher = Amp::Match.create(:files => ["code/support.yml", "bin/amp.rb"])
+    
+    assert_false matcher.exact?("silly.rb")
+    assert_false matcher.exact?("code/lib.rb")
+    
+    assert matcher.exact?("code/support.yml")
+    assert matcher.exact?("bin/amp.rb")
+    
+    assert_false matcher.exact?("test/test_bdiff.rb")
+
+  end
+  
+  def test_files_basic_approximate
+    matcher = Amp::Match.create(:files => @match_files, :includer => "\.rb$")
+
+    assert matcher.approximate?("silly.rb")
+    assert matcher.approximate?("code/lib.rb")
+    assert_false matcher.approximate?("code/support.yml")
+    assert_false matcher.approximate?("bin/amp.rb") #in :files
+    assert matcher.approximate?("test/test_bdiff.rb")
+  end
+  
+  def test_call
+    assert @matcher1.call('array.rbc')
+    assert @matcher1.call('lib/amp.rb')
+    assert !@matcher1.call('amp.rb')
+    assert @matcher1.call('monkey/poop/sdf/sdf/testy.rbc')
+    assert !@matcher1.call('busdfasdf')
+    assert !@matcher1.call('.hgignore')
+    assert !@matcher1.call('asdf/sdfs/sdf.asdf/sdf.sdf/.vimrc')
+    
+    assert @matcher2.call('array.rbc')
+    assert @matcher2.call('lib/amp.rb')
+    assert !@matcher2.call('amp.rb')
+    assert @matcher2.call('monkey/poop/sdf/sdf/testy.rbc')
+  end
+  
+  def test_files_basic_exclude
+    matcher = Amp::Match.create(:files => [], :includer => ".*", :excluder => "code")
+
+    assert_false matcher.failure?("silly.rb")
+    assert matcher.failure?("code/lib.rb")
+    assert matcher.failure?("code/support.yml")
+    assert_false matcher.failure?("bin/amp.rb") #in :files
+    assert_false matcher.failure?("test/test_bdiff.rb")
+  end
+  
+  def test_approximate
+    assert @matcher2.approximate?('testy.rbc')
+    assert @matcher2.approximate?('monke/asd/fdf/drty.rbc')
+    assert !@matcher2.approximate?('lib/amp.rb')
+    assert !@matcher2.approximate?('buttmucnhc')
+  end
+  
+  def test_globs
+    assert @matcher3.call('code/ext/asdf.o')
+    assert !@matcher3.call('code/ext/asdf.c')
+    assert !@matcher3.call('code/ext/monkey/asdf.c')
+    assert !@matcher3.call('code/ext/monkey/asdf.o')
+    
+    assert @matcher4.call('code/ext/asdf.o')
+    assert !@matcher4.call('code/ext/asdf.c')
+    assert !@matcher4.call('code/ext/monkey/asdf.c')
+    assert @matcher4.call('code/ext/monkey/asdf.o')
+  end
+  
+  def test_overall_match
+    matcher = Amp::Match.create(:files => "code/support.yml", :includer => "\\.rb$", :excluder => "code")
+    
+    assert matcher.call("silly.rb") #include wins
+    assert_false matcher.call("code/lib.rb") #exclude overrides include
+    assert_raises StandardError do
+      matcher.call("code/support.yml")
+    end
+    assert matcher.call("bin/amp.rb")
+    assert matcher.call("test/test_bdiff.rb")
+  end
+  
+  def test_block
+    assert_equal @block, @matcher2.block
+  end
+  
+  def test_exact?
+    assert @matcher1.exact?('lib/amp.rb')
+    assert @matcher1.exact?('poop')
+    assert !@matcher1.exact?('monkey.rbc')
+  end
+  
+  def test_exclude
+    assert_equal([/^(.+\/)?\.[^.].*/], @matcher1.exclude)
+  end
+  
+  def test_failure?
+    assert @matcher1.failure?('.hgignore')
+    assert @matcher1.failure?('lib/.vimrc')
+    assert @matcher1.failure?('lib/.array.rbc')
+  end
+  
+  def test_files
+    assert_equal @files, @matcher1.files
+  end
+  
+  # Uh, compare procs? wtf?
+  def test_include
+    assert_equal([/\.rbc$/], @matcher1.include)
+  end
+  
+  def test_included
+    assert @matcher1.included?('monkey.rbc')
+    assert @matcher1.included?('asdf/sdf/sdf/s/array.rbc')
+    assert @matcher1.included?('asd/.kernel.rbc') # shouldn't care about the excludes
+  end
+  
+end