dapp 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmM2YzExN2Y3YjVlZjQxOTg0MzVmM2QyMzA1YTQxMTQyNmMzZjA2NQ==
+    OWI0MGM4MWU0MjU2MWUxZWY0NWNkMTczNzEyNzJmMWQ2NDhjMzlkYQ==
   data.tar.gz: !binary |-
-    ZjJhNGExOThmZmE5NjU4MTFlNzhlOTkwZTE5OTY4M2NlMDVmMzk4Yw==
+    MDdmMzhiNTE1ZTM0MjcyMDFmNGEzMzYyNjI2ZmNiNjZlYjA2ZGU0MA==
 SHA512:
   metadata.gz: !binary |-
-    ZjMzMTA0YWEzYmJjYjZjMDE3NTA3NzMyYmM2NjYzNzYwODlmOTNhNzk4ZWQz
-    MTZkYTM0M2ZjYjI4OTlkYTJkMWU2ZTA1NzllNmVhMDcxNGQyMDc0MTY2NDY0
-    ZDQ2MjNhM2FiYmY4ODU2OTJiOWQ0ZWY3NjIxMjc2N2NkYjljOWY=
+    ZDlmZDU3NDYzYTA5YzgwZDRkOGI0MmJmMjU3ZTc1ZGEyOGRkYWQyM2I3NTI3
+    MmI2YzRmNmNhM2JjZjZmMzQxNzk1YjZmNGNiZjJhODI0YjU1MWMzODE5YjJi
+    ZDcwMGNiNmQ5Y2M3NTU0ZGNjZTg5OTRiZjE4M2I0YTAwMWE1ZDg=
   data.tar.gz: !binary |-
-    ODJkNjk4N2NmM2Q0ZWM1NTgxNjY1ODVkMzE1MDI1YWU5NWRkMmIyN2JjNDlk
-    MjFhOTcxODBjZWVkODQwYzliMDRkZjY5OWUzMTcxNDdmODNiNjU1ZTdmYzRj
-    ODI4ODk0OTFkNjNmMGI2NWUxODdiMGQ0N2M3M2EyMmJmNzlkZjc=
+    NTQ5OGJhMjRkZjI2MTU0ZDEzNzE5ZTdlMjVmYzI2MzcyODkxMThmM2NiMDMx
+    NTE0MTM2YTc4MzhjOWJmMmI2OGRjNDA5ZmU2NmU0ZTcwZjNmOTMxZDhiNjVl
+    MTk2MmRiODU1YjRkN2U0M2I3ZDIzMjAyM2M4ZDkyMGE5NTJhN2Q=

data/lib/dapp.rb

@@ -17,6 +17,7 @@ require 'dapp/builder'
 require 'dapp/docker'
 require 'dapp/atomizer'
 require 'dapp/git_repo/base'
+require 'dapp/git_repo/own'
 require 'dapp/git_repo/chronicler'
 require 'dapp/git_repo/remote'
 require 'dapp/git_artifact'

data/lib/dapp/builder.rb

@@ -127,7 +127,18 @@ module Dapp
       [opts[:basename], opts[:name]].compact.join '-'
     end
 
-    def add_artifact_from_git(url, where_to_add, branch: opts[:git_artifact_branch], ssh_key_path: nil, **kwargs)
+    def add_git_artifact(where_to_add, **kwargs)
+      log "Adding artifact (to #{where_to_add})"
+
+      # own repo
+      repo = GitRepo::Own.new(self)
+
+      # add artifact
+      artifact = GitArtifact.new(self, repo, where_to_add, flush_cache: opts[:flush_cache], branch: home_branch, **kwargs)
+      artifact.add_multilayer!
+    end
+
+    def add_remote_git_artifact(url, where_to_add, branch: opts[:git_artifact_branch] || home_branch, ssh_key_path: nil, **kwargs)
       log "Adding artifact from git (#{url} to #{where_to_add}, branch: #{branch})"
 
       # extract git repo name from url

data/lib/dapp/builder/cascade_tagging.rb

@@ -31,13 +31,13 @@ module Dapp
         (opts[:build_history_length] - 1).downto(1).each do |n|
           origin = i.merge(tag: "#{i[:tag]}_#{n}")
 
-          if docker.image_exists?(**origin)
+          if docker.image_exist?(**origin)
             docker.tag origin, i.merge(tag: "#{i[:tag]}_#{n + 1}")
           end
         end
 
         # shift top -> 1
