luban 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dca8fcb876590469dc26cde8d96ac98005d359ba
-  data.tar.gz: 09eb04a2e533f65e76eea153a7c58756060161c4
+  metadata.gz: e7a3cfbc9249fac2f651aaabc6ed1ba12812e5fd
+  data.tar.gz: 9bd71c0b02c5980ad4b2ecdfaba22d11102b9a68
 SHA512:
-  metadata.gz: 38a19f7fee773f5ce14f375cc204a96d1e8c186bd7c2ceb931104471d2f8bb7a4e65591850760671bd75069f2ed37aa2ecc5ac92cf1cb5229a80f38247552478
-  data.tar.gz: 4d1c3ee0509c66fb65fed17069ae622ae925ec76e0a17b55000adf0e9948368876914beaaef237c7e9b05c175425d373bfef844802f515742dfbc8ff14748e12
+  metadata.gz: 315eac49c38cffab66de6163303843f75db7252fbb6842c659119144a2b3ce818dab01d46f9828c16c57d43b112bf75afd4b42712eb0b77a2aa6da94b1cff364
+  data.tar.gz: 908d2fd0049c95613b3fa8efa054314a53314678d6abd5193323fbd7b631862d2ba244fd9efee7a12da6b3bb69f35ea172970e404e56cf05db3ed7971b2b2c05

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change log
 
+## Version 0.9.3 (Oct 17, 2016)
+
+New feature:
+  * Supported Rubygems-update for Ruby version 1.9.3 or above
+
+Minor enhancements:
+  * Refactored gem installer and applied changes to gem installers for Bundler and RubygemsUpdates
+  * Added abstract methods to get latest version in Package::Base
+    * Retrieved latest package version if the version is specified as "latest"
+  * Upgraded Bundler to 1.13.5 in Ruby
+
+Bug fixes:
+  * Fixed a bug in adding host to a given role
+  * Ensured symlink for archived logs path to be created for profile-based application publication
+
 ## Version 0.9.2 (Oct 13, 2016)
 
 Bug fixes:

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

@@ -119,6 +119,7 @@ module Luban
 
         def create_profile_symlinks
           create_release_symlink(shared_path)
+          create_symlinks_for_archived_logs
         end
 
         def create_app_symlinks
@@ -126,6 +127,7 @@ module Luban
           assure_linked_dirs
           create_symlinks_for_linked_dirs
           create_symlinks_for_linked_files
+          create_symlinks_for_archived_logs
         end
 
         def create_release_symlink(target_dir)
@@ -134,13 +136,16 @@ module Luban
 
         def create_symlinks_for_linked_dirs
           create_linked_dirs(linked_dirs, from: shared_path, to: release_path)
-          assure_symlink(archived_logs_path, log_path.join(archived_logs_path.basename))
         end
 
         def create_symlinks_for_linked_files
           create_linked_files(linked_files, from: profile_path, to: release_path.join('config'))
         end
 
