luban 0.12.8 → 0.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 789a5249cba00bfdfb1260f95d3841006e1bbc0f
-  data.tar.gz: 3b138b65496a4f011386d1472609b06a6d9e8557
+  metadata.gz: 6dd440bc4925ab701d0ed20efac1bbbbfb47619d
+  data.tar.gz: 3a652f09e27d0af7700cbe8a20a24e036fa7c6ee
 SHA512:
-  metadata.gz: 5e62edc62fc52674c8088f53fa7143249862b37919f610b33353e1e4fd72d1343c8495acf52ff6437d0ca98a242cf27ea2ecc37f8508f5fa0b24cd003f8e76d3
-  data.tar.gz: ccf9b6b5a205e5cb7e420e439127513c6cdf8ccb25a0ce39004939a07410346b9c642676ede9d3b8f832788b47f1729f293de9357398d8e76c2b227b1caf6b07
+  metadata.gz: 3ae27fdfc42619731ab379001e709c7961b67cce5e30c9d22c539f37c4057404e435cfa260d39e662487959e3bfd96c596aca9355640473e8fb10b3c90155724
+  data.tar.gz: b1eb78d08394460907d60d39bc74fd651142655acbbd7aa7d00577ad97acd299aedd710a9556c33351b63f1eb117899055b32c066bb6f7001c5a8dc64f3d82e2

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change log
 
+## Version 0.12.9 (Mar 23, 2017)
+
+Minor enhancements:
+  * Used Etc.getpwnam to retrieve current user id
+  * Speeded up bundle install gems with bundle jobs (default: 4)
+  * Added docker config parameters, #docker_workdir, #docker_entrypoint, #docker_command
+    * Applied the new docker config parameters in Dockerfile template
+    * Also, setup PATH properly instead of using environment resource file in Dockerfile template
+  * Added environment variables in docker-compose template
+  * Added util method, #cleanup_files, to manage retention of file copies like releases
+  * Upgraded dependency of Git on Curl to version 7.53.1
+  * Ensured environment dockerization occur if any dockerized components are changed
+  * Cleaned up dockerized archives properly
+  * Only install packages that are currently used during dockerization
+  * Only deploy releases that are currently used during dockerization
+
+Bug fixes:
+  * Skipped uninstalling a given package if any other packages depends on it
+  * Skipped binstubs updates in package installation if the package is a dependence of another package
+
 ## Version 0.12.8 (Feb 23, 2017)
 
 Bug fixes:

data/lib/luban/deployment/cli/application/base.rb

@@ -59,18 +59,45 @@ module Luban
       def deployable?; true; end
       def controllable?; has_source? or has_services?; end
 
-      def use_package?(package_name, package_version, servers: [])
-        package_name = package_name.to_sym
+      def use_package?(package_name, package_version)
         packages.has_key?(package_name) and
-        packages[package_name].has_version?(package_version) and
-        packages[package_name].config.servers.any? { |s| servers.include?(s) }
+        packages[package_name].has_version?(package_version)
+      end
+
+      def depend_on_package?(package_name, package_version)
+        !dependent_packages_for(package_name, package_version).empty?
+      end
+
+      def dependent_packages_for(package_name, package_version)
+        packages.inject([]) do |dependent_pkgs, (pkg_name, pkg)|
+          if pkg.package_options.any? do |version, _|
+               pkg.class.required_packages_for(version).any? do |_, deps|
+                 deps.any? { |dep| dep.name == package_name.to_s and dep.version == package_version }
+               end
+             end
+            dependent_pkgs << "#{display_name}.#{pkg_name}"
+          end
+          dependent_pkgs
+        end
       end
 
       def other_package_users_for(package_name, package_version, servers: [])
+        dependent_packages_for(package_name, package_version) | 
         find_project.package_users_for(package_name, package_version, 
                                        exclude: [name], servers: servers)
       end
 
+      def package_users_for(package_name, package_version, servers: [])
+        package_users = []
+        if config.servers.any? { |s| servers.include?(s) }
+          if use_package?(package_name, package_version)
+            package_users << "#{display_name}.#{package_name}"
+          end
+          package_users |= dependent_packages_for(package_name, package_version)
+        end
+        package_users
+      end
+
       def package(name, version:, **opts)
         yield opts if block_given?
         name = name.to_sym

data/lib/luban/deployment/cli/application/configurator.rb

