luban 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fa7543e21ed502b6c3f17e0f20ab595dab79d07
-  data.tar.gz: 9b50ec645632e5dbd37410d53344d7361efc58d8
+  metadata.gz: d5bfdac90e3be004eaf61bb816f54479a51592a3
+  data.tar.gz: 479bbe9ed933df387977557a5a28ad2138f0d017
 SHA512:
-  metadata.gz: 2b1b189f6a2e92c9d35ec54ce9741c8bb24ed0bfdb296a86cd97f5e137b0ac87901ac74c88703ce7d99eb16f4ac2f61b57f6c185878c4913701003f0b7b1e238
-  data.tar.gz: 476d325cfe19580c92574a4461b58a917486ac546857830b1b25b5be4b21647c69fd9463d3cf246319a26c31bc18f30e641906c3b14e741a9f858dace56afcf0
+  metadata.gz: b4851bb38fa007fd4aa7aa74aafea3dc08a1d79ebb04370d991ead74ac6b842d1f51f329aced85f698f132c11c33e4ad36504eda0be4002c30c7275eaf58e2f3
+  data.tar.gz: 0ee3f50877b21a2f8fd85bb9dde6f4b82a47d9240af3a9f9431f9a33e5262bb030130afab0af2ba0e2a536c21d0ef5602288e5f29902a986ab2190b4a052fa75

data/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change log
 
-## Version 0.11.2 (Jan 06, 2017)
+## Version 0.11.3 (Jan 09, 2017)
 
 Minor enhancements:
   * Separated package installations by application instead of by project
+  * Enhanced the Curl package configure to set a hard-coded path to the run-time linker for SSL
+  * Enhanced Git installation:
+    * Added package dependency of Curl and an install option to specify Curl version
+    * Added install switch, #install_tcltk, to turn on/off tcltk installation (default: off)
+    * Turned off localization for Git installation (NO_GETTEXT=1)
+
+Bug fixes:
+  * Corrected the long descriptions for package provision commands
 
 ## Version 0.11.1 (Jan 04, 2017)
 

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

@@ -230,6 +230,7 @@ module Luban
           commands[:provision].alter do
             task :install do
               desc "Install a given version"
+              long_desc "Install a given version in #{_package.parent.class.name}"
               option :version, "Version to install", short: :v, required: true,
                      assure: ->(v){ _package.versions.include?(v) }
               switch :force, "Force to install", short: :f
@@ -238,12 +239,14 @@ module Luban
 
             task :install_all do
               desc "Install all versions"
+              long_desc "Install all versions in #{_package.parent.class.name}"
               switch :force, "Force to install", short: :f
               action! :install_all
             end
 
             task :uninstall do
               desc "Uninstall a given version"
+              long_desc "Uninstall a given version in #{_package.parent.class.name}"
               option :version, "Version to uninstall", short: :v, required: true,
                       assure: ->(v){ _package.versions.include?(v) }
               switch :force, "Force to uninstall", short: :f
@@ -252,6 +255,7 @@ module Luban
 
             task :uninstall_all do
               desc "Uninstall all versions"
+              long_desc "Uninstall all versions in #{_package.parent.class.name}"
               switch :force, "Force to uninstall", short: :f, required: true
               action! :uninstall_all
             end

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

@@ -29,7 +29,8 @@ module Luban
             if osx? 
               @configure_opts << "--with-darwinssl"
             else
-              @configure_opts << "--with-ssl=\"#{dir} -Wl,-rpath -Wl,#{dir.join('lib')}\""
+              @configure_opts << "--with-ssl=\"#{dir}\""
+              @configure_opts << "LDFLAGS=\"-Wl,-rpath -Wl,#{dir.join('lib')}\""
             end
           end
         end

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

@@ -5,6 +5,7 @@ module Luban
         apply_to :all do
           before_install do
             depend_on 'openssl', version: '1.0.2j'
+            depend_on 'curl', version: '7.52.1'
           end
         end
 
@@ -12,10 +13,16 @@ module Luban
 
         def setup_provision_tasks
           super
+          provision_tasks[:install].switch :install_tcltk, "Install with TclTk"
           provision_tasks[:install].option :openssl, "OpenSSL version"
+          provision_tasks[:install].option :curl, "Curl version"
         end
 
         class Installer < Luban::Deployment::Package::Installer
+          def install_tcltk?
+            task.opts.install_tcltk
+          end
+
           define_executable 'git'
 
           def source_repo
@@ -35,6 +42,25 @@ module Luban
           def with_openssl_dir(dir)
             @configure_opts << "--with-openssl=#{dir}"
           end
+
+          def with_curl_dir(dir)
+            @configure_opts << "--with-curl=#{dir}"
+          end
+
+          protected
+
+          def configure_build_options
+            super
+            @configure_opts << "--without-tcltk" unless install_tcltk?
+          end
+
+          def make_package!
+            test(:make, "NO_GETTEXT=1 >> #{install_log_file_path} 2>&1")
+          end
+
+          def install_package!
+            test(:make, "NO_GETTEXT=1 install >> #{install_log_file_path} 2>&1")
+          end
         end
       end
     end

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.11.2"
+    VERSION = "0.11.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli