dply 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29b858fa9d36e91f13a1136c63e1ab90822a8cc06f561656de7b71d013435b3c
-  data.tar.gz: 9516217208aa220291ee6e882070ee4d77776e479f6acaca354e405b12235644
+  metadata.gz: c1977ebe3a85d14aa607bbe886439ac8fd914a9a5622455604de86dc5a92ce9c
+  data.tar.gz: 8820cbf3a600d4c64d604fbcb1318a7c3bf65dc75337dd008bc9b387c665ad26
 SHA512:
-  metadata.gz: d5b2a86f4a6a98020d1ca414a22fb08758d08596a344f3f30f0639c2b4a74f977404d3bcc607be5cae6def03102802f7446af82381c7c863a81c73393ba68cde
-  data.tar.gz: c346852ec95ed4f55634173e78a399fa775b559911385179eac052eb92d9757f34af3cd14633a578127b40ea568e816a75a26504d024be93c85f720bdf85e0ce
+  metadata.gz: 7c01d534aa672ed1558f6999606e073ac7660b1504eefa0c902460a28e6362d7af43a32a63602e26e3b24d3a1466030c7c9c8b777ce4809fa261cb4a2f4eb167
+  data.tar.gz: be4e873ffbf2a109a44212313bfde650dbf04fb686c983cb14d87a18c2f41c4d2657e051c36113f358afb0190ce50962c0a07da24fa1543ed43c1ef8bb5bb1ef

data/lib/dply/cli/install_pkgs.rb

@@ -1,3 +1,4 @@
+require 'dply/constants'
 require 'dply/pkgs'
 require 'dply/helper'
 
@@ -14,8 +15,9 @@ module Dply
 
       def run
         opts.parse!(@argv)
-        error "pkgs.yml cannot be a symlink" if File.symlink? "pkgs.yml"
-        pkgs = Pkgs.new("pkgs.yml")
+        path = Constants::PKGS_YML
+        error "#{path} cannot be a symlink" if File.symlink? path
+        pkgs = Pkgs.new(path)
         pkgs.install(build_mode: @options[:build_mode])
         puts "installed"
       end

data/lib/dply/constants.rb

@@ -0,0 +1,6 @@
+module Dply
+  module Constants
+    PKGS_YML = "dply/pkgs.yml"
+  end
+end
+

data/lib/dply/deplist.rb

@@ -4,6 +4,7 @@ require_relative 'helper'
 require_relative 'rpm'
 require_relative 'pkgs'
 require_relative 'elf'
+require_relative 'constants'
 
 module Dply
   class Deplist
@@ -21,7 +22,7 @@ module Dply
       tmp_dir do
         logger.info "(in #{Dir.pwd})"
         cmd "tar xf #{@tar_path}"
-        pkgs_list = Pkgs.new("pkgs.yml").runtime
+        pkgs_list = Pkgs.new(Constants::PKGS_YML).runtime
 
         @libs_files_map = libs_files_map
         libs = @libs_files_map.keys

data/lib/dply/util.rb

@@ -4,6 +4,7 @@ require_relative 'helper'
 require_relative 'bundle'
 require_relative 'linker'
 require_relative 'pkgs'
+require_relative 'constants'
 require 'etc'
 
 module Dply
@@ -24,8 +25,9 @@ module Dply
     end
 
     def install_pkgs(build_mode: false)
-      return if not File.exists? "pkgs.yml"
-      pkgs = Pkgs.new("pkgs.yml")
+      pkgs_yml = Constants::PKGS_YML
+      return if not File.exists? pkgs_yml
+      pkgs = Pkgs.new(pkgs_yml)
       return if pkgs.installed?(build_mode: build_mode)
       drake_install build_mode
     end

data/lib/dply/version.rb

@@ -1,3 +1,3 @@
 module Dply
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/dply/deplist_spec.rb

@@ -22,8 +22,9 @@ module Dply
       it "doesn't throw an error when pkgs.yml has the required pkgs" do
         pkgs_data = { "pkgs" => ["libattr"], "build_pkgs" => [] }
         tmp_dir do
-          File.write "pkgs.yml", YAML.dump(pkgs_data)
-          system! "tar czf test.tar.gz pkgs.yml libacl.so.1"
+          FileUtils.mkdir "dply"
+          File.write "dply/pkgs.yml", YAML.dump(pkgs_data)
+          system! "tar czf test.tar.gz dply/pkgs.yml libacl.so.1"
           deplist = Deplist.new("test.tar.gz")
           silence_warnings do
             expect { deplist.verify! }.to output(/all dependencies satisfied/).to_stdout_from_any_process

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dply
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-elf
@@ -96,6 +96,7 @@ files:
 - lib/dply/cli/task.rb
 - lib/dply/code_archive.rb
 - lib/dply/command.rb
+- lib/dply/constants.rb
 - lib/dply/curl.rb
 - lib/dply/custom_logger.rb
 - lib/dply/deplist.rb
@@ -179,12 +180,10 @@ files:
 - spec/test_data/sample_repo/Gemfile
 - spec/test_data/sample_repo/Rakefile
 - spec/test_data/sample_repo/app.rb
-- spec/test_data/sample_repo/application-override.yml
-- spec/test_data/sample_repo/application.yml
 - spec/test_data/sample_repo/dply/app.rb
 - spec/test_data/sample_repo/dply/config/test.erb
+- spec/test_data/sample_repo/dply/pkgs.yml
 - spec/test_data/sample_repo/lib/libacl.so.1
-- spec/test_data/sample_repo/pkgs.yml
 - spec/webserver.rb
 - test/sample_data/build.tar.gz
 - test/sample_data/build.tar.gz.md5
@@ -254,12 +253,10 @@ test_files:
 - spec/test_data/sample_repo/Gemfile
 - spec/test_data/sample_repo/Rakefile
 - spec/test_data/sample_repo/app.rb
-- spec/test_data/sample_repo/application-override.yml
-- spec/test_data/sample_repo/application.yml
 - spec/test_data/sample_repo/dply/app.rb
 - spec/test_data/sample_repo/dply/config/test.erb
+- spec/test_data/sample_repo/dply/pkgs.yml
 - spec/test_data/sample_repo/lib/libacl.so.1
-- spec/test_data/sample_repo/pkgs.yml
 - spec/webserver.rb
 - test/sample_data/build.tar.gz
 - test/sample_data/build.tar.gz.md5

data/spec/test_data/sample_repo/application-override.yml

@@ -1,2 +0,0 @@
-db:
-  host: asdf-override

data/spec/test_data/sample_repo/application.yml

@@ -1,3 +0,0 @@
-db:
-  host: asdf
-  port: 5432