@@ -20,6 +20,12 @@ module Luban
             cp('-r', default_source_template_path, default_source_path)
           end
         end
+
+        protected
+
+        def init_docker_workdir
+          docker_workdir current_app_path
+        end
       end
     end
   end

data/lib/luban/deployment/cli/application/docker/dockerable.rb

@@ -28,6 +28,16 @@ module Luban
           @default_docker_template_path ||= base_templates_path(__FILE__)
         end
 
+        def package(name, version:, **opts)
+          opts.merge!(deprecated: true) unless opts[:current]
+          super
+        end
+
+        def release(version, **opts)
+          opts.merge!(deprecated: true) unless opts[:current]
+          super
+        end
+
         protected
 
         %i(setup! install_all! uninstall_all! destroy! 

data/lib/luban/deployment/cli/application/docker/dockerizer.rb

@@ -140,16 +140,21 @@ module Luban
         end
 
         def init_build_sources
+          # Init packages
           sources = { packages: packages_path }
+          # Init releases
           releases = get_releases(releases_path, type: 'app')
           if releases.has_key?(:"app.bundler")
             sources[:"app.bundler"] = releases.delete(:"app.bundler")
           end
           sources.merge!(releases)
+          # Init profile
           profile_path = releases_path.dirname.join('profile')
           profile = directory?(profile_path) ? get_releases(profile_path, type: 'profile') : {}
-          sources["env.#{stage}".to_sym] = app_path
           sources.merge!(profile)
+          # Init environment
+          sources["env.#{stage}".to_sym] = app_path
+
           sources.inject({}) do |srcs, (name, path)|
             md5 = md5_for_dir(path)
             srcs[name] = { path: path, md5: md5, tag: md5[0, revision_size] }
@@ -215,15 +220,29 @@ module Luban
         end
 
         def package_application!
-          build[:archives].each_pair do |name, archive|
-            source = build[:sources][name]
-            archive[:status] = 
-              if file?(archive[:path]) and archive[:path].basename.to_s =~ /#{source[:tag]}/
-                :skipped
-              else
-                execute(:tar, "-cJf", archive[:path], source[:path]) ? :succeeded : :failed
-              end
+          changed = false
+          env_archive = "env.#{stage}".to_sym
+          build[:archives].each_key do |name|
+            changed = true if name != env_archive and package_archive!(name) == :succeeded
           end
+          package_archive!(env_archive, force: changed)
+        end
+
+        def package_archive!(name, force: false)
+          source = build[:sources][name]
+          archive = build[:archives][name]
+          archive[:status] = 
+            if !force and file?(archive[:path]) and archive[:path].basename.to_s =~ /#{source[:tag]}/
+              :skipped
+            else
+              execute(:tar, "-cJf", archive[:path], source[:path]) ? :succeeded : :failed
+            end.tap do |status| 
+              cleanup_archive!(name) unless status == :failed
+            end
+        end
+
+        def cleanup_archive!(name)
+          cleanup_files(archive_file_path("#{name.to_s.gsub(/-\h+$/, '')}-*"))
         end
 
         def render_dockerfile

data/lib/luban/deployment/cli/application/docker/templates/Dockerfile.erb

@@ -14,7 +14,6 @@ RUN yum -y install \
 
 # Create luban user with the given uid
 RUN adduser -ms /bin/bash -u $luban_uid $luban_user && \
-    echo "source <%= envrc_file %>" >> /home/$luban_user/.bashrc && \
     mkdir -p $luban_root_path && \
     chown -R $luban_user:$luban_user $luban_root_path
 
@@ -25,7 +24,7 @@ ADD <%= build[:archives].collect { |_, a| a[:path].basename }.join(" \\\n    ")
 
 # Populate image labels
 LABEL luban.project="<%= project %>" \
-      luban.application="<%= project %>" \
+      luban.application="<%= application %>" \
       luban.stage="<%= stage %>" \
       <%- build[:sources].each_pair do |name, source| -%>
       luban.<%= name %>.source_tag="<%= source[:tag] %>" \
@@ -42,6 +41,13 @@ LABEL luban.project="<%= project %>" \
       luban.luban_root_path="$luban_root_path"
 
 USER $luban_user
-WORKDIR /home/$luban_user
+WORKDIR <%= docker_workdir %>
 
-CMD ["/bin/bash"]
+ENV PATH=<%= app_bin_path %>:$PATH
+
+<% unless docker_entrypoint.empty? -%>
+ENTRYPOINT <%= docker_entrypoint.inspect %>
+<% end -%>
+<% unless docker_command.empty? -%>
+CMD <%= docker_command.inspect %>
+<% end -%>

data/lib/luban/deployment/cli/application/docker/templates/docker-compose.yml.erb

@@ -11,6 +11,7 @@ services:
     image: <%= build[:image_tag] %>
     environment:
       TZ: <%= timezone %>
-    entrypoint: /bin/bash
-    stdin_open: true
-    tty: true
+      <%- env_vars.each_pair do |name, value| -%>
+      <%= name.upcase %>: <%= value %>
+      <%- end -%>
+    command: <%= docker_command %>

data/lib/luban/deployment/cli/application/publisher.rb

@@ -4,6 +4,8 @@ module Luban
       class Publisher < Worker
         include Luban::Deployment::Helpers::LinkedPaths
 
+        DefaultBundleJobs = Luban::Deployment::Application::Repository::DefaultBundleJobs
+
         def release_type; task.opts.release_pack[:type]; end
         def release_version; task.opts.release_pack[:version]; end
         def release_tag; task.opts.release_pack[:tag]; end
@@ -49,6 +51,10 @@ module Luban
           @bundle_flags ||= %w(--deployment --quiet)
         end
 
+        def bundle_jobs
+          @bundle_jobs ||= DefaultBundleJobs
+        end
+
         def bundle_linked_dirs
           @bundle_linked_dirs ||= %w(.bundle vendor/cache vendor/bundle)
         end
@@ -142,10 +148,7 @@ module Luban
         end
 
         def cleanup_releases(keep_releases = 1)
-          files = capture(:ls, '-xtd', releases_path.join("#{release_version}-*")).split(" ")
-          if files.count > keep_releases
-            files.last(files.count - keep_releases).each { |f| rmdir(f) }
-          end
+          cleanup_files(releases_path.join("#{release_version}-*"), keep_copies: keep_releases)
         end
 
         def cleanup_app_releases; cleanup_releases(5); end
@@ -189,6 +192,7 @@ module Luban
               options << "--without #{bundle_without.join(' ')}"
             end
             options << bundle_flags.join(' ')
+            options << "--jobs #{bundle_jobs}"
             if (output = capture(bundle_executable, :install, *options)).empty?
               info "Successfully deployed bundled gems"
             else

data/lib/luban/deployment/cli/application/repository.rb

@@ -5,6 +5,7 @@ module Luban
         using Luban::CLI::CoreRefinements
         include Luban::Deployment::Worker::Paths::Local
 
+        DefaultBundleJobs = 4
         DefaultRevisionSize = 12
 
         attr_reader :type
@@ -76,6 +77,10 @@ module Luban
           @bundle_without ||= %w(development test)
         end
 
+        def bundle_jobs
+          @bundle_jobs ||= DefaultBundleJobs
+        end
+
         # Description on abstract methods:
         #   available?: check if the remote repository is available
         #   cloned?: check if the remote repository is cloned locally
@@ -167,11 +172,8 @@ module Luban
         end
 
         def cleanup_releases(keep_releases = 1)
-          path = releases_path.join("#{release_prefix}-#{version}-*.#{release_package_extname}")
-          files = capture(:ls, '-xt', path).split(" ")
-          if files.count > keep_releases
-            files.last(files.count - keep_releases).each { |f| rm(f) }
-          end
+          cleanup_files(releases_path.join("#{release_prefix}-#{version}-*.#{release_package_extname}"),
+                        keep_copies: keep_releases)
         end
 
         def release_with_gemfile?(gemfile_path)
@@ -202,7 +204,7 @@ module Luban
               unless bundle_without.include?(stage.to_s)
                 options << "--without #{bundle_without.join(' ')}"
               end
-              options << "--quiet"
+              options << "--jobs #{bundle_jobs} --quiet"
               if (output = capture(bundle_cmd, :install, *options)).empty?
                 info "Successfully bundled gems in Gemfile"
               else

data/lib/luban/deployment/cli/package/base.rb

@@ -149,7 +149,7 @@ module Luban
           if apps.empty? or opts[:force]
             uninstall!(args: args, opts: opts)
           else
-            puts "Skipped. #{name}-#{opts[:version]} is being referenced by #{apps.join(', ')}. " +
+            puts "  Skipped! #{name}-#{opts[:version]} is being used by #{apps.join(', ')}. " +
                  "use -f to force uninstalling if necessary."
           end
         end

data/lib/luban/deployment/cli/package/installer/install.rb

@@ -88,7 +88,11 @@ module Luban
               update_result "#{package_full_name} is uninstalled. "
             end
           else
-            message = "#{package_full_name} is NOT installed."
+            message = if deprecated? 
+                        "#{package_full_name} has been deprecated."
+                      else
+                        "#{package_full_name} is NOT installed."
+                      end
             if directory?(install_path) or directory?(build_path)
               if force?
                 uninstall!
@@ -137,6 +141,7 @@ module Luban
         end
 
         def update_binstubs
+          return if child?
           if current?
             if installed?
               update_binstubs!

data/lib/luban/deployment/cli/project.rb

@@ -14,9 +14,8 @@ module Luban
 
       def package_users_for(package_name, package_version, exclude: [], servers: [])
         apps.values.inject([]) do |package_users, app|
-          if !exclude.include?(app.name) and
-              app.use_package?(package_name, package_version, servers: servers)
-            package_users << app.display_name
+          unless exclude.include?(app.name)
+            package_users |= app.package_users_for(package_name, package_version, servers: servers)
           end
           package_users
         end

data/lib/luban/deployment/cli/service/configurator.rb

@@ -56,6 +56,22 @@ module Luban
 
           protected
 
+          def init
+            super
+            if dockerized?
+              init_docker_workdir
+              init_docker_entrypoint
+              init_docker_command
+            end
+          end
+
+          def init_docker_workdir
+            docker_workdir app_path
+          end
+
+          def init_docker_entrypoint; end
+          def init_docker_command; end
+
           def upload_profile_templates(templates, dirs: Pathname.new(''), depth: 2)
             indent = '  ' * depth
             templates.each do |src_path|

data/lib/luban/deployment/cli/service/controller.rb

@@ -177,6 +177,7 @@ module Luban
           protected
 
           def init
+            super
             load_process_monitor_commands if monitorable?
           end
 

data/lib/luban/deployment/helpers/utils.rb

@@ -104,6 +104,13 @@ module Luban
           capture(:find, "#{dir} -type f ! -name '*.md5' 2>/dev/null | LC_ALL=C sort -u | xargs cat | $(type -p md5sum md5 | head -1)")[/^\h+/]
         end
 
+        def cleanup_files(path, keep_copies: 1)
+          files = capture(:ls, '-xtd', path).split(" ")
+          if files.count > keep_copies
+            files.last(files.count - keep_copies).each { |f| execute(:rm, '-fr', f) }
+          end
+        end
+
         def sudo(*args)
           execute(:sudo, *args)
         end

data/lib/luban/deployment/packages/git.rb

@@ -5,7 +5,7 @@ module Luban
         apply_to :all do
           before_install do
             depend_on 'openssl', version: '1.0.2k'
-            depend_on 'curl', version: '7.52.1'
+            depend_on 'curl', version: '7.53.1'
           end
         end
 

data/lib/luban/deployment/parameters.rb

@@ -1,3 +1,5 @@
+require 'etc'
+
 module Luban
   module Deployment
     module Parameters
@@ -31,7 +33,7 @@ module Luban
         end
 
         def current_uid
-          `id -u #{current_user} 2>/dev/null`.chomp
+          Etc.getpwnam(current_user).uid
         end
 
         parameter :luban_roles, default: %i(app)
@@ -44,7 +46,7 @@ module Luban
         parameter :work_dir
         parameter :apps_path
         parameter :project
-        parameter :user, default: -> { current_user }
+        parameter :user, default: ->{ current_user }
         parameter :author
         parameter :config_finder, default: ->{ Hash.new }
 
@@ -128,6 +130,9 @@ module Luban
         parameter :base_image, default: 'centos:7'
         parameter :timezone, default: 'UTC'
         parameter :base_packages, default: ->{ Array.new }
+        parameter :docker_workdir, default: '/home/$luban_user'
+        parameter :docker_entrypoint, default: ->{ Array.new }
+        parameter :docker_command, default: ->{ ["/bin/bash"] }
         parameter :docker_tls_verify, default: false
         parameter :docker_cert_path
         parameter :docker_tcp_port

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.12.8"
+    VERSION = "0.12.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.12.8
+  version: 0.12.9
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli