v2gpti 1.1.9 → 1.2.0

data/lib/git-pivotal-tracker-integration/command/deliver.rb

@@ -13,223 +13,168 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'git-pivotal-tracker-integration/command/base'
-require 'git-pivotal-tracker-integration/command/command'
-require 'git-pivotal-tracker-integration/util/git'
-require 'git-pivotal-tracker-integration/util/story'
-require 'pivotal-tracker'
-
-# The class that encapsulates starting a Pivotal Tracker Story
-class GitPivotalTrackerIntegration::Command::Deliver < GitPivotalTrackerIntegration::Command::Base
-
-  # Starts a Pivotal Tracker story by doing the following steps:
-  # * Create a branch
-  # * Add default commit hook
-  # * Start the story on Pivotal Tracker
-  #
-  # @param [String, nil] filter a filter for selecting the story to start.  This
-  #   filter can be either:
-  #   * a story id
-  #   * a story type (feature, bug, chore)
-  #   * +nil+
-  # @return [void]
-  def run(filter)
-    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
-    self.check_branch
-    story = GitPivotalTrackerIntegration::Util::Story.select_release @project
-    $LOG.debug("story:#{story.name}")
-    sort_for_deliver story
-    GitPivotalTrackerIntegration::Util::Story.pretty_print story
-
-    current_branch = GitPivotalTrackerIntegration::Util::Git.branch_name
-
-    puts "Merging from orgin develop..."
-    GitPivotalTrackerIntegration::Util::Shell.exec "git pull"
-
-    # checkout QA branch
-    # Merge develop into QA
-    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout QA"
-    GitPivotalTrackerIntegration::Util::Shell.exec "git pull"
-    if (GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs develop")
-      puts "Merged 'develop' in to 'QA'"
-    else
-      abort "FAILED to merge 'develop' in to 'QA'"
-    end
-
-    # Update version and build numbers
-    build_number      = story.name.dup
-    build_number[0]   = ""
-    working_directory = pwd
-
-    puts "storyNAME:#{story.name}"
-    puts "build_number:#{build_number}"
-    puts "working_directory:#{working_directory}*"
-
-    if (OS.mac? && @platform.downcase == "ios")
-      project_directory = ((GitPivotalTrackerIntegration::Util::Shell.exec 'find . -name "*.xcodeproj" 2>/dev/null').split /\/(?=[^\/]*$)/)[0]
-
-      # cd to the project_directory
-      Dir.chdir(project_directory)
-
-      # set build number and project number in project file
-      pwd
-      puts GitPivotalTrackerIntegration::Util::Shell.exec "xcrun agvtool new-version -all #{build_number}", false
-      puts GitPivotalTrackerIntegration::Util::Shell.exec "xcrun agvtool new-marketing-version SNAPSHOT"
-
-      # cd back to the working_directory
-      Dir.chdir(working_directory)
-    end
+module GitPivotalTrackerIntegration
+  module Command
+    # The class that encapsulates starting a Pivotal Tracker Story
+    class Deliver < Base
+
+      # Starts a Pivotal Tracker story by doing the following steps:
+      # * Create a branch
+      # * Add default commit hook
+      # * Start the story on Pivotal Tracker
+      #
+      # @param [String, nil] filter a filter for selecting the story to start.  This
+      #   filter can be either:
+      #   * a story id
+      #   * a story type (feature, bug, chore)
+      #   * +nil+
+      # @return [void]
+      def run(filter)
+        $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{Util::Git.branch_name}")
+        self.check_branch
+        story = Util::Story.select_release @project
+        $LOG.debug("Release Story:#{story.name}")
+        sort_for_deliver story
+        Util::Story.pretty_print story
+
+        current_branch = Util::Git.branch_name
+
+        puts "Merging from orgin develop..."
+        Util::Shell.exec "git pull"
+
+        # checkout QA branch
+        # Merge develop into QA
+        Util::Shell.exec "git checkout QA"
+        Util::Shell.exec "git reset --hard origin/QA"
+        Util::Shell.exec "git pull"
+        if (Util::Shell.exec "git merge -s recursive --strategy-option theirs develop")
+          puts "Merged 'develop' in to 'QA'"
+        else
+          abort "FAILED to merge 'develop' in to 'QA'"
+        end
+
+        # retrieve build number from story name
+        build_number      = story.name.slice(1..-1)
+        working_directory = pwd
+
+        puts "Story Name:         #{story.name}"
+        puts "Build Number:       #{build_number}"
+        puts "Working Directory:  #{working_directory}*"
+        puts ""
+
+        if (OS.mac? && @platform.downcase == "ios")
+          project_directory = ((Util::Shell.exec 'find . -name "*.xcodeproj" 2>/dev/null').split /\/(?=[^\/]*$)/)[0]
+
+          # cd to the project_directory
+          Dir.chdir(project_directory)
+
+          # set build number and project number in project file
+          pwd
+          puts Util::Shell.exec "xcrun agvtool new-version -all #{build_number}", false
+          puts Util::Shell.exec "xcrun agvtool new-marketing-version SNAPSHOT"
+
+          # cd back to the working_directory
+          Dir.chdir(working_directory)
+        elsif @platform == 'android'
+          updater = VersionUpdate::Gradle.new(@repository_root)
+          updater.update_qa_version(build_number)
+        end
+
+        # Create a new build commit, push to QA, checkout develop
+        Util::Git.create_commit( "Update build number to #{build_number} for delivery to QA", story)
+        puts Util::Shell.exec "git push"
+        puts Util::Shell.exec "git checkout develop"
+
+        i_stories = included_stories @project, story
+        deliver_stories i_stories, story
+      end
 
-    # Create a new build commit, push to QA, checkout develop
-    GitPivotalTrackerIntegration::Util::Git.create_commit( "Update build number to #{build_number} for delivery to QA", story)
-    puts GitPivotalTrackerIntegration::Util::Shell.exec "git push"
-    puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout develop"
+      def check_branch
+
+        current_branch    = Util::Git.branch_name
+        suggested_branch  = "develop"
+
+        if !suggested_branch.nil? && suggested_branch.length !=0 && current_branch != suggested_branch
+          should_chage_branch = ask("Your currently checked out branch is '#{current_branch}'. You must be on the #{suggested_branch} branch to run this command.\n\n Do you want to checkout '#{suggested_branch}' before starting?(Y/n)")
+          if should_chage_branch != "n"
+            print "Checking out branch '#{suggested_branch}'...\n\n"
+            Util::Shell.exec "git checkout #{suggested_branch}"
+            Util::Shell.exec 'git pull'
+          else
+              abort "You must be on the #{suggested_branch} branch to run this command."
+          end
+        end
+      end
 
-    i_stories = included_stories @project, story
-    deliver_stories i_stories, story
-  end
+      private
 
-  def check_branch
+      def deliver_stories(stories, build_story)
+        all_stories = stories.dup
+        all_stories << build_story
 
-    current_branch    = GitPivotalTrackerIntegration::Util::Git.branch_name
-    suggested_branch  = "develop"
+        all_stories.each do |story|
+          labels = story.labels.map(&:name)
+          labels << build_story.name
+          labels.uniq!
 
-    if !suggested_branch.nil? && suggested_branch.length !=0 && current_branch != suggested_branch
-      should_chage_branch = ask("Your currently checked out branch is '#{current_branch}'. You must be on the #{suggested_branch} branch to run this command.\n\n Do you want to checkout '#{suggested_branch}' before starting?(Y/n)")
-      if should_chage_branch != "n"
-        print "Checking out branch '#{suggested_branch}'...\n\n"
-        GitPivotalTrackerIntegration::Util::Shell.exec "git checkout #{suggested_branch}"
-        GitPivotalTrackerIntegration::Util::Shell.exec 'git pull'
-      else
-          abort "You must be on the #{suggested_branch} branch to run this command."
-      end
-    end
-  end
+          story.add_labels(*labels)
 
-  private
-
-  CANDIDATE_STATES = %w(finished unstarted).freeze
-  CANDIDATE_TYPES = %w(bug chore feature release)
-
-  def deliver_stories(stories, build_story)
-    all_stories = stories.dup
-    all_stories << build_story
-    all_stories.each {|story|
-      # puts "story class:#{story.class}"
-      s_labels_string = story.labels
-      s_labels = ""
-      if (s_labels_string)
-        s_labels = s_labels_string.split(",")
-        s_labels << build_story.name
-        s_labels_string = s_labels.uniq.join(",")
-      else
-        s_labels_string = build_story.name
+          case story.story_type
+          when 'feature', 'bug'
+            story.current_state = 'delivered'
+          when 'chore'
+            story.current_state = 'accepted'
+          end
+          story.save
+        end
       end
 
-      # puts "labels:#{s_labels_string}"
-      story.update(:labels => s_labels_string)
-      if (story.story_type == "feature") || (story.story_type == "bug")
-        story.update(:current_state => "delivered")
-      elsif (story.story_type == "chore")
-        story.update(:current_state => "accepted")
-      end
-    }
-  end
+      def included_stories(project, build_story)
 
-  def included_stories(project, build_story)
+        stories = project.stories(filter: "current_state:finished  type:bug,chore,feature -id:#{build_story.id}", limit: 1000)
 
-    notes_file = ENV['HOME']+"/#{project.name}-#{build_story.name}"
-    output = File.open( notes_file, "w")
-    output << "Included stories:\n"
+        # capture story details in a file as well as to stdout
+        notes_file = ENV['HOME']+"/#{project.name}-#{build_story.name}"
 
-    criteria = {
-      :current_state => CANDIDATE_STATES,
-      :limit => 1000,
-      :story_type => CANDIDATE_TYPES
-    }
+        File.open(notes_file, 'w') do |file|
+          puts "Included Stories"
+          file.puts "Included Stories"
 
+          stories.each do |story|
+            file.puts "#{story.id} - #{story.name}"
+            puts "#{story.id} - #{story.name}"
+          end
+        end
 
-    candidates = project.stories.all criteria
-
-    # only include stories that have been estimated
-    estimated_candidates = Array.new
-    val_is_valid = true
-    puts "Included stories:\n"
-    candidates.each do |val|
-      val_is_valid = true
-      if (val.id == build_story.id)
-        next
-      end
-      if (val.current_state != "finished")
-        val_is_valid = false
+        stories
       end
-      if (val.story_type == "release")
-        val_is_valid = false
-      end
-      if val_is_valid
-        # puts "val_is_valid:#{val_is_valid}"
-         estimated_candidates << val
-         output << "#{val.id}\n"
-         puts "#{val.id}"
 
+      def sort_for_deliver(release_story)
+        last_release  = Util::Story.last_release_story(@project, "b")
+        stories       = included_stories(@project, release_story)
+        last_release  = stories.shift if last_release.nil?
+
+        abort "\nThere are no last release stories or finished stories to deliver" if last_release.nil?
+        stories << release_story
+        previous_story = last_release.dup
+
+        puts "Last release:#{previous_story.name}"
+        last_accepted_release_story = @project.stories(filter: "current_state:accepted type:release").last
+        not_accepted_releases       = @project.stories(filter: "current_state:unstarted type:release")
+        stories.reverse!
+
+        stories.each do |story|
+          if not_accepted_releases.size == 1 && !last_accepted_release_story.nil?
+            story.after_id = last_accepted_release_story.id
+          elsif previous_story.current_state == 'accepted'
+            story.after_id = not_accepted_releases[not_accepted_releases.size - 2].id
+          else
+            story.after_id = previous_story.id
+          end
+          story.save
+        end
       end
-    end
-    output.close
-    candidates = estimated_candidates
-  end
-
 
-  def development_branch_name(story)
-    prefix = "#{story.id}-"
-    story_name = "#{story.name.gsub(/[^0-9a-z\\s]/i, '_')}"
-    if(story_name.length > 30)
-      suggested_suffix = story_name[0..27]
-      suggested_suffix << "__"
-    else
-      suggested_suffix = story_name
     end
-    branch_name = "#{prefix}" + ask("Enter branch name (#{story.id}-<#{suggested_suffix}>): ")
-    puts
-    if branch_name == "#{prefix}"
-      branch_name << suggested_suffix
-    end
-    branch_name.gsub(/[^0-9a-z\\s\-]/i, '_')
   end
-
-  def start_on_tracker(story)
-    print 'Starting story on Pivotal Tracker... '
-    story.update(
-      :current_state => 'started',
-      :owned_by => GitPivotalTrackerIntegration::Util::Git.get_config('user.name')
-    )
-    puts 'OK'
-  end
-
-  def sort_for_deliver(release_story)
-    last_release = GitPivotalTrackerIntegration::Util::Story.last_release_story(@project, "b")
-    stories = included_stories(@project, release_story)
-    if last_release.nil?
-      last_release = stories[0]
-      stories.shift
-    end
-    abort "\nThere are no last release stories or finished stories to deliver" if last_release.nil?
-    stories << release_story
-    previous_story = last_release.dup
-
-    puts "Last release:#{previous_story.name}"
-    last_accepted_release_story=@project.stories.all(:current_state => 'accepted', :story_type => 'release').last
-    not_accepted_releases = @project.stories.all(:current_state => 'unstarted', :story_type => 'release')
-    stories.reverse!
-
-    stories.each do |story|
-      if not_accepted_releases.size == 1 && !last_accepted_release_story.nil?
-        story.move(:after, last_accepted_release_story)
-      elsif previous_story.current_state == 'accepted'
-        story.move(:after, not_accepted_releases[not_accepted_releases.size - 2])
-      else
-        story.move(:after, previous_story)
-      end
-    end
-  end
-
 end

data/lib/git-pivotal-tracker-integration/command/finish.rb

@@ -13,78 +13,85 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'git-pivotal-tracker-integration/command/base'
-require 'git-pivotal-tracker-integration/command/command'
-require 'git-pivotal-tracker-integration/util/git'
-
-# The class that encapsulates finishing a Pivotal Tracker Story
-class GitPivotalTrackerIntegration::Command::Finish < GitPivotalTrackerIntegration::Command::Base
-
-  # Finishes a Pivotal Tracker story by doing the following steps:
-  # * Check that the pending merge will be trivial
-  # * Merge the development branch into the root branch
-  # * Delete the development branch
-  # * Push changes to remote
-  #
-  # @return [void]
-  def run(argument)
-    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
-    no_complete = argument =~ /--no-complete/
-
-    branch_status_check = GitPivotalTrackerIntegration::Util::Shell.exec "git status -s"
-    abort "\n\nThere are some unstaged changes in your current branch. Please do execute the below commands first and then try with git finish \n git add . \n git commit -m '<your-commit-message>'" unless branch_status_check.empty?
-
-    # ask("pause")
-    GitPivotalTrackerIntegration::Util::Git.trivial_merge?
-    $LOG.debug("configuration:#{@configuration}")
-    $LOG.debug("project:#{@project}")
-    $LOG.debug("story:#{@configuration.story(@project)}")
-
-    memm =  PivotalTracker::Membership.all(@project)
-    self.commit_new_build
-
-    time_spent = ""
-    while 1
-      time_spent = ask("How much time did you spend on this task? (example: 15m, 2.5h)")
-      if (/\d/.match( time_spent )) && /[mhd]/.match(time_spent)
-        break
+module GitPivotalTrackerIntegration
+  module Command
+
+    # The class that encapsulates finishing a Pivotal Tracker Story
+    class Finish < Base
+
+      # Finishes a Pivotal Tracker story by doing the following steps:
+      # * Check that the pending merge will be trivial
+      # * Merge the development branch into the root branch
+      # * Delete the development branch
+      # * Push changes to remote
+      #
+      # @return [void]
+      def run(argument)
+        $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{Util::Git.branch_name}")
+        no_complete = argument =~ /--no-complete/
+
+        branch_status_check = Util::Shell.exec "git status -s"
+        abort "\n\nThere are some unstaged changes in your current branch. Please do execute the below commands first and then try with git finish \n git add . \n git commit -m '<your-commit-message>'" unless branch_status_check.empty?
+
+        # ask("pause")
+        Util::Git.trivial_merge?
+        story = @configuration.story(@project)
+
+        $LOG.debug("configuration:#{@configuration}")
+        $LOG.debug("project:#{@project}")
+        $LOG.debug("story:#{story}")
+
+        self.commit_new_build
+
+        time_spent = ""
+        while 1
+          time_spent = ask("How much time did you spend on this task? (example: 15m, 2.5h)")
+          if (/\d/.match( time_spent )) && /[mhd]/.match(time_spent)
+            break
+          end
+        end
+
+        finish_toggle(@configuration, time_spent)
+
+        Util::Git.merge(@configuration.story(@project), no_complete)
+        Util::Git.push Util::Git.branch_name
+
+        labels = story.labels.map(&:name)
+        labels << "Need code review"
+        story.add_labels(*labels)
       end
-    end
-
-    finish_toggle(@configuration, time_spent)
 
-    GitPivotalTrackerIntegration::Util::Git.merge(@configuration.story(@project), no_complete)
-    GitPivotalTrackerIntegration::Util::Git.push GitPivotalTrackerIntegration::Util::Git.branch_name
-  end
 
+      def commit_new_build
+        # Update version and build numbers
+        build_number      = Time.now.utc.strftime("%y%m%d_%H%M")
+        working_directory = pwd
 
-  def commit_new_build
-    # Update version and build numbers
-    build_number      = Time.now.utc.strftime("%y%m%d-%H%M")
-    working_directory = pwd
+        puts "build_number:#{build_number}"
+        puts "working_directory:#{working_directory}*"
 
-    puts "build_number:#{build_number}"
-    puts "working_directory:#{working_directory}*"
+        if (OS.mac? && @platform.downcase == 'ios')
+          project_directory = ((Util::Shell.exec 'find . -name "*.xcodeproj" 2>/dev/null').split /\/(?=[^\/]*$)/)[0]
+          return if project_directory.nil?
 
-    if (OS.mac? && @platform.downcase == "ios")
-      project_directory = ((GitPivotalTrackerIntegration::Util::Shell.exec 'find . -name "*.xcodeproj" 2>/dev/null').split /\/(?=[^\/]*$)/)[0]
-      return if project_directory.nil?
+          # cd to the project_directory
+          Dir.chdir(project_directory)
 
-      # cd to the project_directory
-      Dir.chdir(project_directory)
+          # set build number and project number in project file
+          pwd
+          puts Util::Shell.exec "xcrun agvtool new-version -all #{build_number}", false
+          puts Util::Shell.exec "xcrun agvtool new-marketing-version SNAPSHOT"
 
-      # set build number and project number in project file
-      pwd
-      puts GitPivotalTrackerIntegration::Util::Shell.exec "xcrun agvtool new-version -all #{build_number}", false
-      puts GitPivotalTrackerIntegration::Util::Shell.exec "xcrun agvtool new-marketing-version SNAPSHOT"
+          # cd back to the working_directory
+          Dir.chdir(working_directory)
+        elsif @platform == 'android'
+          updater = VersionUpdate::Gradle.new(@repository_root)
+          updater.update_dev_version(build_number)
+        end
+        # Create a new build commit, push to develop
+        Util::Git.create_commit( "Update build number to #{build_number}", @configuration.story(@project))
+      end
 
-      # cd back to the working_directory
-      Dir.chdir(working_directory)
     end
-
-    # Create a new build commit, push to develop
-    GitPivotalTrackerIntegration::Util::Git.create_commit( "Update build number to #{build_number}", @configuration.story(@project))
   end
-
-
 end

data/lib/git-pivotal-tracker-integration/command/newbug.rb

@@ -13,47 +13,44 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'git-pivotal-tracker-integration/command/base'
-require 'git-pivotal-tracker-integration/command/command'
-require 'git-pivotal-tracker-integration/util/git'
-require 'git-pivotal-tracker-integration/util/story'
-require 'pivotal-tracker'
+module GitPivotalTrackerIntegration
+  module Command
+    # The class that encapsulates creating a Pivotal Tracker Bug Story
+    class Newbug < Base
 
-# The class that encapsulates creating a Pivotal Tracker Bug Story
-class GitPivotalTrackerIntegration::Command::Newbug < GitPivotalTrackerIntegration::Command::Base
+      # Creates a Pivotal Tracker story by doing the following steps:
+      # * Takes arguments from command line
+      # * If arguments contains -i then it creates a bug story under icebox
+      # * If arguments contains -b then it creates a bug story under backlog
+      # * If arguments contains -tl then it creates a bug story at top of specified list
+      # * If arguments contains -bl then it creates a bug story at bottom of specified list
+      # * If there are no arguments passed then it creates a bug story in icebox top of the list if you wish to create
+      def run(args)
+        $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{Util::Git.branch_name}")
+        story = nil
+        if (args.include?("-i")) #icebox
+          story = create_icebox_bug_story(args)
+        elsif (args.include?("-b")) #backlog
+          story = create_backlog_bug_story(args)
+        else
+          puts "\n Syntax for creating new bug story in icebox top of the list:\n git newbug -i -tl <bug-title> \n Syntax for creating new bug story in icebox bottom of the list: \n git newbug -i -bl <bug-title>\n"
+          puts "\n Syntax for creating new bug story in backlog top of the list:\n git newbug -b -tl <bug-title> \n Syntax for creating new bug story in backlog bottom of the list: \n git newbug -b -bl <bug-title>\n"
+          user_response = nil
+          while (user_response.nil? || user_response.empty?)
+            user_response = ask("\nYou have missed some parameters to pass...If you are ok with creating new bug story in icebox then enter y otherwise enter n")
+          end
+          while !(["y","n"].include?(user_response))
+           user_response = ask("\nInvalid entry...If you are ok with creating new bug story in icebox then enter y otherwise enter n")
+          end
+          if user_response.downcase == "y"
+            story = self.create_icebox_bug_story(args)
+          else
+            abort "\nCheck your new bug story creation syntax and then try again"
+          end
+        end
+        puts "A new bug story has been created successfully with ID:#{story.id}"
+      end
 
-  # Creates a Pivotal Tracker story by doing the following steps:
-  # * Takes arguments from command line
-  # * If arguments contains -i then it creates a bug story under icebox
-  # * If arguments contains -b then it creates a bug story under backlog
-  # * If arguments contains -tl then it creates a bug story at top of specified list
-  # * If arguments contains -bl then it creates a bug story at bottom of specified list
-  # * If there are no arguments passed then it creates a bug story in icebox top of the list if you wish to create
-  def run(args)
-    my_projects = PivotalTracker::Project.all
-    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
-    story = nil
-    if (!args.empty? && args.any?{|arg| arg.include?("-i")})
-      story = self.create_icebox_bug_story(args)
-    elsif (!args.empty? && args.any?{|arg| arg.include?("-b")})
-      story = self.create_backlog_bug_story(args)
-	else
-	  puts "\n Syntax for creating new bug story in icebox top of the list:\n git newbug -i -tl <bug-title> \n Syntax for creating new bug story in icebox bottom of the list: \n git newbug -i -bl <bug-title>\n"
-	  puts "\n Syntax for creating new bug story in backlog top of the list:\n git newbug -b -tl <bug-title> \n Syntax for creating new bug story in backlog bottom of the list: \n git newbug -b -bl <bug-title>\n"
-	  user_response = nil
-	  while (user_response.nil? || user_response.empty?)
-	  user_response = ask("\nYou have missed some parameters to pass...If you are ok with creating new bug story in icebox then enter y otherwise enter n")
-	  end
-	  while !(["y","n"].include?(user_response))
-	  user_response = ask("\nInvalid entry...If you are ok with creating new bug story in icebox then enter y otherwise enter n")
-	  end
-	  if user_response.downcase == "y"
-		story = self.create_icebox_bug_story(args)
-	  else
-	  abort "\nCheck your new bug story creation syntax and then try again"
-	  end
     end
-	puts "A new bug story has been created successfully with ID:#{story.id}"
   end
-
 end