dapp 0.7.36 → 0.8.0

data/lib/dapp/git_repo/own.rb

@@ -10,23 +10,27 @@ module Dapp
         dimg.project.local_git_artifact_exclude_paths
       end
 
-      def container_path
-        dimg.container_dapp_path('git_repo_own', "#{name}.git")
-      end
-
       def path
         @path ||= Rugged::Repository.discover(dimg.home_path.to_s).path
       rescue Rugged::RepositoryError => _e
         raise Error::Rugged, code: :local_git_repository_does_not_exist
       end
 
-      def latest_commit(branch = nil)
-        super(branch || 'HEAD')
+      def diff(from, to, **kwargs)
+        if to.nil?
+          git.lookup(from).diff_workdir
+        else
+          super
+        end
+      end
+
+      def latest_commit(_branch = nil)
+        git.head.target_id
       end
 
       def lookup_commit(commit)
         super
-      rescue Rugged::OdbError, TypeError => _e
+      rescue Rugged::OdbError => _e
         raise Error::Rugged, code: :commit_not_found_in_local_git_repository, data: { commit: commit }
       end
     end

data/lib/dapp/git_repo/remote.rb

@@ -9,66 +9,31 @@ module Dapp
 
         dimg.project.log_secondary_process(dimg.project.t(code: 'process.git_artifact_clone', data: { name: name }), short: true) do
           begin
-            Rugged::Repository.clone_at(url, path, bare: true, credentials: _rugged_credentials)
+            Rugged::Repository.clone_at(url, path, bare: true)
           rescue Rugged::NetworkError, Rugged::SslError => e
             raise Error::Rugged, code: :rugged_remote_error, data: { message: e.message, url: url }
           end
         end unless File.directory?(path)
       end
 
-      def _rugged_credentials
-        @_rugged_credentials ||= begin
-          ssh_url = begin
-            URI.parse(@url)
-            false
-          rescue URI::InvalidURIError
-            true
-          end
-
-          if ssh_url
-            host_with_user = @url.split(':', 2).first
-            username = host_with_user.split('@', 2).reverse.last
-            Rugged::Credentials::SshKeyFromAgent.new(username: username)
-          end
-        end
-      end
-
       def path
-        dimg.build_path('git_repo_remote', name, Digest::MD5.hexdigest(@url)).to_s
-      end
-
-      def container_path
-        dimg.container_tmp_path('git_repo_remote', name, Digest::MD5.hexdigest(@url)).to_s
-      end
-
-      def git_bare
-        @git_bare ||= Rugged::Repository.new(path, bare: true, credentials: _rugged_credentials)
+        dimg.build_path("#{name}.git").to_s
       end
 
       def fetch!(branch = nil)
         branch ||= self.branch
         dimg.project.log_secondary_process(dimg.project.t(code: 'process.git_artifact_fetch', data: { name: name }), short: true) do
-          git_bare.fetch('origin', [branch], credentials: _rugged_credentials)
-          raise Error::Rugged, code: :branch_not_exist_in_remote_git_repository, data: { branch: branch, url: url } unless branch_exist?(branch)
+          git.fetch('origin', [branch])
         end unless dimg.ignore_git_fetch || dimg.project.dry_run?
       end
 
-      def branch_exist?(name)
-        git_bare.branches.exist?(branch_format(name))
-      end
-
-      def latest_commit(name)
-        git_bare.ref("refs/remotes/#{branch_format(name)}").target_id
-      end
-
-      def cleanup!
-        super
-        FileUtils.rm_rf path
+      def latest_commit(branch)
+        git.ref("refs/remotes/origin/#{branch}").target_id
       end
 
       def lookup_commit(commit)
         super
-      rescue Rugged::OdbError, TypeError => _e
+      rescue Rugged::OdbError => _e
         raise Error::Rugged, code: :commit_not_found_in_remote_git_repository, data: { commit: commit, url: url }
       end
 
@@ -76,10 +41,8 @@ module Dapp
 
       attr_reader :url
 
-      private
-
-      def branch_format(name)
-        "origin/#{name.reverse.chomp('origin/'.reverse).reverse}"
+      def git
+        super(bare: true)
       end
     end
   end

data/lib/dapp/image/docker.rb

@@ -7,6 +7,10 @@ module Dapp
       attr_reader :name
       attr_reader :project
 
+      def self.image_by_name(name:, **kwargs)
+        (@images ||= {})[name] ||= new(name: name, **kwargs)
+      end
+
       def initialize(name:, project:, from: nil)
         @from = from
         @name = name
@@ -90,23 +94,17 @@ module Dapp
         def cache_reset(name = '')
           cache.delete(name)
           Project.shellout!("docker images --format='{{.Repository}}:{{.Tag}};{{.ID}};{{.CreatedAt}};{{.Size}}' --no-trunc #{name}").stdout.lines.each do |l|
-            name, id, created_at, size_field = l.split(';').map(&:strip)
+            name, id, created_at, size_field = l.split(';')
             size = begin
-              match = size_field.match(/^(\d+(\.\d+)?)\ ?(b|kb|mb|gb|tb)$/i)
-              raise Error::Build, code: :unsupported_docker_image_size_format, data: {value: size_field} unless match and match[1] and match[3]
-
-              number = match[1].to_f
-              unit = match[3].downcase
-
-              coef = case unit
-                     when 'b'  then 0
+              number, unit = size_field.split
+              coef = case unit.to_s.downcase
+                     when 'b'  then return number.to_f
                      when 'kb' then 1
                      when 'mb' then 2
                      when 'gb' then 3
                      when 'tb' then 4
                      end
-
-              number * (1000**coef)
+              number.to_f * (1000 ** coef)
             end
             cache[name] = { id: id, created_at: created_at, size: size }
           end

data/lib/dapp/image/stage.rb

@@ -29,7 +29,7 @@ module Dapp
       end
 
       def built?
-        !@built_id.nil?
+        !built_id.nil?
       end
 
       def export!(name)

data/lib/dapp/project/chef.rb

@@ -6,18 +6,13 @@ module Dapp
       def local_git_artifact_exclude_paths(&blk)
         super do |exclude_paths|
           exclude_paths << '.dapp_chef'
-          exclude_paths << '.chefinit'
 
           yield exclude_paths if block_given?
         end
       end
 
-      def local_cookbook_path
-        File.join(path, '.dapp_chef')
-      end
-
-      def chefinit_cookbook_path
-        File.join(path, '.chefinit')
+      def builder_cookbook_path
+        Pathname.new(path).join('.dapp_chef')
       end
     end # Chef
   end # Project

data/lib/dapp/project/command/stages/cleanup_local.rb

@@ -99,8 +99,7 @@ module Dapp
               project_images_detailed.each do |_, attrs|
                 attrs['Config']['Labels'].each do |repo_name, commit|
                   next if (repo = project_git_repositories[repo_name]).nil?
-                  git = repo.name == 'own' ? :git : :git_bare
-                  unproper_images_names.concat(image_hierarchy_by_id(attrs['Id'])) unless repo.send(git).exists?(commit)
+                  unproper_images_names.concat(image_hierarchy_by_id(attrs['Id'])) unless repo.commit_exists?(commit)
                 end
               end
               remove_images(unproper_images_names.uniq)

data/lib/dapp/project/command/stages/cleanup_repo.rb

@@ -73,8 +73,7 @@ module Dapp
               repo_project_dappstage_images_detailed(registry).each do |_, attrs|
                 attrs[:labels].each do |repo_name, commit|
                   next if (repo = project_git_repositories[repo_name]).nil?
-                  git = repo.name == 'own' ? :git : :git_bare
-                  unproper_images.concat(repo_image_tags_hierarchy(registry, attrs[:id])) unless repo.send(git).exists?(commit)
+                  unproper_images.concat(repo_image_tags_hierarchy(registry, attrs[:id])) unless repo.commit_exists?(commit)
                 end
               end
               remove_repo_images(registry, unproper_images.uniq)

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.36'.freeze
-  BUILD_CACHE_VERSION = '6.5'
+  VERSION = '0.8.0'.freeze
+  BUILD_CACHE_VERSION = 7
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.36
+  version: 0.8.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -401,7 +401,6 @@ files:
 - lib/dapp/build/stage/install/install.rb
 - lib/dapp/build/stage/mod/group.rb
 - lib/dapp/build/stage/mod/logging.rb
-- lib/dapp/build/stage/setup/chef_cookbooks.rb
 - lib/dapp/build/stage/setup/ga_post_setup_patch.rb
 - lib/dapp/build/stage/setup/ga_post_setup_patch_dependencies.rb
 - lib/dapp/build/stage/setup/ga_pre_setup_patch.rb
@@ -410,6 +409,7 @@ files:
 - lib/dapp/builder/base.rb
 - lib/dapp/builder/chef.rb
 - lib/dapp/builder/chef/berksfile.rb
+- lib/dapp/builder/chef/cookbook.rb
 - lib/dapp/builder/chef/cookbook_metadata.rb
 - lib/dapp/builder/chef/error.rb
 - lib/dapp/builder/none.rb
@@ -476,6 +476,7 @@ files:
 - lib/dapp/error/registry.rb
 - lib/dapp/error/rugged.rb
 - lib/dapp/error/shellout.rb
+- lib/dapp/error/tar_writer.rb
 - lib/dapp/exception/base.rb
 - lib/dapp/exception/introspect_image.rb
 - lib/dapp/exception/registry.rb

data/lib/dapp/build/stage/setup/chef_cookbooks.rb

@@ -1,36 +0,0 @@
-module Dapp
-  module Build
-    module Stage
-      module SetupGroup
-        # ChefCookbooks
-        class ChefCookbooks < Base
-          include Mod::Group
-
-          def initialize(dimg, next_stage)
-            @prev_stage = Setup.new(dimg, self)
-            super
-          end
-
-          def dependencies
-            [dimg.builder.chef_cookbooks_checksum]
-          end
-
-          def prepare_image
-            super
-            dimg.builder.chef_cookbooks(image)
-          end
-
-          protected
-
-          def should_not_be_detailed?
-            true
-          end
-
-          def ignore_log_commands?
-            true
-          end
-        end # ChefCookbooks
-      end
-    end # Stage
-  end # Build
-end # Dapp