dapp 0.14.31 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6092e38bdbb81a6c55974d8b31bba7222e3b1ffb
-  data.tar.gz: c44a7a91434f4f618b981612d1fd2711881881a2
+  metadata.gz: 42f6d6fce7254c75aa1746062ff9490bb38aaa34
+  data.tar.gz: 644155d4d9e2788eb5e0563e26a84b9dcf35b73e
 SHA512:
-  metadata.gz: 695205e420bc45641e7d1066176ad4a67f4e837a12927a0e6461139a0d1757901cc1178735a43a6c166b56aa42d95d5f4e95f23a6b0de8639ea3da909bea85bb
-  data.tar.gz: eba3b705f9836f1ae696c8d7816d1cf1086c19bcd622e4b76a43c5d80945d20991162bdcdc236939e0b0c5d95c4813485204ad75a40d11f1aea522ddc0965884
+  metadata.gz: 3db6d327a4f8b90d26674653df5f5c6c1f9733fad3152bee49d228daf452900ccfa823159aa040f123b381560ceb7db2b43fc5618d272cb00680bc6865d3a4d7
+  data.tar.gz: 5d0229d66b4643e90cf6531b3326161b5fe2c103875ccba9acc132b66e6a2cd3fecceec5f2bd96a508518694a8df7b0570cbfe586c9b9fc257fb4a1d352f9d77

data/bin/dapp

@@ -50,10 +50,6 @@ with_dapp_running_lock do
         $stderr.puts "\033[1m\033[90mStacktrace dumped to #{filename}\033[0m"
       end
 
-      if Dapp::CLI.dapp_object
-        Dapp::CLI.dapp_object.sentry_exception(e)
-      end
-
       raise
     end
   rescue Dapp::Error::Shellout => e

data/lib/dapp.rb

@@ -24,8 +24,6 @@ require 'openssl'
 require 'etc'
 require 'zlib'
 require 'slugify'
-require 'sentry-raven'
-require 'toml-rb'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -36,7 +34,6 @@ require 'dapp/helper/sha256'
 require 'dapp/helper/net_status'
 require 'dapp/helper/tar'
 require 'dapp/helper/yaml'
-require 'dapp/helper/url'
 require 'dapp/prctl'
 require 'dapp/error/base'
 require 'dapp/error/dapp'
@@ -52,7 +49,6 @@ require 'dapp/config/config'
 require 'dapp/config/error/config'
 require 'dapp/dapp/lock'
 require 'dapp/dapp/ssh_agent'
-require 'dapp/dapp/sentry'
 require 'dapp/dapp/git_artifact'
 require 'dapp/dapp/dappfile'
 require 'dapp/dapp/chef'

data/lib/dapp/cli.rb

@@ -37,10 +37,6 @@ BANNER
            show_options: true,
            exit: 0
 
-    class << self
-      attr_accessor :dapp_object
-    end
-
     def initialize(*args)
       super(*args)
 

data/lib/dapp/cli/command/base.rb

@@ -58,9 +58,6 @@ module Dapp
 
         def run_dapp_command(run_method, *args)
           dapp = ::Dapp::Dapp.new(*args)
-          ::Dapp::CLI.dapp_object = dapp
-          dapp.sentry_message("Manual usage: `#{self.run_method}` command") unless ENV['CI']
-
           begin
             if block_given?
               yield dapp
@@ -70,16 +67,12 @@ module Dapp
           end
         end
 
-        def run_method
-          class_to_lowercase
-        end
-
         def run(_argv = ARGV)
           raise
         end
 
         def cli_options(**kwargs)
-          config.merge(dapp_command: run_method, **kwargs)
+          config.merge(**kwargs)
         end
       end
     end

data/lib/dapp/dapp.rb

@@ -12,13 +12,10 @@ module Dapp
     include Logging::Paint
 
     include SshAgent
-    include Sentry
-
     include Helper::Sha256
-    extend  Helper::Trivia
+    extend Helper::Trivia
     include Helper::Trivia
     include Helper::Tar
-    include Helper::Url
 
     include Deps::Gitartifact
     include Deps::Base
@@ -38,18 +35,6 @@ module Dapp
       self.class.options
     end
 
-    def settings
-      @settings ||= begin
-        settings_path = File.join(self.class.home_dir, "settings.toml")
-
-        if File.exists? settings_path
-          TomlRB.load_file(settings_path)
-        else
-          {}
-        end
-      end
-    end
-
     def name
       @name ||= begin
         if git_url
@@ -90,18 +75,15 @@ module Dapp
       self.class.tmp_base_dir
     end
 
-    def build_dir
-      @build_dir ||= begin
+    def build_path(*path)
+      @build_path ||= begin
         if option_build_dir
           Pathname.new(option_build_dir)
         else
           path('.dapp_build')
         end.expand_path.tap(&:mkpath)
       end
-    end
-
-    def build_path(*path)
-      make_path(build_dir, *path)
+      make_path(@build_path, *path)
     end
 
     def local_git_artifact_exclude_paths(&blk)
@@ -147,10 +129,6 @@ module Dapp
     end
 
     class << self
-      def home_dir
-        File.join(Dir.home, ".dapp")
-      end
-
       def options
         @options ||= {}
       end

data/lib/dapp/dimg/cli/command/base.rb

@@ -20,6 +20,10 @@ module Dapp::Dimg::CLI
           end
         end
       end
+
+      def run_method
+        class_to_lowercase
+      end
     end
   end
 end

data/lib/dapp/dimg/config/directive/git_artifact_remote.rb

@@ -3,13 +3,11 @@ module Dapp
     module Config
       module Directive
         class GitArtifactRemote < GitArtifactLocal
-          include ::Dapp::Helper::Url
-
           attr_reader :_url, :_name, :_branch, :_commit
 
           def initialize(url, **kwargs, &blk)
             @_url  = url
-            @_name = git_url_to_name(url)
+            @_name = url.gsub(%r{.*?([^\/ ]+)\.git}, '\\1')
 
             super(**kwargs, &blk)
           end

data/lib/dapp/dimg/git_artifact.rb

@@ -68,12 +68,12 @@ module Dapp
               stage.image.add_service_change_label :"dapp-git-#{paramshash}-type" => 'directory'
 
               commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d \"#{to}\""
-              commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commits(stage))} -C \"#{to}\""
+              commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commit(stage))} -C \"#{to}\""
             when :file
               stage.image.add_service_change_label :"dapp-git-#{paramshash}-type" => 'file'
 
               commands << "#{repo.dimg.dapp.install_bin} #{credentials.join(' ')} -d \"#{File.dirname(to)}\""
-              commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commits(stage))} -C \"#{File.dirname(to)}\""
+              commands << "#{sudo}#{repo.dimg.dapp.tar_bin} -xf #{archive_file(stage, *archive_stage_commit(stage))} -C \"#{File.dirname(to)}\""
             end
           end
         end
@@ -121,30 +121,34 @@ module Dapp
       def stage_dependencies_checksum(stage)
         return [] if (stage_dependencies = stages_dependencies[stage.name]).empty?
 
-        paths = (include_paths(true) + base_paths(stage_dependencies, true)).uniq
-        to_commit = dev_mode? ? nil : latest_commit
+        paths = base_paths(stage_dependencies, true)
+        commit = dev_mode? ? nil : latest_commit
 
-        stage_dependencies_key = [stage.name, to_commit]
+        stage_dependencies_key = [stage.name, commit]
         @stage_dependencies_checksums ||= {}
         @stage_dependencies_checksums[stage_dependencies_key] = begin
           if @stage_dependencies_checksums.key?(stage_dependencies_key)
             @stage_dependencies_checksums[stage_dependencies_key]
           else