+        def create_symlinks_for_archived_logs
+          assure_symlink(archived_logs_path, log_path.join(archived_logs_path.basename))
+        end
+
         def update_releases_log
           execute %{echo "[$(date -u)][#{user}] #{release_log_message}" >> #{releases_log_path}}
         end

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

@@ -52,6 +52,18 @@ module Luban
             { major_version: version, patch_level: '' }
           end
 
+          def version_mutex; @version_mutex ||= Mutex.new; end
+
+          def latest_version
+            version_mutex.synchronize do
+              @latest_version ||= get_latest_version
+            end
+          end
+
+          def get_latest_version
+            raise NotImplementedError, "#{self.class.name}#get_latest_version is an abstract method."
+          end
+
           protected
 
           def package_require_path(package_name)
@@ -84,6 +96,7 @@ module Luban
 
         def update_package_options(version, **opts)
           unless has_version?(version)
+            version = self.class.package_class(name).latest_version if version == 'latest'
             package_options[version] = 
               { name: name.to_s }.merge!(self.class.decompose_version(version))
           end

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

@@ -195,6 +195,7 @@ module Luban
           required_packages[type].each do |d|
             version = task.opts.send(d.name) || d.version
             next if version == 'default'
+            version = self.class.package_class(d.name).latest_version if version == 'latest'
             self.class.worker_class(:installer, package: d.name).new(
               config: config, backend: backend,
               cmd: cmd, args: {},

data/lib/luban/deployment/configuration/server_set.rb

@@ -37,7 +37,7 @@ module Luban
           end.tap do |s|
             s.roles.each do |role| 
               @servers[role] ||= []
-              @servers[role] << new_server
+              @servers[role] << s unless @servers[role].include?(s)
             end
           end
         end

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

@@ -1,46 +1,12 @@
+require_relative 'gem'
+
 module Luban
   module Deployment
     module Packages
-      class Bundler < Luban::Deployment::Package::Base
-        protected
-
-        def setup_provision_tasks
-          super
-          provision_tasks[:install].switch :install_doc, "Install Bundler document"
-        end
-
-        class Installer < Luban::Deployment::Package::Installer
-          def install_doc?
-            task.opts.install_doc
-          end
-
-          def package_path
-            parent.package_path
-          end
-
-          def install_path
-            parent.install_path
-          end
-
+      class Bundler < Gem
+        class Installer < Gem::Installer
           define_executable 'bundler'
 
-          def gem_executable
-            parent.gem_executable
-          end
-
-          def src_file_extname
-            @src_file_extname ||= 'gem'
-          end
-
-          def source_repo
-            #@source_repo ||= "http://production.cf.rubygems.org"
-            @source_repo ||= "https://rubygems.org"
-          end
-
-          def source_url_root
-            @source_url_root ||= "downloads"
-          end
-
           def installed?
             return false unless file?(bundler_executable)
             match?("#{bundler_executable} -v", package_version)
@@ -48,39 +14,13 @@ module Luban
 
           protected
 
-          def validate
-            if parent.nil?
-              abort "Aborted! Parent package for Bundler MUST be provided."
-            end
-            unless parent.is_a?(Ruby::Installer)
-              abort "Aborted! Parent package for Bundler MUST be an instance of #{Ruby::Installer.name}"
-            end
-          end
-
-          def uncompress_package; end
-          def configure_package; end
-          def make_package; end
-          def build_package; install_package; end
-          def update_binstubs!; end
-
-          def install_package!
+          def build_package
             if file?(bundler_executable)
-              uninstall_bundler! and install_bundler!
+              uninstall_gem! and super
             else
-              install_bundler!
+              super
             end
           end
-
-          def uninstall_bundler!
-            test("#{gem_executable} uninstall bundler -a -x -I >> #{install_log_file_path} 2>&1")
-          end
-
-          def install_bundler!
-            install_opts = ['--local']
-            #install_opts << "--no-document" unless install_doc?
-            install_opts << "--no-rdoc --no-ri" unless install_doc?
-            test("#{gem_executable} install #{install_opts.join(' ')} #{src_cache_path} >> #{install_log_file_path} 2>&1")
-          end
         end
       end
     end

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

@@ -0,0 +1,71 @@
+module Luban
+  module Deployment
+    module Packages
+      class Gem < Luban::Deployment::Package::Base        
+        class << self
+          using Luban::CLI::CoreRefinements
+
+          def gem_name
+            @gem_name ||= name.split('::').last.snakecase.gsub('_', '-')
+          end
+
+          protected
+
+          def get_latest_version
+            require 'json'
+            JSON.parse(`curl https://rubygems.org/api/v1/versions/#{gem_name}/latest.json 2>/dev/null`)['version']
+          end
+        end
+
+        protected
+
+        def setup_provision_tasks
+          super
+          provision_tasks[:install].switch :install_doc, "Install #{self.class.gem_name} document"
+        end
+
+        class Installer < Luban::Deployment::Package::Installer
+          def install_doc?; task.opts.install_doc; end
+          def package_path; parent.package_path; end
+          def install_path; parent.install_path; end
+          def gem_executable; parent.gem_executable; end
+          def src_file_extname; @src_file_extname ||= 'gem'; end
+          def source_repo; @source_repo ||= "https://rubygems.org"; end
+          def source_url_root; @source_url_root ||= "downloads"; end
+
+          protected
+
+          def validate
+            if parent.nil?
+              abort "Aborted! Parent package for #{package_name} MUST be provided."
+            end
+            unless parent.is_a?(Ruby::Installer)
+              abort "Aborted! Parent package for #{package_name} MUST be an instance of #{Ruby::Installer.name}"
+            end
+          end
+
+          def uncompress_package; end
+          def configure_package; end
+          def make_package; end
+          def build_package; install_gem!; end
+          def update_binstubs; end
+
+          def install_opts
+            install_opts = ['--local']
+            #install_opts << "--no-document" unless install_doc?
+            install_opts << "--no-rdoc --no-ri" unless install_doc?
+            install_opts
+          end
+
+          def install_gem!
+            test("#{gem_executable} install #{install_opts.join(' ')} #{src_cache_path} >> #{install_log_file_path} 2>&1")
+          end
+
+          def uninstall_gem!
+            test("#{gem_executable} uninstall #{package_name} -a -x -I >> #{install_log_file_path} 2>&1")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -47,14 +47,16 @@ module Luban
         apply_to '>= 1.9.3' do
           before_install do
             depend_on 'openssl', version: '1.0.2j'
-            depend_on 'rubygems', version: '2.6.7'
             #depend_on 'yaml', version: '0.1.6'
           end
+          after_install do
+            depend_on 'rubygems-update', version: 'latest'
+          end
         end
 
         apply_to :all do
           after_install do
-            depend_on 'bundler', version: '1.13.3'
+            depend_on 'bundler', version: '1.13.5'
           end
         end
         
@@ -124,6 +126,10 @@ module Luban
 
           protected
 
+          def create_task(task)
+            super.tap { |t| t.opts.send("rubygems-update=", t.opts.rubygems) }
+          end
+
           def configure_build_options
             super
             @configure_opts.unshift("--disable-install-doc") unless install_doc?

data/lib/luban/deployment/packages/rubygems-update.rb

@@ -0,0 +1,29 @@
+require_relative 'gem'
+
+module Luban
+  module Deployment
+    module Packages
+      class RubygemsUpdate < Gem
+        class Installer < Gem::Installer
+          define_executable 'update_rubygems'
+
+          def installed?
+            return false unless file?(gem_executable)
+            match?("#{gem_executable} -v", package_version)
+          end
+
+          protected
+
+          def build_package
+            super and update_rubygems! and uninstall_gem!
+          end
+
+          def update_rubygems!
+            update_opts = "--no-rdoc --no-ri" unless install_doc?
+            test("#{update_rubygems_executable} #{update_opts} >> #{install_log_file_path} 2>&1")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,8 @@ module Luban
       class Rubygems < Luban::Deployment::Package::Base
         protected
 
+        def self.get_latest_version; RubygemsUpdate.get_latest_version; end
+
         def setup_provision_tasks
           super
           provision_tasks[:install].switch :install_doc, "Install Rubygems document"

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.9.2"
+    VERSION = "0.9.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli
@@ -142,11 +142,13 @@ files:
 - lib/luban/deployment/helpers/linked_paths.rb
 - lib/luban/deployment/helpers/utils.rb
 - lib/luban/deployment/packages/bundler.rb
+- lib/luban/deployment/packages/gem.rb
 - lib/luban/deployment/packages/git.rb
 - lib/luban/deployment/packages/logrotate.rb
 - lib/luban/deployment/packages/openssl.rb
 - lib/luban/deployment/packages/popt.rb
 - lib/luban/deployment/packages/ruby.rb
+- lib/luban/deployment/packages/rubygems-update.rb
 - lib/luban/deployment/packages/rubygems.rb
 - lib/luban/deployment/packages/yaml.rb
 - lib/luban/deployment/parameters.rb