dply 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36989af82dd38d5bf66b70f92627fc0757db80b04f9f0e7a14ba6b9b1b09145b
-  data.tar.gz: 02366bde4e4a38ba98b3f6f59e7a43e7c8aa8048ed6f0e96449a046f17bcd477
+  metadata.gz: 47be2897b6fac53ffa527667a3f1b7a794038422eeb5d1f2ec344624334760f2
+  data.tar.gz: 38805b70907e8591654d56c970288b3df5a99459c1c55c8977e79319c3c36973
 SHA512:
-  metadata.gz: 9aada7a0bb8c7daf5161d2aff4705758fe27ee5d8184aa545da9326e767482221f8643fe4e7134e4d2c6958335181f9292f9f17f048479e079ffd4fbd16a51be
-  data.tar.gz: e90d76148eb33897e6c7eaafb6b0bd433014b31030d5ddc6ba1ce52e2d1cf3e6c6086d5a085eed906fb9e47396051f459a05254f636ae809f0a92303785eea7d
+  metadata.gz: 4103db48d903226e2526a243bb2dade117b2e189493a09c3c3142c789957e05285350bf960216e442b8d864d8ccdd23a1172dd3e4e7444781ce8089fc1b3c373
+  data.tar.gz: 26a4dd026591bc40a397d26e4b2863d2d971720170d424cded39adfa8865cc13222bb785a1ee11d35731ed101bc7cf5f4cc1ae42cde2e3eee5340344b7eee53d

data/lib/dply/app_config.rb

@@ -114,7 +114,7 @@ module Dply
       deactivate_gem 'ruby-elf' # in case gemfile contains another version of ruby-elf
       Bundler.setup
       reactivate_gem 'dply'
-      logger.debug { "LOAD_PATH: #{$LOAD_PATH.inspect}" }
+      logger.trace { "LOAD_PATH: #{$LOAD_PATH.inspect}" }
     end
 
     def reactivate_gem(name)

data/lib/dply/code_archive.rb

@@ -13,25 +13,36 @@ module Dply
       @name = name
       @branch = get_branch
       @revision = revision
-      @dir = "tmp/build_artifacts"
+      @dir = "#{Dir.pwd}/tmp/build_artifacts"
+      @skip_depcheck = false
       validate
     end
 
-    def build(git: true, gnu_tar: false, &block)
+    def build(empty: false, gnu_tar: false, &block)
       make_dir
-      create_tar git, gnu_tar
-      instance_eval &block if block
+      create_tar empty, gnu_tar
+      instance_eval(&block) if block
       add_git_commit_id
       add_revision
       add_archive_name
-      depcheck
-      compress
+    end
+
+    def depcheck!
+      return if @skip_depcheck
+      command = %(ruby -W0 "#{__dir__}/scripts/depcheck.rb" #{tar})
+      logger.bullet "depcheck #{tar}"
+      env = logger.debug? ? { "LOG_DEBUG" => "true" } : {}
+      cmd command, display: false, env: env
+    end
+
+    def compress!
+      cmd %(#{gzip} -f -9 "#{tar}")
     end
 
     private
 
     def get_branch
-      out = cmd "git rev-parse --abbrev-ref HEAD", return_output: true
+      out = `git rev-parse --abbrev-ref HEAD`
       out.chomp.tr("/", "_")
     end
 
@@ -43,30 +54,33 @@ module Dply
       FileUtils.mkdir @dir if not File.directory? @dir
     end
 
-    def create_tar(git, gnu_tar)
+    def create_tar(empty, gnu_tar)
       tmp_dir = "tmp/app_code"
-      if git
-        if gnu_tar
-          FileUtils.rm_rf tmp_dir if File.exists? tmp_dir
-          FileUtils.mkdir tmp_dir
-          sh "git archive HEAD | tar xf - -C #{tmp_dir}"
-          cmd "tar cf #{tar} -C #{tmp_dir} ."
-        else
-          cmd "git archive -o #{tar} HEAD"
-        end
+      return if empty
+      if gnu_tar
+        FileUtils.rm_rf tmp_dir
+        FileUtils.mkdir tmp_dir
+        sh "git archive HEAD | tar xf - -C #{tmp_dir}"
+        cmd "tar cf #{tar} -C #{tmp_dir} ."
       else
-        cmd "tar -cf #{tar} -T /dev/null"
+        cmd "git archive -o #{tar} HEAD"
       end
     ensure
-      FileUtils.rm_rf tmp_dir if File.exists? tmp_dir
+      FileUtils.rm_rf tmp_dir
     end
 
-    def add(file, chdir: nil)
-      if chdir
-        cmd %(tar -h -C #{chdir} --append -f "#{tar}" "#{file}")
+    def add(file, dereference: false)
+      realpath = File.realpath(file)
+      tar_relpath = Pathname.new(tar).relative_path_from(Pathname.new(Dir.pwd)).to_s
+      command = ["tar", "--append", "-f", tar_relpath]
+      command << "-h" if dereference
+      if File.symlink?(file) && File.directory?(realpath)
+        prefix = file.sub(":", '\:')
+        command.concat ["-C", file, "--transform", "s:^:#{prefix}/:S", "."]
       else
-        cmd %(tar -h --append -f "#{tar}" "#{file}")
+        command << file
       end
+      cmd command
     end
 
     def remove(file)
@@ -97,19 +111,8 @@ module Dply
       add "vendor/bundle"
     end
 
-    def depcheck
-      return if @skip_depcheck
-      command = %(ruby -W0 "#{__dir__}/scripts/depcheck.rb" #{tar})
-      logger.bullet "depcheck #{tar}"
-      cmd command, display: false
-    end
-
-    def compress
-      cmd %(#{gzip} -f -9 "#{tar}")
-    end
-
     def gzip
-      File.exists?("/usr/bin/pigz") ? "pigz" : "gzip"
+      File.exist?("/usr/bin/pigz") ? "pigz" : "gzip"
     end
 
     def validate

data/lib/dply/command.rb

@@ -25,7 +25,7 @@ module Dply
       ret = yield
       exitstatus = $?.exitstatus
       if exitstatus != 0
-        raise Error, "non zero exit for \"#{command_str}\""
+        raise Error, %(non zero exit for "#{command_str}")
       end
       ret
     end

data/lib/dply/custom_logger.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'shellwords'
 require_relative 'ext/string'
 
 module Dply
@@ -9,7 +10,8 @@ module Dply
     def initialize(file)
       super(file)
       @level = ::Logger::INFO
-#      @trace_mode = false
+      @saved_logdev = @logdev
+      @trace_mode = false
     end
 
     def format_message(severity, timestamp, progname, msg)
@@ -26,13 +28,16 @@ module Dply
     end
 
     def command(command, mode:)
+      str = command.is_a?(Array) ? shelljoin(command) : command
       case mode
       when :arrow
-        arrow command
+        arrow str
       when :bullet
-        bullet command
+        bullet str
+      when :warn
+        warn str
       else
-        debug command
+        debug str
       end
     end
 
@@ -44,9 +49,10 @@ module Dply
       info "#{"\u2219".bold.blue} #{msg}"
     end
 
-    def trace(msg)
+    def trace(msg = nil)
       return if not @trace_mode
-      info %(#{"T".bold.blue} #{msg}\n)
+      msg = yield if block_given?
+      info %(#{"T".bold.blue} #{msg})
     end
 
     def remote(msg)
@@ -59,9 +65,29 @@ module Dply
       info "dply_marker:#{msg}"
     end
 
-    def silence!
+    private
+
+    def shelljoin(command)
+      arr = command.map do |i|
+        case i
+        when /\A[A-Za-z0-9._\-=+:\/]+\z/
+          i
+        when /\A[^']+\z/
+          %('#{i}')
+        else
+          i.shellescape
+        end
+      end
+      arr.join " "
+    end
+
+    def disable
       @logdev = nil
     end
 
+    def enable
+      @logdev = @saved_logdev
+    end
+
   end
 end

data/lib/dply/deplist.rb

@@ -32,8 +32,20 @@ module Dply
           pp @libs_files_map
         end
 
-        deps = Rpm.libs_pkgs_map libs
+        deps = {}
+        libs.each do |lib|
+          what_provides = Rpm.what_provides(lib)
+          if what_provides.empty?
+            logger.error "no pkgs provide '#{lib}': required by files: #{@libs_files_map[lib]})"
+            @error = true
+            next
+          end
+          deps[lib] = what_provides
+        end
+
         verify_deps(deps, pkgs_list)
+        error "packages dependencies not satisfied" if @error
+        puts "all dependencies satisfied".green
       end
     end
 
@@ -47,8 +59,6 @@ module Dply
           @error = true
         end
       end
-      error "packages dependencies not satisfied" if @error
-      puts "all dependencies satisfied".green
     end
 
     def tmp_dir(&block)

data/lib/dply/elf.rb

@@ -44,6 +44,8 @@ module Dply
         rpaths = @elf[".dynamic"].rpath + @elf[".dynamic"].runpath
         # expand $ORIGIN
         rpaths = rpaths.map { |i| i.sub("$ORIGIN", "#{@path.dirname}") }
+        # select only existing rpaths
+        rpaths = rpaths.select { |i| File.exists? i }
         # convert all paths to realpath
         rpaths = rpaths.map { |i| Pathname.new(i).realpath }
         # select paths which start with cwd or are subpaths to cwd

data/lib/dply/meta_config.rb

@@ -15,7 +15,7 @@ module Dply
     end
 
     def define(&block)
-      instance_eval &block
+      instance_eval(&block)
     end
 
     def generate
@@ -23,7 +23,7 @@ module Dply
       @sources.each do |i|
         path = i.fetch(:path)
         url = i.fetch(:url)
-        auth = i.fetch(:auth)
+#        auth = i.fetch(:auth)
         optional = i.fetch(:optional)
         deep_merge = i.fetch(:deep_merge)
         block = i.fetch(:block)

data/lib/dply/rpm.rb

@@ -4,21 +4,14 @@ module Dply
   module Rpm
     extend Helper
 
-    # libs should include ()(64bit) in their name if 64bit libs
-    def self.libs_pkgs_map(libs)
-      h = {}
-      libs.each { |lib| h[lib] = pkg_list(lib) }
-      return h
+    def self.what_provides(lib)
+      command = ["rpm", "--queryformat", "%{NAME} ", "-q", "--whatprovides", lib]
+      output = cmd command, return_output: true, display: false
+      output.strip.split
+    rescue Error
+      logger.command command, mode: :warn
+      []
     end
 
-    class << self
-      private
-
-      def pkg_list(lib)
-        command = ["rpm", "--queryformat", "%{NAME} ", "-q", "--whatprovides", lib]
-        output = cmd command, return_output: true, display: false
-        output.strip.split
-      end
-    end
   end
 end

data/lib/dply/scripts/depcheck.rb

@@ -1,4 +1,6 @@
 require_relative '../deplist'
 
+logger = Dply::Logger.logger
+logger.level = ::Logger::DEBUG if ENV["LOG_DEBUG"]
 deplist = Dply::Deplist.new(ARGV.shift)
 deplist.verify!

data/lib/dply/task_dsl.rb

@@ -37,6 +37,8 @@ module Dply
       revision = ENV["BUILD_NUMBER"] || "unknown"
       archive = CodeArchive.new(name, revision: revision)
       archive.build(**opts, &block)
+      archive.depcheck!
+      archive.compress!
       return archive
     end
 

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/spec/dply/code_archive_spec.rb

@@ -0,0 +1,120 @@
+require 'dply/code_archive'
+module Dply
+  describe CodeArchive do
+
+    def setup_work_dir
+      File.write "code", "code"
+      system! "git init"
+      system! "git add code"
+      system! "git commit -m 'initial commit'"
+      FileUtils.mkdir "tmp"
+      FileUtils.mkdir "shared"
+      FileUtils.touch "shared/a"
+      FileUtils.touch "shared/b"
+      system! "ln -sf shared linked_dir"
+      system! "ln -sf shared/a linked_file"
+      long_name = "a" * 101
+      FileUtils.mkdir_p "long_path"
+      FileUtils.touch "long_path/#{long_name}"
+    end
+
+    def build_tar(**kwargs, &block)
+      Dir.chdir @work_dir do
+        FileUtils.rm_rf "tmp/build_artifacts"
+        archive = CodeArchive.new("test", revision: "dev")
+        suppress_logger { archive.build(**kwargs, &block) }
+      end
+    end
+
+    def extract_tar
+      extract_dir = "#{@work_dir}/tmp/extract"
+      FileUtils.rm_rf extract_dir
+      FileUtils.mkdir_p extract_dir
+      Dir.chdir extract_dir do
+        system! "tar xf ../build_artifacts/test-dev-master.tar"
+        yield
+      end
+    end
+
+    before :all do
+      @work_dir = "tmp/code_archive"
+      FileUtils.rm_rf @work_dir
+      FileUtils.mkdir_p @work_dir
+      Dir.chdir @work_dir do
+        setup_work_dir
+      end
+    end
+
+    describe "#build" do
+
+      it "builds a tar from git code and adds the specified files" do
+        build_tar gnu_tar: false do
+          add "shared/a"
+          Dir.chdir("shared") { add "b" }
+        end
+
+        extract_tar do
+          expect(File).to exist("code")
+          expect(File).to exist("shared/a")
+          expect(File).to exist("b")
+        end
+
+      end
+
+      it "raises error when adding a too long filename" do
+        expect do
+          suppress_output { build_tar { add "long_path" } }
+        end.to raise_error(Error)
+      end
+
+
+      it "is able to able long filenames with gnu_tar: true" do
+        build_tar gnu_tar: true do
+          add "long_path"
+        end
+
+        extract_tar do
+          expect(File).to exist("code")
+          expect(File).to exist("long_path")
+        end
+      end
+
+
+      it "add(path) dereferences path only if path is a symlink to a directory" do
+        build_tar do
+          add "linked_file"
+          add "linked_dir"
+        end
+
+        extract_tar do
+          expect(File).to exist("code")
+          expect(File).to exist("linked_dir/a")
+          expect(File).to exist("linked_dir/b")
+          expect(File.symlink?("linked_file")).to be(true)
+        end
+      end
+
+      it "dereferences symlinks when derefence: true" do
+        build_tar do
+          add "linked_file", dereference: true
+        end
+
+        extract_tar do
+          expect(File).to exist("code")
+          expect(File.symlink? "linked_file").to be(false)
+        end
+      end
+
+      it "doesn't include code from git when empty: true" do
+        build_tar empty: true do
+          add "shared/a"
+        end
+
+        extract_tar do
+          expect(File).to exist("shared/a")
+          expect(File).not_to exist("code")
+        end
+      end
+    end
+  end
+end

data/spec/dply/rpm_spec.rb

@@ -15,16 +15,13 @@ module Dply
       "#{lib}()(64bit)"
     end
 
-    subject(:rpm) { Rpm }
-
-    describe ".libs_pkgs_map" do
-      it "returns the map of lib => [list of pkgs] which provide that lib" do
+    describe ".what_provides" do
+      it "returns the [list of pkgs] which provide a given lib" do
         test_cases = test_cases()
-        libs = test_cases.keys.map { |i| to_64bit i }
-        map = rpm.libs_pkgs_map libs
-        test_cases.keys.each do |i|
-          lib = to_64bit(i)
-          expect(map[lib]).to eq(test_cases[i])
+        test_cases.each do |lib, res|
+          lib = to_64bit(lib)
+          what_provides = Rpm.what_provides(lib)
+          expect(res).to eq(what_provides)
         end
       end
     end

data/spec/spec_helper.rb

@@ -30,6 +30,14 @@ ensure
   $stderr.reopen orig_stderr
 end
 
+def suppress_logger(&block)
+  logger = Dply::Logger.logger
+  logger.send :disable
+  yield
+ensure
+  logger.send :enable
+end
+
 def system!(command, quiet: true)
   if quiet
     retval = system command, [:out, :err] => "/dev/null"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf
@@ -145,6 +145,7 @@ files:
 - lib/dplyr/tasks_config.rb
 - spec/dply/base_config_spec.rb
 - spec/dply/bundle_spec.rb
+- spec/dply/code_archive_spec.rb
 - spec/dply/command_spec.rb
 - spec/dply/curl_spec.rb
 - spec/dply/deplist_spec.rb
@@ -218,6 +219,7 @@ summary: rake based deploy tool
 test_files:
 - spec/dply/base_config_spec.rb
 - spec/dply/bundle_spec.rb
+- spec/dply/code_archive_spec.rb
 - spec/dply/command_spec.rb
 - spec/dply/curl_spec.rb
 - spec/dply/deplist_spec.rb