-            if (patches = diff_patches(nil, to_commit, paths: paths)).empty?
+            if (entries = repo_entries(commit, paths: paths)).empty?
               repo.dimg.dapp.log_warning(desc: { code: :stage_dependencies_not_found,
                                                  data: { repo: repo.respond_to?(:url) ? repo.url : 'local',
                                                          dependencies: stage_dependencies.join(', ') } })
             end
 
-            patches.sort_by {|patch| patch.delta.new_file[:path]}
-              .reduce(nil) {|prev_hash, patch|
-              Digest::SHA256.hexdigest [
-                prev_hash,
-                patch.delta.new_file[:path],
-                patch.delta.new_file[:mode].to_s,
-                patch.to_s
-              ].compact.join(':::')
-            }
+            entries
+              .sort_by {|root, entry| File.join(root, entry[:name])}
+              .reduce(nil) {|prev_hash, (root, entry)|
+                content = nil
+                content = repo.lookup_object(entry[:oid]).content if entry[:type] == :blob
+
+                Digest::SHA256.hexdigest [
+                  prev_hash,
+                  File.join(root, entry[:name]),
+                  entry[:filemode].to_s,
+                  content
+                ].compact.join(':::')
+              }
           end
         end
       end
@@ -187,7 +191,7 @@ module Dapp
       end
 
       def archive_any_changes?(stage)
-        any_changes?(*archive_stage_commits(stage))
+        repo_entries(archive_stage_commit(stage)).any?
       end
 
       def patch_any_changes?(stage)
@@ -212,18 +216,18 @@ module Dapp
         [:owner, :group].map { |attr| "--#{attr}=#{send(attr)}" unless send(attr).nil? }.compact
       end
 
-      def archive_file(stage, from_commit, to_commit)
+      def archive_file(stage, commit)
         if repo.dimg.dapp.options[:use_system_tar]
-          archive_file_with_system_tar(stage, from_commit, to_commit)
+          archive_file_with_system_tar(stage, commit)
         else
-          archive_file_with_tar_writer(stage, from_commit, to_commit)
+          archive_file_with_tar_writer(stage, commit)
         end
-        repo.dimg.container_tmp_path('archives', archive_file_name(from_commit, to_commit))
+        repo.dimg.container_tmp_path('archives', archive_file_name(commit))
       end
 
-      def archive_file_with_tar_writer(stage, from_commit, to_commit)
-        tar_write(repo.dimg.tmp_path('archives', archive_file_name(from_commit, to_commit))) do |tar|
-          archive_diff_pathes(stage,from_commit, to_commit) do |path, content, mode|
+      def archive_file_with_tar_writer(stage, commit)
+        tar_write(repo.dimg.tmp_path('archives', archive_file_name(commit))) do |tar|
+          each_archive_entry(stage, commit) do |path, content, mode|
             if mode == 40960 # symlink
               tar.add_symlink path, content, mode
             else
@@ -237,10 +241,10 @@ module Dapp
         raise Error::TarWriter, message: e.message
       end
 
-      def archive_file_with_system_tar(stage, from_commit, to_commit)
-        repo.dimg.tmp_path('archives', archive_file_name(from_commit, to_commit)).tap do |archive_path|
-          relative_archive_file_path = File.join('archives_files', file_name(from_commit, to_commit))
-          archive_diff_pathes(stage, from_commit, to_commit) do |path, content, mode|
+      def archive_file_with_system_tar(stage, commit)
+        repo.dimg.tmp_path('archives', archive_file_name(commit)).tap do |archive_path|
+          relative_archive_file_path = File.join('archives_files', file_name(commit))
+          each_archive_entry(stage, commit) do |path, content, mode|
             file_path = repo.dimg.tmp_path(relative_archive_file_path, path)
 
             if mode == 40960 # symlink
