dapp 0.8.0 → 0.9.0

data/lib/dapp/dimg/lock/base.rb

@@ -0,0 +1,51 @@
+module Dapp
+  module Dimg
+    module Lock
+      class Base
+        attr_reader :name
+
+        def initialize(name)
+          @name = name
+          @active_locks = 0
+        end
+
+        def lock(timeout: 60, on_wait: nil, readonly: false)
+          _do_lock(timeout, on_wait, readonly) unless @active_locks > 0
+          @active_locks += 1
+        end
+
+        def unlock
+          @active_locks -= 1
+          _do_unlock if @active_locks.zero?
+        end
+
+        def synchronize(*args)
+          lock(*args)
+          begin
+            yield if block_given?
+          ensure
+            unlock
+          end
+        end
+
+        protected
+
+        def _do_lock(_timeout, _on_wait, _readonly)
+          raise
+        end
+
+        def _do_unlock
+          raise
+        end
+
+        def _waiting(timeout, on_wait, &blk)
+          if on_wait
+            on_wait.call { ::Timeout.timeout(timeout, &blk) }
+          else
+            ::Timeout.timeout(timeout, &blk)
+          end
+        end
+      end # Base
+    end # Lock
+  end
+end # Dapp

data/lib/dapp/dimg/lock/file.rb

@@ -0,0 +1,48 @@
+module Dapp
+  module Dimg
+    module Lock
+      class File < Base
+        class << self
+          attr_writer :counter
+
+          def counter
+            @counter ||= 0
+          end
+        end # << self
+
+        attr_reader :lock_path
+
+        def initialize(lock_path, name)
+          super(name)
+
+          @lock_path = Pathname.new(lock_path).tap(&:mkpath)
+        end
+
+        protected
+
+        def lock_file_path
+          lock_path.join(name.slice(0, 32))
+        end
+
+        def _do_lock(timeout, on_wait, readonly)
+          @file = ::File.open(lock_file_path, ::File::RDWR | ::File::CREAT, 0o644)
+
+          begin
+            mode = (readonly ? ::File::LOCK_SH : ::File::LOCK_EX)
+            _waiting(timeout, on_wait) { @file.flock(mode) } unless @file.flock(mode | ::File::LOCK_NB)
+          rescue ::Timeout::Error
+            raise ::Dapp::Dimg::Error::Lock, code: :timeout, data: { name: name, timeout: timeout }
+          end
+
+          self.class.counter += 1
+        end
+
+        def _do_unlock
+          @file.close
+          @file = nil
+          self.class.counter -= 1
+        end
+      end # File
+    end # Lock
+  end
+end # Dapp

data/lib/dapp/error/base.rb

@@ -1,6 +1,5 @@
 module Dapp
   module Error
-    # Base
     class Base < NetStatus::Exception
       def initialize(net_status = {})
         super({ context: self.class.to_s.split('::').last.downcase }.merge(net_status))

data/lib/dapp/error/dapp.rb

@@ -0,0 +1,5 @@
+module Dapp
+  module Error
+    class Dapp < Base; end
+  end
+end

data/lib/dapp/error/dappfile.rb

@@ -1,6 +1,5 @@
 module Dapp
   module Error
-    # Dappfile
     class Dappfile < Base; end
   end
 end

data/lib/dapp/error/shellout.rb

@@ -1,6 +1,5 @@
 module Dapp
   module Error
-    # Shellout
     class Shellout < Base; end
   end
 end

data/lib/dapp/exception/base.rb

@@ -1,6 +1,5 @@
 module Dapp
   module Exception
-    # Base
     class Base < Error::Base; end
   end
 end

data/lib/dapp/helper/cli.rb

@@ -1,6 +1,5 @@
 module Dapp
   module Helper
-    # Cli
     module Cli
       def parse_options(cli, argv)
         cli_wrapper(cli) do
@@ -24,7 +23,6 @@ module Dapp
         arg
       end
 
-      # rubocop:disable Metrics/MethodLength
       def parse_subcommand(cli, args)
         argv = args
         divided_subcommand = []
@@ -46,21 +44,22 @@ module Dapp
 
         [argv, divided_subcommand, subcommand_argv]
       end
-      # rubocop:enable Metrics/MethodLength
 
       def run_subcommand(cli, divided_subcommand, subcommand_argv)
         if !divided_subcommand.empty?
           cli.class.const_get(prepare_subcommand(divided_subcommand)).new.run(subcommand_argv)
         else
-          STDERR.puts 'Error: subcommand not passed'
-          puts
           puts cli.opt_parser
           exit 1
         end
       end
 
       def prepare_subcommand(divided_subcommand)
-        Array(divided_subcommand).map(&:capitalize).join
+        Array(divided_subcommand)
+          .map { |c| c.split(/[-_]/) }
+          .flatten
+          .map(&:capitalize)
+          .join
       end
 
       def composite_options(opt)

data/lib/dapp/helper/net_status.rb

@@ -1,6 +1,5 @@
 module Dapp
   module Helper
-    # NetStatus
     module NetStatus
       def self.message(exception)
         net_status = exception.net_status.net_status_normalize(context: exception.net_status.delete(:context))

data/lib/dapp/helper/sha256.rb

@@ -1,6 +1,5 @@
 module Dapp
   module Helper
-    # Sha256
     module Sha256
       def hashsum(arg)
         sha256(arg)

data/lib/dapp/helper/trivia.rb

@@ -1,6 +1,5 @@
 module Dapp
   module Helper
-    # Trivia
     module Trivia
       def kwargs(args)
         args.last.is_a?(Hash) ? args.pop : {}

data/lib/dapp/prctl.rb

@@ -1,4 +1,3 @@
-# Prctl
 module Prctl
   PR_SET_PDEATHSIG = 1
 

data/lib/dapp/version.rb

@@ -1,5 +1,4 @@
-# Version
 module Dapp
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.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.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -362,6 +362,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.47.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.47.0
 description: Build docker packaged apps using chef or shell
 email:
 - dmitry.stolyarov@flant.com
@@ -374,161 +388,179 @@ files:
 - config/en/common.yml
 - config/en/net_status.yml
 - lib/dapp.rb
-- lib/dapp/artifact.rb
-- lib/dapp/build/stage/after_install_artifact.rb
-- lib/dapp/build/stage/after_setup_artifact.rb
-- lib/dapp/build/stage/artifact_base.rb
-- lib/dapp/build/stage/artifact_default.rb
-- lib/dapp/build/stage/base.rb
-- lib/dapp/build/stage/before_install.rb
-- lib/dapp/build/stage/before_install_artifact.rb
-- lib/dapp/build/stage/before_setup.rb
-- lib/dapp/build/stage/before_setup_artifact.rb
-- lib/dapp/build/stage/build_artifact.rb
-- lib/dapp/build/stage/docker_instructions.rb
-- lib/dapp/build/stage/from.rb
-- lib/dapp/build/stage/ga_archive.rb
-- lib/dapp/build/stage/ga_archive_dependencies.rb
-- lib/dapp/build/stage/ga_artifact_patch.rb
-- lib/dapp/build/stage/ga_base.rb
-- lib/dapp/build/stage/ga_dependencies_base.rb
-- lib/dapp/build/stage/ga_latest_patch.rb
-- lib/dapp/build/stage/import_artifact.rb
-- lib/dapp/build/stage/install/ga_post_install_patch.rb
-- lib/dapp/build/stage/install/ga_post_install_patch_dependencies.rb
-- lib/dapp/build/stage/install/ga_pre_install_patch.rb
-- lib/dapp/build/stage/install/ga_pre_install_patch_dependencies.rb
-- 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/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
-- lib/dapp/build/stage/setup/ga_pre_setup_patch_dependencies.rb
-- lib/dapp/build/stage/setup/setup.rb
-- 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
-- lib/dapp/builder/shell.rb
 - lib/dapp/cli.rb
 - lib/dapp/cli/base.rb
