app_stack 0.0.9 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDUwNTI1MmNlNmI0OGFiNjBkZjU1ZDI3YjgyOTE0YTExNmVlMTBiNw==
+    MmFmMzhjYjBiYmRmNjZkZjFjNGIxZWU5OThjZjJhOTRhNGJlZWUwNg==
   data.tar.gz: !binary |-
-    ZGMxZTc2MjFhYjNmYjlkZTQwZTg3Yjc0YjZkMTVlNGUwYjQyYTE2MA==
+    MGRmMTNmYWY5NWI1ODY0ZWVmNDdmZDcxYmFmNTQyNzhkMzBlN2YwMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmUyN2VlNWM2MTU2M2RmNDE5YjY4YWVkY2UxZmUyODE3MWRjN2FmYjdiNTBj
-    NmI5MTgwODM4YTUwYTU3ZjIzNmViMzIzYTQ1NWY0Y2IyNzE4ODgxN2UzMDk0
-    MGUwMzNlMjBkNjc5Nzk2N2ZjMWMyYThkYzRjZTEyYzRmZGNhMTc=
+    YmRjYmU4N2MwZDIxYmUyMDRjM2FlMDRjNGIwN2RmZTA0YjhjZDU5MDgzYmFh
+    OTI3Yjk3NTFiM2FjNzRmMDI1YjM4YWU4ZWQ3OWM0NGZmNTMyMTg1OTMzYjk3
+    NWM4YTUwZGVhZDcyOTRlMTZmYWI3MTNjOGE5Mzk2MzEyYjQxN2Y=
   data.tar.gz: !binary |-
-    YWI1YzEzZGFkMDcxOTk2OTc4NWFhNjBlNDI5ODFiZTFmYzkxMjNlNmMwZGJm
-    NTIyY2NiM2JkZTc1NmU4M2NhZjE0MWMzODBkODFjMzA4YWFjMjQ5MmZkOGE0
-    MjdkZDVlZTk0Mzg1NTI5ZTY1ZjY4MmE2YzJlZDIzZGZjNDdlZWU=
+    ZjFkODQzOTVjZTA1ZDNjZWFjYjRjZWNjMjNkNTRmYmE0ZTVjNTQyZWQ5MDNi
+    YmQwODA1MTQwZGZkZGUxMGVmNWIzY2UyZDMyNWEwM2Y3YWNhZDE5ZDJjOTUy
+    NTY3ZTlhZDEyYzU4MDliN2U3NmUxYzNlZGRhYmFjMTM4YzVjMjU=

data/lib/app_stack/version.rb

@@ -2,5 +2,5 @@
 
 # AppStack module
 module AppStack
-  VERSION = '0.0.9'
+  VERSION = '1.0.0'
 end

data/lib/app_stack.rb

@@ -95,7 +95,6 @@ module AppStack
       raise "no directory found for #{app}" unless File.directory?(app_dir)
       raise "no configuration found for #{app}" unless
                File.exists?(app_dir + '/' + File.basename(@conf_file))
-      carp "Merge #{app.bold.blue}"
 
       # loop over remote files
       elist = export_list(app_dir)
@@ -107,23 +106,28 @@ module AppStack
         src_f = File.expand_path(app_dir + '/' + file)
         tgt_f = File.expand_path(@app_root + '/' + file)
 
-        if @files[file].nil? || @files[file] == app # yes, copy it
-          @files[file] = app unless @files[file]
-
-          carp "From #{app.blue.bold} copy #{file.bold}",
-               copy_file!(src_f, tgt_f),
-               1 unless File.exists?(src_f + @config['tpl_ext'])
+        if @files[file] == '__self' # don't handle it
+          carp "From #{app.blue.bold} #{file.bold}",
+               'skip, use '.white + @files[file], 2
+        else # not registered as self, copy over
+          unless @files[file] == app
+            carp "By #{app.bold.blue}, overwrite #{@files[file].bold} #{file}",
+                 'ok'.green, 1 if @files[file]
+            @files[file] = app
+          end
+
+          if File.exists?(src_f + @config['tpl_ext'])
+            carp "From #{app.blue.bold} render #{file.bold}",
+                 render_file!(src_f + @config['tpl_ext'], tgt_f), 1
+
+          else
+            carp "From #{app.blue.bold} copy #{file.bold}",
+                 copy_file!(src_f, tgt_f), 1
+          end
 
           # register the copied file to app-root file list
           @self_files << file unless @self_files.include?(file)
-        else # don't handle it
-          carp "From #{app.blue.bold} #{file.bold}",
-               'skip, use '.white + @files[file], 2
         end
-
-        carp "From #{app.blue.bold} render #{file.bold}",
-             render_file!(src_f + @config['tpl_ext'], tgt_f),
-             1 if File.exists?(src_f + @config['tpl_ext'])
       end
     end
   end
@@ -214,7 +218,7 @@ module AppStack
 
   # render from erb if newer
   def render_file!(f, target)
-    done = 'keep'.white
+    # done = 'keep'.white
     # if newer?(f, target)
     tilt = Tilt::ERBTemplate.new(f)
     oh = File.open(target, 'wb')

data/spec/fixtures/my_app/.app_stack.yml

@@ -23,12 +23,12 @@ attrs:
 files:
   .app_stack.yml: __self
   .gitignore: __self
-  Gemfile: __self
   config: __self
   config/self_render.conf: __self
   config/self_render.conf.erb: __self
   lib: __self
-  lib/auth_util.rb: __self
+  lib/auth_util.rb: module-2
   lib/libonly1.rb: module-1
   lib/libonly2.rb: module-2
+  Gemfile: module-2
 tpl_ext: .erb

data/spec/fixtures/stack_apps/module-1/.app_stack.yml

@@ -3,7 +3,6 @@ export:
   - lib/**/*.rb
   - config/**/*
   - app/**/*.rb
-  - Gemfile
 attrs:
   application_name: App Name for Module 1
   application_code: module_1_code

data/spec/stackup_spec.rb

@@ -5,13 +5,14 @@ describe AppStack do
     before(:all) do
       FileUtils.cp 'spec/fixtures/.app_stack.yml', 'spec/fixtures/my_app'
 
-      %w[config/self_render.conf Gemfile].each do |f|
+      %w[config/self_render.conf].each do |f|
         FileUtils.touch('spec/fixtures/my_app/' + f)
       end
 
-      sleep 1
+      # sleep 1
 
       FileUtils.touch('spec/fixtures/my_app/config/self_render.conf.erb')
+      FileUtils.touch('spec/fixtures/stack_apps/module-1/Gemfile')
       FileUtils.touch('spec/fixtures/stack_apps/module-2/Gemfile.erb')
 
       # run the stackup script
@@ -45,7 +46,7 @@ describe AppStack do
     end
 
     after(:all) do
-      %w[config/self_render.conf Gemfile
+      %w[config/self_render.conf Gemfile lib/auth_util.rb
          lib/libonly1.rb lib/libonly2.rb].each do |f|
         file = 'spec/fixtures/my_app/' + f
         FileUtils.rm(file) if File.exists?(file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_stack
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Huang Wei
@@ -107,7 +107,6 @@ files:
 - spec/fixtures/my_app/.app_stack.yml
 - spec/fixtures/my_app/.gitignore
 - spec/fixtures/my_app/config/self_render.conf.erb
-- spec/fixtures/my_app/lib/auth_util.rb
 - spec/fixtures/sample_config.yml
 - spec/fixtures/stack_apps/module-1/.app_stack.yml
 - spec/fixtures/stack_apps/module-1/Gemfile
@@ -155,7 +154,6 @@ test_files:
 - spec/fixtures/incexc/lib/mixin/otherlib.rb
 - spec/fixtures/incexc/spec/spec_helper.rb
 - spec/fixtures/incexc/spec/support/api_test.rb
-- spec/fixtures/my_app/lib/auth_util.rb
 - spec/fixtures/stack_apps/module-1/lib/auth_util.rb
 - spec/fixtures/stack_apps/module-1/lib/libonly1.rb
 - spec/fixtures/stack_apps/module-2/lib/auth_util.rb

data/spec/fixtures/my_app/lib/auth_util.rb

@@ -1,5 +0,0 @@
-# encoding: utf-8
-
-def auth_util
-  'auth_util from module 1'
-end