dapp 0.35.24 → 0.35.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: be6da76fd071625161bf829c7004669e9d32e1049bc76fbc47e5f4e5405c1121
-  data.tar.gz: 6e82c044625221031d1c10094935e48134fe088149ee976a92bc7a6309def346
+SHA1:
+  metadata.gz: be91f5ed8804390c36e42190d1187d8734fc1c00
+  data.tar.gz: fa9afd09e2928cfb0d1e1db4a48d6ba1e325aba5
 SHA512:
-  metadata.gz: c748e01641e9c531840ccc9dd8238dbb04b2acef4340b4698785ff6db7290040979a1153f67fe8d587bce1e65b48ee639864982b27b203215ac322f7e9916dc4
-  data.tar.gz: 38bd43546751b84d7962bfb19a8a6e817bc911f168cc335a07db9f62904f3453a37a32a4bd81144882643c83da750bfb45682ebd520a7ca7a79552ba100938ab
+  metadata.gz: 345886195ffe42765837dc13b75f09f43be525336463c0cedbe9db5f85ee155512ed4c258a5697e21ffb768cae0ff6a18ab42193a84c198ce16d7f80f76fd0c7
+  data.tar.gz: eecaec48962bf79fc4aa59f00ecbff8baa561c310ed7765a8d58f87ab674a3366c7dc0f7b6d2d2ee85aea409827b7445f0cd414347bd135a664b03195ade1390

data/lib/dapp/dapp.rb

@@ -143,15 +143,6 @@ module Dapp
       make_path(build_dir, *path)
     end
 
-    def local_git_artifact_exclude_paths(&blk)
-      super do |exclude_paths|
-        build_path_relpath = Pathname.new(build_path).subpath_of(File.dirname(git_own_repo.path))
-        exclude_paths << build_path_relpath.to_s if build_path_relpath
-
-        yield exclude_paths if block_given?
-      end
-    end
-
     def stage_cache
       "dimgstage-#{name}"
     end

data/lib/dapp/dapp/git_artifact.rb

@@ -1,12 +1,6 @@
 module Dapp
   class Dapp
     module GitArtifact
-      def local_git_artifact_exclude_paths(&blk)
-        @local_git_artifact_exclude_paths ||= [].tap do |exclude_paths|
-          yield exclude_paths if block_given?
-        end
-      end
-
       def dimgstage_g_a_commit_label(paramshash)
         "dapp-git-#{paramshash}-commit"
       end

data/lib/dapp/dimg/git_artifact.rb

@@ -32,28 +32,10 @@ module Dapp
         @owner = owner
         @group = group
         @as = as
-
         @stages_dependencies = stages_dependencies
-
-
-        @all_include_paths = base_paths(@include_paths, true)
-        @all_exclude_paths = repo.exclude_paths + base_paths(@exclude_paths, true)
       end
       # rubocop:enable Metrics/ParameterLists
 
-      def base_paths(paths, with_cwd = false)
-        [paths].flatten.compact.map do |path|
-          if with_cwd && !cwd.empty?
-            File.join(cwd, path)
-          else
-            path
-          end
-            .chomp('/')
-            .reverse.chomp('/')
-            .reverse
-        end
-      end
-
       def apply_archive_command(stage)
         res = repo.dapp.ruby2go_git_artifact(
           "GitArtifact" => JSON.dump(get_ruby2go_state_hash),
@@ -144,8 +126,8 @@ module Dapp
           "RepoPath" => File.join("/", @cwd.to_s),
           "Owner" => @owner.to_s,
           "Group" => @group.to_s,
-          "IncludePaths" => @all_include_paths,
-          "ExcludePaths" => @all_exclude_paths,
+          "IncludePaths" => @include_paths,
+          "ExcludePaths" => @exclude_paths,
           "StagesDependencies" => @stages_dependencies.map {|k, v| [_stages_map[k], Array(v).map(&:to_s)]}.to_h,
           "PatchesDir" => dimg.tmp_path('patches'),
           "ContainerPatchesDir" => dimg.container_tmp_path('patches'),

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

@@ -5,10 +5,6 @@ module Dapp
         def initialize(dapp)
           super(dapp, 'own', dapp.path.to_s)
         end
-
-        def exclude_paths
-          dapp.local_git_artifact_exclude_paths
-        end
       end
     end
   end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.24"
+  VERSION = "0.35.26"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.35.24
+  version: 0.35.26
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -742,7 +742,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell