luban 0.10.7 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec3ded5ecfb310a1b91471bc15227b9928e5965
-  data.tar.gz: 6bbb2ecfb31d75c609d694c675b6f2b5ebd5848a
+  metadata.gz: e2d32a4a1dd92cca13d7871748e3c8092e4f9f2f
+  data.tar.gz: baa5d0afb14855fe06ce61149bb4e2e050bd778b
 SHA512:
-  metadata.gz: a7ffa7fb3c20a33e39c0ee20649ee3fcd2489ee0459e928e331e636e4b4d6abb1551784160df196dd621475305ea33e6d1de7334723acdeaeb1a7079be437a74
-  data.tar.gz: d874cc08156832c77626eaa88397fa23a9c69dd4ec7440ef273bce6039e411522d34bb5c80bf02f0daae77af2169953ab0ea5e1e5e2a8fcbbab378e878340603
+  metadata.gz: 37b0f795646f60a414d21957bb7213c2284e75fa8670bcd7f5e12f8fcdeac10d641d6aa2c35a092cbbaf953c6119e5eb841b5cdc030a0ec0c69d5041bff8ab02
+  data.tar.gz: e5ebf731e97745f01ff47b229261c1ba622fbcbd447e2e0e21761e84b7df919cc5fa6bcef1758c118b39db9195d9c7cae05d5490e546979debb39bcc0ebb6d2b

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change log
 
-## Version 0.10.7 (Nov 25, 2016)
+## Version 0.10.8 (Nov 26, 2016)
+
+Minor enhancements:
+   Added #control_file_dir to specify directory name for control file
+    * By default, control_fir_dir is also used in linked_files handling
 
 Bug fixes:
   * Normalized executable name into proper method name when defining executable for a given package

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

@@ -67,9 +67,11 @@ module Luban
           end
 
           def control_file_path
-            @control_file_path ||= profile_path.join(control_file_name)
+            @control_file_path ||= profile_path.join(control_file_dir, control_file_name)
           end
 
+          def control_file_dir; @control_file_dir ||= ""; end
+
           def control_file_name
             @control_file_name ||= "#{service_name}.conf"
           end

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

@@ -5,18 +5,22 @@ module Luban
         def linked_dirs; @linked_dirs ||= []; end
         def linked_files; @linked_files ||= []; end
 
-        def linked_files_dir
-          @linked_files_dir ||= 'config'
-        end
-
         def linked_files_root
           @linked_files_root ||= config_finder[:application].stage_profile_path.join(profile_name)
         end
 
+        def linked_files_dir
+          @linked_files_dir ||= control_file_dir
+        end
+
         def linked_files_from
           @linked_files_from ||= linked_files_root.join(linked_files_dir)
         end
 
+        def linked_files_dir_exists?
+          !linked_files_dir.to_s.empty? and linked_files_from.directory?
+        end
+
         protected
 
         def init
@@ -30,7 +34,7 @@ module Luban
         end
 
         def init_linked_files
-          return unless linked_files_from.directory?
+          return unless linked_files_dir_exists?
           Dir.chdir(linked_files_from) do
             linked_files.concat(Pathname.glob("**/*").select { |f| f.file? })
           end

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.10.7"
+    VERSION = "0.10.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.10.8
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli