dapp 0.3.5 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODBkZDRmN2Q3YzM1NjY3MmEyZTY3MWJjY2Y3N2JmZTQxMDZlNTI0ZQ==
+    NWNiMTY4M2E2ZmM1YzcyNWVjNTRjNGFiNmM2NTBjMTQ5YWEwZjAxYQ==
   data.tar.gz: !binary |-
-    ZmMzN2RhNmM1YTg3NTExMzZjNmViZjJkOWZmMGQ0YWM5NDM2MjhkYg==
+    N2MyY2M5MWZlN2UzYmU5NWI5OGFkMjEzYTI4MDE5N2E5Y2JmNGVjMA==
 SHA512:
   metadata.gz: !binary |-
-    YTU4OWJkNTk2YmE1MDBhNTJhMjI4MGNhMzM5YmRiYzIyYTA5Yzk5ZjRiOGJi
-    ZmI2YTVmOWM1NDUxMWE4YmZiYzc0MTM4Y2QzNjg2ODNhMTM3OWNiYzk5ZTQy
-    N2I4NmFiMzBmNmQxNGI5M2YwZTBlZDkwZWY0NTAwZjhmYjc4MzM=
+    Yjk5ZjAzNzg3ZTIyOTBhMjhjMWY5YTM0ZTNhYTQ4MzMwNDkwNTAyOGI3ZWQ2
+    MzA1MDY4YTQ5YzUyNDgwYzQ1NGRhY2I4NjUzMGM5NTE5Y2ZjMTdjMjE4YjJj
+    ZmVmMGYyZjkxYWQwZDIxYzRmZDQxNDRlOTNjY2EzMzFjMjBmM2E=
   data.tar.gz: !binary |-
-    NWUyMDk0YzlhZDU0YWM3YTY1N2VkZWZiYjUxNWY3MDRhMDlkZmNiYjMxNDdh
-    ODc0MGNiMjkyODQzMDUyNTBhYWIwYWNiNGU2MzkzNGQ5ZGU3OTVmMzkyZTQy
-    MjJjZDg5MjE0ZjIzMzRhNzlmMWYzOTNkOWM4OWZkMDdmZDc2NTA=
+    MWY4ZjJiNzY0MzU3OGYzYWEzMWEwZDUzOWQxOGU4YTM2YmM4MGY2YjA4OWEx
+    Y2U2ZWU4MzU5MWQwNTA0OTliNjhiMWE5Y2EzNDUzNGQ4N2MwMGEwMDBjZjNl
+    ZTMyMjE4ZmJiZTNmMGY2YWRlZGVjMGFkM2JiYjExYjRmNjMxOTU=

data/lib/dapp.rb

@@ -31,7 +31,8 @@ require 'dapp/cli/build'
 require 'dapp/cli/push'
 require 'dapp/cli/smartpush'
 require 'dapp/cli/list'
-require 'dapp/cli/stages'
+require 'dapp/cli/metadata'
+require 'dapp/cli/metadata/flush'
 require 'dapp/cli/stages/flush'
 require 'dapp/cli/stages/cleanup'
 require 'dapp/cli/run'
@@ -55,8 +56,8 @@ require 'dapp/build/stage/source_base'
 require 'dapp/build/stage/from'
 require 'dapp/build/stage/infra_install'
 require 'dapp/build/stage/infra_setup'
-require 'dapp/build/stage/app_install'
-require 'dapp/build/stage/app_setup'
+require 'dapp/build/stage/install'
+require 'dapp/build/stage/setup'
 require 'dapp/build/stage/chef_cookbooks'
 require 'dapp/build/stage/source_1_archive'
 require 'dapp/build/stage/source_1'
@@ -70,7 +71,7 @@ require 'dapp/application/logging'
 require 'dapp/application/path'
 require 'dapp/application/tags'
 require 'dapp/application'
-require 'dapp/image/arguments'
+require 'dapp/image/argument'
 require 'dapp/image/docker'
 require 'dapp/image/stage'
 require 'dapp/git_repo/base'

data/lib/dapp/application.rb

@@ -16,6 +16,9 @@ module Dapp
     attr_reader :ignore_git_fetch
     attr_reader :is_artifact
 
+    STAGES = [:from, :infra_install, :source_1_archive, :source_1, :install, :source_2,
+              :infra_setup, :source_3, :chef_cookbooks, :setup, :source_4, :source_5].freeze
+
     def initialize(config:, cli_options:, ignore_git_fetch: false, is_artifact: false)
       @config = config
       @cli_options = cli_options

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

@@ -4,7 +4,7 @@ module Dapp
       # ChefCookbooks
       class ChefCookbooks < Base
         def initialize(application, next_stage)
-          @prev_stage = AppSetup.new(application, self)
+          @prev_stage = Setup.new(application, self)
           super
         end
 

data/lib/dapp/build/stage/{app_install.rb → install.rb}

@@ -1,8 +1,8 @@
 module Dapp
   module Build
     module Stage
-      # AppInstall
-      class AppInstall < Base
+      # Install
+      class Install < Base
         def initialize(application, next_stage)
           @prev_stage = Source1.new(application, self)
           super
@@ -10,10 +10,10 @@ module Dapp
 
         def image
           super do |image|
-            application.builder.app_install(image)
+            application.builder.install(image)
           end
         end
-      end # AppInstall
+      end # Install
     end # Stage
   end # Build
 end # Dapp

data/lib/dapp/build/stage/{app_setup.rb → setup.rb}

@@ -1,8 +1,8 @@
 module Dapp
   module Build
     module Stage
-      # AppSetup
-      class AppSetup < Base
+      # Setup
+      class Setup < Base
         def initialize(application, next_stage)
           @prev_stage = Source3.new(application, self)
           super
@@ -10,10 +10,10 @@ module Dapp
 
         def image
           super do |image|
-            application.builder.app_setup(image)
+            application.builder.setup(image)
           end
         end
-      end # AppSetup
+      end # Setup
     end # Stage
   end # Build
 end # Dapp

data/lib/dapp/build/stage/source_1.rb

@@ -16,14 +16,14 @@ module Dapp
 
         def dependencies_checksum
           hashsum [super,
-                   app_install_files_checksum,
-                   *application.builder.app_install_checksum]
+                   install_dependencies_files_checksum,
+                   *application.builder.install_checksum]
         end
 
         private
 
-        def app_install_files_checksum
-          @app_install_files_checksum ||= dependency_files_checksum(application.config._app_install_dependencies)
+        def install_dependencies_files_checksum
+          @install_dependencies_files_checksum ||= dependencies_files_checksum(application.config._install_dependencies)
         end
       end # Source1
     end # Stage

data/lib/dapp/build/stage/source_2.rb

@@ -4,7 +4,7 @@ module Dapp
       # Source2
       class Source2 < SourceBase
         def initialize(application, next_stage)
-          @prev_stage = AppInstall.new(application, self)
+          @prev_stage = Install.new(application, self)
           super
         end
 

data/lib/dapp/build/stage/source_3.rb

@@ -12,14 +12,14 @@ module Dapp
 
         def dependencies_checksum
           hashsum [super,
-                   app_setup_files_checksum,
-                   *application.builder.app_setup_checksum]
+                   setup_dependencies_files_checksum,
+                   *application.builder.setup_checksum]
         end
 
         private
 
-        def app_setup_files_checksum
-          @app_setup_files_checksum ||= dependency_files_checksum(application.config._app_setup_dependencies)
+        def setup_dependencies_files_checksum
+          @setup_files_checksum ||= dependencies_files_checksum(application.config._setup_dependencies)
         end
       end # Source3
     end # Stage

data/lib/dapp/build/stage/source_base.rb

@@ -97,7 +97,7 @@ module Dapp
           application.metadata_path git_artifact.filename ".#{name}.#{git_artifact.paramshash}.#{dependencies_checksum}.commit"
         end
 
-        def dependency_files_checksum(regs)
+        def dependencies_files_checksum(regs)
           hashsum(regs.map { |reg| Dir[File.join(application.home_path, reg)].map { |f| File.read(f) if File.file?(f) } })
         end
 

data/lib/dapp/builder/base.rb

@@ -24,19 +24,19 @@ module Dapp
         raise
       end
 
-      def app_install(_image)
+      def install(_image)
         raise
       end
 
-      def app_install_checksum
+      def install_checksum
         raise
       end
 
-      def app_setup(_image)
+      def setup(_image)
         raise
       end
 
-      def app_setup_checksum
+      def setup_checksum
         raise
       end
     end # Base

data/lib/dapp/builder/chef.rb

@@ -11,7 +11,7 @@ module Dapp
 
       DEFAULT_CHEFDK_IMAGE = 'dappdeps/chefdk:0.17.3-1'.freeze # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
 
-      [:infra_install, :infra_setup, :app_install, :app_setup].each do |stage|
+      [:infra_install, :infra_setup, :install, :setup].each do |stage|
         define_method(:"#{stage}_checksum") { stage_cookbooks_checksum(stage) }
 
         define_method(:"#{stage}") do |image|
@@ -160,12 +160,9 @@ module Dapp
             ['if [ "$LOCKDIFF" != "" ] ; then ',
              'cp -a /tmp/Berksfile.lock.orig Berksfile.lock ; ',
              'echo -e "Bad Berksfile.lock\n$LOCKDIFF" 1>&2 ; exit 1 ; fi'].join,
-            ["find /tmp/vendored_cookbooks -type d -exec bash -ec '",
-             "install -o #{Process.uid} -g #{Process.gid} --mode $(stat -c %a {}) -d ",
-             "#{_cookbooks_vendor_path}/$(echo {} | sed -e \"s/^\\/tmp\\/vendored_cookbooks//\")' \\;"].join,
             ["find /tmp/vendored_cookbooks -type f -exec bash -ec '",
-             "install -o #{Process.uid} -g #{Process.gid} --mode $(stat -c %a {}) {} ",
-             "#{_cookbooks_vendor_path}/$(echo {} | sed -e \"s/\\/tmp\\/vendored_cookbooks//\")' \\;"].join
+             "install -D -o #{Process.uid} -g #{Process.gid} --mode $(stat -c %a {}) {} ",
+             "#{_cookbooks_vendor_path}/$(echo {} | sed -e \"s/\\/tmp\\/vendored_cookbooks\\///g\")' \\;"].join
           ]
 
           application.shellout!(

data/lib/dapp/builder/chef/cookbook_metadata.rb

@@ -18,7 +18,7 @@ module Dapp
             @cookbook_metadata.version = version
           end
 
-          def depends(dependency, *_a, &_blk)
+          def depends(dependency)
             @cookbook_metadata.depends << dependency
           end
 

data/lib/dapp/builder/shell.rb

@@ -2,7 +2,7 @@ module Dapp
   module Builder
     # Shell
     class Shell < Base
-      [:infra_install, :infra_setup, :app_install, :app_setup].each do |m|
+      [:infra_install, :infra_setup, :install, :setup].each do |m|
         define_method(:"#{m}_checksum") do
           [application.config._shell.public_send("_#{m}"),
            application.config._shell.public_send("_#{m}_cache_version")].flatten

data/lib/dapp/cli.rb

@@ -7,7 +7,7 @@ module Dapp
     include Mixlib::CLI
     include Helper::Trivia
 
-    SUBCOMMANDS = %w(build smartpush push list run stages).freeze
+    SUBCOMMANDS = %w(build smartpush push list run stages metadata).freeze
 
     banner <<BANNER.freeze
 Usage: dapp [options] sub-command [sub-command options]
@@ -20,6 +20,7 @@ dapp smartpush [options] [PATTERN ...] REPOPREFIX
 dapp list [options] [PATTERN ...]
 dapp run [options] [PATTERN] [DOCKER ARGS]
 dapp stages
+dapp metadata
 
 Options:
 BANNER

data/lib/dapp/cli/build.rb

@@ -16,7 +16,6 @@ Usage:
 
 Options:
 BANNER
-
       option :tmp_dir_prefix,
              long: '--tmp-dir-prefix PREFIX',
              description: 'Tmp directory prefix'
@@ -42,16 +41,18 @@ BANNER
       option :introspect_stage,
              long: '--introspect-stage STAGE',
              proc: proc { |v| v.to_sym },
-             in: [nil, :from, :infra_install, :source_1_archive, :source_1, :app_install,
-                  :source_2, :infra_setup, :source_3, :app_setup, :source_4, :source_5]
+             in: [nil, :from, :infra_install, :source_1_archive, :source_1, :install, :source_2,
+                  :infra_setup, :source_3, :chef_cookbooks, :setup, :source_4, :source_5]
 
       def run(*args)
         super
       rescue Exception::IntrospectImage => e
         $stderr.puts(e.net_status[:message])
         data = e.net_status[:data]
-        system("docker run -ti --rm #{data[:options]} #{data[:built_id]} bash") || raise(RuntimeError)
-        shellout("docker rmi #{data[:built_id]}") if data[:rmi]
+        system("docker run -ti --rm #{data[:options]} #{data[:built_id]} bash").tap do |res|
+          shellout("docker rmi #{data[:built_id]}") if data[:rmi]
+          res || raise(Dapp::Error::Application, code: :application_not_run)
+        end
       end
     end
   end

data/lib/dapp/cli/metadata.rb

@@ -0,0 +1,18 @@
+require 'mixlib/cli'
+
+module Dapp
+  class CLI
+    # CLI metadata subcommand
+    class Metadata < CLI
+      SUBCOMMANDS = %w(flush).freeze
+
+      banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Available subcommands: (for details, dapp SUB-COMMAND --help)
+
+dapp metadata flush
+BANNER
+    end
+  end
+end

data/lib/dapp/cli/metadata/flush.rb

@@ -0,0 +1,22 @@
+require 'mixlib/cli'
+
+module Dapp
+  class CLI
+    class Metadata
+      # Metadata flush subcommand
+      class Flush < Base
+        banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp metadata flush
+Options:
+BANNER
+        def run(argv = ARGV)
+          self.class.parse_options(self, argv)
+          Controller.new(cli_options: config, patterns: cli_arguments).metadata_flush
+        end
+      end
+    end
+  end
+end

data/lib/dapp/cli/stages.rb

@@ -2,7 +2,7 @@ require 'mixlib/cli'
 
 module Dapp
   class CLI
-    # CLI flush subcommand
+    # CLI stages subcommand
     class Stages < CLI
       SUBCOMMANDS = %w(flush cleanup).freeze
 

data/lib/dapp/config/application.rb

@@ -11,8 +11,8 @@ module Dapp
       attr_reader :_chef
       attr_reader :_shell
       attr_reader :_parent
-      attr_reader :_app_install_dependencies
-      attr_reader :_app_setup_dependencies
+      attr_reader :_install_dependencies
+      attr_reader :_setup_dependencies
       attr_reader :_parent
 
       def initialize(parent)
@@ -20,18 +20,18 @@ module Dapp
         @_parent = parent
 
         @_artifact = []
-        @_app_install_dependencies = []
-        @_app_setup_dependencies   = []
+        @_install_dependencies = []
+        @_setup_dependencies   = []
 
         yield self if block_given?
       end
 
-      def app_install_depends_on(*args)
-        @_app_install_dependencies.concat(args)
+      def install_depends_on(*args)
+        @_install_dependencies.concat(args)
       end
 
-      def app_setup_depends_on(*args)
-        @_app_setup_dependencies.concat(args)
+      def setup_depends_on(*args)
+        @_setup_dependencies.concat(args)
       end
 
       def chef
@@ -103,8 +103,8 @@ module Dapp
           app.instance_variable_set(:'@_builder', _builder)
           app.instance_variable_set(:'@_home_path', _home_path)
           app.instance_variable_set(:'@_basename', _basename)
-          app.instance_variable_set(:'@_app_install_dependencies', _app_install_dependencies)
-          app.instance_variable_set(:'@_app_setup_dependencies', _app_setup_dependencies)
+          app.instance_variable_set(:'@_install_dependencies', _install_dependencies)
+          app.instance_variable_set(:'@_setup_dependencies', _setup_dependencies)
           app.instance_variable_set(:'@_artifact', Marshal.load(Marshal.dump(_artifact)))
           app.instance_variable_set(:'@_docker', _docker.clone)             unless @_docker.nil?
           app.instance_variable_set(:'@_git_artifact', _git_artifact.clone) unless @_git_artifact.nil?

data/lib/dapp/config/artifact.rb

@@ -47,9 +47,6 @@ module Dapp
 
       # Stage
       class Stage < Base
-        STAGES = [:from, :infra_install, :source_1_archive, :source_1, :app_install, :source_2,
-                  :infra_setup, :source_3, :chef_cookbooks, :app_setup, :source_4, :source_5].freeze
-
         attr_accessor :_config
         attr_accessor :_before, :_after
 
@@ -77,7 +74,7 @@ module Dapp
         private
 
         def validate_associated_option(option:, value:)
-          return if STAGES.include? value
+          return if Dapp::Application::STAGES.include? value
           raise Error::Config, code: :stage_artifact_incorrect_associated_value, data: { option: option, value: value }
         end
       end

data/lib/dapp/config/shell.rb

@@ -2,14 +2,14 @@ module Dapp
   module Config
     # Shell
     class Shell
-      attr_reader :_infra_install, :_infra_setup, :_app_install, :_app_setup
-      attr_reader :_infra_install_cache_version, :_infra_setup_cache_version, :_app_install_cache_version, :_app_setup_cache_version
+      attr_reader :_infra_install, :_infra_setup, :_install, :_setup
+      attr_reader :_infra_install_cache_version, :_infra_setup_cache_version, :_install_cache_version, :_setup_cache_version
 
       def initialize
         @_infra_install = []
         @_infra_setup   = []
-        @_app_install   = []
-        @_app_setup     = []
+        @_install   = []
+        @_setup     = []
       end
 
       def infra_install(*args, cache_version: nil)
@@ -22,14 +22,14 @@ module Dapp
         @_infra_setup_cache_version = cache_version
       end
 
-      def app_install(*args, cache_version: nil)
-        _app_install.concat(args)
-        @_app_install_cache_version = cache_version
+      def install(*args, cache_version: nil)
+        _install.concat(args)
+        @_install_cache_version = cache_version
       end
 
-      def app_setup(*args, cache_version: nil)
-        _app_setup.concat(args)
-        @_app_setup_cache_version = cache_version
+      def setup(*args, cache_version: nil)
+        _setup.concat(args)
+        @_setup_cache_version = cache_version
       end
 
       def reset_infra_install
@@ -40,12 +40,12 @@ module Dapp
         @_infra_setup = []
       end
 
-      def reset_app_install
-        @_app_install = []
+      def reset_install
+        @_install = []
       end
 
-      def reset_app_setup
-        @_app_setup = []
+      def reset_setup
+        @_setup = []
       end
 
       def reset_all

data/lib/dapp/controller.rb

@@ -56,6 +56,14 @@ module Dapp
       shellout(%{docker rmi $(docker images -f "dangling=true" -f "label=dapp=#{build_configs.first._basename}" -q)})
     end
 
+    def metadata_flush
+      build_configs.each do |config|
+        log(config._name)
+        app = Application.new(config: config, cli_options: cli_options, ignore_git_fetch: true)
+        FileUtils.rm_rf app.metadata_path
+      end
+    end
+
     private
 
     def build_configs

data/lib/dapp/image/{arguments.rb → argument.rb}

@@ -1,7 +1,7 @@
 module Dapp
   module Image
-    # Arguments
-    module Arguments
+    # Argument
+    module Argument
       def add_change_volume(value)
         add_change_option(:volume, value)
       end
@@ -11,11 +11,11 @@ module Dapp
       end
 
       def add_change_env(**options)
-        add_change_option(:env, options_to_args(options))
+        add_change_option(:env, options)
       end
 
       def add_change_label(**options)
-        add_change_option(:label, options_to_args(options))
+        add_change_option(:label, options)
       end
 
       def add_change_cmd(value)
@@ -72,7 +72,7 @@ module Dapp
       end
 
       def add_option_default(hash, key, value)
-        hash[key] = (hash[key].nil? ? value : (Array(hash[key]) << value).flatten)
+        hash[key] = (hash[key].nil? ? [value] : (hash[key] << value)).flatten
       end
 
       def from_options
@@ -89,21 +89,21 @@ module Dapp
       end
 
       def prepared_options
-        prepared_options_default(options) { |k, vals| Array(vals).map { |v| "--#{k}=#{v}" }.join(' ') }
+        prepared_options_default(options) { |key, vals| Array(vals).map { |val| "--#{key}=#{val}" }.join(' ') }
       end
 
       def prepared_change
-        prepared_options_default(from_options.merge(change_options)) do |k, vals|
-          if [:cmd, :entrypoint].include? k
-            %(-c '#{k.to_s.upcase} #{Array(vals)}')
-          else
-            Array(vals).map { |v| %(-c "#{k.to_s.upcase} #{v}") }.join(' ')
-          end
+        prepared_options_default(from_options.merge(change_options)) do |key, vals|
+          case key
+          when :cmd, :entrypoint then [vals]
+          when :env, :label then vals.map(&method(:options_to_args)).flatten
+          else vals
+          end.map { |val| %(-c '#{key.to_s.upcase} #{val}') }.join(' ')
         end
       end
 
       def prepared_options_default(hash)
-        hash.map { |k, vals| yield(k, vals) }.join(' ')
+        hash.map { |key, vals| yield(key, vals) }.join(' ')
       end
 
       def prepared_bash_command

data/lib/dapp/image/stage.rb

@@ -3,7 +3,7 @@ module Dapp
   module Image
     # Stage
     class Stage < Docker
-      include Arguments
+      include Argument
 
       def initialize(name:, built_id: nil, from: nil)
         @bash_commands = []

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.3.5'.freeze
+  VERSION = '0.4.0'.freeze
   BUILD_CACHE_VERSION = 1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -331,15 +331,15 @@ files:
 - lib/dapp/application/logging.rb
 - lib/dapp/application/path.rb
 - lib/dapp/application/tags.rb
-- lib/dapp/build/stage/app_install.rb
-- lib/dapp/build/stage/app_setup.rb
 - lib/dapp/build/stage/base.rb
 - lib/dapp/build/stage/chef_cookbooks.rb
 - lib/dapp/build/stage/from.rb
 - lib/dapp/build/stage/infra_install.rb
 - lib/dapp/build/stage/infra_setup.rb
+- lib/dapp/build/stage/install.rb
 - lib/dapp/build/stage/mod/artifact.rb
 - lib/dapp/build/stage/mod/logging.rb
+- lib/dapp/build/stage/setup.rb
 - lib/dapp/build/stage/source_1.rb
 - lib/dapp/build/stage/source_1_archive.rb
 - lib/dapp/build/stage/source_2.rb
@@ -356,6 +356,8 @@ files:
 - lib/dapp/cli/base.rb
 - lib/dapp/cli/build.rb
 - lib/dapp/cli/list.rb
+- lib/dapp/cli/metadata.rb
+- lib/dapp/cli/metadata/flush.rb
 - lib/dapp/cli/push.rb
 - lib/dapp/cli/run.rb
 - lib/dapp/cli/smartpush.rb
@@ -392,7 +394,7 @@ files:
 - lib/dapp/helper/shellout.rb
 - lib/dapp/helper/streaming.rb
 - lib/dapp/helper/trivia.rb
-- lib/dapp/image/arguments.rb
+- lib/dapp/image/argument.rb
 - lib/dapp/image/docker.rb
 - lib/dapp/image/stage.rb
 - lib/dapp/version.rb