app_stack 1.3.4 → 1.4.0

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: app_stack
 version: !ruby/object:Gem::Version
-  version: 1.3.4
-  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors:
 - Huang Wei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,35 +69,45 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
 description: Merge app source code in a stack to increase module reusability
 email: huangw@7lime.com
 executables:
@@ -114,99 +115,77 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .app_stack.yml
 - Gemfile
 - Gemfile.lock
 - README.md
 - app_stack.gemspec
-- bin/config_assets
 - bin/stackup
-- file.erb
 - lib/app_stack.rb
+- lib/app_stack/app.rb
 - lib/app_stack/cli_options.rb
-- lib/app_stack/copy_list_builder.rb
-- lib/app_stack/local_files_parser.rb
-- lib/app_stack/stack_app.rb
+- lib/app_stack/compare_list.rb
+- lib/app_stack/configuration.rb
+- lib/app_stack/operator.rb
 - lib/app_stack/version.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/local.conf
-- spec/fixtures/sample_files/my_app/local.conf.erb
-- 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/local.conf
-- spec/fixtures/sample_files/my_app_back/local.conf.erb
-- spec/fixtures/sample_files/my_app_back/spec/config_spec.rb
-- spec/merger_spec.rb
+- spec/app_stack_spec.rb
+- spec/cli_options_spec.rb
+- spec/compare_list_spec.rb
+- spec/configuration_spec.rb
+- spec/examples/find_conf_file/both/.app_stack.yml
+- spec/examples/find_conf_file/both/app_stack.yml
+- spec/examples/find_conf_file/with_dot/.app_stack.yml
+- spec/examples/la-assets-helper/app_stack.yml
+- spec/examples/la-assets-helper/lib/la_assets.rb
+- spec/examples/la-import_app/Trivia.erb
+- spec/examples/la-import_app/app_stack.yml
+- spec/examples/la-mongoid/app_stack.yml
+- spec/examples/la-mongoid/config/boot.rb
+- spec/examples/la-mongoid/config/database.rb
+- spec/examples/la-mongoid/config/mongoid.yml
+- spec/examples/la-mongoid/config/mongoid.yml.erb
+- spec/examples/la-sinatra/Gemfile.erb
+- spec/examples/la-sinatra/app_stack.yml
+- spec/examples/no-stacked/some_list.rb
+- spec/examples/sample_config/app_stack.yml
+- spec/examples/sample_config/hash_export.yml
+- spec/examples/sample_config/wrong_key.yml
+- spec/examples/sample_config/wrong_type.yml
+- spec/load_stack_spec.rb
 - spec/spec_helper.rb
-- spec/stackup_spec.rb
 - tags
 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:
-- 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/app_stack_spec.rb
+- spec/cli_options_spec.rb
+- spec/compare_list_spec.rb
+- spec/configuration_spec.rb
+- spec/examples/la-assets-helper/lib/la_assets.rb
+- spec/examples/la-mongoid/config/boot.rb
+- spec/examples/la-mongoid/config/database.rb
+- spec/examples/no-stacked/some_list.rb
+- spec/load_stack_spec.rb
 - spec/spec_helper.rb
-- spec/stackup_spec.rb

data/.app_stack.yml

@@ -1,14 +0,0 @@
-stack:
-- la-sinatra: [default, { Gemfile: Gemfile, Procfile: Procfile.imp }]
-- la-mongoid: [default, mixins]
-- la-mancha-models-syobu-p1
-- la-assets-helper
-export: []
-exclude:
-  - '*sample_files/**/*'
-attrs:
-  application_code: ficus_syobu_p1
-  application_name: Ficus Web Framework
-  gems:
-    default: {}
-    development: {}

data/bin/config_assets

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

data/lib/app_stack/copy_list_builder.rb

