app_stack 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Mjg0MTY2ZmU2NDExMmU3ZjVlYTM5ZDdiODZjYTEyMzg2ZTM4MGM4MA==
+  data.tar.gz: !binary |-
+    NTllMzU1NmZkZjJlYzM2N2UxYjMzZTQwYWZkZDEzNmNjZGE3NWM1ZQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NWJkOTZlY2ZmNmNjZDc2YWU5MDZmMTljOGM0ZTYzZDUwNTIyMjc2N2NiMmQ3
+    ZjIwNTYxZDk5MGRkYWM0YjhkY2FhZGI1NjY3NTFlMmUwZjlmYjBmYzJkMTNi
+    MTk2ZDYxZTRhNzE3OTFjMGY5YmE5ZjFiMDBiYTg4MjNlN2I5MmQ=
+  data.tar.gz: !binary |-
+    NmQ4ZTRjNDI3MzI4NWY4MTlhYzc4MWRmM2U4ZWNjMjhlZDVlODFiNzVhZDYz
+    YTUyMWY5ZDZhMzIwYWY3Y2JhNGMzZmE0MDkzYmI0MjhhZTllMmM0ZTA3ODFl
+    OGM0ODFhNGQzMTVlMDMyZmUzZWZkMGE3ODQ3MmZiOGViY2I2ZmY=

data/README.md

@@ -10,6 +10,11 @@ A configuration file `.app-stack.yml` in you app-root, in format like:
     app_dir: '../stack-apps'
     tpl_ext: '.sample.erb'
     verbose: 1
+    file_patterns:
+      spec/**/*.rb
+      lib/**/*.rb
+      **/*.line_addon
+      **/*.erb
     attrs:
       dababase_name: 'nameofdatabase'
     files:
@@ -22,7 +27,7 @@ And in `Rakefile` add:
 
     namespace :stack do
       task :update do
-        AppStack.new('.app-stack.yml').run!
+        AppStack.run!('.app-stack.yml')
       end
     end
 

data/examples/my_app/.app-stack.yml

@@ -6,18 +6,18 @@ stack_apps_dir: ../stack-apps
 tpl_ext: .template.erb
 addon_ext: .line_addon
 verbose: 1
-ignores:
-- .+\.swap
-- ~.+
-- .+~
-- docs/?.*
-- .git/?.*
+file_patterns:
+- app/**/*.rb
+- spec/**/*.rb
+- lib/**/*.rb
+- config/**/*.rb
+- config/**/*.conf
+- config/**/*.yaml
 attrs:
   application_name: My App
   from_self: myapp
 files:
-  Gemfile: __self
-  README: __self
-  config: __self
-  config/app.config.rb: __self
-  config/configuration.yml: __self
+  config/app.config.rb: base-app
+  app/controllers/hello_controller.rb: __self
+  app/api_controller.rb: __self
+  app/config.rb: __self

data/examples/my_app/README

@@ -1 +1,2 @@
 readme in my app
+readme in base_app

data/examples/stack-apps/auth-app/app/config.rb.erb

@@ -0,0 +1 @@
+<%= "Holly OK." %>

data/lib/app_stack/version.rb

@@ -2,5 +2,5 @@
 
 # AppStack module
 module AppStack
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/app_stack.rb

@@ -3,17 +3,19 @@
 require 'yaml'
 require 'find'
 require 'fileutils'
+require 'ostruct'
+require 'tilt/erb'
+
 require 'term/ansicolor'
 # mixin String class for term-color methods
 class String; include Term::ANSIColor end
-require 'tilt/erb'
-require 'ostruct'
 
 ## A namespace for app-stack based modules
 module AppStack
 
   CONF_FILE = '.app-stack.yml'
 
+  # public entry ponit, receive a configuration filename
   def run!(file = '.app-stack.yml')
     # load configuration
     @config = YAML.load(File.read(file))
@@ -21,79 +23,40 @@ module AppStack
     # assign default values:
     @app_root = File.expand_path(File.dirname(file)) unless @config['app_root']
     @stack_apps_dir = @config['stack_apps_dir']
+    # convert relative path:
     @stack_apps_dir = @app_root + '/' +
                      @stack_apps_dir if @stack_apps_dir.match(/^\.\.?\//)
 
     @files = @config['files'] || {}
     register_own_files!
     # loop over each stack application
-    @config['stack'].each { |stack_app| do_copy(stack_app) }
+    @config['stack'].each { |stack_app| do_copy_stack!(stack_app) }
+
     # rewrite configuration back to app-stack file
     @config['files'] = @files
     File.open(file, 'wb') { |fh| fh.puts YAML.dump(@config) }
   end
 
-  def newer(f1, f2)
-    return false unless File.exists?(f1)
-    return true unless File.exists?(f2)
-    File.mtime(f1) > File.mtime(f2)
-  end
-
-  def do_addon!(f, basename)
-    target = File.expand_path(@app_root + '/' + basename)
-    # add on always applies
-    addon_file = f + @config['addon_ext']
-    if File.exists?(addon_file) # && newer(addon_file, target)
-      add_lines = File.read(addon_file).split("\n")
-      add_lines -= File.read(target).split("\n")
-      afh = File.open(target, 'a')
-      add_lines.each { |line| afh.puts line }
-      afh.close
-      done = 'add lines'.bold.green if add_lines.size > 0
-    end
-  end
-
-  # rubocop:disable MethodLength
-  def copy_file!(f, basename)
-    done = 'keeped'.green
-    target = File.expand_path(@app_root + '/' + basename)
-    # directory?
-    if File.directory?(f)
-      if File.directory?(target)
-        done = 'exists'.green
-      else
-        FileUtils.mkdir_p target
-        done = 'created'.bold.green
+  # for files already in the app root, register to no-copy list
+  def register_own_files!
+    @config['file_patterns'].each do |pt|
+      Dir[@app_root + '/' + pt].each do |f|
+        next if f == @app_root
+        basename = f.sub(/^#{@app_root}\//, '')
+        if @files[basename]
+          carp "From #{'self'.blue.bold} #{basename.bold} ",
+               'keep'.white if @files[basename] == '__self'
+        else
+          carp "From #{'self'.blue.bold} #{basename.bold}",
+               'registed'.green.bold
+          @files[basename] = '__self'
+        end
       end
-    else
-      tpl_file = f + @config['tpl_ext']
-      if File.exists?(tpl_file) && newer(tpl_file, target)
-        @tilt = Tilt::ERBTemplate.new(tpl_file)
-        oh = File.open(target, 'wb')
-        oh.write @tilt.render(OpenStruct.new(@attr.merge(@config['attrs'])))
-        oh.close
-        done = 'rendered'.bold.green
-      elsif newer(f, target)
-        FileUtils.copy f, target
-        done = 'copied'.bold.green
-     end
     end
-    done
-  end
-  # rubocop:able MethodLength
-
-  def ignores(f)
-    @config['ignores'] = [] unless @config['ignores']
-    return true if f == CONF_FILE
-    return true if /#{@config['tpl_ext']}$/.match(f)
-    return true if /#{@config['addon_ext']}$/.match(f)
-    @config['ignores'].each do |ptn|
-      return true if /^#{ptn}$/.match(f)
-    end
-    false
   end
 
-  def do_copy(stack_app)
+  # copy files for each included file
+  def do_copy_stack!(stack_app)
     raise 'invalid app name "__self"' if stack_app == '__self'
     stack_app_dir = File.expand_path(@stack_apps_dir + '/' + stack_app)
 
@@ -104,39 +67,84 @@ module AppStack
                                       stack_conf['attrs'].is_a?(Hash)
     end
 
+    # for each included files
+    @config['file_patterns'].each do |pt|
+      Dir[stack_app_dir + '/' + pt].each do |f|
+        basename = f.sub(/^#{stack_app_dir}\//, '')
+        # trivial ignore the stack directory itself:
+        next if f == stack_app_dir
+        if (@files[basename].nil? or @files[basename] == stack_app)
+          @files[basename] = stack_app unless @files[basename] # register
+          done = copy_file!(f, File.expand_path(@app_root + '/' + basename))
+          carp "From #{stack_app.blue.bold} #{basename.bold}", done
+        else
+          carp "From #{stack_app.blue.bold} #{basename.bold}",
+               'skip, use '.white + @files[basename]
+        end
+      end
+    end
+
+    # for templates and addons
     Find.find(stack_app_dir).each do |f|
       basename = f.sub(/^#{stack_app_dir}\//, '')
-      next if f == stack_app_dir
-      next if ignores(basename)
-      do_copy_it = @files[basename] ? false : true
-      do_copy_it = true if @files[basename] == stack_app
-      if do_copy_it
-        @files[basename] = stack_app unless @files[basename]
-        done = copy_file!(f, basename)
-        carp "From #{stack_app.blue.bold} #{basename.bold}", done
-      else
-        carp "From #{stack_app.blue.bold} #{basename.bold}",
-             'skip, use '.white + @files[basename]
+
+      if basename.gsub!(/#{@config['tpl_ext']}$/, '')
+        target = File.expand_path(@app_root + '/' + basename)
+        # next unless File.exists?(target)
+        done = 'keep'.white
+        if newer?(f, target)
+          tilt = Tilt::ERBTemplate.new(f)
+          oh = File.open(target, 'wb')
+          oh.write tilt.render(OpenStruct.new(@attr.merge(@config['attrs'])))
+          oh.close
+          done = 'rendered'.bold.green
+        end
+        carp "From #{stack_app.blue.bold} render #{basename.bold}", done
+      elsif basename.gsub!(/#{@config['addon_ext']}$/, '')
+        target = File.expand_path(@app_root + '/' + basename)
+        if File.exists?(target)
+          done = do_addon!(f, target)
+        end
+        done ||= 'keep'.white
+        carp "From #{stack_app.blue.bold} addon #{basename.bold}", done
       end
-      done = do_addon!(f, basename)
-      carp "From #{stack_app.blue.bold} addon #{basename.bold}", done if done
     end
   end
 
-  # for files already in the app root, register to no-copy list
-  def register_own_files!
-    Find.find(@app_root).each do |f|
-      next if f == @app_root
-      basename = f.sub(/^#{@app_root}\//, '')
-      next if ignores(basename)
-      if @files[basename]
-        carp "From #{'self'.blue.bold} #{basename.bold} ",
-             'keep'.green if @files[basename] == '__self'
+  def newer?(f1, f2)
+    return false unless File.exists?(f1)
+    return true unless File.exists?(f2)
+    File.mtime(f1) > File.mtime(f2)
+  end
+
+  def do_addon!(addon_file, target)
+    add_lines = File.read(addon_file).split("\n")
+    add_lines -= File.read(target).split("\n")
+    afh = File.open(target, 'a')
+    add_lines.each { |line| afh.puts line }
+    afh.close
+    lines = add_lines.size
+    done = "add #{lines} lines".bold.green if lines > 0
+  end
+
+  def copy_file!(f, target)
+    # directory?
+    if File.directory?(f)
+      if File.directory?(target)
+        done = 'exists'.green
       else
-        @files[basename] = '__self'
-        carp "From #{'self'.blue.bold} #{basename.bold}", 'registed'.green.bold
+        FileUtils.mkdir_p target
+        done = 'created'.bold.green
+      end
+    else
+      if newer?(f, target)
+        FileUtils.copy f, target
+        done = 'copied'.bold.green
+      else
+        done = 'keep'.white
       end
     end
+    done
   end
 
   def carp(job, state = 'done'.green)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: app_stack
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Huang Wei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,11 +77,16 @@ files:
 - examples/my_app/.app-stack.yml
 - examples/my_app/Gemfile
 - examples/my_app/README
+- examples/my_app/app/api_controller.rb
+- examples/my_app/app/config.rb
+- examples/my_app/app/controllers/hello_controller.rb
 - examples/my_app/config/app.config.rb
 - examples/my_app/config/configuration.yml
+- examples/my_app/fileabc.rb
 - examples/stack-apps/auth-app/Gemfile
 - examples/stack-apps/auth-app/Gemfile.line_addon
 - examples/stack-apps/auth-app/README
+- examples/stack-apps/auth-app/app/config.rb.erb
 - examples/stack-apps/auth-app/config/app.config.rb
 - examples/stack-apps/auth-app/config/configuration.yml
 - examples/stack-apps/auth-app/config/configuration.yml.template.erb
@@ -102,27 +98,26 @@ files:
 homepage: https://github.com/7lime/app-stack-gem
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 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: []