bubing 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d996ae2e7602e11ccaf18421fb4feca38941a2
-  data.tar.gz: fc1c1c4653422733dc9d4122c4c5d1c4bdae3169
+  metadata.gz: 0184dc00837bd5b13ff3e410f0eb199f774279b9
+  data.tar.gz: 85a6e1d20ed15195b0db99fa520de9fc623fe90d
 SHA512:
-  metadata.gz: 58acfbb404d39cb116cabcd86e9d5d5a080668b3132b3433a74cfed1e91769253d8a6192483b98bfc1aebc9da4281fc9d49441c713f20dc32ed64057c5936cba
-  data.tar.gz: e15d0c1a3d944373c29cb053027d54ad9b1f6f6dc098c51e74690f68cbc5bdbf97fd342404c14d1ad4a0f71565b8fafb093b1ff9df4bb82e78722c6336bda74f
+  metadata.gz: 1a09a198a30079f2febdca3597c944a76efe607c7f5baf3e6b1217dd6cc0039ffb4606b2a68697c975b3688b180114b0b3ed046bfe422549b2c92bd046d87d53
+  data.tar.gz: 107b85c383f70df2668e878941b87c16c798a1235a566885ca338956ed213cb15c1e098f689087563a1b0f77972bef83716155cba50721139d88c45408f7e427

data/bin/bubing

@@ -7,11 +7,11 @@ options = {}
 options[:plugins] = []
 options[:plugin_dirs] = []
 
-options[:files] = []
-options[:file_dirs] = []
+options[:files] = {}
+options[:file_dirs] = {}
 
 options[:ld_paths] = []
-options[:envs] = []
+options[:envs] = {}
 
 OptionParser.new do |opts|
   opts.banner = 'Usage: bubing [options] BINARY DIRECTORY'
@@ -20,34 +20,35 @@ OptionParser.new do |opts|
     options[:verbose] = v
   end
 
-  opts.on('-p', '--plugin LIBRARY',
-          'Add not linked library, eg plugin') do |plugin|
+  opts.on('-r', 'Run script name') do |v|
+    options[:run_script] = v
+  end
+
+  opts.on('-p', '--plugin LIBRARY', 'Add not linked library, eg plugin') do |plugin|
     options[:plugins] << plugin
   end
 
-  opts.on('-P', '--plugin_directory PATH',
-          'Add directory with additional libs, eg plugin directory') do |plugin_dir|
+  opts.on('-P', '--plugin_directory PATH', 'Add directory with additional libs, eg plugin directory') do |plugin_dir|
     options[:plugin_dirs] << plugin_dir
   end
 
-  opts.on('-f', '--file FILE=PATH',
-          'Add additional file, eg config') do |file|
-    options[:files] << file
+  opts.on('-f', '--file FILE=PATH', 'Add additional file, eg config') do |file|
+    from, to = file.split('=').map(&:strip)
+    options[:files][from] = to
   end
 
-  opts.on('-F', '--file_directory PATH=PATH',
-          'Add directory with additional files, eg configs') do |file_dir|
-    options[:file_dirs] << file_dir
+  opts.on('-F', '--file_directory PATH=PATH', 'Add directory with additional files, eg configs') do |file_dir|
+    from, to = file_dir.split('=').map(&:strip)
+    options[:file_dirs][from] = to
   end
 
-  opts.on('-L', '--ld_path PATH',
-          'Look dependencies in PATH') do |ld_path|
+  opts.on('-L', '--ld_path PATH', 'Look dependencies in PATH') do |ld_path|
     options[:ld_paths] << ld_path
   end
 
-  opts.on('-e', '--env VAR=VAL',
-          'Add environment variable to run.sh') do |env|
-    options[:envs] << env
+  opts.on('-e', '--env VAR=VAL', 'Add environment variable to run.sh') do |env|
+    var, val = env.split('=').map(&:strip)
+    options[:envs][var] = val
   end
 end.parse!
 

data/lib/bubing.rb

@@ -5,4 +5,65 @@ require 'bubing/shared_object_bundler'
 require 'bubing/bundler_factory'
 
 module Bubing
+  def self.configure
+    configuration = Configuration.new
+    yield configuration
+    configuration
+  end
+
+  class Configuration
+    def initialize
+      @options = {}
+      @options[:plugins] = []
+      @options[:plugin_dirs] = []
+      @options[:files] = {}
+      @options[:file_dirs] = {}
+      @options[:envs] = {}
+      @options[:ld_paths] = []
+    end
+
+    def binary(path)
+      @binary = File.absolute_path(path)
+    end
+
+    def directory(path)
+      @directory = File.absolute_path(path)
+    end
+
+    def add_plugin(path)
+      @options[:plugins] << path
+    end
+
+    def add_plugin_dir(path)
+      @options[:plugin_dirs] << path
+    end
+
+    def add_file(from, to)
+      @options[:files][File.expand_path(from)] = to
+    end
+
+    def add_file_dir(from, to)
+      @options[:file_dirs][File.expand_path(from)] = to
+    end
+
+    def add_env(var, val)
+      @options[:envs][var] = val
+    end
+
+    def add_ld_path(path)
+      @options[:ld_paths] << File.expand_path(path)
+    end
+
+    def run_script(name)
+      @options[:run_script] = name
+    end
+
+    def verbose!
+      @options[:verbose] = true
+    end
+
+    def bundle!
+      Bubing::BundlerFactory.new.build(@binary, @directory, **@options).bundle!
+    end
+  end
 end

data/lib/bubing/binary_info.rb

@@ -54,7 +54,7 @@ module Bubing
     end
 
     def x86_64_interpreter
-      libs = Dir['/lib/*']
+      libs = Dir['/lib/*'] + Dir['/lib64/*']
       libs.detect { |l| l.include?(X86_64_INTERPRETER) }
     end
   end

data/lib/bubing/bundler.rb

@@ -14,11 +14,11 @@ module Bubing
       @binary = binary
       @directory = directory
       @interpreter = options[:interpreter]
-      @plugins = options[:plugins]
-      @plugin_dirs = options[:plugin_dirs]
-      @files = options[:files]
-      @file_dirs = options[:file_dirs]
-      @ld_paths = options[:ld_paths]
+      @plugins = options[:plugins] || []
+      @plugin_dirs = options[:plugin_dirs]  || []
+      @files = options[:files]  || []
+      @file_dirs = options[:file_dirs]  || []
+      @ld_paths = options[:ld_paths] || []
       @verbose = options[:verbose]
 
       @lib_dir = File.join(directory, 'lib')
@@ -60,7 +60,7 @@ module Bubing
       if lib.include?('not found')
         raise DependencyNotFoundError.new(lib.split('=>')[0].strip)
       end
-      File.absolute_path(PATH_RE.match(lib)[1].strip)
+      PATH_RE.match(lib)[1].strip
     end
 
     def get_deps(file)
@@ -70,7 +70,7 @@ module Bubing
                       ''
                     end
       trace = `#{ld_lib_path} LD_TRACE_LOADED_OBJECTS=1 #{@interpreter} #{file}`
-      trace.split("\n").map(&:strip).select{|row| row.include?('=>')}.map{|dep| extract_path(dep)}
+      trace.split("\n").map(&:strip).select{|row| row.include?('=>')}.map{|dep| extract_path(dep)}.reject(&:empty?)
     end
 
     def copy_deps(binary)
@@ -103,12 +103,11 @@ module Bubing
     end
 
     def copy_files(files)
-      files.each do |file|
-        file, dst = file.split('=')
-        dst = File.join(@directory, dst)
+      files.each do |from, to|
+        dst = File.join(@directory, to)
 
         FileUtils.mkdir_p(dst)
-        copy(file, dst)
+        copy(from, dst)
       end
     end
   end

data/lib/bubing/executable_bundler.rb

@@ -1,15 +1,13 @@
 module Bubing
   class ExecutableBundler < Bubing::Bundler
-    RUN_TEMPLATE = '%{envs} ./lib/%{interpreter} ./bin/%{binary}'
+    RUN_TEMPLATE = '%{envs} ./lib/%{interpreter} ./bin/%{binary} "$@"'
 
     def initialize(binary, directory, **options)
       super
       @bin_dir = File.join(@directory, 'bin')
+      @run_script = options[:run_script] || 'run.sh'
 
-      @envs = options[:envs].each_with_object({}) do |env, h|
-        k, v = env.split('=')
-        h[k] = v
-      end
+      @envs = options[:envs] || {}
       if @envs['LD_LIBRARY_PATH'].nil?
         @envs['LD_LIBRARY_PATH'] = './lib'
       end
@@ -19,23 +17,23 @@ module Bubing
       super
       copy(@interpreter, @lib_dir)
       copy(@binary, @bin_dir)
-      log('Preparing run.sh...')
+      log("Preparing #{@run_script}...")
       run_file = make_run
 
       FileUtils.chmod('+x', run_file)
     end
 
     def make_run
-      run_file = File.join(@directory, 'run.sh')
-      envs = @envs.each_with_object([]) do |(k, v), ary|
-        ary << "#{k}=#{v}"
-      end.join(' ')
-      run = RUN_TEMPLATE % {envs: envs, interpreter: File.basename(@interpreter), binary: File.basename(@binary)}
-      File.open(run_file, 'w') do |file|
-        file.write("#!/bin/bash\n")
-        file.write("#{run}\n")
+      File.join(@directory, @run_script).tap do |run_file|
+        envs = @envs.each_with_object([]) do |(k, v), ary|
+          ary << "#{k}=#{v}"
+        end.join(' ')
+        run = RUN_TEMPLATE % {envs: envs, interpreter: File.basename(@interpreter), binary: File.basename(@binary)}
+        File.open(run_file, 'w') do |file|
+          file.write("#!/bin/bash\n")
+          file.write("#{run}\n")
+        end
       end
-      run_file
     end
 
     protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bubing
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Gleb Sinyavsky
@@ -9,7 +9,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-05-07 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: Script for bundling linux binaries
 email: zhulik.gleb@gmail.com
 executables: