luban 0.9.17 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54aaa659fc68b437ea84a6dde006a0aed146ce41
-  data.tar.gz: 593e65772197951b07170e1f3e1fec53daa528ff
+  metadata.gz: d2a1de16ff5b4437eeaddb1b9b9479f989f8f125
+  data.tar.gz: 2bef8b28135962894860e662d3b00d289c7f3634
 SHA512:
-  metadata.gz: cddef05167829d326ee7d0114f0336cab8b8c5cc9f1ab759412f69d4af32a15537a642706f6948d8130cd5f44b05351ba5dac9252aecb2177bca79f278ee6de0
-  data.tar.gz: 71596aa46bf7d871bee756cf250ef35465e8b0844b673773bc90001054a92eb8bc7314d0b0e69ad89028f93b1e205bc4f91592c7f96c1add52e49c62a4a8c222
+  metadata.gz: 1eabdca1caf19f816cead559a941f69613e5cfdc76e2ac0dfc2ebb98ee9f9a1859bbf61e74094ba5edad4454239aaf0a7d6b2c08a14133398730ec79328776af
+  data.tar.gz: f72579c2d4d0793cf482c396e366ec54ac74ef05310403ddef72be09371e88e93087fbf6374ee6434656b03f26d394ff5879b4b00b4d7fefccaca81d9e90ac45

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change log
 
+## Version 0.10.0 (Nov 21, 2016)
+
+New features:
+  * Used bundler to manage gem dependencies in Luban deployment projects
+    * By default, gems will be bundled in vendor/bundle
+    * Added one command-line option, --bundle-path, to customize the bundle path
+    * Updated Gemfile template with Luban dependency on version 0.10.x
+
+Minor enhancements:
+  * Deprecated Rubygems-update and setup Rubygems directly for Rubygems upgrade
+  * Upgraded Rubygems to version 2.6.8
+
 ## Version 0.9.17 (Nov 16, 2016)
 
 Minor enhancements:

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

@@ -50,7 +50,7 @@ module Luban
             #depend_on 'yaml', version: '0.1.6'
           end
           after_install do
-            depend_on 'rubygems-update', version: '2.6.7'
+            depend_on 'rubygems', version: '2.6.8'
           end
         end
 
@@ -126,10 +126,6 @@ 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/runner.rb

@@ -20,10 +20,19 @@ module Luban
         @config_file ||= work_dir.join(lubanfile)
       end
 
+      def new_project?; !!@new_project; end
+
       def init_project(args:, opts:)
-        set_default :project, args[:project]
+        if new_project?
+          project args[:project]
+          if project == '.'
+            work_dir Pathname.pwd
+            project work_dir.basename(".deploy").to_s
+          end
+        end
         singleton_class.send(:include, Luban::Deployment::Helpers::Generator::Project)
         create_project_skeleton
+        create_project_bundle(opts[:bundle_path])
       end
 
       protected
@@ -80,6 +89,7 @@ module Luban
       end
 
       def setup_cli_with_projects
+        @new_project = false
         load_configuration_file(config_file)
         set_default_common_parameters
         set_default_project_parameters
@@ -87,7 +97,7 @@ module Luban
 
         version Luban::Deployment::VERSION
         desc "Manage the deployment of project #{project.camelcase}"
-        setup_init_project(false)
+        setup_init_project
         setup_projects
       end
 
@@ -106,6 +116,7 @@ module Luban
       end
 
       def setup_cli_without_projects
+        @new_project = true
         set_default_common_parameters
 
         version Luban::Deployment::VERSION
@@ -114,13 +125,24 @@ module Luban
         setup_init_project
       end
 
-      def setup_init_project(new_project = true)
+      def setup_init_project
+        _self = self
         command :init do
           desc 'Initialize a Luban deployment project'
-          argument :project, 'Project name', required: true if new_project
+          option :bundle_path, 'Bundle path', default: "vendor/bundle"
+          if _self.new_project?
+            argument :project, 'Project name', required: true, assure: ->(name) { !name.empty? }
+          end
           action! :init_project
         end
       end
+
+      def create_project_bundle(bundle_path)
+        Dir.chdir(work_dir) do
+          puts "Running bundle install"
+          `bundle install --path "#{bundle_path}" 2>&1`.chomp.split("\n").each { |l| puts "  #{l}" }
+        end
+      end
     end
   end
 end

data/lib/luban/deployment/templates/project/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'luban'
+gem 'luban', '~>0.10.0'

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.9.17"
+    VERSION = "0.10.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.10.0
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli
@@ -150,7 +150,6 @@ files:
 - 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
@@ -207,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby framework for server automation and application deployment

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

@@ -1,29 +0,0 @@
-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