dapp 0.2.8 → 0.3.0

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.2.8'.freeze
+  VERSION = '0.3.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.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -354,19 +354,20 @@ files:
 - lib/dapp/cli/base.rb
 - lib/dapp/cli/build.rb
 - lib/dapp/cli/flush.rb
-- lib/dapp/cli/flush/build_cache.rb
-- lib/dapp/cli/flush/stage_cache.rb
+- lib/dapp/cli/flush/metadata.rb
+- lib/dapp/cli/flush/stages.rb
 - lib/dapp/cli/list.rb
 - lib/dapp/cli/push.rb
+- lib/dapp/cli/run.rb
 - lib/dapp/cli/smartpush.rb
 - lib/dapp/config/application.rb
+- lib/dapp/config/artifact.rb
 - lib/dapp/config/chef.rb
 - lib/dapp/config/docker.rb
 - lib/dapp/config/git_artifact.rb
 - lib/dapp/config/main.rb
 - lib/dapp/config/shell.rb
 - lib/dapp/controller.rb
-- lib/dapp/docker_image.rb
 - lib/dapp/error/application.rb
 - lib/dapp/error/base.rb
 - lib/dapp/error/build.rb
@@ -389,7 +390,9 @@ files:
 - lib/dapp/helper/shellout.rb
 - lib/dapp/helper/streaming.rb
 - lib/dapp/helper/trivia.rb
-- lib/dapp/stage_image.rb
+- lib/dapp/image/arguments.rb
+- lib/dapp/image/docker.rb
+- lib/dapp/image/stage.rb
 - lib/dapp/version.rb
 homepage: https://github.com/flant/dapp
 licenses:

data/lib/dapp/docker_image.rb

@@ -1,51 +0,0 @@
-module Dapp
-  # DockerImage
-  class DockerImage
-    include Helper::Shellout
-
-    attr_reader :from
-    attr_reader :name
-
-    def initialize(name:, from: nil)
-      @from = from
-      @name = name
-    end
-
-    def id
-      @id || begin
-        unless (output = shellout!("docker images -q --no-trunc=true #{name}").stdout.strip).empty?
-          output
-        end
-      end
-    end
-
-    def untag!
-      raise Error::Build, code: :image_already_untagged, data: { name: name } unless tagged?
-      shellout!("docker rmi #{name}")
-    end
-
-    def push!(log_verbose: false, log_time: false)
-      raise Error::Build, code: :image_not_exist, data: { name: name } unless tagged?
-      shellout!("docker push #{name}", log_verbose: log_verbose, log_time: log_time)
-    end
-
-    def pull!(log_verbose: false, log_time: false)
-      return if tagged?
-      shellout!("docker pull #{name}", log_verbose: log_verbose, log_time: log_time)
-      @pulled = true
-    end
-
-    def tagged?
-      !!id
-    end
-
-    def pulled?
-      !!@pulled
-    end
-
-    def info
-      raise Error::Build, code: :image_not_exist, data: { name: name } unless tagged?
-      shellout!("docker inspect --format='{{.Created}} {{.Size}}' #{name}").stdout.strip.split
-    end
-  end # DockerImage
-end # Dapp

data/lib/dapp/stage_image.rb

@@ -1,160 +0,0 @@
-module Dapp
-  # StageImage
-  class StageImage < DockerImage
-    def initialize(name:, built_id: nil, from: nil)
-      @bash_commands = []
-      @options = {}
-      @change_options = {}
-      @container_name = SecureRandom.hex
-      @built_id = built_id
-      super(name: name, from: from)
-    end
-
-    def add_change_volume(value)
-      add_change_option(:volume, value)
-    end
-
-    def add_change_expose(value)
-      add_change_option(:expose, value)
-    end
-
-    def add_change_env(value)
-      add_change_option(:env, value)
-    end
-
-    def add_change_label(value)
-      add_change_option(:label, value)
-    end
-
-    def add_change_cmd(value)
-      add_change_option(:cmd, value)
-    end
-
-    def add_change_onbuild(value)
-      add_change_option(:onbuild, value)
-    end
-
-    def add_change_workdir(value)
-      add_change_option(:workdir, value)
-    end
-
-    def add_change_entrypoint(value)
-      add_change_option(:entrypoint, value)
-    end
-
-    def add_change_user(value)
-      add_change_option(:user, value)
-    end
-
-    def add_volume(value)
-      add_option(:volume, value)
-    end
-
-    def add_volumes_from(value)
-      add_option(:'volumes-from', value)
-    end
-
-    def add_commands(*commands)
-      @bash_commands.concat(commands.flatten)
-    end
-
-    def built_id
-      @built_id ||= id
-    end
-
-    def build!(**kvargs)
-      @built_id = if should_be_built?
-                    begin
-                      run!(**kvargs)
-                      commit!
-                    ensure
-                      shellout("docker rm #{container_name}")
-                    end
-                  else
-                    from.built_id
-                  end
-    end
-
-    def export!(name, log_verbose: false, log_time: false, force: false)
-      image = self.class.new(built_id: built_id, name: name)
-      image.tag!(log_verbose: log_verbose, log_time: log_time, force: force)
-      image.push!(log_verbose: log_verbose, log_time: log_time)
-      image.untag!
-    end
-
-    def tag!(log_verbose: false, log_time: false, force: false)
-      if !(existed_id = id).nil? && !force
-        raise Error::Build, code: :another_image_already_tagged if built_id != existed_id
-        return
-      end
-      shellout!("docker tag #{built_id} #{name}", log_verbose: log_verbose, log_time: log_time)
-    end
-
-    protected
-
-    attr_reader :container_name
-    attr_reader :bash_commands
-    attr_reader :options, :change_options
-
-    def add_option(key, value)
-      add_option_default(options, key, value)
-    end
-
-    def add_change_option(key, value)
-      add_option_default(change_options, key, value)
-    end
-
-    def add_option_default(hash, key, value)
-      hash[key] = (hash[key].nil? ? value : (Array(hash[key]) << value).flatten)
-    end
-
-    def run!(log_verbose: false, log_time: false, introspect_error: false, introspect_before_error: false)
-      raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
-      shellout!("docker run #{prepared_options} --name=#{container_name} #{from.built_id} #{prepared_bash_command}",
-                log_verbose: log_verbose, log_time: log_time)
-    rescue Error::Shellout => e
-      raise unless introspect_error || introspect_before_error
-      built_id = introspect_error ? commit! : from.built_id
-      raise Exception::IntrospectImage, message: Dapp::Helper::NetStatus.message(e),
-                                        data: { built_id: built_id, options: prepared_options, rmi: introspect_error }
-    end
-
-    def commit!
-      shellout!("docker commit #{prepared_change} #{container_name}").stdout.strip
-    end
-
-    def should_be_built?
-      !(bash_commands.empty? && change_options.empty?)
-    end
-
-    def prepared_options
-      prepared_options_default(options) { |k, vals| Array(vals).map { |v| "--#{k}=#{v}" }.join(' ') }
-    end
-
-    def prepared_change
-      prepared_options_default(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
-      end
-    end
-
-    def prepared_options_default(hash)
-      hash.map { |k, vals| yield(k, vals) }.join(' ')
-    end
-
-    def prepared_bash_command
-      if bash_commands.empty?
-        'true'
-      else
-        shellout_pack prepared_commands.join(' && ')
-      end
-    end
-
-    def prepared_commands
-      bash_commands.map { |command| command.gsub(/^[\ |;]*|[\ |;]*$/, '') } # strip [' ', ';']
-    end
-  end # StageImage
-end # Dapp