-- lib/dapp/cli/bp.rb
-- lib/dapp/cli/build.rb
-- lib/dapp/cli/cleanup.rb
-- lib/dapp/cli/list.rb
-- lib/dapp/cli/mrproper.rb
-- lib/dapp/cli/push.rb
-- lib/dapp/cli/run.rb
-- lib/dapp/cli/spush.rb
-- lib/dapp/cli/stage_image.rb
-- lib/dapp/cli/stages.rb
-- lib/dapp/cli/stages/cleanup_local.rb
-- lib/dapp/cli/stages/cleanup_repo.rb
-- lib/dapp/cli/stages/flush_local.rb
-- lib/dapp/cli/stages/flush_repo.rb
-- lib/dapp/cli/stages/pull.rb
-- lib/dapp/cli/stages/push.rb
-- lib/dapp/cli/tag.rb
-- lib/dapp/config/artifact_dimg.rb
-- lib/dapp/config/artifact_group.rb
 - lib/dapp/config/base.rb
-- lib/dapp/config/dimg.rb
-- lib/dapp/config/dimg/instance_methods.rb
-- lib/dapp/config/dimg/validation.rb
-- lib/dapp/config/dimg_group.rb
-- lib/dapp/config/dimg_group_base.rb
-- lib/dapp/config/dimg_group_main.rb
-- lib/dapp/config/directive/artifact.rb
-- lib/dapp/config/directive/artifact_base.rb
 - lib/dapp/config/directive/base.rb
-- lib/dapp/config/directive/chef.rb
-- lib/dapp/config/directive/docker/artifact.rb
-- lib/dapp/config/directive/docker/base.rb
-- lib/dapp/config/directive/docker/dimg.rb
-- lib/dapp/config/directive/git_artifact_local.rb
-- lib/dapp/config/directive/git_artifact_remote.rb
-- lib/dapp/config/directive/mount.rb
-- lib/dapp/config/directive/shell/artifact.rb
-- lib/dapp/config/directive/shell/dimg.rb
+- lib/dapp/config/error/config.rb
 - lib/dapp/core_ext/hash.rb
 - lib/dapp/core_ext/pathname.rb
+- lib/dapp/dapp.rb
+- lib/dapp/dapp/chef.rb
+- lib/dapp/dapp/dappfile.rb
+- lib/dapp/dapp/deps/base.rb
+- lib/dapp/dapp/deps/gitartifact.rb
+- lib/dapp/dapp/git_artifact.rb
+- lib/dapp/dapp/lock.rb
+- lib/dapp/dapp/logging/base.rb
+- lib/dapp/dapp/logging/i18n.rb
+- lib/dapp/dapp/logging/paint.rb
+- lib/dapp/dapp/logging/process.rb
+- lib/dapp/dapp/shellout/base.rb
+- lib/dapp/dapp/shellout/streaming.rb
+- lib/dapp/dapp/ssh_agent.rb
 - lib/dapp/dimg.rb