-        docker.tag i, i.merge(tag: "#{i[:tag]}_1") if docker.image_exists?(**i)
+        docker.tag i, i.merge(tag: "#{i[:tag]}_1") if docker.image_exist?(**i)
 
         # tag top
         docker.tag image_id, i

data/lib/dapp/builder/centos7.rb

@@ -2,7 +2,7 @@ module Dapp
   class Builder
     # Centos7 support
     module Centos7
-      # rubocop:disable Metrics/MethodLength:
+      # rubocop:disable Metrics/MethodLength
       def from_centos7
         # use centos7
         docker.from 'centos:7'

data/lib/dapp/builder/chefify.rb

@@ -11,7 +11,7 @@ module Dapp
         [:prepare, :build, :setup].each do |step|
           # run chef-solo for extra dapps
           extra_dapps.each do |extra_dapp|
-            if dapp_chef_cookbooks_artifact.exists_in_step? "cookbooks/#{extra_dapp}/recipes/#{step}.rb", step
+            if dapp_chef_cookbooks_artifact.exist_in_step? "cookbooks/#{extra_dapp}/recipes/#{step}.rb", step
               # FIXME: env ???
               docker.run "chef-solo -c /usr/share/dapp/chef_solo.rb -o #{extra_dapp}::#{step},env-#{opts[:basename]}::void", step: step
             end
@@ -20,7 +20,7 @@ module Dapp
           # run chef-solo for app
           recipe = [opts[:name], step].compact.join '-'
           # FIXME: env ???
-          if dapp_chef_cookbooks_artifact.exists_in_step? "cookbooks/env-#{opts[:basename]}/recipes/#{recipe}.rb", step
+          if dapp_chef_cookbooks_artifact.exist_in_step? "cookbooks/env-#{opts[:basename]}/recipes/#{recipe}.rb", step
             docker.run "chef-solo -c /usr/share/dapp/chef_solo.rb -o env-#{opts[:basename]}::#{recipe}", step: step
           end
         end
@@ -71,7 +71,7 @@ module Dapp
 
       def run_chef_solo_for_dapp_common
         [:prepare, :build, :setup].each do |step|
-          if dapp_chef_cookbooks_artifact.exists_in_step? "cookbooks/dapp-common/recipes/#{step}.rb", step
+          if dapp_chef_cookbooks_artifact.exist_in_step? "cookbooks/dapp-common/recipes/#{step}.rb", step
             # FIXME: env ???
             docker.run "chef-solo -c /usr/share/dapp/chef_solo.rb -o dapp-common::#{step},env-#{opts[:basename]}::void", step: step
           end

data/lib/dapp/docker.rb

@@ -76,7 +76,7 @@ module Dapp
       res.stdout.lines.grep(/^Successfully built ([0-9a-f]+)\n$/).first.strip.split.last
     end
 
-    def image_exists?(**kwargs)
+    def image_exist?(**kwargs)
       !image_id(**kwargs).nil?
     end
 

data/lib/dapp/git_artifact.rb

@@ -71,12 +71,8 @@ module Dapp
       end
     end
 
-    def exists_in_commit?(path, commit)
-      repo.git_bare("cat-file -e #{commit}:#{path}", returns: [0, 128]).status.success?
-    end
-
-    def exists_in_step?(path, step)
-      exists_in_commit?(path, commit_by_step(step))
+    def exist_in_step?(path, step)
+      repo.exist_in_commit?(path, commit_by_step(step))
     end
 
     def prepare_step_commit
@@ -96,12 +92,9 @@ module Dapp
     end
 
     def any_changes?(from)
-      !repo.git_bare("diff --quiet #{from}..#{repo_latest_commit}#{" --relative=#{cwd}" if cwd} #{paths(true)}", returns: [0, 1]).status.success?
+      !repo.git_bare("diff --quiet #{from}..#{repo_latest_commit}#{" --relative=#{cwd}" if cwd} -- #{paths(true)}", returns: [0, 1]).status.success?
     end
 
-    protected
-
-    attr_reader :builder
     attr_reader :repo
     attr_reader :name
     attr_reader :where_to_add
@@ -110,6 +103,10 @@ module Dapp
     attr_reader :owner
     attr_reader :group
     attr_reader :interlayer_period
+
+    protected
+
+    attr_reader :builder
     attr_reader :atomizer
 
     def lock_with_repo(&blk)
@@ -119,7 +116,7 @@ module Dapp
     end
 
     def create_and_add_archive
-      create_archive! unless archive_exists?
+      create_archive! unless archive_exist?
       add_archive
     end
 
@@ -221,7 +218,7 @@ module Dapp
       File.write archive_commitfile_path, repo_latest_commit
     end
 
-    def archive_exists?
+    def archive_exist?
       File.exist? archive_commitfile_path
     end
 
@@ -248,17 +245,18 @@ module Dapp
     def add_patch(filename, step:)
       builder.docker.add_artifact(build_path(filename), filename, '/tmp', step: step)
 
-      builder.docker.run [
+      builder.docker.run(
         "zcat /tmp/#{filename} | #{sudo}git apply --whitespace=nowarn --directory=#{where_to_add}",
-        "rm /tmp/#{filename}"
-      ], step: step
+        "rm /tmp/#{filename}",
+        step: step
+      )
     end
 
     def create_patch!(from, filename, commitfile_path)
       atomizer << build_path(filename)
       atomizer << commitfile_path
 
-      repo.git_bare "diff --binary #{from}..#{repo_latest_commit}#{" --relative=#{cwd}" if cwd} #{paths(true)} | gzip > #{build_path filename}"
+      repo.git_bare "diff --binary #{from}..#{repo_latest_commit}#{" --relative=#{cwd}" if cwd} -- #{paths(true)} | gzip > #{build_path filename}"
       File.write commitfile_path, repo_latest_commit
     end
 

data/lib/dapp/git_repo/base.rb

@@ -20,10 +20,6 @@ module Dapp
         build_path "#{name}.git"
       end
 
-      def git(command, **kwargs)
-        builder.shellout "git #{command}", **kwargs
-      end
-
       def git_bare(command, **kwargs)
         git "--git-dir=#{dir_path} #{command}", **kwargs
       end
@@ -36,15 +32,22 @@ module Dapp
         git_bare("rev-parse #{branch}").stdout.strip
       end
 
+      def exist_in_commit?(path, commit)
+        git_bare("cat-file -e #{commit}:#{path}", returns: [0, 128]).status.success?
+      end
+
       def cleanup!
-        lock do
-          FileUtils.rm_rf dir_path
-        end
       end
 
       def lock(**kwargs, &block)
         builder.filelock(build_path("#{name}.lock"), error_message: "Repository #{name} in use! Try again later.", **kwargs, &block)
       end
+
+      protected
+
+      def git(command, **kwargs)
+        builder.shellout "git #{command}", **kwargs
+      end
     end
   end
 end

data/lib/dapp/git_repo/chronicler.rb

@@ -29,6 +29,7 @@ module Dapp
       def cleanup!
         lock do
           super
+          FileUtils.rm_rf dir_path
           FileUtils.rm_rf chronodir_path
         end
       end

data/lib/dapp/git_repo/own.rb

@@ -0,0 +1,14 @@
+module Dapp
+  module GitRepo
+    # Own Git repo
+    class Own < Base
+      def initialize(builder, **kwargs)
+        super(builder, 'own', **kwargs)
+      end
+
+      def dir_path
+        @dir_path ||= git("-C #{builder.home_path} rev-parse --git-dir").stdout.strip
+      end
+    end
+  end
+end

data/lib/dapp/git_repo/remote.rb

@@ -28,6 +28,13 @@ module Dapp
         end
       end
 
+      def cleanup!
+        lock do
+          super
+          FileUtils.rm_rf dir_path
+        end
+      end
+
       protected
 
       attr_reader :url

data/lib/dapp/version.rb

@@ -1,3 +1,3 @@
 module Dapp
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -103,16 +103,30 @@ dependencies:
   name: test_construct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -177,16 +191,16 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 description: Build docker packaged apps using chef or shell
 email:
 - dmitry.stolyarov@flant.com
@@ -210,6 +224,7 @@ files:
 - lib/dapp/git_artifact.rb
 - lib/dapp/git_repo/base.rb
 - lib/dapp/git_repo/chronicler.rb
+- lib/dapp/git_repo/own.rb
 - lib/dapp/git_repo/remote.rb
 - lib/dapp/version.rb
 homepage: https://github.com/flant/dapp