@@ -1,147 +0,0 @@
-# encoding: utf-8
-
-require 'diffy'
-require 'tilt'
-require 'ostruct'
-
-module AppStack
-  # import from outside apps
-  module CopyListBuilder
-    # get exported source file list from app, filtered by import_conf
-    def import_files(import_conf)
-      file_list = {}
-      import_conf.each do |c|
-        if c.is_a?(String) # group name
-          echo "import from group #{c.bold.blue}"
-          file_list.merge! export_files(c)
-        elsif c.is_a?(Hash)
-          echo "import form file: ", c
-          file_list.merge! glob_files(c, true)
-        else
-          fail 'unknown import options: ' + c.inspect
-        end
-      end
-      file_list
-    end
-
-    # render/copy file list
-    def check_mtime
-      @render_files, @copy_candidates = {}, {}
-      @copy_list.each do |f, t|
-        type, f = f.split ':', 2
-
-        # exclude file in the exclude list
-        excluded = false
-        @config[:exclude].each do |patt|
-          if File.fnmatch?(patt, t)
-            echo "exclude #{short_path(t)} by patthern ", patt
-            excluded = true
-            break
-          end
-        end
-        next if excluded
-
-        # check modification time
-        if type == 'c'
-          if newer?(f, t)
-            @copy_candidates[t] = f
-          else
-            echo "skip copy #{short_path(t).blue} (mtime or existence)."
-          end
-        elsif type == 'r'
-          if newer?(f, t) or @attr_mtime > File.mtime(t)
-            @render_files[t] = f
-          else
-            echo "skip render #{short_path(t).blue} (mtime or existence)."
-          end
-        else
-          fail "unknown operation type #{type} for #{short_path(t)}"
-        end
-      end
-    end
-
-    def check_diff
-      @copy_files, @diffs = {}, {}
-      @copy_candidates.each do |t, f|
-        if File.exists?(t)
-          diff = Diffy::Diff.new(f, t, :source => 'files')
-          if diff.to_s.chomp.size > 0
-            @diffs[t] = diff
-            @copy_files[t] = f
-          else
-            echo "Skip copy #{short_path(t).blue} (no diff)."
-          end
-        else
-          @copy_files[t] = f
-        end
-      end
-    end
-
-    def merge!
-      check_mtime
-      check_diff
-      echo 'final copy list: ', @copy_files
-      echo 'final diff list: ', @diffs
-      echo 'final render lists: ', @render_files
-
-      if @diffs.keys.size > 0 and !@options.force
-        ask_diffs # quit, copy and show diffs special files
-      else
-        do_copy!
-        do_render!
-      end
-    end
-
-    def ask_diffs
-      puts "These files are changed remotely:"
-      i = 1
-      @diffs.each do |t, diff|
-        puts "[#{i.to_s.bold}] " + short_path(t).blue
-        puts "from: #{@copy_files[t].blue}"
-        puts diff.to_s(:color)
-        i += 1
-      end
-
-      puts "use -f (--force) option to overwrite all files,"
-      puts "or 'touch' local file to disable warn for specific file."
-    end
-
-    def do_copy!
-      @copy_files.each { |to, fr| copy_file!(fr, to) }
-    end
-
-    def do_render!
-      @render_files.each { |to, fr| render_file!(fr, to) }
-    end
-
-    # if f1 newer than f2, or f2 not exits but f1 does.
-    def newer?(f1, f2)
-      return false unless File.exists?(f1)
-      return true unless File.exists?(f2)
-      File.mtime(f1) > File.mtime(f2)
-    end
-
-    def copy_file!(fr, to)
-      target_dir = File.dirname(to)
-      puts "copy #{fr.blue} \n   to: " + to.green.bold
-      return if @options.simulate
-      FileUtils.mkdir_p target_dir unless File.directory?(target_dir)
-      FileUtils.cp_r fr, to
-    end
-
-    def render_file!(fr, to)
-      puts "reader #{fr.blue}\n     to: " + to.green.bold
-      return if @options.simulate
-      oh = File.open(to, 'wb')
-      if fr.match(/\.liquid$/)
-        require 'liquid'
-        oh.write Liquid::Template.parse(File.open(fr,
-                                                  'r:utf-8').read).render(attrs)
-      else
-        tilt = Tilt.new(fr)
-        oh.write tilt.render(OpenStruct.new(attrs))
-      end
-      oh.close
-    end
-  end
-end

data/lib/app_stack/local_files_parser.rb

@@ -1,95 +0,0 @@
-# encoding: utf-8
-
-module AppStack
-  # parse local files from a local app directory
-  module LocalFilesParser
-    def attrs
-      @config[:attrs]
-    end
-
-    def directory
-      File.expand_path('../', @file)
-    end
-
-    # use the direct name of the config file as app name
-    def app_name
-      File.basename(directory)
-    end
-
-    def full_path(file)
-      File.expand_path(file, directory)
-    end
-
-    def short_path(path)
-      lpath = path.sub(/^((c|r)\:)?#{directory}\/?/, '')
-      lpath.sub(/^\//, '')
-    end
-
-    # get export files list (copy_from => copy_to hash) for a specific group
-    def export_files(group = 'default')
-      @export_files ||= parse_export_files
-      group = 'default' if group.to_s == 'defaults' # back-compatibility
-      @export_files[group.to_s]
-    end
-
-    # get all exported files in groups
-    def parse_export_files
-      # 'file_group_name' => { copy_from => copy_to_base_name }
-      @export_files ||= {}
-      @config[:export].each do |p_list| # pattern list
-        if p_list.is_a?(Hash) # group, file list
-          p_list.each do |n, p|
-            @export_files[n] ||= {}
-            @export_files[n].merge! find_files(p)
-          end
-        elsif p_list.is_a?(String)
-          @export_files['default'] ||= {}
-          @export_files['default'].merge! find_files([p_list])
-        else
-          fail 'invalid export option ' + p_list.inspect
-        end
-      end
-      @export_files
-    end
-
-    def switch_to_tpl(file)
-      f = full_path(file)
-      tpl_file = nil
-      @config[:tpl_ext].each { |ex| tpl_file = f + ex if File.exists?(f + ex) }
-      tpl_file ? 'r:' + tpl_file : 'c:' + f
-    end
-
-    # from file pattern to copy_from => copy_to (remove directory header) hash
-    def glob_files(dir, allow_hash = false)
-      fhsh = {}
-      if dir.is_a?(Hash)
-        raise 'Can not use hash here for ' + dir.keys.join.to_s + ' in file ' +
-          filename unless allow_hash
-        dir.each do |f, t|
-          t = '/' + t.gsub(/^\//, '')
-          fhsh[switch_to_tpl(f)] = t
-          echo "found: #{short_path(switch_to_tpl(f)).blue} to: ",
-               short_path(t)
-        end
-      else
-        Dir[File.expand_path(dir, directory)].each do |f|
-          fhsh[switch_to_tpl(f)] = f.gsub(/^#{directory}/, '')
-          echo "found: #{short_path(switch_to_tpl(f)).blue} to: ",
-               short_path(short_path(f.gsub(/^#{directory}/, '')))
-        end
-      end
-
-      fhsh
-    end
-
-    # from array (or string) of file patterns, glob files and build a
-    # large array
-    def find_files(plist)
-      fhsh = {}
-      plist.each do |file_pattern|
-        fhsh.merge! glob_files(file_pattern)
-      end
-      fhsh
-    end
-  end
-end

data/lib/app_stack/stack_app.rb

@@ -1,119 +0,0 @@
-# encoding: utf-8
-
-require 'yaml'
-require 'pp'
-
-module AppStack
-  # content parse error
-  class ParseError < RuntimeError; end
-
-  # represent a single stacked application
-  class StackApp
-    attr_reader :file_mtime
-
-    include LocalFilesParser
-    include CopyListBuilder
-
-    def initialize(filename, options)
-      @filename, @options = filename, options
-      @file = File.expand_path(filename)
-      @file_mtime = File.mtime(@file)
-
-      # default configuration, also restrict known keys and data type
-      @config = {
-        stack: [],
-        export: [],
-        exclude: [],
-        attrs: {},
-        stack_dir: '..',
-        tpl_ext: %w[.erb .haml .liquid]
-      }
-
-      echo "load app #{app_name.bold} from file:", @file
-      # use yaml file to set configuration
-      YAML.load(File.open(@file, 'r:utf-8').read).each do |k, v|
-        fail ParseError,
-             "unkown option `#{k}` in #{@filename}" unless @config[k.to_sym]
-        fail ParseError,
-             "'#{k}' must be a #{@config[k.to_sym].class.to_s}" unless
-               v.is_a?(@config[k.to_sym].class)
-        echo "set #{k.blue} to: ", v
-        @config[k.to_sym] = v
-      end
-    end
-
-    # load definitions from all apps in the stack config
-    def load_stack
-      unless @stack
-        @stack = { } # stack_app => import list
-        @config[:stack].each do |app_conf|
-          if app_conf.is_a?(String)
-            app_name, groups = app_conf, ['default']
-          elsif app_conf.is_a?(Hash)
-            fail 'invalid app: ' + app_conf.inspect if app_conf.keys.size > 1
-            app_conf.each { |an, ac| app_name, groups = an, ac }
-          else
-            fail 'invalid stack app: ' + app_conf.inspect
-          end
-
-          conf_file = @config[:stack_dir].sub(/\/?$/, '/') + app_name
-          conf_file += '/' + File.basename(@file)
-          app = StackApp.new(conf_file, @options)
-          @stack[app] = groups
-        end
-      end
-      @stack
-    end
-
-    # entry point: copy or simulate copy
-    def stackup!
-      @copy_list = {} # from_file_full_path => copy item
-      new_attrs, @attr_mtime = {}, file_mtime
-      load_stack.each do |app, import_conf|
-        echo 'load files from ' + app.app_name.bold.blue
-
-        # get file list from app
-        app.import_files(import_conf).each do |f, t|
-          @copy_list[f] = full_path(short_path(t))
-        end
-
-        # update global attrs
-        new_attrs.deep_merge! app.attrs
-        @attr_mtime = app.file_mtime if app.file_mtime > @attr_mtime
-      end
-
-      @config[:attrs] = new_attrs.deep_merge attrs
-      echo 'the merged attributes', attrs
-
-      # add local template files the copy list
-      Dir[directory + "/**/*{#{@config[:tpl_ext].join(',')}}"].each do |f|
-        of = f.gsub(/#{@config[:tpl_ext].join('|')}$/, '')
-        if File.exists?(of)
-          @copy_list['r:' + f] = of
-          echo 'found local template file: ',
-               short_path(f) + ' -> ' + short_path(of)
-        else
-          echo 'skip template file: ', f
-        end
-      end
-
-      merge!
-    end
-
-    # echo message only if verbose specified to be true
-    def echo(msg, var = nil)
-      return unless @options.verbose
-
-      msg = "[#{app_name || self.class.name}] ".green + msg
-      msg += "\n" if var && var.inspect.size > 30
-
-      print msg
-      if var
-        print Term::ANSIColor.bold
-        var.inspect.size > 30 ? PP.pp(var) : PP.singleline_pp(var)
-        print Term::ANSIColor.reset
-      end
-      puts unless var && var.inspect.size > 30
-    end
-  end
-end