+- lib/dapp/dimg/artifact.rb
+- lib/dapp/dimg/build/stage/after_install_artifact.rb
+- lib/dapp/dimg/build/stage/after_setup_artifact.rb
+- lib/dapp/dimg/build/stage/artifact_base.rb
+- lib/dapp/dimg/build/stage/artifact_default.rb
+- lib/dapp/dimg/build/stage/base.rb
+- lib/dapp/dimg/build/stage/before_install.rb
+- lib/dapp/dimg/build/stage/before_install_artifact.rb
+- lib/dapp/dimg/build/stage/before_setup.rb
+- lib/dapp/dimg/build/stage/before_setup_artifact.rb
+- lib/dapp/dimg/build/stage/build_artifact.rb
+- lib/dapp/dimg/build/stage/docker_instructions.rb
+- lib/dapp/dimg/build/stage/from.rb
+- lib/dapp/dimg/build/stage/ga_archive.rb
+- lib/dapp/dimg/build/stage/ga_archive_dependencies.rb
+- lib/dapp/dimg/build/stage/ga_artifact_patch.rb
+- lib/dapp/dimg/build/stage/ga_base.rb
+- lib/dapp/dimg/build/stage/ga_dependencies_base.rb
+- lib/dapp/dimg/build/stage/ga_latest_patch.rb
+- lib/dapp/dimg/build/stage/import_artifact.rb
+- lib/dapp/dimg/build/stage/install/ga_post_install_patch.rb
+- lib/dapp/dimg/build/stage/install/ga_post_install_patch_dependencies.rb
+- lib/dapp/dimg/build/stage/install/ga_pre_install_patch.rb
+- lib/dapp/dimg/build/stage/install/ga_pre_install_patch_dependencies.rb
+- lib/dapp/dimg/build/stage/install/install.rb
+- lib/dapp/dimg/build/stage/mod/group.rb
+- lib/dapp/dimg/build/stage/mod/logging.rb
+- lib/dapp/dimg/build/stage/setup/ga_post_setup_patch.rb
+- lib/dapp/dimg/build/stage/setup/ga_post_setup_patch_dependencies.rb
+- lib/dapp/dimg/build/stage/setup/ga_pre_setup_patch.rb
+- lib/dapp/dimg/build/stage/setup/ga_pre_setup_patch_dependencies.rb
+- lib/dapp/dimg/build/stage/setup/setup.rb
+- lib/dapp/dimg/builder.rb
+- lib/dapp/dimg/builder/base.rb
+- lib/dapp/dimg/builder/chef.rb
+- lib/dapp/dimg/builder/chef/berksfile.rb
+- lib/dapp/dimg/builder/chef/cookbook.rb
+- lib/dapp/dimg/builder/chef/cookbook_metadata.rb
+- lib/dapp/dimg/builder/none.rb
+- lib/dapp/dimg/builder/shell.rb
+- lib/dapp/dimg/cli/base.rb
+- lib/dapp/dimg/cli/bp.rb
+- lib/dapp/dimg/cli/build.rb
+- lib/dapp/dimg/cli/build_context.rb
+- lib/dapp/dimg/cli/build_context/export.rb
+- lib/dapp/dimg/cli/build_context/import.rb
+- lib/dapp/dimg/cli/cleanup.rb
+- lib/dapp/dimg/cli/cli.rb
+- lib/dapp/dimg/cli/dimg.rb
+- lib/dapp/dimg/cli/list.rb
+- lib/dapp/dimg/cli/mrproper.rb
+- lib/dapp/dimg/cli/push.rb
+- lib/dapp/dimg/cli/run.rb
+- lib/dapp/dimg/cli/spush.rb
+- lib/dapp/dimg/cli/stage_image.rb
+- lib/dapp/dimg/cli/stages.rb
+- lib/dapp/dimg/cli/stages/cleanup_local.rb
+- lib/dapp/dimg/cli/stages/cleanup_repo.rb
+- lib/dapp/dimg/cli/stages/flush_local.rb
+- lib/dapp/dimg/cli/stages/flush_repo.rb
+- lib/dapp/dimg/cli/stages/pull.rb
+- lib/dapp/dimg/cli/stages/push.rb
+- lib/dapp/dimg/cli/tag.rb
+- lib/dapp/dimg/config/artifact_dimg.rb
+- lib/dapp/dimg/config/artifact_group.rb
+- lib/dapp/dimg/config/base.rb
+- lib/dapp/dimg/config/dimg.rb
+- lib/dapp/dimg/config/dimg/instance_methods.rb
+- lib/dapp/dimg/config/dimg/validation.rb
+- lib/dapp/dimg/config/dimg_group.rb
+- lib/dapp/dimg/config/dimg_group_base.rb
+- lib/dapp/dimg/config/dimg_group_main.rb
+- lib/dapp/dimg/config/directive/artifact.rb
+- lib/dapp/dimg/config/directive/artifact_base.rb
+- lib/dapp/dimg/config/directive/base.rb
+- lib/dapp/dimg/config/directive/chef.rb
+- lib/dapp/dimg/config/directive/docker/artifact.rb
+- lib/dapp/dimg/config/directive/docker/base.rb
+- lib/dapp/dimg/config/directive/docker/dimg.rb
+- lib/dapp/dimg/config/directive/git_artifact_local.rb
+- lib/dapp/dimg/config/directive/git_artifact_remote.rb
+- lib/dapp/dimg/config/directive/mount.rb
+- lib/dapp/dimg/config/directive/shell/artifact.rb
+- lib/dapp/dimg/config/directive/shell/dimg.rb
+- lib/dapp/dimg/dapp/command.rb
+- lib/dapp/dimg/dapp/command/bp.rb
+- lib/dapp/dimg/dapp/command/build.rb
+- lib/dapp/dimg/dapp/command/build_context/common.rb
+- lib/dapp/dimg/dapp/command/build_context/export.rb
+- lib/dapp/dimg/dapp/command/build_context/import.rb
+- lib/dapp/dimg/dapp/command/cleanup.rb
+- lib/dapp/dimg/dapp/command/common.rb
+- lib/dapp/dimg/dapp/command/list.rb
+- lib/dapp/dimg/dapp/command/mrproper.rb
+- lib/dapp/dimg/dapp/command/push.rb
+- lib/dapp/dimg/dapp/command/run.rb
+- lib/dapp/dimg/dapp/command/spush.rb
+- lib/dapp/dimg/dapp/command/stage_image.rb
+- lib/dapp/dimg/dapp/command/stages/cleanup_local.rb
+- lib/dapp/dimg/dapp/command/stages/cleanup_repo.rb
+- lib/dapp/dimg/dapp/command/stages/common.rb
+- lib/dapp/dimg/dapp/command/stages/flush_local.rb
+- lib/dapp/dimg/dapp/command/stages/flush_repo.rb
+- lib/dapp/dimg/dapp/command/stages/pull.rb
+- lib/dapp/dimg/dapp/command/stages/push.rb
+- lib/dapp/dimg/dapp/command/tag.rb
+- lib/dapp/dimg/dimg.rb
+- lib/dapp/dimg/dimg/git_artifact.rb
+- lib/dapp/dimg/dimg/path.rb
+- lib/dapp/dimg/dimg/stages.rb
+- lib/dapp/dimg/dimg/tags.rb
+- lib/dapp/dimg/docker_registry.rb
+- lib/dapp/dimg/docker_registry/base.rb
+- lib/dapp/dimg/docker_registry/base/authorization.rb
+- lib/dapp/dimg/docker_registry/base/request.rb
+- lib/dapp/dimg/docker_registry/default.rb
+- lib/dapp/dimg/error/base.rb
+- lib/dapp/dimg/error/build.rb
+- lib/dapp/dimg/error/chef.rb
+- lib/dapp/dimg/error/command.rb
+- lib/dapp/dimg/error/config.rb
+- lib/dapp/dimg/error/dimg.rb
+- lib/dapp/dimg/error/lock.rb
+- lib/dapp/dimg/error/registry.rb
+- lib/dapp/dimg/error/rugged.rb
+- lib/dapp/dimg/error/shellout.rb
+- lib/dapp/dimg/error/tar_writer.rb
+- lib/dapp/dimg/exception/base.rb
+- lib/dapp/dimg/exception/introspect_image.rb
+- lib/dapp/dimg/exception/registry.rb
+- lib/dapp/dimg/filelock.rb
 - lib/dapp/dimg/git_artifact.rb
-- lib/dapp/dimg/path.rb
-- lib/dapp/dimg/stages.rb
-- lib/dapp/dimg/tags.rb
-- lib/dapp/docker_registry.rb
-- lib/dapp/docker_registry/base.rb
-- lib/dapp/docker_registry/default.rb
-- lib/dapp/docker_registry/mod/authorization.rb
-- lib/dapp/docker_registry/mod/request.rb
+- lib/dapp/dimg/git_repo/base.rb
+- lib/dapp/dimg/git_repo/own.rb
+- lib/dapp/dimg/git_repo/remote.rb
+- lib/dapp/dimg/image/argument.rb
+- lib/dapp/dimg/image/docker.rb
+- lib/dapp/dimg/image/scratch.rb
+- lib/dapp/dimg/image/stage.rb
+- lib/dapp/dimg/lock/base.rb
+- lib/dapp/dimg/lock/file.rb
 - lib/dapp/error/base.rb
-- lib/dapp/error/build.rb
-- lib/dapp/error/config.rb
+- lib/dapp/error/dapp.rb
 - lib/dapp/error/dappfile.rb
-- lib/dapp/error/dimg.rb
-- lib/dapp/error/image.rb
-- lib/dapp/error/project.rb
-- 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
-- lib/dapp/filelock.rb
-- lib/dapp/git_artifact.rb
-- lib/dapp/git_repo/base.rb
-- lib/dapp/git_repo/own.rb
-- lib/dapp/git_repo/remote.rb
 - lib/dapp/helper/cli.rb
 - lib/dapp/helper/net_status.rb
 - lib/dapp/helper/sha256.rb
 - lib/dapp/helper/trivia.rb