@@ -255,23 +259,6 @@ module Dapp
         end
       end
 
-      def archive_diff_pathes(stage, from_commit, to_commit)
-        diff_patches(from_commit, to_commit).each do |patch|
-          entry = patch.delta.new_file
-          raise_if_submodule_patch!(patch)
-          content = begin
-            if to_commit == nil
-              next unless (path = repo.path.dirname.join(entry[:path])).file?
-              File.read(path)
-            else
-              repo.lookup_object(entry[:oid]).content
-            end
-          end
-
-          yield slice_cwd(stage, entry[:path]), content, entry[:mode]
-        end
-      end
-
       def slice_cwd(stage, path)
         return path if cwd.empty?
 
@@ -289,22 +276,21 @@ module Dapp
         end
       end
 
-      def archive_file_name(from_commit, to_commit)
-        file_name(from_commit, to_commit, ext: 'tar')
+      def archive_file_name(commit)
+        file_name(commit, ext: 'tar')
       end
 
       def patch_file(stage, from_commit, to_commit)
         File.open(repo.dimg.tmp_path('patches', patch_file_name(from_commit, to_commit)), File::RDWR | File::CREAT) do |f|
           diff_patches(from_commit, to_commit).each do |patch|
-            raise_if_submodule_patch!(patch)
+            raise_if_submodule_entry!(patch.delta.new_file)
             f.write change_patch_new_file_path(stage, patch)
           end
         end
         repo.dimg.container_tmp_path('patches', patch_file_name(from_commit, to_commit))
       end
 
-      def raise_if_submodule_patch!(patch) # FIXME
-        entry = patch.delta.new_file
+      def raise_if_submodule_entry!(entry) # FIXME
         if entry[:mode] == 57344 # submodule
           raise Error::Rugged, code: :submodule_not_supported, data: { path: repo.path.dirname.join(entry[:path]) }
         end
@@ -371,6 +357,24 @@ module Dapp
         "#{[paramshash, args].flatten.compact.join('_')}#{".#{ext}" unless ext.nil? }"
       end
 
+      def repo_entries(commit, paths: include_paths_or_cwd)
+        (@repo_entries ||= {})[[commit, paths]] ||= begin
+          repo.entries(commit, paths: paths, exclude_paths: exclude_paths(true))
+        end
+      end
+
+      def each_archive_entry(stage, commit, &blk)
+        repo_entries(commit).each do |root, entry|
+          raise_if_submodule_entry!(entry)
+
+          if entry[:type] == :blob
+            content = repo.lookup_object(entry[:oid]).content
+
+            yield slice_cwd(stage, File.join(root, entry[:name])), content, entry[:filemode]
+          end
+        end
+      end
+
       def diff_patches(from_commit, to_commit, paths: include_paths_or_cwd)
         (@diff_patches ||= {})[[from_commit, to_commit, paths]] ||= begin
           options = {}.tap do |opts|
@@ -414,8 +418,8 @@ module Dapp
         end
       end
 
-      def archive_stage_commits(stage)
-        [nil, stage.layer_commit(self)]
+      def archive_stage_commit(stage)
+        stage.layer_commit(self)
       end
 
       def patch_stage_commits(stage)

data/lib/dapp/dimg/git_repo/base.rb

@@ -31,6 +31,24 @@ module Dapp
           end
         end
 
+        def entries(commit, paths: [], exclude_paths: [])
+          [].tap do |entries|
+            lookup_commit(commit).tree.walk(:preorder) do |root, entry|
+              fullpath = File.join(root, entry[:name]).reverse.chomp('/').reverse
+
+              is_exclude_path = exclude_paths.any? { |p| check_path?(fullpath, p) }
+              is_include_path = begin
+                paths.empty? ||
+                  paths.any? { |p| check_path?(fullpath, p) || check_subpath?(fullpath, p) }
+              end
+
+              next false if is_exclude_path || !is_include_path
+
+              entries << [root, entry]
+            end
+          end
+        end
+
         def diff(from, to, **kwargs)
           if to.nil?
             raise "Workdir diff not supported for #{self.class}"
@@ -89,12 +107,24 @@ module Dapp
         private
 
         def check_path?(path, format)
+          path_checker(path) do |checking_path|
+            File.fnmatch(format, checking_path)
+          end
+        end
+
+        def check_subpath?(path, format)
+          path_checker(format) do |checking_path|
+            File.fnmatch(checking_path, path)
+          end
+        end
+
+        def path_checker(path)
           path_parts = path.split('/')
           checking_path = nil
 
           until path_parts.empty?
             checking_path = [checking_path, path_parts.shift].compact.join('/')
-            return true if File.fnmatch(format, checking_path)
+            return true if yield checking_path
           end
           false
         end

data/lib/dapp/kube/dapp/command/deploy.rb

@@ -144,14 +144,7 @@ module Dapp
               end
 
               watch_hooks_thr = Thread.new do
-                watch_hooks.each {|job|
-                  begin
-                    Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
-                  rescue ::Exception => e
-                    sentry_exception(e, extra: {"job-spec" => job.spec})
-                    raise
-                  end
-                }
+                watch_hooks.each {|job| Kubernetes::Manager::Job.new(self, job.name).watch_till_done!}
               end
 
               deployment_managers = release.deployments.values

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.14.31'.freeze
-  BUILD_CACHE_VERSION = 16
+  VERSION = '0.15.0'.freeze
+  BUILD_CACHE_VERSION = 17
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.14.31
+  version: 0.15.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -186,34 +186,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
-- !ruby/object:Gem::Dependency
-  name: sentry-raven
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.7.2
-- !ruby/object:Gem::Dependency
-  name: toml-rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -471,7 +443,6 @@ files:
 - lib/dapp/dapp/logging/i18n.rb
 - lib/dapp/dapp/logging/paint.rb
 - lib/dapp/dapp/logging/process.rb
-- lib/dapp/dapp/sentry.rb
 - lib/dapp/dapp/shellout/base.rb
 - lib/dapp/dapp/shellout/streaming.rb
 - lib/dapp/dapp/ssh_agent.rb
@@ -668,7 +639,6 @@ files:
 - lib/dapp/helper/sha256.rb
 - lib/dapp/helper/tar.rb
 - lib/dapp/helper/trivia.rb
-- lib/dapp/helper/url.rb
 - lib/dapp/helper/yaml.rb
 - lib/dapp/kube.rb
 - lib/dapp/kube/cli/cli.rb
@@ -736,7 +706,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell

data/lib/dapp/dapp/sentry.rb

@@ -1,112 +0,0 @@
-module Dapp
-  class Dapp
-    module Sentry
-      def sentry_message(msg, **kwargs)
-        return if not ensure_sentry_configured
-        kwargs[:level] ||= "info"
-        Raven.capture_message(msg, _make_sentry_params(**kwargs))
-      end
-
-      def sentry_exception(exception, **kwargs)
-        return if not ensure_sentry_configured
-        (kwargs[:tags] ||= {})['error-code'] = begin
-          net_status = exception.net_status
-          [net_status[:context], net_status[:code]].compact.join('_')
-        end
-        Raven.capture_exception(exception, _make_sentry_params(**kwargs))
-      end
-
-      def ensure_sentry_configured
-        return false unless sentry_settings = settings["sentry"]
-
-        unless @sentry_settings_configured
-          Raven.configure do |config|
-            logger = ::Logger.new(STDOUT)
-            logger.level = ::Logger::WARN
-
-            config.logger = logger
-            config.dsn = sentry_settings["dsn"]
-          end
-
-          @sentry_settings_configured = true
-        end
-
-        return true
-      end
-
-      def _make_sentry_params(level: nil, tags: {}, extra: {}, user: {})
-        {
-          level: level,
-          tags:  _sentry_tags_context.merge(tags),
-          extra: _sentry_extra_context.merge(extra),
-          user:  _sentry_user_context.merge(user),
-        }
-      end
-
-      def _sentry_extra_context
-        @_sentry_extra_context ||= {
-          "pwd" => Dir.pwd,
-          "dapp-dir" => self.work_dir,
-          "options" => self.options,
-          "env-options" => {
-            "DAPP_FORCE_SAVE_CACHE" => ENV["DAPP_FORCE_SAVE_CACHE"],
-            "DAPP_BIN_DAPPFILE_YML" => ENV["DAPP_BIN_DAPPFILE_YML"],
-            "ANSIBLE_ARGS" => ENV["ANSIBLE_ARGS"],
-            "DAPP_CHEF_DEBUG" => ENV["DAPP_CHEF_DEBUG"],
-          },
-        }.tap {|extra|
-          extra["ci-env"] = {"CI" => ENV["CI"]}
-          ENV.select {|k, v| k.start_with?("CI_")}.each do |k, v|
-            extra["ci-env"][k] = v
-          end
-        }
-      end
-
-      def _sentry_tags_context
-        name = options[:name] || 
-        @_sentry_tags_context ||= {
-          "dapp-short-version" => ::Dapp::VERSION.split(".")[0..1].join("."),
-          "dapp-version" => ::Dapp::VERSION,
-          "dapp-build-cache-version" => ::Dapp::BUILD_CACHE_VERSION,
-          "dapp-command" => self.options[:dapp_command],
-        }.tap {|tags|
-          git_config_path = File.join(Dir.pwd, ".git/config")
-
-          tags["dapp-name"] = options[:name]
-
-          if File.exists? git_config_path
-            cfg = IniFile.load(File.join(Dir.pwd, ".git/config"))
-            remote_origin_cfg = cfg['remote "origin"']
-            remote_origin_url = remote_origin_cfg["url"]
-            if remote_origin_url
-              tags["dapp-name"] ||= begin
-                repo_name = remote_origin_url.split('/').last
-                repo_name = repo_name[/.*(?=\.git)/] if repo_name.end_with? '.git'
-                repo_name
-              end
-
-              tags["git-host"] = self.get_host_from_git_url(remote_origin_url)
-
-              git_name = self.git_url_to_name(remote_origin_url)
-
-              tags["git-group"] = git_name.partition("/")[0]
-              tags["git-name"] = git_name
-            end
-          end
-
-          tags["dapp-name"] ||= File.basename(Dir.pwd)
-
-          begin
-            ver = self.class.host_docker_minor_version
-            tags["docker-minor-version"] = ver.to_s
-          rescue ::Exception
-          end
-        }
-      end
-
-      def _sentry_user_context
-        @_sentry_user_context ||= {}
-      end
-    end # Sentry
-  end # Dapp
-end # Dapp

data/lib/dapp/helper/url.rb

@@ -1,23 +0,0 @@
-module Dapp
-  module Helper
-    module Url
-      def git_url_to_name(url)
-        url_without_scheme = url.split("://", 2).last
-        # This may be broken, because "@" should delimit creds, not a ":"
-        url_without_creds = url_without_scheme.split(":", 2).last
-        url_without_creds.gsub(%r{.*?([^\/ ]+\/[^\/ ]+)\.git}, '\\1')
-      end
-
-      def get_host_from_git_url(url)
-        url_without_scheme = url.split("://", 2).last
-        url_without_creds = url_without_scheme.split("@", 2).last
-
-        # Split out part after ":" in this kind of url: github.com:flant/dapp.git
-        url_part = url_without_creds.split(":", 2).first
-
-        # Split out part after first "/": github.com/flant/dapp.git
-        url_part.split("/", 2).first
-      end
-    end # Url
-  end # Helper
-end # Dapp