luban 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3bb8577686b082a631040457727ce47b0999543
-  data.tar.gz: 657f3f393403953ea5606b288f997f212beb4ab3
+  metadata.gz: db4f45e199a07e299a540fde6da20ebc35ed9c55
+  data.tar.gz: a90ba102ab2eba5b2b11eadd4a4373f18eebdd8e
 SHA512:
-  metadata.gz: 7344a5bdf345d666bed583166e90ed40b773fb2f7bdb224102b1d2eefc2de24a270d4b5ae23dbe1eb6fc4a36538ec100d335730134efe25c507474e39b659ff2
-  data.tar.gz: 960aa2296bb31efdae8025a9180188867b94603871977ca307c3b6ac35540d5e99f993115c0e54b38a34849af9e68595d153e399ba25b81461efa3605db0fe8f
+  metadata.gz: beddaa95f8d175de1e33447f14b8eddb8ac7dc49744a39e17da918422364a14749585a1fa74959f46f53f237d25f27a34c7bece75be88f454e9101b2d36d809f
+  data.tar.gz: 3b337963512a401009e2500ba0f94e6277b2b3b4dac45e5201fa185cc2e46f2c7e2ad8ec208e4a4efca56d574753252bd7ea35400b6f7095fb6405b942be9cb2

data/CHANGELOG.md

@@ -0,0 +1,37 @@
+# Change log
+
+## Version 0.3.0 (Apr 12, 2016)
+
+Minor enhancements:
+  * Changed to download third-party source packages locally to save internet access from app servers
+  * Refactored remote and local worker paths
+  * Moved build repositories to the last building step
+  * Fixed wrong clone path when fetching revision in Rsync strategy
+  * Upgrade OpenSSL to 1.0.2g for Git installer
+  * Code cleanup
+
+## Version 0.2.0 (Apr 01, 2016)
+
+Bug fixes:
+  * Removed util method, #md5_for_dir, due to inconsistent hash
+  * Upgrade OpenSSL to 1.0.2g for Ruby installer
+  * Code cleanup
+
+## Version 0.1.0 (Mar 31, 2016)
+
+New features:
+  * Configuration DSL to support environment setup
+  * Command-line interface to run Luban project
+  * Installer to install 3rd-party software packages
+    * OpenSSL installer
+    * YAML installer
+    * Git installer
+    * Ruby installer
+    * Rubygems installer
+    * Bundler installer
+  * Authenticator to setup passwordless SSH to application servers
+  * Builder to setup application environment
+  * Repository to manage application source and profile 
+    * SCM strategy for Git
+    * SCM strategy for Rsync
+  * Publisher to deploy application release

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

@@ -64,9 +64,9 @@ module Luban
       def build(args:, opts:)
         show_app_environment
         promptless_authen(args: args, opts: opts)
-        build_repositories(args: args, opts: opts)
         build!(args: args, opts: opts)
         install_all(args: args, opts: opts)
+        build_repositories(args: args, opts: opts)
       end
 
       def destroy(args:, opts:)

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

@@ -1,7 +1,9 @@
 module Luban
   module Deployment
     class Application
-      class Builder < Luban::Deployment::Worker::Remote
+      class Builder < Luban::Deployment::Worker::Base
+        include Luban::Deployment::Worker::Paths::Remote
+
         def envrc_template_file
           @envrc_template_file ||= find_template_file("envrc.erb")
         end
@@ -39,8 +41,8 @@ module Luban
         protected
 
         def bootstrap
-          assure_dirs(etc_path, tmp_path, 
-                      app_bin_path, app_tmp_path,
+          assure_dirs(etc_path, tmp_path, downloads_path,
+                      app_bin_path, app_tmp_path, 
                       releases_path, shared_path)
           assure_linked_dirs
         end

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

@@ -1,7 +1,9 @@
 module Luban
   module Deployment
     class Application
-      class Publisher < Luban::Deployment::Worker::Remote
+      class Publisher < Luban::Deployment::Worker::Base
+        include Luban::Deployment::Worker::Paths::Remote
+
         def release_name; task.opts.release[:name]; end
         def release_tag; task.opts.release[:tag]; end
         def release_package_path; task.opts.release[:path]; end

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

@@ -1,8 +1,9 @@
 module Luban
   module Deployment
     class Application
-      class Repository < Luban::Deployment::Worker::Local
+      class Repository < Luban::Deployment::Worker::Base
         using Luban::CLI::CoreRefinements
+        include Luban::Deployment::Worker::Paths::Local
 
         DefaultRevisionSize = 12
 

data/lib/luban/deployment/cli/application/scm/rsync.rb

@@ -20,7 +20,7 @@ module Luban
 
             def fetch_revision
               # Use MD5 as the revision
-              capture(:tar, "-cf - #{dir} 2>/dev/null | openssl md5")[0, rev_size]
+              capture(:tar, "-cf - #{clone_path} 2>/dev/null | openssl md5")[0, rev_size]
             end
 
             def clone

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

@@ -64,7 +64,7 @@ module Luban
         end
 
         module Deploy
-          %i(deploy rollback).each do |action| 
+          %i(deploy).each do |action| 
             define_method(action) do |args:, opts:|
               raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
             end

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

@@ -90,11 +90,19 @@ module Luban
 
         def versions; package_options.keys; end
 
-        %i(install uninstall cleanup_all update_binstubs
+        define_task_method("download_package", task: :download, worker: :installer, locally: true)
+        define_task_method("install_package", task: :install, worker: :installer)
+
+        %i(uninstall cleanup_all update_binstubs
            get_summary which_current whence_origin).each do |m| 
           define_task_method(m, worker: :installer)
         end
 
+        def install(args:, opts:)
+          md5 = download_package(args: args, opts: opts)[:md5]
+          install_package(args: args, opts: opts.merge(src_file_md5: md5))
+        end
+
         def install_all(args:, opts:)
           versions.each do |v| 
             install(args: args, opts: opts.merge(version: v))

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

@@ -4,6 +4,8 @@ module Luban
       class Installer
         class InstallFailure < Luban::Deployment::Error; end
 
+        def src_file_md5; task.opts.src_file_md5; end
+
         def required_packages
           @required_packages ||= 
             self.class.package_class(package_name).
@@ -18,20 +20,45 @@ module Luban
           raise NotImplementedError, "#{self.class.name}#installed? is an abstract method."
         end
 
+        def downloaded?
+          file?(src_file_path)
+        end
+
+        def cached?
+          file?(src_cache_path)
+        end
+
         def validate_download_url
           info "Validating download URL for #{package_full_name}"
           validate_download_url!
         end
 
+        def download
+          info "Downloading #{package_full_name}"
+          if downloaded?
+            update_result "Skipped! #{package_full_name} has been downloaded ALREADY.",
+                          status: :skipped, md5: md5_for_file(src_file_path)
+          else
+            download_package!
+            if downloaded?
+              update_result "Successfully downloaded #{package_full_name}.",
+                            md5: md5_for_file(src_file_path)
+            else
+              update_result "Failed to download #{package_full_name}. " + 
+                            "Please check install log for details: #{install_log_file_path}",
+                            status: :failed, level: :error
+            end
+          end
+        end
+
         def install
           info "Installing #{package_full_name}"
           if installed?
             if force?
               install!
             else
-              update_result "Skipped! #{package_full_name} has been installed ALREADY.", 
-                            status: :skipped
-              return
+              return update_result("Skipped! #{package_full_name} has been installed ALREADY.", 
+                                   status: :skipped)
             end
           else
             install!
@@ -146,17 +173,21 @@ module Luban
 
         protected
 
-        def before_install
-          bootstrap
-          unless installed? or file?(src_file_path)
+        def before_download
+          unless downloaded?
+            bootstrap_download
             validate_download_url
           end
+        end
+
+        def before_install
+          bootstrap_install unless installed?
           install_required_packages(:before_install)          
         end
 
         def after_install
           install_required_packages(:after_install)
-          update_binstubs!
+          update_binstubs
         end
 
         def install_required_packages(type)
@@ -177,7 +208,7 @@ module Luban
         end
 
         def install!
-          download_package
+          upload_package
           uncompress_package
           assure_dirs(build_path)
           within build_path do
@@ -252,33 +283,45 @@ module Luban
           end
         end
 
-        def bootstrap
-          assure_dirs(etc_path, tmp_path, app_bin_path, install_path, install_log_path)
+        def bootstrap_download
+          assure_dirs(package_downloads_path)
         end
 
-        def download_package
-          info "Downloading #{package_full_name} source package"
-          if file?(src_file_path)
-            info "#{package_full_name} is downloaded ALREADY"
-          else
-            download_package!
-          end
+        def bootstrap_install
+          assure_dirs(etc_path, tmp_path, app_bin_path, install_path, install_log_path)
         end
 
         def download_package!
-          unless test("curl -L -o #{src_file_path} #{download_url} >> #{install_log_file_path} 2>&1")
+          unless test(:curl, "-L -o #{src_file_path} #{download_url}")
             rm(src_file_path)
             abort_action('download')
           end
         end
 
+        def upload_package
+          info "Uploading #{package_full_name} source package"
+          if file?(src_cache_path)
+            info "#{package_full_name} is uploaded ALREADY"
+          else
+            upload_package!
+          end
+        end
+
+        def upload_package!
+          upload!(src_file_path.to_s, src_cache_path.to_s)
+          unless md5_matched?(src_cache_path, src_file_md5)
+            rm(src_cache_path)
+            abort_action('upload')
+          end
+        end
+
         def uncompress_package
           info "Uncompressing #{package_full_name} source package"
           uncompress_package!
         end
 
         def uncompress_package!
-          unless test("tar -xzf #{src_file_path} -C #{package_tmp_path} >> #{install_log_file_path} 2>&1")
+          unless test("tar -xzf #{src_cache_path} -C #{package_tmp_path} >> #{install_log_file_path} 2>&1")
             abort_action('uncompress')
           end
         end

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

@@ -12,40 +12,28 @@ module Luban
           @src_file_extname ||= DefaultSrcFileExtName
         end
 
-        def src_file_path
-          @src_file_path ||= tmp_path.join(src_file_name)
+        def src_cache_path
+          @src_cache_path ||= tmp_path.join(src_file_name)
         end
 
-        def source_repo
-          raise NotImplementedError, "#{self.class.name}#source_repo is an abstract method."
-        end
-
-        def download_from_source?
-          lubhub_repo.nil?
-        end
-
-        def download_from_lubhub?
-          !lubhub_repo.nil?
+        def src_file_path 
+          @src_file_path ||= package_downloads_path.join(src_file_name)
         end
 
-        def download_repo
-          @download_repo ||= download_from_source? ? source_repo : lubhub_repo
+        def source_repo
+          raise NotImplementedError, "#{self.class.name}#source_repo is an abstract method."
         end
 
         def source_url_root
           raise NotImplementedError, "#{self.class.name}#source_url_root is an abstract method."
         end
 
-        def download_url_root
-          @download_url_root ||= download_from_source? ? source_url_root : package_name
-        end
-
         def download_url
-          @download_url ||= File.join(download_repo, download_url_root, src_file_name)
+          @download_url ||= File.join(source_repo, source_url_root, src_file_name)
         end
 
         def install_path
-          @install_path ||= package_path.join('versions', package_version)
+          @install_path ||= package_versions_path.join(package_version)
         end
 
         def bin_path

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

@@ -1,7 +1,9 @@
 module Luban
   module Deployment
     module Package
-      class Worker < Luban::Deployment::Worker::Remote
+      class Worker < Luban::Deployment::Worker::Base
+        include Luban::Deployment::Worker::Paths::Remote
+
         class << self
           def package_class(package)
             Luban::Deployment::Package::Base.package_class(package)
@@ -34,9 +36,17 @@ module Luban
           @package_path ||= luban_install_path.join('pkg', package_name)
         end
 
+        def package_versions_path
+          @package_versions_path ||= package_path.join('versions')
+        end
+
         def package_tmp_path
           @package_tmp_path ||= package_path.join('tmp')
         end
+
+        def package_downloads_path
+          @package_downloads_path ||= downloads_path.join(package_name)
+        end
       end
     end
   end

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

@@ -72,7 +72,7 @@ module Luban
             install_opts = ['--local']
             install_opts << "--no-document" unless install_doc?
             test("#{gem_executable} uninstall bundler -a -x -I >> #{install_log_file_path} 2>&1") and
-            test("#{gem_executable} install #{install_opts.join(' ')} #{src_file_path} >> #{install_log_file_path} 2>&1")
+            test("#{gem_executable} install #{install_opts.join(' ')} #{src_cache_path} >> #{install_log_file_path} 2>&1")
           end
         end
       end

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

@@ -4,7 +4,7 @@ module Luban
       class Git < Luban::Deployment::Package::Binary
         apply_to :all do
           before_install do
-            depend_on 'openssl', version: '1.0.2e'
+            depend_on 'openssl', version: '1.0.2g'
           end
         end
 

data/lib/luban/deployment/parameters.rb

@@ -58,7 +58,7 @@ module Luban
             luban_root_path Pathname.new(luban_root_path)
           end
           unless luban_root_path.is_a?(Pathname)
-            abort "Aborted! Luban root path should be a String or a Pathname: luban_root_path Pathname.new('/opt/luban')"
+            abort "Aborted! Luban root path should be a String or a Pathname: luban_root_path Pathname.new('#{DefaultLubanRootPath}')"
           end
         end
       end
@@ -70,9 +70,6 @@ module Luban
 
         parameter :process_monitor
         parameter :process_monitor_env
-        parameter :lubhub_protocol
-        parameter :lubhub_host
-        parameter :lubhub_port
 
         parameter :sshkit_backend
         parameter :authen_key_type
@@ -82,26 +79,11 @@ module Luban
         parameter :pty
         parameter :connection_timeout
         parameter :ssh_options
-        parameter :shell_setup
         parameter :use_sudo
 
-        # To download all package sources directly from the package providers,
-        # Just do NOT set any Lubpack related variables.
-        #
-        # To specify the Lubpack of your own, you can
-        #     lubhub_protocol 'http'
-        #     lubhub_host 'your.lubhub.com'
-        #     lubhub_port 8080
-        def lubhub
-          lubhub_host.nil? ? nil : "#{lubhub_protocol}://#{lubhub_host}:#{lubhub_port}"
-        end
-        alias_method :lubhub_repo, :lubhub
-
         protected
 
         def set_default_project_parameters
-          set_default :lubhub_protocol, 'http'
-          set_default :lubhub_port, 8080
           set_default :sshkit_backend, SSHKit::Backend::Netssh
           set_default :authen_key_type, 'rsa'
           set_default :default_env, { path: '$PATH:/usr/local/bin' }
@@ -110,7 +92,6 @@ module Luban
           set_default :pty, false
           set_default :connection_timeout, 30 # second
           set_default :ssh_options, {}
-          set_default :shell_setup, 'bash -l' # Use Bash interactive shell by default
           set_default :use_sudo, false # Turn off sudo by default
 
           setup_default_project_config_finder

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/luban/deployment/worker/paths.rb

@@ -0,0 +1,75 @@
+module Luban
+  module Deployment
+    module Worker
+      module Paths
+        module Local
+          def project_path
+            @project_path ||= work_dir
+          end
+
+          def apps_path
+            @apps_path ||= project_path.join('apps')
+          end
+
+          def app_path
+            @app_path ||= apps_path.join(application)
+          end
+        end
+
+        module Remote
+          def env_path
+            @env_path ||= luban_root_path.join('env')
+          end
+
+          def etc_path
+            @etc_path ||= luban_root_path.join('etc')
+          end
+
+          def tmp_path
+            @tmp_path ||= luban_root_path.join('tmp')
+          end
+
+          def downloads_path
+            @downloads_path ||= luban_root_path.join('downloads')
+          end
+
+          def project_path
+            @project_path ||= env_path.join("#{stage}.#{project}")
+          end
+
+          def app_path
+            @app_path ||= project_path.join(application)
+          end
+
+          def app_bin_path
+            @app_bin_path ||= app_path.join('bin')
+          end
+
+          def app_tmp_path
+            @app_tmp_path ||= app_path.join('tmp')
+          end
+
+          def releases_path
+            @releases_path ||= app_path.join('releases')
+          end
+
+          def shared_path
+            @shared_path ||= app_path.join('shared')
+          end
+
+          def envrc_file
+            @envrc_file ||= app_path.join(".envrc")
+          end
+
+          def unset_envrc_file
+            @unset_envrc_file ||= app_path.join(".unset_envrc")
+          end
+
+          def luban_install_path
+            @luban_install_path ||= project_path.join('.luban')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/luban/deployment/worker.rb

@@ -1,4 +1,3 @@
 require_relative 'worker/task'
 require_relative 'worker/base'
-require_relative 'worker/local'
-require_relative 'worker/remote'
+require_relative 'worker/paths'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -142,9 +143,7 @@ files:
 - lib/luban/deployment/version.rb
 - lib/luban/deployment/worker.rb
 - lib/luban/deployment/worker/base.rb
-- lib/luban/deployment/worker/controller.rb
-- lib/luban/deployment/worker/local.rb
-- lib/luban/deployment/worker/remote.rb
+- lib/luban/deployment/worker/paths.rb
 - lib/luban/deployment/worker/task.rb
 - luban.gemspec
 homepage: https://github.com/lubanrb/luban

data/lib/luban/deployment/worker/controller.rb

@@ -1,11 +0,0 @@
-module Luban
-  module Deployment
-    module Worker
-      class Controller < Base
-        def bin_path
-          @bin_path ||= install_path.join('bin')
-        end
-      end
-    end
-  end
-end

data/lib/luban/deployment/worker/local.rb

@@ -1,19 +0,0 @@
-module Luban
-  module Deployment
-    module Worker
-      class Local < Base
-        def project_path
-          @project_path ||= work_dir
-        end
-
-        def apps_path
-          @apps_path ||= project_path.join('apps')
-        end
-
-        def app_path
-          @app_path ||= apps_path.join(application)
-        end
-      end
-    end
-  end
-end

data/lib/luban/deployment/worker/remote.rb

@@ -1,55 +0,0 @@
-module Luban
-  module Deployment
-    module Worker
-      class Remote < Base
-        def env_path
-          @env_path ||= luban_root_path.join('env')
-        end
-
-        def etc_path
-          @etc_path ||= luban_root_path.join('etc')
-        end
-
-        def tmp_path
-          @tmp_path ||= luban_root_path.join('tmp')
-        end
-
-        def project_path
-          @project_path ||= env_path.join("#{stage}.#{project}")
-        end
-
-        def app_path
-          @app_path ||= project_path.join(application)
-        end
-
-        def app_bin_path
-          @app_bin_path ||= app_path.join('bin')
-        end
-
-        def app_tmp_path
-          @app_tmp_path ||= app_path.join('tmp')
-        end
-
-        def releases_path
-          @releases_path ||= app_path.join('releases')
-        end
-
-        def shared_path
-          @shared_path ||= app_path.join('shared')
-        end
-
-        def luban_install_path
-          @luban_install_path ||= project_path.join('.luban')
-        end
-
-        def envrc_file
-          @envrc_file ||= app_path.join(".envrc")
-        end
-
-        def unset_envrc_file
-          @unset_envrc_file ||= app_path.join(".unset_envrc")
-        end
-      end
-    end
-  end
-end