-- lib/dapp/image/argument.rb
-- lib/dapp/image/docker.rb
-- lib/dapp/image/scratch.rb
-- lib/dapp/image/stage.rb
-- lib/dapp/lock/base.rb
-- lib/dapp/lock/error.rb
-- lib/dapp/lock/file.rb
 - lib/dapp/prctl.rb
-- lib/dapp/project.rb
-- lib/dapp/project/chef.rb
-- lib/dapp/project/command/bp.rb
-- lib/dapp/project/command/build.rb
-- lib/dapp/project/command/cleanup.rb
-- lib/dapp/project/command/common.rb
-- lib/dapp/project/command/list.rb
-- lib/dapp/project/command/mrproper.rb
-- lib/dapp/project/command/push.rb
-- lib/dapp/project/command/run.rb
-- lib/dapp/project/command/spush.rb
-- lib/dapp/project/command/stage_image.rb
-- lib/dapp/project/command/stages/cleanup_local.rb
-- lib/dapp/project/command/stages/cleanup_repo.rb
-- lib/dapp/project/command/stages/common.rb
-- lib/dapp/project/command/stages/flush_local.rb
-- lib/dapp/project/command/stages/flush_repo.rb
-- lib/dapp/project/command/stages/pull.rb
-- lib/dapp/project/command/stages/push.rb
-- lib/dapp/project/command/tag.rb
-- lib/dapp/project/dappfile.rb
-- lib/dapp/project/deps/base.rb
-- lib/dapp/project/deps/gitartifact.rb
-- lib/dapp/project/git_artifact.rb
-- lib/dapp/project/lock.rb
-- lib/dapp/project/logging/base.rb
-- lib/dapp/project/logging/i18n.rb
-- lib/dapp/project/logging/paint.rb
-- lib/dapp/project/logging/process.rb
-- lib/dapp/project/shellout/base.rb
-- lib/dapp/project/shellout/streaming.rb
-- lib/dapp/project/ssh_agent.rb
 - lib/dapp/version.rb
 homepage: https://github.com/flant/dapp
 licenses: