app_stack 1.1.4 → 1.2.0

data/spec/fixtures/sample_files/module_3/app_stack.yml

@@ -0,0 +1,3 @@
+export:
+  - lib/**/*.rb
+  - bin/**/*

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

@@ -0,0 +1,15 @@
+stack:
+- module_1:
+  - default
+  - tests
+- module_2
+- module_3:
+  - default
+  - config/application.yml: ''
+  - config/database_production.yml: config/database.yml
+exclude:
+- doc/excluding.txt
+- Rakefile
+- bin/*
+attrs:
+  application_code: my_app

data/spec/fixtures/sample_files/my_app/doc/excluding.txt

@@ -0,0 +1 @@
+from my_app

data/spec/fixtures/sample_files/my_app_back/app_stack.yml

@@ -0,0 +1,15 @@
+stack:
+- module_1:
+  - default
+  - tests
+- module_2
+- module_3:
+  - default
+  - config/application.yml: ''
+  - config/database_production.yml: config/database.yml
+exclude:
+- doc/excluding.txt
+- Rakefile
+- bin/*
+attrs:
+  application_code: my_app

data/spec/fixtures/sample_files/my_app_back/doc/excluding.txt

@@ -0,0 +1 @@
+from my_app

data/spec/merger_spec.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe AppStack::Merger do
+  subject (:mg) { AppStack::Merger.new('spec/fixtures/sample_files/my_app/app_stack.yml') }
+  describe '#parse_stacks' do
+    it 'get a stacked app list' do
+      mg.stacks[0].app_name.should eq('module_1')
+    end
+
+    it 'get a group of files' do
+      file = File.expand_path('spec/fixtures/sample_files/module_1/spec/config_spec.rb')
+      mg.stacks[0].copy_list[file].should eq('/spec/config_spec.rb')
+    end
+
+    it 'get the default files' do
+      file = File.expand_path('spec/fixtures/sample_files/module_2/app/lib/sequence.rb')
+      mg.stacks[1].copy_list[file].should eq('/app/lib/sequence.rb')
+    end
+
+    it 'get file with specified target name' do
+      file = File.expand_path('spec/fixtures/sample_files/module_3/config/database_production.yml')
+      mg.stacks[2].copy_list[file].should eq('config/database.yml')
+    end
+  end
+
+  describe '#prepare' do
+    it 'get copy list' do
+      mg.prepare
+      file = File.expand_path('spec/fixtures/sample_files/module_3/config/database_production.yml')
+      target = File.expand_path('spec/fixtures/sample_files/my_app/config/database.yml')
+      mg.copy_list[target].should eq(file)
+    end
+
+    it 'get render list' do
+      mg.prepare
+      file = File.expand_path('spec/fixtures/sample_files/module_2/Gemfile.liquid')
+      target = File.expand_path('spec/fixtures/sample_files/my_app/Gemfile')
+      mg.render_list[target].should eq(file)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,16 +1,14 @@
 # encoding: utf-8
 require 'simplecov'
 SimpleCov.start do
-  coverage_dir 'docs/coverage'
+  coverage_dir 'doc/coverage'
 end
 
 require 'rspec'
-require 'app_stack'
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-# mixin-up, add stub-reader for testing
-module AppStack
-  attr_reader :config, :app_root, :stack_dir, :files
-  attr_accessor :verbose
-end
+require 'app_stack'
 
-# file test
+# reset files tructure of the my_app folder
+FileUtils.rm_rf 'spec/fixtures/sample_files/my_app'
+FileUtils.cp_r 'spec/fixtures/sample_files/my_app_back', 'spec/fixtures/sample_files/my_app'

data/spec/stackup_spec.rb

@@ -1,56 +1,17 @@
 # encoding: utf-8
+require 'spec_helper'
 
 describe AppStack do
-  describe '#stackup' do
-    before(:all) do
-      FileUtils.cp 'spec/fixtures/.app_stack.yml', 'spec/fixtures/my_app'
-
-      %w[config/self_render.conf].each do |f|
-        FileUtils.touch('spec/fixtures/my_app/' + f)
-      end
-
-      # 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
-      AppStack.stackup!('spec/fixtures/my_app/.app_stack.yml')
-      AppStack.verbose = 2
-    end
-
-    it 'cp files from the chain of stacks' do
-      c1 = File.read('spec/fixtures/my_app/lib/libonly1.rb')
-      c2 = File.read('spec/fixtures/my_app/lib/libonly2.rb')
-      c1.should match(/'libonlyl from module 1'/)
-      c2.should match(/'libonly2 from module 2'/)
-    end
-
-    it 'copy the file found first' do
-      cts = File.read('spec/fixtures/my_app/lib/auth_util.rb')
-      cts.should match(/'auth_util from module 1'/)
-    end
-
-    it 'renders erb file from stack' do
-      cts = File.read('spec/fixtures/my_app/Gemfile')
-      cts.should match(/ruby\.taobao\.com/)
-      cts.should match(/gem: 'rspec', '~> 2.0.0'/)
-      cts.should match(/gem: 'mongoid'/)
-      cts.should match(/gem: 'grape'/)
-    end
-
-    it 'renders erb file in app-root' do
-      cts = File.read('spec/fixtures/my_app/config/self_render.conf')
-      cts.should match(/self config for my_app_code/)
-    end
-
-    after(:all) do
-      %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)
-      end
+  describe '.stackup!' do
+    it 'copy proper files' do
+      AppStack.stackup!('spec/fixtures/sample_files/my_app/app_stack.yml')
+      File.exists?('spec/fixtures/sample_files/my_app/config/boot_sample.rb').should be_false
+      File.exists?('spec/fixtures/sample_files/my_app/doc/including.txt').should be_true
+      File.exists?('spec/fixtures/sample_files/my_app/app/lib/sequence.rb').should be_true
+      File.read('spec/fixtures/sample_files/my_app/Gemfile').should eq("Mod2: my_app\n")
+      File.read('spec/fixtures/sample_files/my_app/doc/excluding.txt').should eq("from my_app\n")
+      FileUtils.rm_rf 'spec/fixtures/sample_files/my_app'
+      FileUtils.cp_r 'spec/fixtures/sample_files/my_app_back', 'spec/fixtures/sample_files/my_app'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_stack
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -98,41 +98,90 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - README.md
 - app_stack.gemspec
+- doc/coverage/.last_run.json
+- doc/coverage/.resultset.json
+- doc/coverage/assets/0.7.1/application.css
+- doc/coverage/assets/0.7.1/application.js
+- doc/coverage/assets/0.7.1/fancybox/blank.gif
+- doc/coverage/assets/0.7.1/fancybox/fancy_close.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_loading.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_nav_left.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_nav_right.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_shadow_e.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_shadow_n.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_shadow_ne.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_shadow_nw.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_shadow_s.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_shadow_se.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_shadow_sw.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_shadow_w.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_title_left.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_title_main.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_title_over.png
+- doc/coverage/assets/0.7.1/fancybox/fancy_title_right.png
+- doc/coverage/assets/0.7.1/fancybox/fancybox-x.png
+- doc/coverage/assets/0.7.1/fancybox/fancybox-y.png
+- doc/coverage/assets/0.7.1/fancybox/fancybox.png
+- doc/coverage/assets/0.7.1/favicon_green.png
+- doc/coverage/assets/0.7.1/favicon_red.png
+- doc/coverage/assets/0.7.1/favicon_yellow.png
+- doc/coverage/assets/0.7.1/loading.gif
+- doc/coverage/assets/0.7.1/magnify.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-icons_222222_256x240.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-icons_2e83ff_256x240.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-icons_454545_256x240.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-icons_888888_256x240.png
+- doc/coverage/assets/0.7.1/smoothness/images/ui-icons_cd0a0a_256x240.png
+- doc/coverage/index.html
 - lib/app_stack.rb
+- lib/app_stack/config.rb
+- lib/app_stack/merger.rb
 - lib/app_stack/version.rb
-- spec/app_as_hash_spec.rb
-- spec/export_list_spec.rb
-- spec/fixtures/.app_stack.yml
-- spec/fixtures/app-sample.yml
-- spec/fixtures/incexc-config.yml
-- spec/fixtures/incexc/.gitignore
-- spec/fixtures/incexc/.rspec
-- spec/fixtures/incexc/Rakefile
-- spec/fixtures/incexc/Rakefile.erb
-- spec/fixtures/incexc/incexc-config.yml
-- spec/fixtures/incexc/lib/anyway.rb
-- spec/fixtures/incexc/lib/extra/excludes.rb
-- 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/.app_stack.yml
-- spec/fixtures/my_app/.gitignore
-- spec/fixtures/my_app/config/self_render.conf.erb
-- spec/fixtures/sample_config.yml
-- spec/fixtures/stack_apps/module-1/.app_stack.yml
-- spec/fixtures/stack_apps/module-1/Gemfile
-- 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/.app_stack.yml
-- spec/fixtures/stack_apps/module-2/Gemfile
-- spec/fixtures/stack_apps/module-2/Gemfile.erb
-- spec/fixtures/stack_apps/module-2/lib/auth_util.rb
-- spec/fixtures/stack_apps/module-2/lib/libonly2.rb
-- spec/gitignore_list_spec.rb
-- spec/load_configuration_spec.rb
-- spec/register_self_spec.rb
+- spec/config_spec.rb
+- spec/fixtures/config_sample/sample.yml
+- spec/fixtures/config_sample/wrong_key.yml
+- spec/fixtures/config_sample/wrong_type.yml
+- spec/fixtures/sample_files/module_1/Gemfile
+- spec/fixtures/sample_files/module_1/Gemfile.erb
+- spec/fixtures/sample_files/module_1/Rakefile
+- spec/fixtures/sample_files/module_1/app_stack.yml
+- spec/fixtures/sample_files/module_1/config/boot_sample.rb
+- spec/fixtures/sample_files/module_1/doc/excluding.txt
+- spec/fixtures/sample_files/module_1/doc/including.txt
+- spec/fixtures/sample_files/module_1/lib/mixins/b_lib.rb
+- spec/fixtures/sample_files/module_1/lib/mixins/s_lib.rb
+- spec/fixtures/sample_files/module_1/lib/samples/a_lib.rb
+- spec/fixtures/sample_files/module_1/spec/config_spec.rb
+- spec/fixtures/sample_files/module_2/Gemfile
+- spec/fixtures/sample_files/module_2/Gemfile.liquid
+- spec/fixtures/sample_files/module_2/app/lib/sequence.rb
+- spec/fixtures/sample_files/module_2/app_stack.yml
+- spec/fixtures/sample_files/module_3/app_stack.yml
+- spec/fixtures/sample_files/module_3/bin/del
+- spec/fixtures/sample_files/module_3/bin/rm
+- spec/fixtures/sample_files/module_3/config/application.yml
+- spec/fixtures/sample_files/module_3/config/database_development.yml
+- spec/fixtures/sample_files/module_3/config/database_production.yml
+- spec/fixtures/sample_files/module_3/lib/libfile_1.rb
+- spec/fixtures/sample_files/module_3/lib/libfile_2.rb
+- spec/fixtures/sample_files/my_app/app_stack.yml
+- spec/fixtures/sample_files/my_app/doc/excluding.txt
+- spec/fixtures/sample_files/my_app/spec/config_spec.rb
+- spec/fixtures/sample_files/my_app_back/app_stack.yml
+- spec/fixtures/sample_files/my_app_back/doc/excluding.txt
+- spec/fixtures/sample_files/my_app_back/spec/config_spec.rb
+- spec/merger_spec.rb
 - spec/spec_helper.rb
 - spec/stackup_spec.rb
 homepage: https://github.com/7lime/app_stack-gem
@@ -162,19 +211,17 @@ specification_version: 3
 summary: Use as a rake task, define a stack of modules and app-stack will merge files
   from those stack-apps to the local application directory.
 test_files:
-- spec/app_as_hash_spec.rb
-- spec/export_list_spec.rb
-- spec/fixtures/incexc/lib/anyway.rb
-- spec/fixtures/incexc/lib/extra/excludes.rb
-- spec/fixtures/incexc/lib/mixin/otherlib.rb
-- spec/fixtures/incexc/spec/spec_helper.rb
-- spec/fixtures/incexc/spec/support/api_test.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
-- spec/fixtures/stack_apps/module-2/lib/libonly2.rb
-- spec/gitignore_list_spec.rb
-- spec/load_configuration_spec.rb
-- spec/register_self_spec.rb
+- spec/config_spec.rb
+- spec/fixtures/sample_files/module_1/config/boot_sample.rb
+- spec/fixtures/sample_files/module_1/lib/mixins/b_lib.rb
+- spec/fixtures/sample_files/module_1/lib/mixins/s_lib.rb
+- spec/fixtures/sample_files/module_1/lib/samples/a_lib.rb
+- spec/fixtures/sample_files/module_1/spec/config_spec.rb
+- spec/fixtures/sample_files/module_2/app/lib/sequence.rb
+- spec/fixtures/sample_files/module_3/lib/libfile_1.rb
+- spec/fixtures/sample_files/module_3/lib/libfile_2.rb
+- spec/fixtures/sample_files/my_app/spec/config_spec.rb
+- spec/fixtures/sample_files/my_app_back/spec/config_spec.rb
+- spec/merger_spec.rb
 - spec/spec_helper.rb
 - spec/stackup_spec.rb

data/spec/app_as_hash_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-module AppStack
-  def config
-    @config
-  end
-end
-
-describe AppStack do
-  it 'load a app as a hash' do
-    AppStack.load_configuration('spec/fixtures/app-sample.yml')
-    AppStack.config['stack'][0].is_a?(Hash).should be_true
-    # AppStack.stackup!('spec/fixtures/app-sample.yml')
-  end
-end

data/spec/export_list_spec.rb

@@ -1,66 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-require 'fileutils'
-
-describe AppStack do
-  describe '#newer?' do
-    it 'true for newer file' do
-      FileUtils.touch('.rspec_new')
-      AppStack.newer?('.rspec_new', '.rspec').should be_true
-      FileUtils.rm('.rspec_new')
-    end
-
-    it 'handles non exits file well' do
-      AppStack.newer?('.rspec', '.rspec_non').should be_true
-      AppStack.newer?('.no_rspec', '.rspec').should be_false
-    end
-  end
-
-  describe '#export_list' do
-    subject :el do
-      AppStack.load_configuration('spec/fixtures/incexc-config.yml')
-      AppStack.export_list('spec/fixtures/incexc')
-    end
-
-    it 'contains exported files' do
-      el.include?('lib/anyway.rb').should be_true
-      el.include?('lib/mixin/otherlib.rb').should be_true
-    end
-
-    it 'excludes gitignore files' do
-      el.include?('lib/mixin/otherlist.rb.bak').should be_false
-    end
-
-    it 'excludes explicitly excluded files' do
-      el.include?('lib/extra/excludes.rb').should be_false
-    end
-
-    # depreciated
-    # it 'include explicitly included files' do
-    #   el.include?('spec/spec_helper.rb').should be_true
-    #   el.include?('spec/support/api_test.rb').should be_true
-    # end
-
-    it 'can include grouped files' do
-      el.include?('spec/support/api_test.rb').should be_false
-      elist = AppStack.export_list('spec/fixtures/incexc', ['default', 'test'])
-      elist.include?('spec/support/api_test.rb').should be_true
-      elist.include?('spec/spec_helper.rb').should be_true
-    end
-
-    it 'can set to include all files' do
-      elist = AppStack.export_list('spec/fixtures/incexc', ['all'])
-      elist.include?('spec/support/api_test.rb').should be_true
-      elist.include?('spec/spec_helper.rb').should be_true
-      elist.include?('lib/mixin/otherlib.rb').should be_true
-    end
-  end
-
-  describe '#merge_stacks!' do
-    it 'raise for non existing directory' do
-      AppStack.load_configuration('spec/fixtures/sample_config.yml')
-      stacks = AppStack.config['stack']
-      expect { AppStack.merge_stacks!(stacks) }.to raise_error
-    end
-  end
-end

data/spec/fixtures/.app_stack.yml

@@ -1,21 +0,0 @@
----
-stack:
-- module-1
-- module-2
-export:
-- lib/**/*.rb
-- config/**/*
-- app/**/*.rb
-exclude:
-- lib/extra/*.rb
-attrs:
-  application_name: My App Name
-  application_code: my_app_code
-  database_password: the very secret
-  gems:
-    default:
-      rspec: ~> 2.0.0
-      mongoid: ''
-    development:
-      app_stack: ~> 0.0.8
-files:

data/spec/fixtures/app-sample.yml

@@ -1,25 +0,0 @@
-stack:
-  - incexc: [all]
-stack_dir: '.'
-tpl_ext: '.erb'
-verbose: 1
-export:
-  - lib/**/*.rb
-  - app/**/*.rb
-  - test:
-      - spec/**/*
-exclude:
-  - lib/extra/*.rb
-attrs:
-  application_name: App Name
-  application_code: app_code
-  database_password: the very secret
-  gems:
-    default:
-      - rspec: '~> 2.0.0'
-      - mongoid: ''
-    development:
-files:
-  README.md: '__self'
-
-

data/spec/fixtures/incexc/.gitignore

@@ -1,27 +0,0 @@
-.DS_Store
-.bundle
-logs/*.log
-logs/**/*.log
-log/*.log
-log/**/*.log
-tmp/**/*
-vendor/gems/*
-!vendor/gems/cache/
-.sass-cache/*
-public/assets/*
-*.bak
-tmp/*
-*.swp
-*~
-~*
-Thumbs.db
-*/Thumbs.db
-.idea/*
-db/*.db
-db/*.sqlite*
-.yardoc/*
-.yardoc/**/*
-docs/*
-docs/**/*
-.dev_flow
-*.gem

data/spec/fixtures/incexc/incexc-config.yml

@@ -1,24 +0,0 @@
-stack: [incexc]
-stack_dir: '.'
-tpl_ext: '.erb'
-verbose: 1
-export:
-  - lib/**/*.rb
-  - app/**/*.rb
-  - test:
-      - spec/**/*
-exclude:
-  - lib/extra/*.rb
-attrs:
-  application_name: App Name
-  application_code: app_code
-  database_password: the very secret
-  gems:
-    default:
-      - rspec: '~> 2.0.0'
-      - mongoid: ''
-    development:
-files:
-  README.md: '__self'
-
-

data/spec/fixtures/incexc/lib/anyway.rb

@@ -1 +0,0 @@
-# encoding: utf-8

data/spec/fixtures/incexc/lib/extra/excludes.rb

@@ -1 +0,0 @@
-# encoding: utf-8

data/spec/fixtures/incexc/lib/mixin/otherlib.rb

@@ -1 +0,0 @@
-# encoding: utf-8

data/spec/fixtures/incexc/spec/spec_helper.rb

@@ -1 +0,0 @@
-# encoding: utf-8

data/spec/fixtures/incexc/spec/support/api_test.rb

@@ -1 +0,0 @@
-# encoding: utf-8

data/spec/fixtures/incexc-config.yml

@@ -1,23 +0,0 @@
-stack: [incexc]
-stack_dir: '.'
-tpl_ext: '.erb'
-verbose: 1
-export:
-  - lib/**/*.rb
-  - Rakefile
-  - Rakefile.erb
-exclude:
-  - lib/extra/*.rb
-attrs:
-  application_name: App Name
-  application_code: app_code
-  database_password: the very secret
-  gems:
-    default:
-      - rspec: '~> 2.0.0'
-      - mongoid: ''
-    development:
-files:
-  README.md: '__self'
-
-

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

@@ -1,31 +0,0 @@
----
-stack:
-- module-1
-- module-2
-export:
-- lib/**/*.rb
-- config/**/*
-- app/**/*.rb
-exclude:
-- lib/extra/*.rb
-attrs:
-  application_name: My App Name
-  application_code: my_app_code
-  database_password: the very secret
-  gems:
-    default:
-      rspec: ~> 2.0.0
-      mongoid: ''
-    development:
-      app_stack: ~> 0.0.8
-files:
-  .app_stack.yml: __self
-  .gitignore: __self
-  config: __self
-  config/self_render.conf: __self
-  config/self_render.conf.erb: __self
-  lib: __self
-  lib/auth_util.rb: module-2
-  lib/libonly1.rb: module-1
-  lib/libonly2.rb: module-2
-  Gemfile: module-2