luban 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72355bc137cbef16a7cb79d5ff8cdf43aaf5b319
-  data.tar.gz: bf8dcc14391a985b0e94f6d6ee7860a3ae86da1c
+  metadata.gz: 51db0c8680dd9ed4b6d19a0e8b99c28d9c90bacb
+  data.tar.gz: e097338152892da6526a9ed445c6154b2e127f1b
 SHA512:
-  metadata.gz: 475b0feae1238547ba9541ee95a379e9f41a6cde447a1e403d283c7845f79b05a698a93bf0fa067f9039402236c5cf163c9b5192322c6b6924752ab32af089f8
-  data.tar.gz: 0dc3c43f80118bd6d882c6ebff860818d1ad1a966130299f8e62cda710e90d59a2340d950ca5b35e98aac2160e87bb59d207c9bdc09ca165acd9a155ffb85cef
+  metadata.gz: 9579b032ed20af7cc705cd00c45b3156a92a60228d92309aa9e14120d0f55c805d837dbcefac3b119664bd608f2715292509da77e09819841d0bd0bb632d1228
+  data.tar.gz: 989fd8aff640d2f0c8f20f2e2e11ccb52307458c32208e7b47b41216e952c0927c7a73ed2db00d29a3c11efd0a4bbb6f6a103aebcf2e8c89f563f5c1f5df99ef

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## Version 0.9.12 (Oct 27, 2016)
+
+Bug fixes:
+  * Fixed local source initialization issue
+    * As a side effect, refactored local source handling
+
 ## Version 0.9.11 (Oct 24, 2016)
 
 Bug fixes:

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

@@ -112,16 +112,19 @@ module Luban
         release_opts[version] = opts.merge(version: version)
       end
 
-      def default_source_path
-        @default_source_path ||=
-          [config_finder[:application].stage_config_path.join('app'),
-           config_finder[:application].base_path.join('app')].find do |source_path|
-            File.directory?(source_path)
-          end
+      def local_source_path
+        @local_source_path ||= [local_source_stage_path, local_source_base_path].find do |path|
+                                  File.directory?(path)
+                                end
+      end
+
+      def local_source_stage_path
+        @local_source_stage_path ||= config_finder[:application].stage_config_path.join('app')
       end
+      alias_method :default_source_path, :local_source_stage_path
 
-      def default_source?
-        has_source? and source[:from] == default_source_path
+      def local_source_base_path
+        @local_source_base_path ||= config_finder[:application].base_path.join('app')
       end
 
       def has_version?(version)
@@ -237,8 +240,10 @@ module Luban
       end
 
       def init_source(args:, opts:)
-        if default_source?
-          init_source!(args: args, opts: opts.merge(source: source))
+        if respond_to?(:default_source_template_path, true)
+          init_source!(args: args, 
+                       opts: opts.merge(default_source_template_path: default_source_template_path,
+                                        default_source_path: default_source_path))
         end
       end
       dispatch_task :init_source!, to: :configurator, as: :init_source, locally: true
@@ -284,8 +289,8 @@ module Luban
       end
 
       def set_default_for_source
-        unless default_source_path.nil?
-          source(default_source_path, scm: :rsync)
+        unless local_source_path.nil?
+          source(local_source_path, scm: :rsync)
           release(stage, current: true)
         end
       end

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

@@ -5,11 +5,11 @@ module Luban
         include Luban::Deployment::Service::Configurator::Base
 
         def default_source_path
-          task.opts.source[:from]
+          task.opts.default_source_path
         end
 
         def default_source_template_path
-          raise NotImplementedError, "#{self.class.name}#default_source_template_path is an abstract method."
+          task.opts.default_source_template_path
         end
 
         def init_source

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.9.11"
+    VERSION = "0.9.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli